diff --git a/.checkpackageignore b/.checkpackageignore index 49327f0aba9..0dcca5ebc7e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1,4 +1,3 @@ -board/aarch64-efi/post-image.sh Shellcheck board/amarula/vyasa/post-build.sh Shellcheck board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch lib_patch.Upstream board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch lib_patch.Upstream @@ -22,7 +21,6 @@ board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh Shellcheck board/bsh/imx8mn-bsh-smm-s2/flash.sh Shellcheck lib_shellscript.EmptyLastLine board/bsh/imx8mn-bsh-smm-s2/post-build.sh Shellcheck board/canaan/k210-soc/post-build.sh Shellcheck -board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck board/chromebook/snow/sign.sh Shellcheck @@ -65,7 +63,6 @@ board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-sp board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch lib_patch.Upstream board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch lib_patch.Upstream board/pine64/rock64/post-build.sh Shellcheck -board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck @@ -81,16 +78,14 @@ board/solidrun/clearfog/post-build.sh Shellcheck board/solidrun/macchiatobin/post-build-mainline.sh Shellcheck board/solidrun/macchiatobin/post-build.sh Shellcheck board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh Shellcheck -board/stmicroelectronics/common/stm32mp157/post-image.sh Shellcheck +board/stmicroelectronics/common/stm32mp1xx/post-image.sh Shellcheck board/stmicroelectronics/stm32f429-disco/flash.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_sd.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_xip.sh Shellcheck -board/stmicroelectronics/stm32f469-disco/post-build.sh Shellcheck board/synopsys/axs10x/post-build.sh Shellcheck board/technologic/ts4900/post-image.sh Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck -board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch lib_patch.Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch lib_patch.Upstream @@ -107,7 +102,6 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch lib_patch.Upstream boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_patch.Upstream boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream -configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash @@ -159,7 +153,6 @@ configs/globalscale_espressobin_defconfig lib_defconfig.ForceCheckHash configs/grinn_chiliboard_defconfig lib_defconfig.ForceCheckHash configs/grinn_liteboard_defconfig lib_defconfig.ForceCheckHash configs/hifive_unleashed_defconfig lib_defconfig.ForceCheckHash -configs/icnova-a20-adb4006_defconfig lib_defconfig.ForceCheckHash configs/imx23evk_defconfig lib_defconfig.ForceCheckHash configs/imx6-sabreauto_defconfig lib_defconfig.ForceCheckHash configs/imx6-sabresd_defconfig lib_defconfig.ForceCheckHash @@ -178,7 +171,6 @@ configs/kontron_bl_imx8mm_defconfig lib_defconfig.ForceCheckHash configs/kontron_pitx_imx8m_defconfig lib_defconfig.ForceCheckHash configs/kontron_smarc_sal28_defconfig lib_defconfig.ForceCheckHash configs/linksprite_pcduino_defconfig lib_defconfig.ForceCheckHash -configs/ls1046a-frwy_defconfig lib_defconfig.ForceCheckHash configs/mangopi_mq1rdw2_defconfig lib_defconfig.ForceCheckHash configs/mender_x86_64_efi_defconfig lib_defconfig.ForceCheckHash configs/microchip_sam9x60ek_mmc_defconfig lib_defconfig.ForceCheckHash @@ -231,7 +223,6 @@ configs/riotboard_defconfig lib_defconfig.ForceCheckHash configs/roc_pc_rk3399_defconfig lib_defconfig.ForceCheckHash configs/rock64_defconfig lib_defconfig.ForceCheckHash configs/rock_pi_n8_defconfig lib_defconfig.ForceCheckHash -configs/rockpro64_defconfig lib_defconfig.ForceCheckHash configs/roseapplepi_defconfig lib_defconfig.ForceCheckHash configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash @@ -252,7 +243,6 @@ configs/snps_archs38_axs103_defconfig lib_defconfig.ForceCheckHash configs/snps_archs38_haps_defconfig lib_defconfig.ForceCheckHash configs/snps_archs38_hsdk_defconfig lib_defconfig.ForceCheckHash configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash -configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash @@ -344,7 +334,6 @@ package/brickd/S70brickd Shellcheck lib_sysv.Indent lib_sysv.Variables package/bridge-utils/0001-fix-build-on-musl.patch lib_patch.Upstream package/brltty/0001-Fix-linking-error-on-mips64el.patch lib_patch.Upstream package/brltty/S10brltty Shellcheck lib_sysv.Indent lib_sysv.Variables -package/bsdiff/0001-Add-missing-header-for-u_char.patch lib_patch.Upstream package/bustle/0001-Makefile-fix-pcap-config-call.patch lib_patch.Upstream package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch lib_patch.Upstream package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch lib_patch.Upstream @@ -369,7 +358,7 @@ package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables package/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch lib_patch.Upstream -package/chrony/S49chrony Shellcheck lib_sysv.Indent lib_sysv.Variables +package/chrony/S49chronyd lib_sysv.Variables package/cmake/0001-rename-cmake-rootfile.patch lib_patch.Upstream package/cmocka/0001-Don-t-redefine-uintptr_t.patch lib_patch.Upstream package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream @@ -435,7 +424,6 @@ package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch lib_patch.Upstream package/dmraid/0001-fix-compilation-under-musl.patch lib_patch.Upstream package/dmraid/S20dmraid lib_sysv.Variables -package/docker-engine/S60dockerd Shellcheck lib_sysv.Indent lib_sysv.Variables package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch lib_patch.Upstream package/domoticz/S99domoticz Shellcheck package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch lib_patch.Upstream @@ -460,17 +448,10 @@ package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch lib_ package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch lib_patch.Upstream package/efl/0003-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch lib_patch.Upstream -package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch lib_patch.Upstream -package/ejabberd/0002-fix-ejabberdctl.patch lib_patch.Upstream -package/ejabberd/0003-correct-includes.patch lib_patch.Upstream -package/ejabberd/S50ejabberd Shellcheck lib_sysv.Indent lib_sysv.Variables -package/ejabberd/check-erlang-lib Shellcheck package/elftosb/0001-fixes-includes.patch lib_patch.Upstream package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch lib_patch.Upstream package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch lib_patch.Upstream -package/erlang-p1-sip/0001-correct-include.patch lib_patch.Upstream -package/erlang-p1-xmpp/0001-fix-includes.patch lib_patch.Upstream package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch lib_patch.Upstream package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch lib_patch.Upstream package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch lib_patch.Upstream @@ -494,13 +475,6 @@ package/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch lib_p package/fbterm/0002-mouse.cpp-fix-musl-compile.patch lib_patch.Upstream package/fbterm/0003-C++11-compliance.patch lib_patch.Upstream package/fbterm/0004-iconv.patch lib_patch.Upstream -package/fbv/0001-cross.patch lib_patch.Sob lib_patch.Upstream -package/fbv/0002-fix-24bpp-support-on-big-endian.patch lib_patch.Sob lib_patch.Upstream -package/fbv/0003-fix-bgr555.patch lib_patch.Upstream -package/fbv/0004-giflib.patch lib_patch.Upstream -package/fbv/0005-include.patch lib_patch.Sob lib_patch.Upstream -package/fbv/0006-libpng15.patch lib_patch.Upstream -package/fbv/0007-gif.c-fic-build-with-gcc-10.patch lib_patch.Upstream package/fcgiwrap/0001-use-LIBS-from-configure.patch lib_patch.Upstream package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch lib_patch.Upstream package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch lib_patch.Upstream @@ -579,7 +553,6 @@ package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_p package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream -package/gobject-introspection/0003-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream @@ -599,8 +572,6 @@ package/heirloom-mailx/0001-fix-libressl-support.patch lib_patch.Upstream package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch lib_patch.Upstream package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch lib_patch.Upstream package/htpdate/S43htpdate Shellcheck -package/httping/0001-fix-math-library-linking.patch lib_patch.Upstream -package/httping/0002-Makefile-allow-build-without-gettext.patch lib_patch.Upstream package/i2pd/S99i2pd Shellcheck lib_sysv.Indent lib_sysv.Variables package/i7z/0001-fix-build-with-gcc-10.patch lib_patch.Upstream package/ibm-sw-tpm2/0001-Use-LONG_BIT-to-define-RADIX_BITS.patch lib_patch.Upstream @@ -707,7 +678,6 @@ package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch package/libfuse/0001-fix-aarch64-build.patch lib_patch.Upstream package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch lib_patch.Upstream package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream -package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream @@ -854,7 +824,6 @@ package/lugaru/0001-ImageIO-fix-invalid-conversion.patch lib_patch.Upstream package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch lib_patch.Upstream package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch lib_patch.Upstream -package/lz4/0001-build-Support-BUILD_SHARED-no.patch lib_patch.Upstream package/lzma/0001-Remove-static-from-LDFLAGS.patch lib_patch.Upstream package/lzop/0001-allow-overriding-modification-time.patch lib_patch.Upstream package/macchanger/0001-Fix-missing-include-for-caddr_t.patch lib_patch.Upstream @@ -966,7 +935,6 @@ package/nss-pam-ldapd/S45nslcd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent package/ntp/0001-ntp-syscalls-fallback.patch lib_patch.Upstream package/ntp/S49ntp.in lib_sysv.Variables package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch lib_patch.Upstream -package/numactl/0001-link-with-latomic-if-needed-again.patch lib_patch.Upstream package/nuttcp/0001-susv3-legacy.patch lib_patch.Upstream package/nvidia-driver/0001-use-LDFLAGS.patch lib_patch.Upstream package/octave/0001-Fix-BLAS-library-integer-size-detection.patch lib_patch.Upstream @@ -1054,7 +1022,6 @@ package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch lib_patch.Upstream package/pixman/0001-Disable-tests.patch lib_patch.Upstream package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch lib_patch.Upstream -package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch lib_patch.Upstream package/pkgconf/pkg-config.in Shellcheck package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch lib_patch.Upstream @@ -1081,9 +1048,6 @@ package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.pat package/pulseaudio/S50pulseaudio lib_sysv.ConsecutiveEmptyLines lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch lib_patch.Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch lib_patch.Upstream -package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch lib_patch.Upstream -package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch lib_patch.Upstream -package/python-daphne/0001-remove-pytest-runner-requirement.patch lib_patch.Upstream package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch lib_patch.Upstream package/python-pylibftdi/0001-do-not-use-find-library.patch lib_patch.Upstream package/python-pyqt5/0001-configure-skip-qtdetail.patch lib_patch.Upstream @@ -1152,7 +1116,6 @@ package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch l package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch lib_patch.Upstream package/rng-tools/S21rngd Shellcheck lib_sysv.Variables package/rocksdb/0001-build_tools-build_detect_platform-fix-C-tests.patch lib_patch.Upstream -package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch lib_patch.Upstream package/rpcbind/0001-Remove-yellow-pages-support.patch lib_patch.Upstream package/rpcbind/S30rpcbind lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables package/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch lib_patch.Upstream @@ -1173,13 +1136,10 @@ package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch l package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream package/samba4/S91smb Shellcheck lib_sysv.Indent lib_sysv.Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch lib_patch.Upstream -package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch lib_patch.Upstream -package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream -package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch lib_patch.Upstream -package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream -package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream -package/screen/0006-comm.h-now-depends-on-term.h.patch lib_patch.Upstream -package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch lib_patch.Upstream +package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream +package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch lib_patch.Upstream +package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream +package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch lib_patch.Upstream package/sdl/0001-use-correct-directfb-config.patch lib_patch.Upstream package/sdl/0002-fix-compilation-with-libx11.patch lib_patch.Upstream @@ -1297,7 +1257,6 @@ package/uemacs/01-clear-ixon-termios-flag.patch lib_patch.Upstream package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch lib_patch.Upstream package/uhttpd/0001-Remove-Werror.patch lib_patch.Upstream package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch lib_patch.Upstream -package/umtprd/0001-Fix-output_dir-make-dependency.patch lib_patch.Upstream package/unbound/S70unbound Shellcheck package/unifdef/0001-Makefile-fix-error-on-install.patch lib_patch.Upstream package/unscd/S46unscd Shellcheck lib_sysv.Indent lib_sysv.Variables @@ -1365,7 +1324,6 @@ package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.pa package/wilc-driver/0005-Fix-cast-warnings.patch lib_patch.Upstream package/wipe/0001-musl.patch lib_patch.Upstream package/wireless_tools/0001-remove-bzero.patch lib_patch.Upstream -package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch lib_patch.Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch lib_patch.Upstream package/wpa_supplicant/ifupdown.sh Shellcheck package/x11r7/xapp_luit/0001-posix-openpt.patch lib_patch.Upstream @@ -1396,9 +1354,6 @@ package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch. package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream -package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch lib_patch.Upstream -package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch lib_patch.Upstream -package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch lib_patch.Upstream package/xinetd/0001-ar.patch lib_patch.Upstream package/xinetd/0002-destdir.patch lib_patch.Upstream package/xinetd/0003-rpc-fix.patch lib_patch.Upstream diff --git a/CHANGES b/CHANGES index 5cfffe63dfc..72da8d90847 100644 --- a/CHANGES +++ b/CHANGES @@ -1,24 +1,110 @@ -2024.08.3, released December 8th, 2024 +2024.11.1, released January 9th, 2025 Important / security related fixes. - Defconfigs: fix mender_x86_64_efi_defconfig build on setups - where /bin/sh is not bash. + Infrastructure: + + - Ensure CONFIG_TRIM_UNUSED_KSYMS is disabled when building + external Linux kernel modules + + Updated/fixed packages: apr, bc, bluez5_utils, c-icap, + cryptodev-linux, dahdi-linux, dpdk, freeipmi, gdb, gnupg2, + gnuplot, gnutls, go, gobject-introspection, grub2, gst-omx, + gst1-devtools, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, igt-gpu-tools, iperf3, libcurl, + libsha1, libsndfile, libsoup3, libvirt, libxcrypt, libxml2, + libzenoh-pico, linux, linux-pam, netatalk, nettle, octave, + opensc, perl, php, pixman, polkit, procps-ng, + python-autocommand, python-django, python3, quickjs, samba4, + skeleton, subversion, ti-k3-r5-loader, tzdata, v4l2loopback, + wayland, webkitgtk, weston, wget, wireshark, wpewebkit, + xr819-xradio, xxhash, zfs, zic + + Issues resolved: + - bluetooth.service cannot connect to D-BUS + https://gitlab.com/buildroot.org/buildroot/-/issues/65 + - gdb package doesn't have a licence hash in the gdb.hash file + https://gitlab.com/buildroot.org/buildroot/-/issues/66 + - package/libsha1: Build failure with GCC 14 [-Wimplicit-int] + https://gitlab.com/buildroot.org/buildroot/-/issues/69 + +2024.11, released December 8th, 2024 + + Various fixes. + + Updated/fixed packages: eza, foot, gnutls, ibm-sw-tpm2, + mosquitto, pixman + + Issues resolved: + - procps-ng: builderror in 2024.08 + https://gitlab.com/buildroot.org/buildroot/-/issues/38 + +2024.11-rc3, released Decemmber 5th, 2024 + + Fixes all over the tree. Updated/fixed packages: alsa-lib, android-tools, bats-core, - bluez-alsa, bmap-tools, boost, checksec, ebtables, expat, fbv, - ffmpeg, foot, frr, gnuplot, gnutls, intel-microcode, irssi, - libcurl, libgit2, libkrb5, libmodbus, libpng, libvpl, - linux-pam, linux-tools, lmbench, mbedtls, mosquitto, musl, - musl-compat-headers, nfs-utils, ntp, php, picotool, - postgresql, procps-ng, python-psycopg2, python-sip, qt6base, - quagga, rt-tests, sexpect, sshguard, systemd, tiff, x11vnc + doxygen, frr, gnutls, libvpl, linux-tools, lmbench, lrzsz, + musl, nfs-utils, opkg, polkit, postgresql, procps-ng, + python-psycopg2, quagga, rt-tests, rust, sexpect + +2024.11-rc2, released November 23rd, 2024 + + Fixes all over the tree. + + Updated/fixed packages: bmap-tools, go, intel-microcode, + libblockdev, libcurl, libkrb5, libnvme, libpng, php, + postgresql, python-sip, skopeo, tiff, util-linux-libs + +2024.11-rc1, released November 13th, 2024 + + Fixes all over the tree and package updates. + + Toolchain: + + - binutils 2.43 added, binutils 2.42 becomes the default. + - glibc updated to 2.40 + - ARM, Bootlin and Synopsys external toolchains updated + - Support added for ARM FDPIC, which allows to use shared + libraries on ARM noMMU targets + + Go support: allow using a pre-built Go compiler, using the new + go-bin package. + + New defconfigs: friendlyarm_nanopi_neo, nvidia_bf3, + stm32f746_disco_sd, ti_am62px_sk, versal_vek280 + + Removed defconfigs: qemu_nios2_10m50 + + New packages: andes-spi-burn, bfscripts, cpp-httplib, dlib, + dpdk, evilwm, go-bin, iana-assignments, iotools, lua-uuid, + oath-toolkit, perl-mime-base32, python-aiohappyeyeballs, + python-aiomqtt, python-argcomplete, python-dotenv, + python-dunamai, python-immutabledict, python-iterable-io, + python-path, python-poetry-dynamic-versioning, + python-propcache, python-proto-plus, python-psygnal, + python-pyaml, python-pydantic-settings, python-pyqt5-sip, + python-pysnmpcrypto, python-rgbmatrix, python-sdbus, + python-sdbus-networkmanager, python-simple-websocket, + python-tinyhtml5, python-zipstream-ng, qt6charts, qt6scxml, + superiotool, tailscale, tinyinit, uefisettings + + Removed packages: bsdiff, popperjs + + Added tests: erofs filesystem, audit, dosfstools, dtc, + exfatprogs, go-bin, iputils, oath-toolkit, parted, pppd, pv, + pyqt5, python-sdbus, python-sdbus-networkmanager, rrdtool, + unbound, which Issues resolved: - - procps-ng: builderror in 2024.08 - https://gitlab.com/buildroot.org/buildroot/-/issues/38 - - fbv package download link is broken in long term support branch - https://gitlab.com/buildroot.org/buildroot/-/issues/73 + - host rpath fixups misses needed directory + https://gitlab.com/buildroot.org/buildroot/-/issues/39 + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - ripgrep leaves /usr/crates2.json / .crates.toml files + https://gitlab.com/buildroot.org/buildroot/-/issues/17 2024.08.2, released November 14th, 2024 @@ -204,6 +290,44 @@ - Can't subscribe buildroot mailing list https://gitlab.com/buildroot.org/buildroot/-/issues/25 +2024.05.3, released September 9th, 2024 + + Important / security related fixes. + + A large number of GCC 14.x compilation fixes and additional + runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, augeas, autossh, bandwidthd, + bcusdk, boost, brcm-patchram-plus, btrfs-progs, busybox, + can-utils, coreutils, cpuload, cryptsetup, cwiid, dhrystone, + dvb-apps, elfutils, faifa, fetchmail, ffmpeg, fluent-bit, + fluidsynth, freerdp, gcc, gcc-bare-metal, gdb, gnutls, gpsd, + hiawatha, hostapd, htop, ibm-sw-tpm2, intel-microcode, iperf3, + iproute2, ksmbd-tools, libcli, libcoap, libcurl, libest, + libfreefare, libgtk3, libngs, libpwquality, libressl, libupnp, + libxml2, libxslt, lrzsz, mdio-tools, micropython, + mjpg-streamer, mokutil, mpir, ncftp, nginx, nodejs, odb, + open-iscsi, openldap, openswan, openvpn, pistache, procps-ng, + python-django, quotatool, rtty, ruby, sconeserver, speex, + swaybg, tar, tftpd, tinyssh, uclibc, uclibc-ng-test, unbound, + uuu, vorbus-tools, wpewebkit, zfs, zsh + + Issues resolved: + - TAR-1.35 will not build for target (host-variant will build) + https://gitlab.com/buildroot.org/buildroot/-/issues/4 + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + 2024.05.2, released August 14th, 2024 Important / security related fixes. @@ -374,6 +498,88 @@ #16036: android-tools version is too old #16075: Cannot use linux kernel extensions from external tree.. +2024.02.8, released November 14th, 2024 + + Important / security related fixes. + + Updated/fixed packages: apache, asterisk, bind, bootgen, criu, + file, fluidsynth, ghostscript, heimdal, intel-microcode, + jailhouse, jsoncpp, libarchive, libcurl, libldns, liblinear, + libmdbx, libopenh264, ltrace, lightning, nghttp2, ntp, php, + postgresql, procps-ng, python-pyqt5, ruby, sysvinit, tor, + wpebackend-fdo + + New packages: python-pyqt5-sip + +2024.02.7, released October 21th, 2024 + + Important / security related fixes. + + Per-package-directories fixes for the .gdbinit file and RPATH + fixups for SDK. + + utils/check-package: Also check for correct indentation of + help lines. + + A large number of typo fixes. + + Updated/fixed packages: aer-inject, armadillo, asterisk, + aumix, babeld, bind, botan, cache-calibrator, clamav, + comix-cursors, cryptsetup, cups, dovecot, dovecot-pigeonhole, + expat, fbset, genpart, glibc, gnu-efi, gnutls, go, grub2, + libarchive, libcuefile, libcurl, libglob, libgpg-error, + libilbc, libkcapi, libopenssl, libpcap, libuecc, linux-pam, + mosquitto, nginx, ntpsec, p910nd, php, postgresql, procps-ng, + proftpd, pure-ftpd, python-django, python-huepy, + python-sqlparse, python-unittest-xml-reporting, python3, + qt6base, qt6svg, rp-pppoe, sofia-sip, strongswan, szip, + tllist, unbound, wpebackend-fdo, wpewebkit, x264, xenomai, + xserver_xorg-server, zabbix + + New packages: go-bootstrap-stage3 + + Issues resolved: + - procps-ng: build failure when linking to systemd + https://gitlab.com/buildroot.org/buildroot/-/issues/28 + - orange pi 2w does not boot + https://gitlab.com/buildroot.org/buildroot/-/issues/36 + - glibc configure fails on aarch64 with mathvec SVE ACLE error + https://gitlab.com/buildroot.org/buildroot/-/issues/40 + - Kernel Build from Custom Git Repo fails with hash-error + https://gitlab.com/buildroot.org/buildroot/-/issues/46 + - package/linux-pam: Remove unneeded flex dependency + https://gitlab.com/buildroot.org/buildroot/-/issues/47 + +2024.02.6, released September 9th, 2024 + + Important / security related fixes. + + Added a large number of additional runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, boost, btrfs-progs, busybox, + cryptsetup, dropbear, elfutils, fetchmail, ffmpeg, fluidsynth, + freerdp, gcc, gdb, gnutls, gpsd, hiawatha, hostapd, htop, + intel-microcode, iperf3, ksmbd-tools, libcoap, libcurl, + libest, libgtk3, libpwquality, libressl, libupnp, libxml2, + libxslt, lrzsz, mdio-tools, micropython, mjpg-streamer, mpir, + ncftp, nginx, nodejs, open-iscsi, openldap, openvpn, pistache, + procps-ng, python-django, ruby, speex, swaybg, tinyssh, + uclibc, uclibc-ng-test, unbound, uuu, wpewebkit, zfs + + Issues resolved: + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + 2024.02.5, released August 14th, 2024 Important / security related fixes. diff --git a/Config.in b/Config.in index d7a8dc68485..247a9e8ef1c 100644 --- a/Config.in +++ b/Config.in @@ -285,7 +285,7 @@ config BR2_KERNEL_MIRROR config BR2_GNU_MIRROR string "GNU Software mirror" - default "http://ftpmirror.gnu.org" + default "https://ftpmirror.gnu.org" help GNU has multiple software mirrors scattered around the world. The following allows you to select your preferred diff --git a/Config.in.legacy b/Config.in.legacy index 38e0c207bb2..63360b42b87 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,95 @@ endif ############################################################################### +comment "Legacy options removed in 2024.11" + +config BR2_PACKAGE_BSDIFF + bool "bsdiff has been removed" + select BR2_LEGACY + help + The bsdiff package was removed as it is not maintained + anymore (no commit since 2014). + +config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP + bool "BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP + help + The option has been renamed to + BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "qemu nios2 support has been removed" + select BR2_LEGACY + help + NIOS2 support has been removed since Qemu 9.1.0. + +config BR2_PACKAGE_POPPERJS + bool "popperjs has been removed" + select BR2_LEGACY + help + The project has been renamed to floating-ui. + +config BR2_KERNEL_HEADERS_6_10 + bool "kernel headers version 6.10.x are no longer supported" + select BR2_LEGACY + help + Version 6.10.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry moved to iana-assignment package" + help + Installation of the IANA PEN is now handled by the + iana-assignment package; to install a custom PEN, + use a rootfs-overlay for example. + +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI_WRAP + bool + default y if BR2_PACKAGE_IPMITOOL_PEN_REG_URI != "" + select BR2_LEGACY + +config BR2_PACKAGE_ERLANG_P1_YAML + bool "erlang-p1-yaml has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_FAST_YAML + help + The erlang-p1-yaml package has been renamed to + erlang-fast-yaml. + +config BR2_PACKAGE_ERLANG_P1_XMPP + bool "erlang-p1-xmpp has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_XMPP + help + The erlang-p1-xmpp package has been renamed to erlang-xmpp. + +config BR2_PACKAGE_ERLANG_P1_XML + bool "erlang-p1-xml has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_FAST_XML + help + The erlang-p1-xml package has been renamed to erlang-fast-xml. + +config BR2_PACKAGE_ERLANG_P1_STUN + bool "erlang-p1-stun has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ERLANG_STUN + help + The erlang-p1-stun package has been renamed to erlang-stun. + +config BR2_PACKAGE_FBV_GIF + bool "fbv GIF support has been removed" + select BR2_LEGACY + help + Fbv GIF support has been removed, use PNG, BMP or JPEG. + +config BR2_BINUTILS_VERSION_2_40_X + bool "binutils 2.40 has been removed" + select BR2_LEGACY + help + binutils 2.40 has been removed, use a newer version. + comment "Legacy options removed in 2024.08" config BR2_PACKAGE_MIDORI @@ -175,6 +264,13 @@ config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE flutter-dynamic-layouts was removed from flutter-packages as of commit e35f29177495131f0f598fc7ae1ffd74d89edf15. +config BR2_KERNEL_HEADERS_6_9 + bool "kernel headers version 6.9.x are no longer supported" + select BR2_LEGACY + help + Version 6.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_x86_knightslanding bool "knightslanding x86 architecture support dropped" select BR2_LEGACY @@ -288,6 +384,13 @@ config BR2_PACKAGE_VERSAL_FIRMWARE The versal-firmware package has been replaced by the more generic xilinx-prebuilt package. +config BR2_KERNEL_HEADERS_6_8 + bool "kernel headers version 6.8.x are no longer supported" + select BR2_LEGACY + help + Version 6.8.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_TARGET_AT91BOOTSTRAP bool "at91bootstrap removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index b23ae3332c3..8b7d18a6e3f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -81,6 +81,9 @@ F: package/libmbim/ F: package/libqmi/ F: package/modem-manager/ +N: Aleksandr Makarov +F: package/cpp-httplib/ + N: Alessandro Partesotti F: package/oatpp/ @@ -239,6 +242,7 @@ F: package/sysdig/ N: Andy Shevchenko F: package/fb-test-app/ +F: package/iotools/ N: Anthony Viallard F: package/gnuplot/ @@ -300,7 +304,6 @@ F: package/git/ N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig -F: package/cegui/ F: package/log4qt/ F: package/python-esptool/ F: package/python-pyaes/ @@ -541,6 +544,10 @@ F: package/vmtouch/ F: support/testing/tests/package/test_atftp.py F: support/testing/tests/package/test_zip.py +N: Brandon Maier +F: package/dtc/ +F: support/testing/tests/package/test_dtc* + N: Brock Williams F: package/pdmenu/ @@ -551,6 +558,7 @@ F: boot/ti-k3-boot-firmware/ F: boot/ti-k3-r5-loader/ F: configs/beagleplay_defconfig F: configs/ti_am62ax_sk_defconfig +F: configs/ti_am62px_sk_defconfig F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig @@ -591,6 +599,9 @@ F: package/gstreamer1/gst1-shark/ F: package/micropython/ F: package/syslog-ng/ +N: Christian Hitz +F: package/qt6/qt6scxml/ + N: Christian Kellermann F: package/python-pylibftdi/ @@ -767,14 +778,19 @@ F: package/xinetd/ N: Dario Binacchi F: board/bsh/ +F: board/stmicroelectronics/stm32f746-disco/ F: board/stmicroelectronics/stm32f769-disco/ F: configs/imx6ulz_bsh_smm_m2_defconfig F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig +F: configs/stm32f746_disco_sd_defconfig F: configs/stm32f769_disco_sd_defconfig +F: package/aespipe/ F: package/armadillo/ F: package/babeld/ +F: package/iana-assignments/ F: package/sscep/ +F: package/tinyinit/ F: package/uuu/ N: Dario Binacchi @@ -852,6 +868,10 @@ F: package/logsurfer/ N: Dominik Michael Rauh F: package/gdal/ +N: Dong Wang +F: board/friendlyarm/nanopi-neo/ +F: configs/friendlyarm_nanopi_neo_defconfig + N: Doug Kehn F: package/nss-pam-ldapd/ F: package/sp-oops-extract/ @@ -1072,6 +1092,10 @@ N: Falco Hyfing F: package/python-pymodbus/ N: Fiona Klute +F: package/*/S* +F: package/python-aiomqtt/ +F: package/python-dunamai/ +F: package/python-poetry-dynamic-versioning/ F: package/python-pyasynchat/ F: package/python-pyasyncore/ @@ -1420,7 +1444,18 @@ F: package/axel/ F: package/mawk/ N: J. Neuschäfer -F: package/tipidee +F: package/execline/ +F: package/mdevd/ +F: package/python-rgbmatrix/ +F: package/rpi-rgb-led-matrix/ +F: package/s6/ +F: package/s6-linux-init/ +F: package/s6-linux-utils/ +F: package/s6-networking/ +F: package/s6-portable-utils/ +F: package/s6-rc/ +F: package/skalibs/ +F: package/tipidee/ N: Jagan Teki F: board/amarula/ @@ -1474,6 +1509,9 @@ F: package/serd/ F: package/sord/ F: package/sratom/ F: package/stb/ +F: package/superiotool/ +F: package/tailscale/ +F: package/uefisettings/ F: package/zchunk/ F: support/testing/tests/package/sample_python_rtoml.py F: support/testing/tests/package/test_python_rtoml.py @@ -1620,6 +1658,8 @@ N: Johan Oudinet F: package/ejabberd/ F: package/erlang-base64url/ F: package/erlang-eimp/ +F: package/erlang-fast-xml/ +F: package/erlang-fast-yaml/ F: package/erlang-goldrush/ F: package/erlang-idna/ F: package/erlang-jiffy/ @@ -1632,14 +1672,12 @@ F: package/erlang-p1-oauth2/ F: package/erlang-p1-pkix/ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ -F: package/erlang-p1-stun/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ -F: package/erlang-p1-xml/ -F: package/erlang-p1-xmpp/ -F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/erlang-stun/ +F: package/erlang-xmpp/ F: package/forge/ F: package/nginx-dav-ext/ F: package/vis-network/ @@ -1762,6 +1800,7 @@ F: package/kexec/ F: package/libjxl/ F: package/libopenmpt/ F: package/mokutil/ +F: package/oath-toolkit/ F: package/octave/ F: package/ola/ F: package/openblas/ @@ -1826,6 +1865,9 @@ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dmidecode.py F: support/testing/tests/package/test_dos2unix.py +F: support/testing/tests/package/test_dosfstools.py +F: support/testing/tests/package/test_dosfstools/ +F: support/testing/tests/package/test_dpdk.py F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_ethtool.py F: support/testing/tests/package/test_ethtool/ @@ -1906,14 +1948,18 @@ F: support/testing/tests/package/test_ntp.py F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py F: support/testing/tests/package/test_numactl/ +F: support/testing/tests/package/test_oath_toolkit.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_openblas.py +F: support/testing/tests/package/test_parted.py F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_postgresql.py +F: support/testing/tests/package/test_pppd.py +F: support/testing/tests/package/test_pppd/ F: support/testing/tests/package/test_pv.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py @@ -1955,9 +2001,12 @@ F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_vorbis_tools.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ +F: support/testing/tests/package/test_which.py F: support/testing/tests/package/test_wine.py F: support/testing/tests/package/test_xfsprogs.py F: support/testing/tests/package/test_xfsprogs/ +F: support/testing/tests/package/test_xvisor.py +F: support/testing/tests/package/test_xxhash.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ @@ -2185,6 +2234,7 @@ N: Marcus Hoffmann F: package/nethogs/ F: package/pico-sdk/ F: package/picotool/ +F: package/python-immutabledict/ F: package/python-jc/ F: package/python-ruamel-yaml-clib/ F: support/testing/tests/package/test_python_fastapi.py @@ -2214,7 +2264,7 @@ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig N: Marleen Vos -F: board/stmicroelectronics/common/stm32mp157/ +F: board/stmicroelectronics/common/stm32mp1xx/ F: configs/avenger96_defconfig F: configs/stm32mp157a_dk1_defconfig F: configs/stm32mp157c_dk2_defconfig @@ -2380,6 +2430,7 @@ F: board/zynq/ F: board/zynqmp/ F: boot/xilinx-prebuilt/ F: configs/versal_vck190_defconfig +F: configs/versal_vek280_defconfig F: configs/versal_vpk180_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig @@ -2435,6 +2486,7 @@ F: support/testing/tests/package/test_python_git.py F: support/testing/tests/package/test_python_unittest_xml_reporting.py N: Nicolas Cavallari +F: package/bluez-alsa/ F: package/libgit2/ N: Nicolas Serafini @@ -2463,6 +2515,7 @@ F: package/tcf-agent/ N: Leo Yu-Chi Liang F: board/andes F: configs/andes_ae350_45_defconfig +F: package/andes-spi-burn/ F: package/kmon/ N: Olaf Rempel @@ -2708,14 +2761,20 @@ F: package/python-jmespath/ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ +F: package/python-sdbus/ +F: package/python-sdbus-networkmanager/ F: support/testing/tests/package/sample_python_jmespath.py F: support/testing/tests/package/sample_python_pymupdf.py F: support/testing/tests/package/sample_python_rsa.py F: support/testing/tests/package/sample_python_s3transfer.py +F: support/testing/tests/package/sample_python_sdbus.py +F: support/testing/tests/package/sample_python_sdbus_networkmanager.py F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py +F: support/testing/tests/package/test_python_sdbus.py +F: support/testing/tests/package/test_python_sdbus_networkmanager.py N: Raphael Pavlidis F: package/nvidia-persistenced/ @@ -2837,6 +2896,7 @@ F: support/testing/tests/package/test_python_mako.py F: toolchain/ N: Roy Kollen Svendsen +F: package/dlib/ F: package/qt6/ N: Rufus Segar @@ -3152,6 +3212,8 @@ F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py F: support/testing/tests/package/test_python_git.py F: support/testing/tests/package/test_python_unittest_xml_reporting.py +F: support/testing/tests/toolchain/test_external_arm.py +F: support/testing/tests/toolchain/test_external_synopsys.py F: toolchain/ N: Timo Ketola @@ -3203,6 +3265,12 @@ F: package/rtl8822cs/ N: Victor Huesca F: support/testing/tests/core/test_root_password.py +N: Vincent Jardin +F: board/nvidia/bf3/ +F: configs/nvidia_bf3_defconfig +F: package/bfscripts/ +F: package/dpdk/ + N: Vincent Prince F: package/nss-myhostname/ F: package/utp_com/ @@ -3244,13 +3312,18 @@ F: package/ngrep/ N: Waldemar Brodkorb F: board/qemu/riscv32-virt/ +F: board/stmicroelectronics/stm32f746-disco/ F: configs/qemu_riscv32_nommu_virt_defconfig +F: configs/stm32f746_disco_sd_defconfig F: package/asterisk/ +F: package/evilwm/ +F: package/fbv/ F: package/libjwt/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ F: package/uclibc-ng-test/ +F: package/zabbix/ F: support/testing/tests/package/test_ruby.py N: Will Newton diff --git a/Makefile b/Makefile index 28bb3ab12cc..7f61909aff6 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.08.3 +export BR2_VERSION := 2024.11.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1733673000 +BR2_VERSION_EPOCH = 1736433000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/arch/Config.in b/arch/Config.in index f39c33ef7ff..e57f4b2baa0 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -12,6 +12,9 @@ config BR2_SOFT_FLOAT config BR2_USE_MMU bool +config BR2_ARCH_HAS_FDPIC_SUPPORT + bool + choice prompt "Target Architecture" default BR2_i386 @@ -312,6 +315,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_14 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_13 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -437,6 +444,16 @@ config BR2_BINFMT_ELF and executables used across different architectures and operating systems. +config BR2_BINFMT_FDPIC + bool "FDPIC" + depends on BR2_ARCH_HAS_FDPIC_SUPPORT + select BR2_BINFMT_SUPPORTS_SHARED + help + ELF FDPIC binaries are based on ELF, but allow the individual + load segments of a binary to be located in memory + independently of each other. This makes this format ideal for + use in environments where no MMU is available. + config BR2_BINFMT_FLAT bool "FLAT" depends on !BR2_USE_MMU diff --git a/arch/Config.in.arm b/arch/Config.in.arm index e92332879b8..308f91e7291 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -89,6 +89,7 @@ config BR2_ARM_CPU_ARMV7A config BR2_ARM_CPU_ARMV7M bool + select BR2_ARCH_HAS_FDPIC_SUPPORT config BR2_ARM_CPU_ARMV8A bool diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 9fd22aaf1e5..235cafacf5b 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -23,6 +23,11 @@ choice help Specific CPU variant to use +config BR2_m68k_68030 + bool "68030" + select BR2_m68k_m68k + select BR2_USE_MMU + config BR2_m68k_68040 bool "68040" select BR2_m68k_m68k @@ -36,6 +41,7 @@ config BR2_m68k_cf5208 endchoice config BR2_GCC_TARGET_CPU + default "68030" if BR2_m68k_68030 default "68040" if BR2_m68k_68040 default "5208" if BR2_m68k_cf5208 diff --git a/board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash b/board/aarch64-efi/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/linux-headers/linux-headers.hash rename to board/aarch64-efi/patches/linux-headers/linux-headers.hash diff --git a/board/aarch64-efi/patches/linux/linux.hash b/board/aarch64-efi/patches/linux/linux.hash new file mode 100644 index 00000000000..20941a269b9 --- /dev/null +++ b/board/aarch64-efi/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz diff --git a/board/aarch64-efi/post-image.sh b/board/aarch64-efi/post-image.sh index f0214dc8667..1aef15ef6f7 100755 --- a/board/aarch64-efi/post-image.sh +++ b/board/aarch64-efi/post-image.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR=$(dirname "$0") -cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index a7a4a203526..411d1942f55 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -149,8 +149,14 @@ #address-cells = <1>; #size-cells = <1>; - eth0_addr: eth-mac-addr@9A { - reg = <0x0 0x06>; + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eth0_addr: eth-mac-addr@9A { + reg = <0x0 0x06>; + }; }; }; diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt index 4de4cb38943..36561fc777f 100644 --- a/board/andes/ae350/readme.txt +++ b/board/andes/ae350/readme.txt @@ -41,6 +41,49 @@ After building, you should obtain the following files: |-- u-boot-spl.bin `-- u-boot.itb +How to update the bootloader and device-tree +============================================ + +To update the bootloader and device tree, make sure you have +an ICEman (Andes OpenOCD [1]) and AICE [2] connection set up +as below: + + Local Host Local/Remote Host + .-----------------. .--------------. + | buildroot images| | | + | | ICEman host + | .----------. | | .--------. | + | | SPI_burn |<---+--socket--+->| ICEman | | + | '----------' | | '--.-----' | + '-----------------' '-----|--------' + | + USB + .--------------. | + | target | .-----v-----. + | board <----JTAG---| AICE | + | | '-----------' + '--------------' + +[1] https://github.com/andestech/ICEman +[2] https://www.andestech.com/en/products-solutions/andeshape-platforms/aice-micro/ + +The Andes SPI_burn tool will be located in output/host/bin. Use +the following commands to update the bootloader and device tree: + + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x0 -i u-boot-spl.bin + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0x10000 -i u-boot.itb + $ SPI_burn --host $ICE_IP --port $ICE_BURNER_PORT --addr 0xf0000 -i ae350_ax45mp.dtb + +Note that the --addr option specifies the offset starting from +the flash base address 0x80000000 and set by U-Boot configurations. +e.g. +u-boot-spl.bin : CONFIG_SPL_TEXT_BASE=0x80000000 +u-boot.itb : CONFIG_SPL_LOAD_FIT_ADDRESS=0x80010000 +ae350_ax45mp.dtb: CONFIG_SYS_FDT_BASE=0x800f0000 + +How to write the SD card +======================== + Copy the sdcard.img to a SD card with "dd": $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment index fa38bbca3a6..4497ed4c744 100644 --- a/board/andes/ae350/uboot.config.fragment +++ b/board/andes/ae350/uboot.config.fragment @@ -1,6 +1,5 @@ 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 diff --git a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/0001-feat-fvp-add-stdout-path.patch b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/0001-feat-fvp-add-stdout-path.patch deleted file mode 100644 index 0a04c02240e..00000000000 --- a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/0001-feat-fvp-add-stdout-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8c30a0c7fe0162de0618b26fb34cc91ea582e5f7 Mon Sep 17 00:00:00 2001 -From: Debbie Martin -Date: Wed, 27 Sep 2023 18:05:26 +0100 -Subject: [PATCH] feat(fvp): add stdout-path - -Add stdout-path to the fvp-base devicetree to be passed to BL33 (U-Boot) -and then to the Linux kernel to be compliant to Arm SystemReady IR: -https://developer.arm.com/documentation/DUI1101/2-0/ -Configure-U-Boot-for-SystemReady/Adapt-the-Devicetree - -This has been tested by booting fvp-base to Linux and ensuring the -console is accessible. - -Change-Id: Iae98630f18f735ce344c1158f41f358c2a49eeb6 -Signed-off-by: Diego Sueiro -Signed-off-by: Debbie Martin -Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/+/8c30a0c7fe0162de0618b26fb34cc91ea582e5f7%5E!/ -Signed-off-by: Vincent Stehlé ---- - fdts/fvp-base-psci-common.dtsi | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/fdts/fvp-base-psci-common.dtsi b/fdts/fvp-base-psci-common.dtsi -index 79cf37d3b0..ff31ba7616 100644 ---- a/fdts/fvp-base-psci-common.dtsi -+++ b/fdts/fvp-base-psci-common.dtsi -@@ -27,11 +27,12 @@ - #address-cells = <2>; - #size-cells = <2>; - -+ chosen { -+ stdout-path = "serial0:115200n8"; - #if (ENABLE_RME == 1) -- chosen { bootargs = "console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=on";}; --#else -- chosen {}; -+ bootargs = "console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=on"; - #endif -+ }; - - aliases { - serial0 = &v2m_serial0; --- -2.43.0 - diff --git a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index 6f02bfbb22e..00000000000 --- a/board/arm/fvp-ebbr/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz diff --git a/board/arm/fvp-ebbr/patches/linux/linux.hash b/board/arm/fvp-ebbr/patches/linux/linux.hash index 04e69e882ae..20941a269b9 100644 --- a/board/arm/fvp-ebbr/patches/linux/linux.hash +++ b/board/arm/fvp-ebbr/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b78dcd09f6b725872a2c0c87a70a064b0fbbcccfe5ce60aa46c669934a9e28b6 linux-6.8.11.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz diff --git a/board/arm/fvp-ebbr/patches/uboot/uboot.hash b/board/arm/fvp-ebbr/patches/uboot/uboot.hash index 9f554d5c686..fe9b4f53dc6 100644 --- a/board/arm/fvp-ebbr/patches/uboot/uboot.hash +++ b/board/arm/fvp-ebbr/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 077cf8ca283411103ad274a3724dacb5068ede824de749beff9c9e5b531b43ea u-boot-2024.07-rc3.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/arm/fvp-ebbr/readme.txt b/board/arm/fvp-ebbr/readme.txt index 8115bfbdfbd..fe7d4de5c55 100644 --- a/board/arm/fvp-ebbr/readme.txt +++ b/board/arm/fvp-ebbr/readme.txt @@ -26,8 +26,8 @@ Running on the FVP Download the FVP from one of the following sources, corresponding to your host computer: -- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FM_11_25/FVP_Base_RevC-2xAEMvA_11.25_15_Linux64.tgz -- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FM_11_25/FVP_Base_RevC-2xAEMvA_11.25_15_Linux64_armv8l.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64.tgz +- https://developer.arm.com/-/cdn-downloads/permalink/Fixed-Virtual-Platforms/FM-11.27/FVP_Base_RevC-2xAEMvA_11.27_19_Linux64_armv8l.tgz The FVP will be located under one of the corresponding folders: diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone/patches/uboot/uboot.hash index fe9b4f53dc6..904fa56c02a 100644 --- a/board/beagleboard/beaglebone/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglebone/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 6f02bfbb22e..8b77e1f1653 100644 --- a/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/beagleboard/beagleplay/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/beagleboard/beagleplay/patches/linux/linux.hash b/board/beagleboard/beagleplay/patches/linux/linux.hash index a53ec1f4e7f..53eb1438945 100644 --- a/board/beagleboard/beagleplay/patches/linux/linux.hash +++ b/board/beagleboard/beagleplay/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 24fa01fb989c7a3e28453f117799168713766e119c5381dac30115f18f268149 linux-6.9.tar.xz +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index 97a2b4eaf95..00000000000 --- a/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 00000000000..b89e91d3e88 --- /dev/null +++ b/board/beagleboard/beagleplay/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/board/beagleboard/beagleplay/patches/uboot/uboot.hash b/board/beagleboard/beagleplay/patches/uboot/uboot.hash index 97a2b4eaf95..fe9b4f53dc6 100644 --- a/board/beagleboard/beagleplay/patches/uboot/uboot.hash +++ b/board/beagleboard/beagleplay/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/beagleboard/beaglev_fire/patches/linux/linux.hash b/board/beagleboard/beaglev_fire/patches/linux/linux.hash index 416a8b1550b..9ee63df23d3 100644 --- a/board/beagleboard/beaglev_fire/patches/linux/linux.hash +++ b/board/beagleboard/beaglev_fire/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dcb7b41fd363729675c34545fcb514d5a94dbb3714ee10f527a26ca7716c2579 linux-linux4microchip+fpga-2024.06.tar.gz +sha256 7bd234a93bc6351d6a830f9ef18e9e780d70c478d280a6513a30bc2f945fb050 linux-linux4microchip+fpga-2024.09.1.tar.gz diff --git a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash index 2628d4b4fd6..cb0ec5ec524 100644 --- a/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash +++ b/board/beagleboard/beaglev_fire/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d461c45a9c5acd019776cdcf8ab2b571315282a880dd6580431f7dd5bfac3889 uboot-linux4microchip+fpga-2024.06.tar.gz +sha256 a2fad7fe7f933fa4679b070e952e1e7a21dbd8b586d7a9a11bfcb99e75ae7ad6 uboot-linux4microchip+fpga-2024.09.tar.gz diff --git a/board/canaan/k210-soc/rootfs_overlay/init b/board/canaan/k210-soc/rootfs_overlay/init deleted file mode 120000 index a0b71977c06..00000000000 --- a/board/canaan/k210-soc/rootfs_overlay/init +++ /dev/null @@ -1 +0,0 @@ -/sbin/init \ No newline at end of file diff --git a/board/cubietech/cubieboard1/patches/linux/linux.hash b/board/cubietech/cubieboard1/patches/linux/linux.hash index 5e9df51ecdd..42d02c9f783 100644 --- a/board/cubietech/cubieboard1/patches/linux/linux.hash +++ b/board/cubietech/cubieboard1/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz +sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz diff --git a/board/cubietech/cubieboard1/patches/uboot/uboot.hash b/board/cubietech/cubieboard1/patches/uboot/uboot.hash index 97a2b4eaf95..904fa56c02a 100644 --- a/board/cubietech/cubieboard1/patches/uboot/uboot.hash +++ b/board/cubietech/cubieboard1/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 17c409530da..f9af28ab3cf 100644 --- a/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/freescale/ls1028ardb/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0dda154c335e1a50c727601e698b6a0827e3f92308873b373449fb888df5acfd atf-LSDK-21.08.tar.gz +sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/linux/linux.hash b/board/freescale/ls1028ardb/patches/linux/linux.hash index bd5e29d026c..e038c228623 100644 --- a/board/freescale/ls1028ardb/patches/linux/linux.hash +++ b/board/freescale/ls1028ardb/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6db58cf91b98f7fc279f341279a5d43d4069fb56a660a34209aba6af53ea2b57 linux-LSDK-21.08.tar.gz +sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/patches/uboot/uboot.hash b/board/freescale/ls1028ardb/patches/uboot/uboot.hash index d0cc110fdd0..a5ccd82b2b0 100644 --- a/board/freescale/ls1028ardb/patches/uboot/uboot.hash +++ b/board/freescale/ls1028ardb/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6279c161ad8a218b549e6631be969b74f358cf01a20103953ccaf3bb14185ac2 u-boot-LSDK-21.08.tar.gz +sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt index cfd1c8c4906..6633d60b901 100644 --- a/board/freescale/ls1028ardb/readme.txt +++ b/board/freescale/ls1028ardb/readme.txt @@ -12,11 +12,11 @@ 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 + - rcw, lf-6.6.23-2.0.0 + - atf (fork), lf-6.6.23-2.0.0 + - uboot (fork), lf-6.6.23-2.0.0 - cadence-dp-firmware (blob), LSDK 20.12 - - linux (fork), LSDK 21.08 + - linux (fork), lf-6.6.23-2.0.0 Build ===== diff --git a/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..f9af28ab3cf --- /dev/null +++ b/board/freescale/ls1046a-frwy/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4f4dc78bfb5b7391a65ae0f83856661071f666ac2bf6a9380fddbe376a8bdaaa atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash b/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/ls1046a-frwy/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/ls1046a-frwy/patches/linux/linux.hash b/board/freescale/ls1046a-frwy/patches/linux/linux.hash new file mode 100644 index 00000000000..e038c228623 --- /dev/null +++ b/board/freescale/ls1046a-frwy/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 6d592722e004516309f8ce33e654f1322e4d1f0f33567acb86ca19229176fd9e linux-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash new file mode 100644 index 00000000000..a5ccd82b2b0 --- /dev/null +++ b/board/freescale/ls1046a-frwy/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 a2bcd7a34d4908ffbadfea731d0f0fd20f19a31cff6ff6310980e7f6743ceb24 u-boot-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/ls1046a-frwy/readme.txt b/board/freescale/ls1046a-frwy/readme.txt index fbcfdb1b857..4d1e0e1dcd9 100644 --- a/board/freescale/ls1046a-frwy/readme.txt +++ b/board/freescale/ls1046a-frwy/readme.txt @@ -13,11 +13,11 @@ 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 - - qoriq-fm-ucode (blob), LSDK 21.08 - - linux (fork), LSDK 21.08 + - rcw, lf-6.6.23-2.0.0 + - atf (fork), lf-6.6.23-2.0.0 + - uboot (fork), lf-6.6.23-2.0.0 + - qoriq-fm-ucode (blob), lf-6.6.23-2.0.0 + - linux (fork), lf-6.6.23-2.0.0 Build ===== diff --git a/board/friendlyarm/nanopi-neo/extlinux.conf b/board/friendlyarm/nanopi-neo/extlinux.conf new file mode 100644 index 00000000000..e65951f9d92 --- /dev/null +++ b/board/friendlyarm/nanopi-neo/extlinux.conf @@ -0,0 +1,4 @@ +label NanoPi NEO linux + kernel /boot/zImage + devicetree /boot/sun8i-h3-nanopi-neo.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait panic=10 diff --git a/board/friendlyarm/nanopi-neo/genimage.cfg b/board/friendlyarm/nanopi-neo/genimage.cfg new file mode 100644 index 00000000000..6d57dd90882 --- /dev/null +++ b/board/friendlyarm/nanopi-neo/genimage.cfg @@ -0,0 +1,17 @@ +# Minimal SD card image for the NanoPi NEO. +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" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash b/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/friendlyarm/nanopi-neo/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/friendlyarm/nanopi-neo/patches/linux/linux.hash b/board/friendlyarm/nanopi-neo/patches/linux/linux.hash new file mode 100644 index 00000000000..ecff37638a0 --- /dev/null +++ b/board/friendlyarm/nanopi-neo/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz diff --git a/board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash b/board/friendlyarm/nanopi-neo/patches/uboot/uboot.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/uboot/uboot.hash rename to board/friendlyarm/nanopi-neo/patches/uboot/uboot.hash diff --git a/board/friendlyarm/nanopi-neo/post-build.sh b/board/friendlyarm/nanopi-neo/post-build.sh new file mode 100755 index 00000000000..d84a5da0b0f --- /dev/null +++ b/board/friendlyarm/nanopi-neo/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo/readme.txt b/board/friendlyarm/nanopi-neo/readme.txt new file mode 100644 index 00000000000..cfe7714a410 --- /dev/null +++ b/board/friendlyarm/nanopi-neo/readme.txt @@ -0,0 +1,41 @@ +Nanopi NEO + +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO. With the current configuration +it will bring-up the board, and allow access through the serial console. + +FriendlyARM Nanopi NEO link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO + +How to build +============ + + $ make friendlyarm_nanopi_neo_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 SD card in your Nanopi NEO and power it up. The console +is on the debug TTL UART, 115200 8N1. + +Ethernet +========== + + # udhcpc -i eth0 + +Enjoy! diff --git a/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash b/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/in-circuit/icnova-a20-adb4006/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash b/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash new file mode 100644 index 00000000000..98edd13a581 --- /dev/null +++ b/board/in-circuit/icnova-a20-adb4006/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz diff --git a/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch b/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch new file mode 100644 index 00000000000..edaa47ac4e8 --- /dev/null +++ b/board/in-circuit/icnova-a20-adb4006/patches/uboot/0001-sunxi-sun4i-Reduce-cpu-clock-at-SPL-initialization-t.patch @@ -0,0 +1,48 @@ +From 3cdf8aa3ff45e35a237285c107785bc3d2c6976a Mon Sep 17 00:00:00 2001 +From: Ludwig Kormann +Date: Wed, 31 Jan 2024 11:28:19 +0100 +Subject: [PATCH] sunxi: sun4i: Reduce cpu clock at SPL initialization to 144 + MHz + +Up until now cpu clock gets initialized at 384 MHz, which is +the highest supported cpu clock. + +Recent A20 batches show an increased percentage of modules +reacting very sensitive to operating conditions outside the +specifications. + +The cpu dies very shortly after PLLs, core frequency or cpu +voltage are missconfigured. E.g.: +- uboot SPL selects 384 MHz as cpu clock which requires a cpu + voltage of at least 1.1 V. +- Linux CPU Frequency scaling with most sun7i dts will reduce + cpu voltage down to 1.0 V. +- When intiating a reboot or reset from linux the cpu voltage + may keep the 1.0 V configuration and the cpu dies during SPL + initialization. + +Therefore reduce cpu clock at uboot SPL initialization down +to 144 MHz from 384 MHz. + +Signed-off-by: Ludwig Kormann +Upstream: Not Applicable +--- + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +index 2cec91cb20..252c4c693e 100644 +--- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h ++++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +@@ -141,7 +141,7 @@ struct sunxi_ccm_reg { + #define CCM_PLL1_CFG_SIG_DELT_PAT_EN_SHIFT 2 + #define CCM_PLL1_CFG_FACTOR_M_SHIFT 0 + +-#define PLL1_CFG_DEFAULT 0xa1005000 ++#define PLL1_CFG_DEFAULT 0xa1004c01 + + #if defined CONFIG_OLD_SUNXI_KERNEL_COMPAT && defined CONFIG_MACH_SUN5I + /* +-- +2.39.2 + diff --git a/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash b/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash new file mode 100644 index 00000000000..904fa56c02a --- /dev/null +++ b/board/in-circuit/icnova-a20-adb4006/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/nvidia/bf3/linux.config b/board/nvidia/bf3/linux.config new file mode 100644 index 00000000000..5dce5654810 --- /dev/null +++ b/board/nvidia/bf3/linux.config @@ -0,0 +1,163 @@ +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TASKSTATS=y +CONFIG_MEMCG=y +CONFIG_BLK_CGROUP=y +CONFIG_CPUSETS=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_PROFILING=y +CONFIG_ARCH_VEXPRESS=y +CONFIG_COMPAT=y +CONFIG_ACPI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BINFMT_MISC=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=y +CONFIG_UNIX=y +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_BRIDGE=y +CONFIG_NET_SCHED=y +CONFIG_VSOCKETS=y +CONFIG_PCI=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_CFG_SYSFS=y +CONFIG_FW_CFG_SYSFS_CMDLINE=y +CONFIG_VIRTIO_BLK=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_SG=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_VIRTIO=y +CONFIG_ATA=y +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +CONFIG_MACVLAN=y +CONFIG_VIRTIO_NET=y +CONFIG_NLMON=y +CONFIG_INPUT_EVDEV=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PL031=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_INPUT=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_MAILBOX=y +CONFIG_PL320_MBOX=y +CONFIG_ARM_SMMU_V3=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_VIRTIO_FS=y +CONFIG_OVERLAY_FS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_RAS=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +CONFIG_EDAC_BLUEFIELD=y +CONFIG_I2C=y +CONFIG_MELLANOX_PLATFORM=y +CONFIG_REGMAP_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_GPIO_MLXBF2=y +CONFIG_GPIO_MLXBF3=y +CONFIG_GPIO_MLXBF=y +CONFIG_I2C_MLXBF=y +CONFIG_I2C_MLXCPLD=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_MLXCPLD=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_MLXCPLD=y +CONFIG_LEDS_MLXREG=y +CONFIG_NET_SWITCHDEV=y +CONFIG_MLX5_BRIDGE=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_TC_SKB_EXT=y +CONFIG_CONFIG_NET_CLS_ACT=y +CONFIG_MLX5_CLS_ACT=y +CONFIG_DCB=y +CONFIG_MLX5_CORE_EN_DCB=y +CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_CORE=y +CONFIG_MLX5_DPLL=y +CONFIG_MLX5_EN_ARFS=y +CONFIG_INET_ESP=y +CONFIG_INET6_ESP=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_INET_ESP_OFFLOAD=y +CONFIG_INET6_ESP_OFFLOAD=y +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_EN_RXNFC=y +CONFIG_TLS_DEVICE=y +CONFIG_TLS=y +CONFIG_MLX5_EN_TLS=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_FPGA_IPSEC=y +CONFIG_MLX5_FPGA_TLS=y +CONFIG_MLX5_FPGA=y +CONFIG_MLX5_IPSEC=y +CONFIG_MACSEC=y +CONFIG_MLX5_MACSEC=y +CONFIG_MLX5_MPFS=y +CONFIG_MLX5_SF_MANAGER=y +CONFIG_MLX5_SF=y +CONFIG_MLX5_SW_STEERING=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_INGRESS=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_TABLES=y +CONFIG_NF_FLOW_TABLE=y +CONFIG_NET_ACT_CT=y +CONFIG_MLX5_TC_CT=y +CONFIG_MLX5_TC_SAMPLE=y +CONFIG_MLX5_TLS=y +CONFIG_VDPA=y +CONFIG_VHOST_IOTLB=y +CONFIG_MLX5_VDPA_NET=y +CONFIG_MLX5_VDPA_STEERING_DEBUG=y +CONFIG_MLX5_VDPA=y +CONFIG_IOMMUFD=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_VFIO=y +CONFIG_MLX5_VFIO_PCI=y +CONFIG_MLXBF_BOOTCTL=y +CONFIG_MLXBF_GIGE=y +CONFIG_MLXBF_PMC=y +CONFIG_MLXBF_TMFIFO=y +CONFIG_MLXFW=y +CONFIG_MLXREG_HOTPLUG=y +CONFIG_MLXREG_IO=y +CONFIG_WATCHDOG=y +CONFIG_MLX_WDT=y +CONFIG_MMC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_BLUEFIELD=y +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_MLXBF3=y +CONFIG_POWER_MLXBF=y +CONFIG_SENSORS_MLXREG_FAN=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_RD_GZIP=y +CONFIG_INITRAMFS_COMPRESSION_GZIP=y diff --git a/board/nvidia/bf3/patches/linux-headers/linux-headers.hash b/board/nvidia/bf3/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/nvidia/bf3/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/nvidia/bf3/patches/linux/linux.hash b/board/nvidia/bf3/patches/linux/linux.hash new file mode 100644 index 00000000000..d2272b2110a --- /dev/null +++ b/board/nvidia/bf3/patches/linux/linux.hash @@ -0,0 +1,4 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +# After checking with pgp with using key +# B8868C80BA62A1FFFAF5FDA9632D3A06589DA6B1 +sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz diff --git a/board/nvidia/bf3/readme.txt b/board/nvidia/bf3/readme.txt new file mode 100644 index 00000000000..7e072d21e2b --- /dev/null +++ b/board/nvidia/bf3/readme.txt @@ -0,0 +1,70 @@ +***************** +BlueField 3 Board +***************** + +The BlueField 3 board is provided "as-is" without official support +from NVIDIA. + +For a detailed description of this board, please refer to the official +website: +https://www.nvidia.com/en-us/networking/products/data-processing-unit/ + + +Missing Kernel Modules +====================== + +Please note that the following kernel modules are unavailable as they +are not included in the Linux upstream repository: + - CONFIG_MLXBF_PTM (module: mlxbf-ptm) + - CONFIG_MLXBF_PKA (module: mlxbf-pka) + +For further details on these kernel modules and their usage, please +refer to the NVIDIA documentation: +https://docs.nvidia.com/networking/display/bluefielddpuosv470/installing+popular+linux+distributions+on+bluefield + + +Boot loader +=========== + +NVIDIA does not provide information for rebuilding the ARM BL1, BL2, +BL3, UEFI, or other components in the boot stages. Therefore, we +assume the BF3 board is already running the pre-built Ubuntu image +provided in the BFB installation format. + +Since there are no available details on the BF3's BFB format or the +ARM Trusted Firmware (ATF) needed to rebuild BL1, BL2, BL3, UEFI, or +GRUB, these components are assumed to remain unmodified. + + +Grub Configuration and Image Loading +==================================== + +The board's image is loaded from the BF3's GRUB, with the following +GRUB settings, assuming the console is set to `hvc0` to provide access +thru `/dev/rshimN/console` from the root CPU since the root CPU's +rshim exposes a virtio console over the PCIe bus to the BR3 board. + +To update GRUB settings, boot using the built-in BF3 Ubuntu image. + +Extract of /etc/default/grub: + + GRUB_DEFAULT=0 + GRUB_TIMEOUT_STYLE=menu + GRUB_TIMEOUT=-1 + GRUB_RECORDFAIL_TIMEOUT=5 + GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` + GRUB_CMDLINE_LINUX_DEFAULT="" + GRUB_CMDLINE_LINUX="console=hvc0 earlyprintk=hvc0 earlycon=hvc0 loglevel=7 fixrtc net.ifnames=0 biosdevname=0 iommu.passthrough=1" + + +Uploading Buildroot Images +-------------------------- + +After configuring GRUB, you can upload your Buildroot images to the +BF3’s GRUB boot folder: + + scp build_folder/images/Image BF3:/boot/vmlinuz-buildroot-xyz + +Finally, run `update-grub` on the BF3 board to apply the updated GRUB settings. + +Enjoy! diff --git a/board/olimex/a20_olinuxino/patches/linux/linux.hash b/board/olimex/a20_olinuxino/patches/linux/linux.hash index 8ffd3e4fbc9..4769129ac16 100644 --- a/board/olimex/a20_olinuxino/patches/linux/linux.hash +++ b/board/olimex/a20_olinuxino/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b9676828b737e8fb8eaa5198303d35d35e8df019550be153c8a42c99afe0cdd5 linux-6.6.36.tar.xz +sha256 5fae869d6a24055c16ffc2d92669e3fb2b258e34d36c850bb8cf9def417ecfa0 linux-6.6.54.tar.xz diff --git a/board/olimex/a20_olinuxino/patches/uboot/uboot.hash b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash index 72699801049..8491435683e 100644 --- a/board/olimex/a20_olinuxino/patches/uboot/uboot.hash +++ b/board/olimex/a20_olinuxino/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/pine64/pine64/genimage.cfg b/board/pine64/pine64/genimage.cfg index 06b4ed1056d..bd026c33c6d 100644 --- a/board/pine64/pine64/genimage.cfg +++ b/board/pine64/pine64/genimage.cfg @@ -14,23 +14,17 @@ 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 + image = "u-boot-sunxi-with-spl.bin" + offset = 8K } partition boot { partition-type = 0xC bootable = "true" image = "boot.vfat" + offset = 1M } partition rootfs { diff --git a/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash b/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/pine64/rockpro64/patches/linux/linux.hash b/board/pine64/rockpro64/patches/linux/linux.hash new file mode 100644 index 00000000000..396c18dd5c7 --- /dev/null +++ b/board/pine64/rockpro64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz diff --git a/board/pine64/rockpro64/patches/uboot/uboot.hash b/board/pine64/rockpro64/patches/uboot/uboot.hash new file mode 100644 index 00000000000..904fa56c02a --- /dev/null +++ b/board/pine64/rockpro64/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/pine64/rockpro64/post-build.sh b/board/pine64/rockpro64/post-build.sh index ba29375c05e..e947745488b 100755 --- a/board/pine64/rockpro64/post-build.sh +++ b/board/pine64/rockpro64/post-build.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR=$(dirname "$0") -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "$BOARD_DIR/extlinux.conf" "$BINARIES_DIR/extlinux/extlinux.conf" diff --git a/board/qemu/aarch64-sbsa/readme.txt b/board/qemu/aarch64-sbsa/readme.txt index cf5f66d4d60..7d97d7f6ab4 100644 --- a/board/qemu/aarch64-sbsa/readme.txt +++ b/board/qemu/aarch64-sbsa/readme.txt @@ -17,7 +17,7 @@ Run the emulation with: qemu-system-aarch64 \ -M sbsa-ref \ - -cpu cortex-a57 \ + -cpu neoverse-n1 \ -smp 4 \ -m 1024 \ -nographic \ diff --git a/board/qemu/nios2-10m50/linux.fragment b/board/qemu/nios2-10m50/linux.fragment deleted file mode 100644 index c7647cee8a0..00000000000 --- a/board/qemu/nios2-10m50/linux.fragment +++ /dev/null @@ -1,3 +0,0 @@ -# Embed the DTB in the kernel image -CONFIG_NIOS2_DTB_SOURCE_BOOL=y -CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" diff --git a/board/qemu/nios2-10m50/readme.txt b/board/qemu/nios2-10m50/readme.txt deleted file mode 100644 index f8f8f3b3a50..00000000000 --- a/board/qemu/nios2-10m50/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -Run the emulation with: - - qemu-system-nios2 -kernel output/images/vmlinux -nographic # qemu_nios2_10m50_defconfig - -The login prompt will appear in the terminal that started Qemu. diff --git a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 5632db01f84..4a0534d1ba9 100644 --- a/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/qemu/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 c9f0d0bf967d690edbf34b621728a6271856f2e26ed46081a285b6d627a358c5 arm-trusted-firmware-v2.7-git4.tar.gz sha256 7efa89e1b4e4106ee05d68e876c8efbb146364d89cfd5d26bf4647b09c08f32b arm-trusted-firmware-v2.10-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt index 555924f9496..b4336e93576 100644 --- a/board/qemu/riscv32-virt/readme.txt +++ b/board/qemu/riscv32-virt/readme.txt @@ -1,7 +1,7 @@ Run Linux in emulation with: - qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig + qemu-system-riscv32 -M virt -bios output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv32_virt_defconfig - qemu-system-riscv32 -M virt -bios 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 rv32,mmu=off -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 # qemu_riscv32_nommu_virt_defconfig + qemu-system-riscv32 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv32,mmu=off -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 # qemu_riscv32_nommu_virt_defconfig The login prompt will appear in the terminal that started Qemu. diff --git a/board/qemu/riscv64-virt-efi/readme.txt b/board/qemu/riscv64-virt-efi/readme.txt index 6b9651a011d..10d4ed966fb 100644 --- a/board/qemu/riscv64-virt-efi/readme.txt +++ b/board/qemu/riscv64-virt-efi/readme.txt @@ -22,8 +22,7 @@ Run the emulation with: -blockdev node-name=pflash0,driver=file,read-only=on,filename=output/images/RISCV_VIRT_CODE.fd \ -blockdev node-name=pflash1,driver=file,filename=output/images/RISCV_VIRT_VARS.fd \ \ - -drive file=output/images/disk.img,format=raw,id=hd0 \ - -device virtio-blk-device,drive=hd0 \ + -drive file=output/images/disk.img,format=raw \ \ -netdev user,id=net0 \ -device virtio-net-device,netdev=net0 # qemu_riscv64_virt_efi_defconfig diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index f1c7bf41b51..f9e920a88b3 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -1,7 +1,7 @@ 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 output/images/fw_jump.elf -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic # qemu_riscv64_virt_defconfig - qemu-system-riscv64 -M virt -bios 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 -netdev user,id=net0 -device virtio-net-device,netdev=net0 # qemu_riscv64_nommu_virt_defconfig + qemu-system-riscv64 -M virt -bios none -kernel output/images/Image -append "rootwait root=/dev/vda ro" -drive file=output/images/rootfs.ext2,format=raw,id=hd0,if=none -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off -netdev user,id=net0 -device virtio-net-device,netdev=net0 # qemu_riscv64_nommu_virt_defconfig The login prompt will appear in the terminal that started Qemu. diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf index a1a531f038b..c4198deaa06 100644 --- a/board/radxa/rock5b/extlinux.conf +++ b/board/radxa/rock5b/extlinux.conf @@ -1,4 +1,4 @@ label Radxa Rock 5b Linux kernel /boot/Image devicetree /boot/rk3588-rock-5b.dtb - append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait + append root=PARTLABEL=rootfs earlycon rootwait diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg index 138ec26e3aa..070cc03dc24 100644 --- a/board/radxa/rock5b/genimage.cfg +++ b/board/radxa/rock5b/genimage.cfg @@ -2,7 +2,7 @@ image sdcard.img { hdimage { - partition-table-type = "hybrid" + partition-table-type = "gpt" } partition uboot { @@ -11,8 +11,15 @@ image sdcard.img { offset = 32K } + partition uboot-env { + partition-type-uuid = 3de21764-95bd-54bd-a5c3-4abe786f38a8 + offset = 16M + size = 64K + } + partition rootfs { - partition-type = 0x83 + partition-type-uuid = L image = "rootfs.ext2" + bootable = true } } diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash index ba90c84f54e..005667b1f16 100644 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ b/board/radxa/rock5b/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 f68d9f5ffc0a24f850699b86c8aea8b8687de7384158d5ed3bede37de098d60c linux-6.7.4.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash index bc999536af2..904fa56c02a 100644 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ b/board/radxa/rock5b/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/radxa/rock5b/u-boot.fragment b/board/radxa/rock5b/u-boot.fragment new file mode 100644 index 00000000000..ceba8d609a6 --- /dev/null +++ b/board/radxa/rock5b/u-boot.fragment @@ -0,0 +1,5 @@ +CONFIG_ENV_SIZE=0x10000 +CONFIG_PARTITION_TYPE_GUID=y +# CONFIG_ENV_IS_NOWHERE is not set +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_MMC_ENV_DEV=1 diff --git a/board/solidrun/clearfog/genimage.cfg b/board/solidrun/clearfog/genimage.cfg index 8963619cc52..35aab62a8c3 100644 --- a/board/solidrun/clearfog/genimage.cfg +++ b/board/solidrun/clearfog/genimage.cfg @@ -4,7 +4,7 @@ image sdcard.img { partition u-boot { in-partition-table = "no" - image = "u-boot-spl.kwb" + image = "u-boot-with-spl.kwb" offset = 512 } diff --git a/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/solidrun/clearfog/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/solidrun/clearfog/patches/linux/linux.hash b/board/solidrun/clearfog/patches/linux/linux.hash new file mode 100644 index 00000000000..b8935a250a6 --- /dev/null +++ b/board/solidrun/clearfog/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz diff --git a/board/solidrun/clearfog/patches/uboot/uboot.hash b/board/solidrun/clearfog/patches/uboot/uboot.hash new file mode 100644 index 00000000000..fe9b4f53dc6 --- /dev/null +++ b/board/solidrun/clearfog/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/genimage.cfg.template rename to board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template diff --git a/board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/arm-trusted-firmware/arm-trusted-firmware.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/arm-trusted-firmware/arm-trusted-firmware.hash diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash similarity index 100% rename from board/stmicroelectronics/common/stm32mp157/patches/linux/linux.hash rename to board/stmicroelectronics/common/stm32mp1xx/patches/linux/linux.hash diff --git a/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash new file mode 100644 index 00000000000..fe9b4f53dc6 --- /dev/null +++ b/board/stmicroelectronics/common/stm32mp1xx/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp1xx/post-image.sh similarity index 93% rename from board/stmicroelectronics/common/stm32mp157/post-image.sh rename to board/stmicroelectronics/common/stm32mp1xx/post-image.sh index 0cf52f4564d..77547832abd 100755 --- a/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ b/board/stmicroelectronics/common/stm32mp1xx/post-image.sh @@ -22,7 +22,7 @@ main() GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" sed -e "s/%ATFBIN%/${ATFBIN}/" \ - board/stmicroelectronics/common/stm32mp157/genimage.cfg.template > ${GENIMAGE_CFG} + board/stmicroelectronics/common/stm32mp1xx/genimage.cfg.template > ${GENIMAGE_CFG} support/scripts/genimage.sh -c ${GENIMAGE_CFG} diff --git a/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash index 88e1ba4660d..fc2057c3f24 100644 --- a/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f429-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 97cdc9127c7700556ea0891267a0c24cf372f4b81636fb8203a914f3a69f3406 linux-6.1.98.tar.xz +sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz diff --git a/board/stmicroelectronics/stm32f469-disco/extlinux.conf b/board/stmicroelectronics/stm32f469-disco/extlinux.conf index 1c2db4383ba..65aa286a7a9 100644 --- a/board/stmicroelectronics/stm32f469-disco/extlinux.conf +++ b/board/stmicroelectronics/stm32f469-disco/extlinux.conf @@ -1,4 +1,4 @@ label stm32f469-disco-buildroot - kernel /zImage - devicetree /stm32f469-disco.dtb - append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel + kernel /boot/zImage + devicetree /boot/stm32f469-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/board/stmicroelectronics/stm32f469-disco/genimage.cfg b/board/stmicroelectronics/stm32f469-disco/genimage.cfg index 517ead7751e..e911a94e46b 100644 --- a/board/stmicroelectronics/stm32f469-disco/genimage.cfg +++ b/board/stmicroelectronics/stm32f469-disco/genimage.cfg @@ -1,24 +1,7 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "stm32f469-disco.dtb", - "extlinux" - } - } - - size = 16M -} - image sdcard.img { hdimage { } - partition u-boot { - partition-type = 0xC - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash index d8e8263e9ef..b241c795baa 100644 --- a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash index fe9b4f53dc6..904fa56c02a 100644 --- a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32f469-disco/post-build.sh b/board/stmicroelectronics/stm32f469-disco/post-build.sh index ec20fca7d96..03e9dcae821 100755 --- a/board/stmicroelectronics/stm32f469-disco/post-build.sh +++ b/board/stmicroelectronics/stm32f469-disco/post-build.sh @@ -1,4 +1,4 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/board/stmicroelectronics/stm32f746-disco/extlinux.conf b/board/stmicroelectronics/stm32f746-disco/extlinux.conf new file mode 100644 index 00000000000..40fc04dd103 --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/extlinux.conf @@ -0,0 +1,4 @@ +label stm32f746-disco-buildroot + kernel /boot/zImage + devicetree /boot/stm32f746-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootwait consoleblank=0 ignore_loglevel diff --git a/board/stmicroelectronics/stm32f746-disco/flash_sd.sh b/board/stmicroelectronics/stm32f746-disco/flash_sd.sh new file mode 100755 index 00000000000..b4858cb9dac --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/flash_sd.sh @@ -0,0 +1,22 @@ +#!/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" + exit 1 +fi + +"${OUTPUT_DIR}"/host/bin/openocd -f board/stm32f746g-disco.cfg \ + -c "init" \ + -c "reset init" \ + -c "flash probe 0" \ + -c "flash info 0" \ + -c "flash write_image erase ${OUTPUT_DIR}/images/u-boot.bin 0x08000000" \ + -c "reset run" \ + -c "shutdown" diff --git a/board/stmicroelectronics/stm32f746-disco/genimage.cfg b/board/stmicroelectronics/stm32f746-disco/genimage.cfg new file mode 100644 index 00000000000..e911a94e46b --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/genimage.cfg @@ -0,0 +1,10 @@ +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 32M + } +} diff --git a/board/stmicroelectronics/stm32f746-disco/linux.fragment b/board/stmicroelectronics/stm32f746-disco/linux.fragment new file mode 100644 index 00000000000..625fdced9e8 --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/linux.fragment @@ -0,0 +1,13 @@ +# CONFIG_PREEMPT is not set +# CONFIG_MULTIUSER is not set +# CONFIG_TIMERFD is not set +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0xC0000000 +CONFIG_DRAM_SIZE=0x01000000 +# CONFIG_GCC_PLUGINS is not set +# CONFIG_XIP_KERNEL is not set +# CONFIG_BLK_DEV is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_PROC_SYSCTL is not set +# CONFIG_CRYPTO is not set +CONFIG_RCU_TRACE=y \ No newline at end of file diff --git a/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash new file mode 100644 index 00000000000..b241c795baa --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash new file mode 100644 index 00000000000..904fa56c02a --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32f746-disco/post-build.sh b/board/stmicroelectronics/stm32f746-disco/post-build.sh new file mode 100755 index 00000000000..03e9dcae821 --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/board/stmicroelectronics/stm32f746-disco/readme.txt b/board/stmicroelectronics/stm32f746-disco/readme.txt new file mode 100644 index 00000000000..4ac16da3313 --- /dev/null +++ b/board/stmicroelectronics/stm32f746-disco/readme.txt @@ -0,0 +1,31 @@ +STM32F746-DISCO +=================== + +This tutorial describes how to use the predefined Buildroot +configuration for the STM32F746-DISCO evaluation platform. + +Building +-------- + + make stm32f746_disco_sd_defconfig + make + +Flashing +-------- + + ./board/stmicroelectronics/stm32f746-disco/flash_sd.sh output/ + +It will flash the U-boot bootloader. + +Creating SD card +---------------- + +Buildroot prepares an "sdcard.img" image in the output/images/ directory, +ready to be dumped on a SD card. Launch the following command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout and its content, see the +definition in board/stmicroelectronics/stm32f746-disco/genimage.cfg. diff --git a/board/stmicroelectronics/stm32f769-disco/extlinux.conf b/board/stmicroelectronics/stm32f769-disco/extlinux.conf index 48483a01fc4..edc1582615d 100644 --- a/board/stmicroelectronics/stm32f769-disco/extlinux.conf +++ b/board/stmicroelectronics/stm32f769-disco/extlinux.conf @@ -1,4 +1,4 @@ label stm32f769-disco-buildroot - kernel /zImage - devicetree /stm32f769-disco.dtb - append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel + kernel /boot/zImage + devicetree /boot/stm32f769-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/board/stmicroelectronics/stm32f769-disco/genimage.cfg b/board/stmicroelectronics/stm32f769-disco/genimage.cfg index 41f9da51248..e911a94e46b 100644 --- a/board/stmicroelectronics/stm32f769-disco/genimage.cfg +++ b/board/stmicroelectronics/stm32f769-disco/genimage.cfg @@ -1,24 +1,7 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "stm32f769-disco.dtb", - "extlinux" - } - } - - size = 16M -} - image sdcard.img { hdimage { } - partition u-boot { - partition-type = 0xC - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash index d8e8263e9ef..b241c795baa 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz +sha256 b1751f18ece3df08d502dd87a9ab1a317dc0f9486355bf8ee62ba6af0b35da30 linux-5.15.167.tar.xz diff --git a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash index fe9b4f53dc6..904fa56c02a 100644 --- a/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash +++ b/board/stmicroelectronics/stm32f769-disco/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/stmicroelectronics/stm32f769-disco/post-build.sh b/board/stmicroelectronics/stm32f769-disco/post-build.sh index c8cca3de8c9..45100509411 100755 --- a/board/stmicroelectronics/stm32f769-disco/post-build.sh +++ b/board/stmicroelectronics/stm32f769-disco/post-build.sh @@ -4,4 +4,4 @@ BOARD_DIR="$(dirname "$0")" # Kernel is built without devpts support sed -i '/^devpts/d' "${TARGET_DIR}"/etc/fstab -install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index f0635a66526..8b77e1f1653 100644 --- a/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62ax-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ -# Locally computed: -sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch deleted file mode 100644 index 2f3d80c86dc..00000000000 --- a/board/ti/am62ax-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 -From: Udit Kumar -Date: Tue, 13 Feb 2024 13:56:40 +0530 -Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous - clocks -X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; - h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; - b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA - RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA - 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD - AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j - AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK - 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk - nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o - AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl - +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM - TPOUZ/i7kinChIDsZnF4A== -X-Developer-Key: i=bb@ti.com; a=openpgp; - fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 - -Most of clocks and their parents are defined in contiguous range, -But in few cases, there is gap in clock numbers[0]. -Driver assumes clocks to be in contiguous range, and add their clock -ids incrementally. - -New firmware started returning error while calling get_freq and is_on -API for non-available clock ids. - -In this fix, driver checks and adds only valid clock ids. - -[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html -Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. - -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 - -Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") -Signed-off-by: Udit Kumar -Reviewed-by: Nishanth Menon -Signed-off-by: Bryan Brattlof ---- - drivers/clk/keystone/sci-clk.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c -index 35fe197dd303c..eb2ef44869b23 100644 ---- a/drivers/clk/keystone/sci-clk.c -+++ b/drivers/clk/keystone/sci-clk.c -@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - struct sci_clk *sci_clk, *prev; - int num_clks = 0; - int num_parents; -+ bool state; - int clk_id; - const char * const clk_names[] = { - "clocks", "assigned-clocks", "assigned-clock-parents", NULL -@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - clk_id = args.args[1] + 1; - - while (num_parents--) { -+ /* Check if this clock id is valid */ -+ ret = provider->ops->is_auto(provider->sci, -+ sci_clk->dev_id, clk_id, &state); -+ -+ if (ret) { -+ clk_id++; -+ continue; -+ } -+ - sci_clk = devm_kzalloc(dev, - sizeof(*sci_clk), - GFP_KERNEL); - -base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd --- -2.43.2 - diff --git a/board/ti/am62ax-sk/patches/linux/linux.hash b/board/ti/am62ax-sk/patches/linux/linux.hash index 2e9aad399eb..53eb1438945 100644 --- a/board/ti/am62ax-sk/patches/linux/linux.hash +++ b/board/ti/am62ax-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index 75de6acf93b..00000000000 --- a/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 00000000000..b89e91d3e88 --- /dev/null +++ b/board/ti/am62ax-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/board/ti/am62ax-sk/patches/uboot/uboot.hash b/board/ti/am62ax-sk/patches/uboot/uboot.hash index 6f8624c3cc8..fe9b4f53dc6 100644 --- a/board/ti/am62ax-sk/patches/uboot/uboot.hash +++ b/board/ti/am62ax-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# locally computed -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/ti/am62px-sk/genimage.cfg b/board/ti/am62px-sk/genimage.cfg new file mode 100644 index 00000000000..b0a1bee8b99 --- /dev/null +++ b/board/ti/am62px-sk/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + "k3-am62p5-sk.dtb", + "Image" + } + + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 00000000000..8b77e1f1653 --- /dev/null +++ b/board/ti/am62px-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash b/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/ti/am62px-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am62px-sk/patches/linux/linux.hash b/board/ti/am62px-sk/patches/linux/linux.hash new file mode 100644 index 00000000000..53eb1438945 --- /dev/null +++ b/board/ti/am62px-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 00000000000..b89e91d3e88 --- /dev/null +++ b/board/ti/am62px-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/board/ti/am62px-sk/patches/uboot/uboot.hash b/board/ti/am62px-sk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..fe9b4f53dc6 --- /dev/null +++ b/board/ti/am62px-sk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/ti/am62px-sk/readme.txt b/board/ti/am62px-sk/readme.txt new file mode 100644 index 00000000000..a20911c3542 --- /dev/null +++ b/board/ti/am62px-sk/readme.txt @@ -0,0 +1,39 @@ +Texas Instuments SK-AM62P5 Test and Development Board + +Description +=========== + +This configuration will build a complete image for the TI SK-AM62P +board: https://www.ti.com/tool/SK-AM62P. + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_am62px_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +IMPORTANT: make sure to use the tiboot3 firmware that match with the TI +K3 SoC boot ROM (tiboot3-am62px-{hs-fs/hs}-evm.bin) used on the board. +Use the BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN to name which tiboot3.bin +security variant we want to use. + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-AM62P board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled UART to +communicate with the board. diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index d68ac4bd30d..8b77e1f1653 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch deleted file mode 100644 index 788b6439d89..00000000000 --- a/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 -From: Udit Kumar -Date: Tue, 13 Feb 2024 13:56:40 +0530 -Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous - clocks -X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; - h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; - b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA - RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA - 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD - AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j - AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK - 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk - nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o - AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl - +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM - TPOUZ/i7kinChIDsZnF4A== -X-Developer-Key: i=bb@ti.com; a=openpgp; - fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 - -Most of clocks and their parents are defined in contiguous range, -But in few cases, there is gap in clock numbers[0]. -Driver assumes clocks to be in contiguous range, and add their clock -ids incrementally. - -New firmware started returning error while calling get_freq and is_on -API for non-available clock ids. - -In this fix, driver checks and adds only valid clock ids. - -[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html -Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. - -Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") -Signed-off-by: Udit Kumar -Reviewed-by: Nishanth Menon -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 -Signed-off-by: Bryan Brattlof ---- - drivers/clk/keystone/sci-clk.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c -index 35fe197dd303c..eb2ef44869b23 100644 ---- a/drivers/clk/keystone/sci-clk.c -+++ b/drivers/clk/keystone/sci-clk.c -@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - struct sci_clk *sci_clk, *prev; - int num_clks = 0; - int num_parents; -+ bool state; - int clk_id; - const char * const clk_names[] = { - "clocks", "assigned-clocks", "assigned-clock-parents", NULL -@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - clk_id = args.args[1] + 1; - - while (num_parents--) { -+ /* Check if this clock id is valid */ -+ ret = provider->ops->is_auto(provider->sci, -+ sci_clk->dev_id, clk_id, &state); -+ -+ if (ret) { -+ clk_id++; -+ continue; -+ } -+ - sci_clk = devm_kzalloc(dev, - sizeof(*sci_clk), - GFP_KERNEL); - -base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd --- -2.43.2 - diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash index 5e9df51ecdd..706ddb8dbbd 100644 --- a/board/ti/am62x-sk/patches/linux/linux.hash +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz +sha256 5ffceb2350db1547e69231a63df2d3beed015a313d7d7adf8b5cb71dedaeb16a linux-6.10.13.tar.xz diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index fe9b4f53dc6..00000000000 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 00000000000..b89e91d3e88 --- /dev/null +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash index fe9b4f53dc6..904fa56c02a 100644 --- a/board/ti/am62x-sk/patches/uboot/uboot.hash +++ b/board/ti/am62x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index d68ac4bd30d..8b77e1f1653 100644 --- a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch deleted file mode 100644 index 788b6439d89..00000000000 --- a/board/ti/am64x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 -From: Udit Kumar -Date: Tue, 13 Feb 2024 13:56:40 +0530 -Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous - clocks -X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; - h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; - b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA - RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA - 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD - AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j - AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK - 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk - nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o - AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl - +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM - TPOUZ/i7kinChIDsZnF4A== -X-Developer-Key: i=bb@ti.com; a=openpgp; - fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 - -Most of clocks and their parents are defined in contiguous range, -But in few cases, there is gap in clock numbers[0]. -Driver assumes clocks to be in contiguous range, and add their clock -ids incrementally. - -New firmware started returning error while calling get_freq and is_on -API for non-available clock ids. - -In this fix, driver checks and adds only valid clock ids. - -[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html -Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. - -Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") -Signed-off-by: Udit Kumar -Reviewed-by: Nishanth Menon -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 -Signed-off-by: Bryan Brattlof ---- - drivers/clk/keystone/sci-clk.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c -index 35fe197dd303c..eb2ef44869b23 100644 ---- a/drivers/clk/keystone/sci-clk.c -+++ b/drivers/clk/keystone/sci-clk.c -@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - struct sci_clk *sci_clk, *prev; - int num_clks = 0; - int num_parents; -+ bool state; - int clk_id; - const char * const clk_names[] = { - "clocks", "assigned-clocks", "assigned-clock-parents", NULL -@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - clk_id = args.args[1] + 1; - - while (num_parents--) { -+ /* Check if this clock id is valid */ -+ ret = provider->ops->is_auto(provider->sci, -+ sci_clk->dev_id, clk_id, &state); -+ -+ if (ret) { -+ clk_id++; -+ continue; -+ } -+ - sci_clk = devm_kzalloc(dev, - sizeof(*sci_clk), - GFP_KERNEL); - -base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd --- -2.43.2 - diff --git a/board/ti/am64x-sk/patches/linux/linux.hash b/board/ti/am64x-sk/patches/linux/linux.hash index 2e9aad399eb..53eb1438945 100644 --- a/board/ti/am64x-sk/patches/linux/linux.hash +++ b/board/ti/am64x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1c4cdcb9d560fad1fb95db2cb8afbedc922f9ead848371fe40363b13f9f631ba linux-6.8.8.tar.xz +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index 97a2b4eaf95..00000000000 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 00000000000..b89e91d3e88 --- /dev/null +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/board/ti/am64x-sk/patches/uboot/uboot.hash b/board/ti/am64x-sk/patches/uboot/uboot.hash index 97a2b4eaf95..fe9b4f53dc6 100644 --- a/board/ti/am64x-sk/patches/uboot/uboot.hash +++ b/board/ti/am64x-sk/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch b/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch deleted file mode 100644 index d151a40d6e2..00000000000 --- a/board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang - -Currently the kernel hangs when USB Host1 is enabled due to the lack of -support for controlling the USB hub clock and GPIO reset line. - -Peter Chen has made several attempts to fix this problem, but his series -has not been applied yet, so better disable USB host1 for now to avoid -the kernel hang. - -Signed-off-by: Fabio Estevam ---- - -diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi -index 828dd20cd27d..c9e122865312 100644 ---- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi -@@ -292,7 +292,8 @@ &usbh1 { - pinctrl-0 = <&pinctrl_usbh>; - vbus-supply = <®_usb_h1_vbus>; - clocks = <&clks IMX6QDL_CLK_CKO>; -- status = "okay"; -+ /* currently USB support causes a kernel hang. Disable it for now */ -+ status = "disabled"; - }; - - &usbotg { diff --git a/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf b/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..cbb284f91b4 --- /dev/null +++ b/board/udoo/mx6qdl/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +Label imx6qdl-udoo buildroot + kernel ../zImage + fdtdir ../ + append root=/dev/mmcblk2p1 rootwait rw diff --git a/board/versal/readme.txt b/board/versal/readme.txt index 9cf499b35bb..4d8406fb1f4 100644 --- a/board/versal/readme.txt +++ b/board/versal/readme.txt @@ -4,6 +4,7 @@ Xilinx Versal boards: ****************************************** Supported Versal Boards: Xilinx VCK190 board +Xilinx VEK280 board Xilinx VPK180 board ****************************************** @@ -12,6 +13,9 @@ Evaluation board features can be found here with the links below. VCK190: https://www.xilinx.com/products/boards-and-kits/vck190.html +VEK280: +https://www.xilinx.com/products/boards-and-kits/vek280.html + VPK180: https://www.xilinx.com/products/boards-and-kits/vpk180.html diff --git a/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch b/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch new file mode 100644 index 00000000000..d894ad35d1b --- /dev/null +++ b/board/versal/vek280/patches/linux/0001-arm64-versal-Fix-vek280-memory-configuration.patch @@ -0,0 +1,47 @@ +From: Michal Simek +Date: Mon, 15 Jul 2024 08:24:57 +0200 +Subject: [PATCH] arm64: versal: Fix vek280 memory configuration + +Board has 12GB total but Vivado wizard supports one channel LPDDR4 4GB +configuration (2GB low + 2GB high) or two channel LPDDR 8GB configuration +(2GB low + 6GB high). Wiring the remaining 4GB LPDDR can be done via board +tab but not available as option in wizard. That's why only describe 8GB by +default. + +Signed-off-by: Michal Simek +Signed-off-by: Neal Frager +Upstream: https://github.com/Xilinx/linux-xlnx/commit/3c7a97d99bdb3dd6b1f36d7d87d3a3c113dfe2ea +--- + arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts | 2 +- + arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts +index 1641dc0b5141..ad5d590318e6 100644 +--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts ++++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revA.dts +@@ -19,7 +19,7 @@ / { + + memory: memory@0 { + device_type = "memory"; +- reg = <0 0 0 0x80000000>, <0x8 0x0 0x7 0x80000000>; /* 32GB */ ++ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */ + }; + + chosen { +diff --git a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts +index fda47cd87b3a..80aae8fa4b11 100644 +--- a/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts ++++ b/arch/arm64/boot/dts/xilinx/versal-vek280-revB.dts +@@ -19,7 +19,7 @@ / { + + memory: memory@0 { + device_type = "memory"; +- reg = <0 0 0 0x80000000>, <0x8 0x0 0x7 0x80000000>; /* 32GB */ ++ reg = <0 0 0 0x80000000>, <0x8 0x80000000 0x1 0x80000000>; /* 2GB + 6GB */ + }; + + chosen { +-- +2.43.0 + diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index d85f7734780..b007db43035 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz diff --git a/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch b/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch new file mode 100644 index 00000000000..5f6ceb289d2 --- /dev/null +++ b/boot/edk2/0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch @@ -0,0 +1,129 @@ +From 921c78f57a16b00debd58899a48e7045015c374b Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Mon, 17 Jun 2024 17:07:41 +0200 +Subject: [PATCH] OvmfPkg/QemuVideoDxe: add feature PCD to remap framebuffer + W/C + +Some platforms (such as SBSA-QEMU on recent builds of the emulator) only +tolerate misaligned accesses to normal memory, and raise alignment +faults on such accesses to device memory, which is the default for PCIe +MMIO BARs. + +When emulating a PCIe graphics controller, the framebuffer is typically +exposed via a MMIO BAR, while the disposition of the region is closer to +memory (no side effects on reads or writes, except for the changing +picture on the screen; direct random access to any pixel in the image). + +In order to permit the use of such controllers on platforms that only +tolerate these types of accesses for normal memory, it is necessary to +remap the memory. Use the DXE services to set the desired capabilities +and attributes. + +Hide this behavior under a feature PCD so only platforms that really +need it can enable it. (OVMF on x86 has no need for this) + +Signed-off-by: Ard Biesheuvel +Upstream: https://github.com/tianocore/edk2/commit/c1d1910be6e04a8b1a73090cf2881fb698947a6e +Signed-off-by: Romain Naour +--- + OvmfPkg/OvmfPkg.dec | 5 +++++ + OvmfPkg/QemuVideoDxe/Gop.c | 19 +++++++++++++++++++ + OvmfPkg/QemuVideoDxe/Qemu.h | 2 +- + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf | 4 ++++ + 4 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec +index 51be9a5959..2c40de8a13 100644 +--- a/OvmfPkg/OvmfPkg.dec ++++ b/OvmfPkg/OvmfPkg.dec +@@ -444,3 +444,8 @@ + + ## This feature flag indicates the firmware build supports secure boot. + gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|FALSE|BOOLEAN|0x6d ++ ++ ## Whether QemuVideoDxe should perform a EFI_MEMORY_WC remap of the PCI ++ # framebuffer. This might be required on platforms that do not tolerate ++ # misaligned accesses otherwise. ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine|FALSE|BOOLEAN|0x75 +diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c +index b11eed7558..a29c025afd 100644 +--- a/OvmfPkg/QemuVideoDxe/Gop.c ++++ b/OvmfPkg/QemuVideoDxe/Gop.c +@@ -9,6 +9,8 @@ + + #include "Qemu.h" + ++#include ++ + STATIC + VOID + QemuVideoCompleteModeInfo ( +@@ -54,6 +56,7 @@ QemuVideoCompleteModeData ( + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FrameBufDesc; + QEMU_VIDEO_MODE_DATA *ModeData; ++ EFI_STATUS Status; + + ModeData = &Private->ModeData[Mode->Mode]; + Info = Mode->Info; +@@ -79,6 +82,22 @@ QemuVideoCompleteModeData ( + (UINT64)Mode->FrameBufferSize + )); + ++ if (FeaturePcdGet (PcdRemapFrameBufferWriteCombine)) { ++ Status = gDS->SetMemorySpaceCapabilities ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ ++ Status = gDS->SetMemorySpaceAttributes ( ++ FrameBufDesc->AddrRangeMin, ++ FrameBufDesc->AddrLen, ++ EFI_MEMORY_WC | EFI_MEMORY_XP ++ ); ++ ASSERT_EFI_ERROR (Status); ++ } ++ + FreePool (FrameBufDesc); + return EFI_SUCCESS; + } +diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h +index 57341a0bbf..a3da725fbf 100644 +--- a/OvmfPkg/QemuVideoDxe/Qemu.h ++++ b/OvmfPkg/QemuVideoDxe/Qemu.h +@@ -13,7 +13,7 @@ + #ifndef _QEMU_H_ + #define _QEMU_H_ + +-#include ++#include + #include + #include + #include +diff --git a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +index 43a6e07faa..4c0870171b 100644 +--- a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf ++++ b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -44,6 +44,7 @@ + + [LibraryClasses] + BaseMemoryLib ++ DxeServicesTableLib + FrameBufferBltLib + DebugLib + DevicePathLib +@@ -61,6 +62,9 @@ + gEfiDevicePathProtocolGuid # PROTOCOL BY_START + gEfiPciIoProtocolGuid # PROTOCOL TO_START + ++[FeaturePcd] ++ gUefiOvmfPkgTokenSpaceGuid.PcdRemapFrameBufferWriteCombine ++ + [Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId + gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource +-- +2.45.0 + diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index f7daa8ddf36..abcf3c6b8e3 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6bdfdffcc2235a117b3f9d4124da63103f19ff30157673f812e1093b20ebb7ad edk2-edk2-stable202308-git4.tar.gz +sha256 4595b9d9d14c06bd03f575e4b7623574a4a874ef465652ecdc224099a5b14fc7 edk2-edk2-stable202405-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index e5816b353a2..145a9a80aef 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202308 +EDK2_VERSION = edk2-stable202405 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 4df12774a38..08960293228 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -5,7 +5,7 @@ ################################################################################ GRUB2_VERSION = 2.12 -GRUB2_SITE = http://ftp.gnu.org/gnu/grub +GRUB2_SITE = $(BR2_GNU_MIRROR)/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 2f996cbafce..cc0044f00a5 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -1,6 +1,6 @@ config BR2_TARGET_OPTEE_OS bool "optee_os" - depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A || BR2_RISCV_64 help OP-TEE OS provides the secure world boot image and the trust application development kit of the OP-TEE project. OP-TEE OS diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index c6de49c1512..883f166fc1e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -54,16 +54,26 @@ OPTEE_OS_MAKE_OPTS = \ CROSS_COMPILE_core="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_rv64="$(TARGET_CROSS)" \ PYTHON3="$(HOST_DIR)/bin/python3" +ifeq ($(BR2_riscv),y) +OPTEE_OS_MAKE_OPTS += \ + ARCH=riscv \ + CFG_RV64_core=y \ + CFG_USER_TA_TARGETS=ta_rv64 +else ifeq ($(BR2_aarch64),y) OPTEE_OS_MAKE_OPTS += \ + ARCH=arm \ CFG_ARM64_core=y \ CFG_USER_TA_TARGETS=ta_arm64 else OPTEE_OS_MAKE_OPTS += \ + ARCH=arm \ CFG_ARM32_core=y endif +endif # Get mandatory PLATFORM and optional PLATFORM_FLAVOR and additional # variables @@ -77,6 +87,10 @@ OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) # root path otherwise the output directory path depends on the target # platform name. OPTEE_OS_BUILDDIR_OUT = out +ifeq ($(BR2_riscv),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_rv64 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_rv64 +endif ifeq ($(BR2_aarch64),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index c276528fad5..8c7898ebf69 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -17,7 +17,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2024.04" + bool "2024.10" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -61,7 +61,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2024.04" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index a8021fb696b..af025a583e4 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.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 index e426f039e02..db5c3cdaf8b 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -46,6 +46,7 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ + host-gnutls \ host-openssl \ host-python3 \ host-python-jsonschema \ diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 0a0487b4e9a..8648d6eb7e9 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 "2024.07" + bool "2024.10" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2024.07" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2024.10" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL @@ -315,7 +315,7 @@ config BR2_TARGET_UBOOT_USE_BINMAN help Use binman tool for generation and signing of boot images. - https://docs.u-boot.org/en/v2024.07/develop/package/binman.html + https://docs.u-boot.org/en/v2024.10/develop/package/binman.html menu "U-Boot binary format" diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 0811ed58c46..af025a583e4 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index ab534a8b3a2..d8faef648fa 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -172,6 +172,11 @@ UBOOT_MAKE_OPTS += \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS)) +# Disable FDPIC if enabled by default in toolchain +ifeq ($(BR2_BINFMT_FDPIC),y) +UBOOT_MAKE_OPTS += KCFLAGS=-mno-fdpic +endif + ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y) UBOOT_DEPENDENCIES += arm-trusted-firmware ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 443113e47b9..9f284ff74b6 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,34 +1,21 @@ -# Architecture BR2_aarch64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -## Required tools to create bootable media -BR2_PACKAGE_HOST_GENIMAGE=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y - -# Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="200M" -# BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" - -# Linux headers same as kernel, a 5.15 series -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.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Host tools for genimage +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index 261a2c9fa36..0aff8f92e0d 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -1,11 +1,5 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" @@ -13,8 +7,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" @@ -22,19 +14,13 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index 183c4f7b730..e75ca9cf346 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -1,11 +1,5 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration BR2_GLOBAL_PATCH_DIR="board/acmesystems/aria-g25/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" @@ -13,8 +7,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" @@ -22,19 +14,13 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/acmesystems_arietta_g25_128mb_defconfig b/configs/acmesystems_arietta_g25_128mb_defconfig index 43ec1d2d5fa..788818c118a 100644 --- a/configs/acmesystems_arietta_g25_128mb_defconfig +++ b/configs/acmesystems_arietta_g25_128mb_defconfig @@ -1,11 +1,5 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" @@ -13,8 +7,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" @@ -22,19 +14,13 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-128m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/acmesystems_arietta_g25_256mb_defconfig b/configs/acmesystems_arietta_g25_256mb_defconfig index 294ab312447..c483ae4c573 100644 --- a/configs/acmesystems_arietta_g25_256mb_defconfig +++ b/configs/acmesystems_arietta_g25_256mb_defconfig @@ -1,11 +1,5 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Kernel headers BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# System configuration BR2_GLOBAL_PATCH_DIR="board/acmesystems/arietta-g25/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_ISSUE="Welcome to Arietta-G25 Buildroot" @@ -13,8 +7,6 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-g25/genimage.cfg" - -# Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" @@ -22,19 +14,13 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariettag25" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Root filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# AT91bootstrap bootloader BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.10.3" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="arietta-256m" - -# Tools to build sdcard.img BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig index bbae73dff4b..5d3ec12ad63 100644 --- a/configs/am574x_idk_defconfig +++ b/configs/am574x_idk_defconfig @@ -1,14 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a15=y - -# System -BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" @@ -16,30 +12,19 @@ BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index 2267d49afc3..f59d78a5b91 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -1,49 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_GLOBAL_PATCH_DIR="board/amarula/vyasa/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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="2022.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-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_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" - -# Kernel +BR2_TARGET_GENERIC_HOSTNAME="vyasa-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to VYASA RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.91" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/amarula/vyasa/linux_gmac.fragment" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-vyasa" BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/amarula/vyasa/linux_gmac.fragment" - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="vyasa-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to VYASA RK3288!" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" 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/amarula/vyasa/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index fd8b7db0e74..7b5a6f73c6c 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -34,6 +34,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSBI=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_ANDES_SPI_BURN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index 124cc3ff94d..72f308c86d3 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,17 +1,10 @@ -# Architecture BR2_aarch64=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_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.22.06)/linux-v.22.06.tar.gz" @@ -19,18 +12,12 @@ 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" - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y - -# U-boot 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.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" - -# Tools BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/arcturus_ucp1020_defconfig b/configs/arcturus_ucp1020_defconfig index 8b90f44750d..8e489f7f192 100644 --- a/configs/arcturus_ucp1020_defconfig +++ b/configs/arcturus_ucp1020_defconfig @@ -1,28 +1,17 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y - -# System settings BR2_TARGET_GENERIC_HOSTNAME="UCP1020" BR2_TARGET_GENERIC_ISSUE="Welcome to Arcturus uCP1020 System on Module" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCP1020-kernel,v20190618)/linux-v20190618.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucp1020" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ucp1020" - -# Filesystem BR2_TARGET_ROOTFS_JFFS2=y - -# U-boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 69266894e16..d4e7ca0dd44 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -# Linux headers same as kernel, a 6.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y BR2_GLOBAL_PATCH_DIR="board/arm/foundation-v8/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" diff --git a/configs/arm_fvp_ebbr_defconfig b/configs/arm_fvp_ebbr_defconfig index 57b671d5f70..5aa17278895 100644 --- a/configs/arm_fvp_ebbr_defconfig +++ b/configs/arm_fvp_ebbr_defconfig @@ -1,35 +1,23 @@ -# Architecture BR2_aarch64=y - -# Image +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/arm/fvp-ebbr/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arm/fvp-ebbr/post-image.sh support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/arm/fvp-ebbr/genimage.cfg" - -# Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y 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.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="fvp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/arm/fvp-ebbr/fvp-ebbr.dts" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y @@ -45,12 +33,10 @@ BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_ARM_GICV3=y" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07-rc3" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vexpress_fvp" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/arm/fvp-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 diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig index 782587e4105..1bb7c446ed5 100644 --- a/configs/armadeus_apf27_defconfig +++ b/configs/armadeus_apf27_defconfig @@ -1,25 +1,10 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Build BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_HOSTNAME="apf27" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 -BR2_TARGET_ROOTFS_UBI=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" @@ -30,8 +15,8 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# U-boot +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig index 4ff79dd0128..4db1c558cca 100644 --- a/configs/armadeus_apf28_defconfig +++ b/configs/armadeus_apf28_defconfig @@ -1,20 +1,10 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Build BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_HOSTNAME="apf28" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" @@ -24,10 +14,7 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=4227 diff --git a/configs/armadeus_apf51_defconfig b/configs/armadeus_apf51_defconfig index 8317dd7b8ba..0d9d4f2bc60 100644 --- a/configs/armadeus_apf51_defconfig +++ b/configs/armadeus_apf51_defconfig @@ -1,20 +1,11 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Build BR2_GLOBAL_PATCH_DIR="board/armadeus/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_HOSTNAME="apf51" BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.215" @@ -25,8 +16,5 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301 BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301 diff --git a/configs/aspeed_ast2500evb_defconfig b/configs/aspeed_ast2500evb_defconfig index 8db5a39a135..2312242e640 100644 --- a/configs/aspeed_ast2500evb_defconfig +++ b/configs/aspeed_ast2500evb_defconfig @@ -1,44 +1,29 @@ -# Architecture BR2_arm=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y 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_XZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2500-evb" -BR2_LINUX_KERNEL_XZ=y - -# Boot +BR2_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="evb-ast2500" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/uboot.fragment" 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_GENIMAGE=y 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 index 04239566c83..104f685200e 100644 --- a/configs/aspeed_ast2600evb_defconfig +++ b/configs/aspeed_ast2600evb_defconfig @@ -1,32 +1,19 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4D16=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y 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_PACKAGE_MTD=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y @@ -35,10 +22,6 @@ 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_GENIMAGE=y 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-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index 2ed2c4f7128..1027a653799 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -1,44 +1,34 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# Bootloader +BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288-s" +BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER S RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker-s/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.79" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-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_SPL=y 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="6.1.79" -BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288-s" -BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER S RK3288!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="512M" 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/asus/tinker/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker-s/post-build.sh" diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index b3e4502a457..f3a2c4d71d0 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -1,12 +1,22 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# Bootloader +BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" +BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="512M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -18,26 +28,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y 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="6.1.44" -BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="tinker-rk3288" -BR2_TARGET_GENERIC_ISSUE="Welcome to TINKER RK3288!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="512M" 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/asus/tinker/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig index b795ad6effc..d505d5b2127 100644 --- a/configs/at91sam9260eknf_defconfig +++ b/configs/at91sam9260eknf_defconfig @@ -1,23 +1,12 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9260ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -28,6 +17,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9260ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 46626d857a0..6a79c956823 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -1,29 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g20ek" - -# Filesystem -BR2_TARGET_ROOTFS_TAR=y BR2_TARGET_ROOTFS_UBI=y -BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000 -BR2_TARGET_ROOTFS_UBI_SUBSIZE=512 -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800 BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -34,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9g20ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig index bf0771bc149..7072e5a6897 100644 --- a/configs/at91sam9g45m10ek_defconfig +++ b/configs/at91sam9g45m10ek_defconfig @@ -1,24 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9m10g45ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -29,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9m10g45ek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9rlek_defconfig b/configs/at91sam9rlek_defconfig index 5c0fdc59935..8a1cb46e168 100644 --- a/configs/at91sam9rlek_defconfig +++ b/configs/at91sam9rlek_defconfig @@ -1,24 +1,13 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9rlek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -29,6 +18,4 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9rlek_nandflash" - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index a87b2cb8d72..775fcceae37 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -1,6 +1,4 @@ BR2_arm=y -BR2_arm926t=y -# Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y @@ -11,10 +9,9 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index 7c95ec56836..0f292167361 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -1,19 +1,9 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -21,8 +11,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -72,14 +60,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -92,6 +75,4 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 2ddf8d64b09..a6fd7e05fcb 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -1,19 +1,9 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Creation of the SD card image -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" - -# System Configuration BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -21,12 +11,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -39,13 +25,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y +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_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" - -# Host packages -# Needed to generate the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index d261985b186..344c6c2eae4 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -1,22 +1,11 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration BR2_GLOBAL_PATCH_DIR="board/atmel/at91sam9x5ek/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.1)/linux-linux4sam_6.1.tar.gz" @@ -24,8 +13,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -75,13 +62,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" @@ -94,13 +77,10 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_6.1" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y +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_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x4000" - -# Host packages -# Needed to generate the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index 4ee7fca35f9..8ae53ee71f6 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -1,23 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -25,8 +15,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -76,13 +64,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -93,9 +77,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index 7ef45db4698..969bbaaaab9 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -10,10 +10,9 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index ef09df3fce8..2cbbcdb816b 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -1,19 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -21,8 +12,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -72,14 +61,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -90,6 +74,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index f5aa3e382fe..bcf49340dbe 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -1,22 +1,12 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -24,8 +14,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -75,13 +63,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -92,9 +76,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index f71e84bf0fc..2fcd7e002bf 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -1,27 +1,17 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_5.8)/linux-linux4sam_5.8.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d33ek sama5d34ek sama5d35ek sama5d36ek" - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.10.3)/at91bootstrap3-v3.10.3.tar.gz" @@ -33,6 +23,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,li BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3xek_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index c0b606bc9a1..d04d84734fc 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -11,13 +11,12 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index ca51ef5b5f5..2aa3d8e5350 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -1,20 +1,11 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -22,8 +13,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -73,17 +62,12 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 - -# Bootloaders +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -94,6 +78,4 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index e8d126c7b0e..9226ca560b5 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -1,23 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System Configuration -# Needed for usb-utils BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -# Creation of the SD card image BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip-2021.10)/linux-linux4microchip-2021.10.tar.gz" @@ -25,8 +15,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Packages BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -76,13 +64,9 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_BASH=y BR2_PACKAGE_HTOP=y BR2_PACKAGE_VIM=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v4.0.1)/at91bootstrap3-v4.0.1.tar.gz" @@ -93,9 +77,6 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Host packages -# Needed to generate the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 64cfb3c2b03..bfec6a58706 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -1,15 +1,8 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System configuration BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" @@ -18,14 +11,10 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96" 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_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.8.16" @@ -42,12 +31,10 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96" -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 6b2ba13e41e..b67a9d3f5da 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -21,7 +21,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" 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_CUSTOM=y diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig index 8a3e5cd8305..9e395783e07 100644 --- a/configs/bananapi_m2_zero_defconfig +++ b/configs/bananapi_m2_zero_defconfig @@ -23,9 +23,9 @@ 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 -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-zero/boot.cmd" 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/bananapi/bananapi-m2-zero/boot.cmd" diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index dbebdf3e371..f733f8c0cae 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -1,40 +1,37 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_GLOBAL_PATCH_DIR="board/lemaker/bananapro/patches" -BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/lemaker/bananapro/patches" BR2_TARGET_GENERIC_HOSTNAME="bananapro" BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!" -BR2_TARGET_GENERIC_GETTY=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_OVERLAY="board/lemaker/bananapro/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/lemaker/bananapro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.7" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapro" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem +BR2_PACKAGE_ALSA_UTILS=y +# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set +BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_UTILS_APLAY=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 - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -43,30 +40,8 @@ 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" - -# Wifi firmware for brcm43362 -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# Audio -BR2_PACKAGE_ALSA_UTILS=y -# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set -BR2_PACKAGE_ALSA_UTILS_AMIXER=y -BR2_PACKAGE_ALSA_UTILS_APLAY=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Wireless packages -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# Host tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index ca418bed208..cad32e90b1a 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,22 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beaglebone/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.6.32-ti-arm32-r7)/linux-6.6.32-ti-arm32-r7.tar.gz" @@ -24,32 +15,25 @@ BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-bonegreen ti/omap/am335x-evmsk ti/omap/am335x-boneblue ti/omap/am335x-boneblack-wireless ti/omap/am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 4121065ee30..5d06af3990e 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -1,9 +1,8 @@ BR2_arm=y BR2_cortex_a8=y -BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone-qt5/patches" -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone-qt5/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/beagleboard/beaglebone/rootfs_overlay" @@ -25,7 +24,6 @@ BR2_PACKAGE_QT5BASE_EGLFS=y BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs" BR2_PACKAGE_QT5QUICKCONTROLS=y BR2_PACKAGE_TI_SGX_DEMOS=y -BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/beagleboneai64_defconfig b/configs/beagleboneai64_defconfig index d4ba61cfab2..0429dd63e17 100644 --- a/configs/beagleboneai64_defconfig +++ b/configs/beagleboneai64_defconfig @@ -3,10 +3,10 @@ BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleboneai64/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleboneai64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beagleboneai64/genimage.cfg" -BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" @@ -25,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="generic" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-j721e" -BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" @@ -37,7 +36,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="j721e_beagleboneai64_a72" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index 9c5c3d165a9..38db1848176 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -1,8 +1,8 @@ BR2_arm=y BR2_cortex_a15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleboneai/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleboneai/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" diff --git a/configs/beagleplay_defconfig b/configs/beagleplay_defconfig index 19b12825c5c..42aa2fbd6ed 100644 --- a/configs/beagleplay_defconfig +++ b/configs/beagleplay_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/beagleboard/beagleplay/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboard/beagleplay/post-build.sh" @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/beagleboard/beagleplay/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-beagleplay" @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="256M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -31,13 +31,13 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_beagleplay_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_beagleplay_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/beaglev_fire_defconfig b/configs/beaglev_fire_defconfig index 5e1faf41b98..1d26a78f07b 100644 --- a/configs/beaglev_fire_defconfig +++ b/configs/beaglev_fire_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.06)/linux-linux4microchip+fpga-2024.06.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.09.1)/linux-linux4microchip+fpga-2024.09.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="mpfs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.06)/uboot-linux4microchip+fpga-2024.06.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.09)/uboot-linux4microchip+fpga-2024.09.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index d4682d6b7ce..19d66c14a4f 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -1,16 +1,12 @@ -# Architecture BR2_aarch64=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_ISSUE="Welcome to Beelink GS1" -# MDEV is required to autoload the ethernet driver module BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beelink/gs1/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beelink/gs1/genimage.cfg" - -# Kernel Linux headers same as kernel, 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15" @@ -20,23 +16,18 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-beelink-gs1" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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_PLATFORM="sun50i_h6" - -# 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_BOARD_DEFCONFIG="beelink_gs1" 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_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 832f8363a75..491a834477f 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,16 +6,9 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_INIT_TINYINIT=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" @@ -25,13 +16,7 @@ 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_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" +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/chromebook_elm_defconfig b/configs/chromebook_elm_defconfig index 0e8b6287c3b..a43b620e1b4 100644 --- a/configs/chromebook_elm_defconfig +++ b/configs/chromebook_elm_defconfig @@ -1,41 +1,22 @@ -# Architecture BR2_aarch64=y BR2_cortex_a72_a53=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel (5.10 series) BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Kernel +BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/elm/sign.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" - -# Build Kernel with a Custom config. BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/chromebook/elm/linux.config" - -# DTS support BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="mediatek/mt8173-elm" - -# Package Firmware for WiFi chip. BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y - -# Scripts to generate final images. -BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/elm/sign.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" - -# Supporting host tools to build / sign FIT Image. +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_PARTED=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_VBOOT_UTILS=y - -# Misc -BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 4b3c742173b..4a66e1ac330 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -1,26 +1,18 @@ -# architecture BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set -BR2_KERNEL_HEADERS_AS_KERNEL=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" BR2_SYSTEM_DHCP="eth0" -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/ci20/genimage.cfg" - -# kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# u-boot +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 @@ -28,12 +20,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" - -# host -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig index d51f2ab7462..c3dede47b8e 100644 --- a/configs/cubieboard1_defconfig +++ b/configs/cubieboard1_defconfig @@ -1,42 +1,28 @@ -# Target BR2_arm=y BR2_cortex_a8=y - -# Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y - -# Build options +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard1/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System configuration BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-cubieboard" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Host utilities BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 18337fac725..14d080d2d41 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,42 +1,32 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" 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_NEEDS_OPENSSL=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/cubietech/cubieboard2/boot.cmd" - -# System -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" diff --git a/configs/engicam_imx6qdl_icore_defconfig b/configs/engicam_imx6qdl_icore_defconfig index d8a51c7ab11..2ac415e3358 100644 --- a/configs/engicam_imx6qdl_icore_defconfig +++ b/configs/engicam_imx6qdl_icore_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# 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="imx6qdl_icore_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" 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="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" 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/engicam/icorem6/genimage.cfg" diff --git a/configs/engicam_imx6qdl_icore_qt5_defconfig b/configs/engicam_imx6qdl_icore_qt5_defconfig index 6d3a344bdd5..8b0c8bbe287 100644 --- a/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -3,74 +3,23 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 4.13 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=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.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo" -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_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" -BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" - -# qt5 dependencies -BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# qt5 -BR2_PACKAGE_QT5=y -BR2_PACKAGE_QT5BASE_OPENGL_LIB=y -BR2_PACKAGE_QT5BASE_LINUXFB=y -BR2_PACKAGE_QT5BASE_FONTCONFIG=y -BR2_PACKAGE_QT5BASE_GIF=y -BR2_PACKAGE_QT5BASE_JPEG=y - -# mesa3d -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_OPENGL_ES=y -BR2_PACKAGE_MESA3D_OPENGL_EGL=y - -# qt5 demo packages -BR2_PACKAGE_GLMARK2=y -BR2_PACKAGE_MESA3D_DEMOS=y -BR2_PACKAGE_KMSCUBE=y -BR2_PACKAGE_QT5CINEX=y -BR2_PACKAGE_QT5CINEX_HD=y - -# fonts BR2_PACKAGE_BITSTREAM_VERA=y BR2_PACKAGE_CANTARELL=y BR2_PACKAGE_DEJAVU=y @@ -78,3 +27,34 @@ BR2_PACKAGE_FONT_AWESOME=y BR2_PACKAGE_GHOSTSCRIPT_FONTS=y BR2_PACKAGE_INCONSOLATA=y BR2_PACKAGE_LIBERATION=y +BR2_PACKAGE_GLMARK2=y +BR2_PACKAGE_KMSCUBE=y +BR2_PACKAGE_MESA3D_DEMOS=y +BR2_PACKAGE_QT5CINEX=y +BR2_PACKAGE_QT5CINEX_HD=y +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_OPENGL_LIB=y +BR2_PACKAGE_QT5BASE_LINUXFB=y +BR2_PACKAGE_QT5BASE_FONTCONFIG=y +BR2_PACKAGE_QT5BASE_GIF=y +BR2_PACKAGE_QT5BASE_JPEG=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/engicam_imx6qdl_icore_rqs_defconfig b/configs/engicam_imx6qdl_icore_rqs_defconfig index 45ed67be07e..7d4d4e3df45 100644 --- a/configs/engicam_imx6qdl_icore_rqs_defconfig +++ b/configs/engicam_imx6qdl_icore_rqs_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo RQS Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# 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="imx6qdl_icore_rqs" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6_rqs/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore-rqs imx6q-icore-rqs" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo RQS Starter Kit" 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="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" 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/engicam/icorem6_rqs/genimage.cfg" diff --git a/configs/engicam_imx6ul_geam_defconfig b/configs/engicam_imx6ul_geam_defconfig index aac8432ef2c..ed4b491ebe1 100644 --- a/configs/engicam_imx6ul_geam_defconfig +++ b/configs/engicam_imx6ul_geam_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 4.11 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam GEAM6UL Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# 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.07-rc1" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_geam_mmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/geam6ul/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-geam-kit" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam GEAM6UL Starter Kit" 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="2017.07-rc1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_geam_mmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" 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/engicam/geam6ul/genimage.cfg" diff --git a/configs/engicam_imx6ul_isiot_defconfig b/configs/engicam_imx6ul_isiot_defconfig index 57a66dea346..1377022c30e 100644 --- a/configs/engicam_imx6ul_isiot_defconfig +++ b/configs/engicam_imx6ul_isiot_defconfig @@ -3,26 +3,11 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System +BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam Is.IoT eMMC Starter Kit" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# 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="imx6ul_isiot_emmc" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/isiot/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" @@ -31,13 +16,18 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-isiot-emmc" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam Is.IoT eMMC Starter Kit" 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="2019.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_emmc" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" 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/engicam/isiot/genimage.cfg" diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index 24b95eefe53..8c428e3fecf 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -1,34 +1,20 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx28-evk" - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_FORMAT_SD=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 0a60d1b6b1b..02970a8c6d0 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -1,21 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -23,22 +15,15 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 49a3ea84483..daedb68e963 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -1,21 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -23,21 +15,14 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 8ae57fc7e09..9c955767589 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -1,21 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -23,22 +15,15 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 09829c20155..54d0a6c3a87 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -1,21 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -23,22 +15,15 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 5beef977d4c..1389629b851 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -1,21 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -23,21 +15,14 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y - -# required tools to create the microSD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 1b2412ad8cb..a9df6671ceb 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -1,18 +1,10 @@ -# architecture BR2_arm=y BR2_cortex_a7=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx7dsdb/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" @@ -20,22 +12,15 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# required tools to create the microSD image +BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index 335030fcd3f..b5b52c1f2d0 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -30,8 +30,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 0ced252cd0e..cb9f896a7a4 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -32,8 +32,8 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=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_SPL=y diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 50fcaeff83f..4d8a3f1ea28 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -30,8 +30,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/configs/freescale_p1025twr_defconfig b/configs/freescale_p1025twr_defconfig index f476d927066..72374ae7a10 100644 --- a/configs/freescale_p1025twr_defconfig +++ b/configs/freescale_p1025twr_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# Linux headers same as kernel, a 4.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" @@ -16,8 +9,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/p1025twr" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/configs/freescale_t1040d4rdb_defconfig b/configs/freescale_t1040d4rdb_defconfig index df44046ef5e..ad231e7f1ed 100644 --- a/configs/freescale_t1040d4rdb_defconfig +++ b/configs/freescale_t1040d4rdb_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e5500=y - -# Linux headers same as kernel, a 4.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.7" @@ -16,8 +9,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t1040d4rdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/configs/freescale_t2080_qds_rdb_defconfig b/configs/freescale_t2080_qds_rdb_defconfig index 3d03c32f7e5..0004c871104 100644 --- a/configs/freescale_t2080_qds_rdb_defconfig +++ b/configs/freescale_t2080_qds_rdb_defconfig @@ -1,14 +1,7 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e6500=y - -# Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Serial port config BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17.14" @@ -16,10 +9,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="fsl/t2080qds fsl/t2080rdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set - diff --git a/configs/friendlyarm_nanopi_neo_defconfig b/configs/friendlyarm_nanopi_neo_defconfig new file mode 100644 index 00000000000..9aed25b30cc --- /dev/null +++ b/configs/friendlyarm_nanopi_neo_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-neo/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.44" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-nanopi-neo" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" +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_GENIMAGE=y diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 284b28ec317..c190de35f87 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,5 +1,4 @@ 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" diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 29110677bb2..59dd2dec9a2 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,7 +1,6 @@ BR2_x86_x1000=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_GLOBAL_PATCH_DIR="board/intel/galileo/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/globalscale_espressobin_defconfig b/configs/globalscale_espressobin_defconfig index 8d44b25ae78..562e646b70d 100644 --- a/configs/globalscale_espressobin_defconfig +++ b/configs/globalscale_espressobin_defconfig @@ -1,11 +1,9 @@ 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 - -# Kernel +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" @@ -15,13 +13,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-3720-espressobin marvell/armada-3720-espressobin-emmc marvell/armada-3720-espressobin-v7 marvell/armada-3720-espressobin-v7-emmc marvell/armada-3720-espressobin-ultra" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Marvell ESPRESSObin" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ROOTFS_TAR_GZIP=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/globalscale/espressobin/genimage.cfg" diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 1aa06f59e74..cb217a5af13 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -1,4 +1,3 @@ -# Architecture BR2_riscv=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y @@ -6,55 +5,39 @@ BR2_RISCV_ISA_RVA=y BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_RVC=y -BR2_RISCV_64=y -BR2_RISCV_ABI_LP64D=y - -# System -BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttySIF0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/sifive/hifive-unleashed/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sifive/hifive-unleashed/genimage_sdcard.cfg" - -# Filesystem -BR2_TARGET_ROOTFS_CPIO=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 - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.190" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sifive/hifive-unleashed/linux.config.fragment" -BR2_LINUX_KERNEL_IMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sifive/hifive-unleashed-a00" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Bootloader +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sifive_unleashed" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSBI=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y - -# Host tools BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y diff --git a/configs/icnova-a20-adb4006_defconfig b/configs/icnova-a20-adb4006_defconfig index ba529c8db5a..01f4abe2158 100644 --- a/configs/icnova-a20-adb4006_defconfig +++ b/configs/icnova-a20-adb4006_defconfig @@ -1,48 +1,41 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.6 LTS series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System +BR2_GLOBAL_PATCH_DIR="board/in-circuit/icnova-a20-adb4006/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ICnova A20 ADB4006" BR2_TARGET_GENERIC_ISSUE="Welcome to ICnova A20 ADB4006!" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/in-circuit/icnova-a20-adb4006/genimage.cfg" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.56" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/in-circuit/icnova-a20-adb4006/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-icnova-a20-adb4006" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="icnova-a20-adb4006" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/in-circuit/icnova-a20-adb4006/boot.cmd" diff --git a/configs/imx23evk_defconfig b/configs/imx23evk_defconfig index b54af418eb1..330d5c45021 100644 --- a/configs/imx23evk_defconfig +++ b/configs/imx23evk_defconfig @@ -1,34 +1,20 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx23-evk" - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx23evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_FORMAT_SD=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# To generate SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" diff --git a/configs/imx6-sabreauto_defconfig b/configs/imx6-sabreauto_defconfig index 24b3fd387f9..0683a01ff68 100644 --- a/configs/imx6-sabreauto_defconfig +++ b/configs/imx6-sabreauto_defconfig @@ -3,39 +3,27 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto nxp/imx/imx6dl-sabreauto nxp/imx/imx6qp-sabreauto" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_LZOP=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -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.1" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index d38478a6df0..bb281e16b81 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -3,38 +3,26 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 56470e27a9c..d3151819fb5 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -3,55 +3,28 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Additional features needed for packages BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="320M" BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd nxp/imx/imx6dl-sabresd nxp/imx/imx6qp-sabresd" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# GL driver -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y -BR2_PACKAGE_MESA3D_OPENGL_ES=y -BR2_PACKAGE_MESA3D_OPENGL_EGL=y - -# Fonts +BR2_PACKAGE_GSTREAMER1=y +BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y +BR2_PACKAGE_GST1_PLUGINS_GOOD=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y +BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y +BR2_PACKAGE_GST1_PLUGINS_BAD=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y +BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y BR2_PACKAGE_BITSTREAM_VERA=y BR2_PACKAGE_CANTARELL=y BR2_PACKAGE_DEJAVU=y @@ -59,41 +32,38 @@ BR2_PACKAGE_FONT_AWESOME=y BR2_PACKAGE_GHOSTSCRIPT_FONTS=y BR2_PACKAGE_INCONSOLATA=y BR2_PACKAGE_LIBERATION=y - -# GL demos BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_KMSCUBE=y -BR2_PACKAGE_LIBV4L=y -BR2_PACKAGE_LIBV4L_UTILS=y BR2_PACKAGE_MESA3D_DEMOS=y - -# Qt5 +BR2_PACKAGE_QT5CINEX=y +BR2_PACKAGE_QT5CINEX_HD=y +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y +BR2_PACKAGE_MESA3D_OPENGL_EGL=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_OPENGL_LIB=y BR2_PACKAGE_QT5BASE_LINUXFB=y BR2_PACKAGE_QT5BASE_FONTCONFIG=y BR2_PACKAGE_QT5BASE_GIF=y BR2_PACKAGE_QT5BASE_JPEG=y -BR2_PACKAGE_QT5CINEX=y -BR2_PACKAGE_QT5CINEX_HD=y - -# NXP firmware package BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y BR2_PACKAGE_FIRMWARE_IMX=y - -# libdrm tests BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y - -# gstreamer-1.0 -BR2_PACKAGE_GSTREAMER1=y -BR2_PACKAGE_GST1_PLUGINS_GOOD=y -BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y -BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y -BR2_PACKAGE_GST1_PLUGINS_BAD=y -BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y -BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y -BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y - -# For automatic kernel module loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_PACKAGE_LIBV4L=y +BR2_PACKAGE_LIBV4L_UTILS=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="320M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6slevk_defconfig b/configs/imx6slevk_defconfig index d78f2ecff0c..f64b5fa41b7 100644 --- a/configs/imx6slevk_defconfig +++ b/configs/imx6slevk_defconfig @@ -3,9 +3,15 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.51" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sl-evk" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -14,14 +20,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.51" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sl-evk" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6sx-sdb_defconfig b/configs/imx6sx-sdb_defconfig index c36520a165d..5dc3f87171c 100644 --- a/configs/imx6sx-sdb_defconfig +++ b/configs/imx6sx-sdb_defconfig @@ -3,25 +3,23 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.46" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb nxp/imx/imx6sx-sdb-reva" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -# required tools to create the SD card image +BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx6ulevk_defconfig b/configs/imx6ulevk_defconfig index 22b5a45480b..e20d452b66b 100644 --- a/configs/imx6ulevk_defconfig +++ b/configs/imx6ulevk_defconfig @@ -1,40 +1,27 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ul-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_DTC=y - -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index 662ef0270e7..38ea8f69408 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -1,15 +1,10 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.4" @@ -17,8 +12,11 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# bootloader +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y +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_VERSION=y @@ -26,22 +24,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y - -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# NXP firmware package for SDMA Firmware -BR2_PACKAGE_FREESCALE_IMX=y -BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y -BR2_PACKAGE_FIRMWARE_IMX=y - -# For automatic kernel module loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index e406d9938bd..b8d713c4de9 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -1,55 +1,35 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" - -# rootfs overlay BR2_ROOTFS_OVERLAY="board/technexion/imx6ulpico/rootfs_overlay" - -# kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-pico-pi imx6ul-pico-hobbit imx6ul-pico-dwarf" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ul-pico-pi nxp/imx/imx6ul-pico-hobbit nxp/imx/imx6ul-pico-dwarf" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# wifi firmware for brcm4339 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# bootloader +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_BOARDNAME="pico-imx6ul" +BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx6ul" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y - -# required tools to create the eMMC image +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index e7f3df81568..541a689ddc2 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -1,38 +1,25 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Kernel +BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# U-Boot +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_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y - -# Filesystem -BR2_ROOTFS_OVERLAY="board/freescale/imx7dsdb/rootfs_overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the eMMC image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index c6ea04b6836..3fbdb898a1f 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -1,50 +1,32 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" - -# kernel +BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-pico-pi" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" -BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y - -# wifi firmware for brcm43439 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# required tools to create the eMMC image -BR2_PACKAGE_HOST_GENIMAGE=y - -# filesystem / image -BR2_ROOTFS_OVERLAY="board/technexion/imx7dpico/rootfs_overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 350b863ec9d..bac68f40a6d 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -28,8 +28,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index b493c110982..8a515a9260d 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -1,41 +1,27 @@ -# Architecture BR2_arm=y BR2_cortex_m7=y - -# Image +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imxrt1050evk/genimage.cfg" - -# Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" BR2_LINUX_KERNEL_DEFCONFIG="imxrt" -BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imxrt1050-evk" - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imxrt1050-evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imxrt1050evk/uboot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Required tools to create the SD card image -BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/khadas_vim3_defconfig b/configs/khadas_vim3_defconfig index 0a838833345..21a16cc1b0b 100644 --- a/configs/khadas_vim3_defconfig +++ b/configs/khadas_vim3_defconfig @@ -1,13 +1,9 @@ -# Architecture BR2_aarch64=y BR2_cortex_a73_a53=y BR2_ARM_FPU_VFPV4=y - -# Image +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/khadas/vim3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/khadas/vim3/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.3" @@ -15,33 +11,17 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-g12b-a311d-khadas-vim3" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Linux headers same as kernel, a 6.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3=y - -# Filesystem +BR2_PACKAGE_DOSFSTOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="128M" - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Required tool to sign the bootloader image BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP=y -BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE="khadas-vim3" - -# Required tools to create the SD image -BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y - -# Supporting host tools to build FIT image -# BR2_PACKAGE_HOST_UBOOT_TOOLS=y -# BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 240cb522455..ba3c58693bc 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -1,12 +1,10 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV3=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" - -# Kernel +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" @@ -16,24 +14,16 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-kontron-n801x-s" 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_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -41,20 +31,13 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_UTIL_LINUX=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 - -# Required host tools to create the SD/eMMC image -BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/bl-imx8mm/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 460f1a97e9b..47d33f11edd 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -1,14 +1,10 @@ -# Architecture BR2_aarch64=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y +BR2_GLOBAL_PATCH_DIR="board/kontron/pitx-imx8m/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" 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.17.7" @@ -18,43 +14,31 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" 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_17=y - BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - -# Bootloader 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="imx8mq" -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="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_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=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 - -# Required host tools to create the SD/eMMC image BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_IMX_MKIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index f8515f5b769..efd4bd41e6c 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -25,11 +25,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y 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_NEEDS_UTIL_LINUX=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.rom" diff --git a/configs/lafrite_defconfig b/configs/lafrite_defconfig index 19fca02c541..5f70706fa03 100644 --- a/configs/lafrite_defconfig +++ b/configs/lafrite_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/librecomputer/lafrite/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index df80bb3f109..8de65aae026 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -1,18 +1,10 @@ -# architecture BR2_arm=y -BR2_arm926t=y - -# system -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.315" @@ -22,30 +14,22 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3" - -# Target packages BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment" -BR2_PACKAGE_BLUEZ5_UTILS=y -BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y -BR2_PACKAGE_BRICKD=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y - -# filesystem +BR2_PACKAGE_BRICKD=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y # BR2_TARGET_ROOTFS_TAR is not set - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" - -# host BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 2b215201cbc..69663e0c3e0 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -1,63 +1,39 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# System settings +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="pcduino" BR2_TARGET_GENERIC_ISSUE="pcDuino buildroot is ready" - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# SD 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 $(BINARIES_DIR)/genimage.cfg" - -# For kernel modules autoloading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/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_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_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_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Host packages BR2_PACKAGE_HOST_GENIMAGE=y - -# Target packages: wireless support for pcduino-lite-wifi -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 -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 462e642c3d8..0d1843bf5fc 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -1,16 +1,8 @@ -# Architecture BR2_aarch64=y BR2_cortex_a72=y - -# Build -BR2_GLOBAL_PATCH_DIR="board/freescale/ls1028ardb/patches board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1028ardb/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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" @@ -18,44 +10,34 @@ 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_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-rdb" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# 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_EXT2_SIZE="128M" # 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_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_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_RCW=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_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/ls1046a-frwy_defconfig b/configs/ls1046a-frwy_defconfig index ce796ce3ef4..2cf0f9c8bc5 100644 --- a/configs/ls1046a-frwy_defconfig +++ b/configs/ls1046a-frwy_defconfig @@ -1,15 +1,8 @@ -# Architecture BR2_aarch64=y BR2_cortex_a72=y - -# patches -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" - -# Toolchain -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/ls1046a-frwy/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ls1046afrwy" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -17,45 +10,34 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/freescale/ls1046a-frwy/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1046a-frwy/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_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,lf-6.6.23-2.0.0)/linux-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1046a-frwy freescale/fsl-ls1046a-frwy-sdk" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem +BR2_PACKAGE_QORIQ_FM_UCODE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # 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_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,lf-6.6.23-2.0.0)/atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1046afrwy" 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_RCW=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,lf-6.6.23-2.0.0)/u-boot-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1046afrwy_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y - -# Firmware -BR2_PACKAGE_QORIQ_FM_UCODE=y -BR2_PACKAGE_QORIQ_FM_UCODE_PLATFORM="ls1046" - -# Host utilities BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_QORIQ_RCW=y BR2_PACKAGE_HOST_QORIQ_RCW_INTREE="ls1046afrwy/NN_NNQNNPNP_3040_0506/rcw_1600_sdboot.bin" diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig index 25a463abb3e..d0e0d8a3649 100644 --- a/configs/mender_x86_64_efi_defconfig +++ b/configs/mender_x86_64_efi_defconfig @@ -1,52 +1,20 @@ -# 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y 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_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" 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_CUSTOM_VERSION_VALUE="6.6.49" 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 @@ -61,19 +29,26 @@ 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_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_MENDER=y BR2_PACKAGE_MENDER_GRUBENV=y BR2_PACKAGE_MENDER_GRUBENV_DEFINES="board/mender/x86_64/mender_grubenv_defines" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +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 +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index 83a970f601f..f370edbaa14 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -1,36 +1,22 @@ -# Architecture BR2_x86_64=y BR2_x86_silvermont=y - -# Misc +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" 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" - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Needed for ethernet -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y - -# Linux kernel 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 - -# Filesystem image +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index e633a6228d7..e8c3af149bf 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -1,35 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Global patches directory and hash check +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_GLOBAL_PATCH_DIR="board/freescale/imx51evk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx51evk" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.218" @@ -37,3 +12,13 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage" 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_BOARDNAME="mx51evk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index d03c7d0916e..004a0f1c191 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -1,32 +1,8 @@ -# Architecture BR2_arm=y BR2_cortex_a8=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# required tools to create the SD card image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mx53loco" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" -BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.20" @@ -34,3 +10,14 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb" 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_BOARDNAME="mx53loco" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index bd94f3fc863..f2359a4b0c0 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -1,24 +1,14 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Toolchain -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Build BR2_GLOBAL_PATCH_DIR="board/solidrun/mx6cubox/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_OVERLAY="board/solidrun/mx6cubox/rootfs_overlay" 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="6.6.27" @@ -27,25 +17,18 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-cubox-i nxp/imx/imx6dl-cubox-i-emmc-som-v15 nxp/imx/imx6dl-cubox-i-som-v15 nxp/imx/imx6dl-hummingboard nxp/imx/imx6dl-hummingboard-emmc-som-v15 nxp/imx/imx6dl-hummingboard-som-v15 nxp/imx/imx6q-cubox-i nxp/imx/imx6q-cubox-i-emmc-som-v15 nxp/imx/imx6q-cubox-i-som-v15 nxp/imx/imx6q-hummingboard nxp/imx/imx6q-hummingboard-emmc-som-v15 nxp/imx/imx6q-hummingboard-som-v15" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index adcd7aeb4eb..0c8c4d228c4 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -1,14 +1,21 @@ BR2_arm=y BR2_cortex_a9=y -BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-udoo-neo-basic nxp/imx/imx6sx-udoo-neo-full nxp/imx/imx6sx-udoo-neo-extended" +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_UBOOT=y @@ -19,15 +26,6 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-udoo-neo-basic nxp/imx/imx6sx-udoo-neo-full nxp/imx/imx6sx-udoo-neo-extended" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -# required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 5092ef0fd14..d139d8e3e20 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,33 +3,29 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -BR2_GLOBAL_PATCH_DIR="board/udoo/mx6qdl/patches" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_OVERLAY="board/udoo/mx6qdl/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.6" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-udoo nxp/imx/imx6dl-udoo" +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_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.84" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -# required tools to create the SD card image 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/udoo/common/boot.scr.txt" diff --git a/configs/nexbox_a95x_defconfig b/configs/nexbox_a95x_defconfig index 69f8b9078f2..2c7ddd98b6e 100644 --- a/configs/nexbox_a95x_defconfig +++ b/configs/nexbox_a95x_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index ba2c79d4a70..03103567e9e 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -1,45 +1,30 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# filesystem +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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_TARBALL=y -# Latest revision of branch boundary-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-nitrogen6sx imx6sx-nitrogen6sx-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index d490ec3c467..4d5408a474a 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -1,44 +1,30 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y - -# filesystem +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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_TARBALL=y -# Latest revision of branch boundary-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 429d84c1d48..65aff368606 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -1,44 +1,29 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# system -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# filesystem -# BR2_TARGET_ROOTFS_TAR is not set +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# bootloader +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" -BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-nitrogen7 imx7d-nitrogen7-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index ea5f21cb3da..9a90cdae54d 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -1,60 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mq-nitrogen8m.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -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 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-6.1.22-2.0.0 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader 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-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" 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-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-nitrogen8m freescale/imx8mq-nitrogen8m-m4 freescale/imx8mq-nitrogen8m_som freescale/imx8mq-nitrogen8m_som-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 5b7fb4a3bc3..db4af070a82 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -1,60 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mm-nitrogen8mm.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -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 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-6.1.22-2.0.0 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader 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-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" 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-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-nitrogen8mm freescale/imx8mm-nitrogen8mm-m4 freescale/imx8mm-nitrogen8mm_rev2 freescale/imx8mm-nitrogen8mm_rev2-m4 freescale/imx8mm-nitrogen8mm_som freescale/imx8mm-nitrogen8mm_som-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 2fc9442d9e7..dc54d240089 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -1,60 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mn-nitrogen8_nano.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -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 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-nitrogen8_nano freescale/imx8mn-nitrogen8mn freescale/imx8mn-nitrogen8mn_som" +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 - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-6.1.22-2.0.0 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader 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-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" 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-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-nitrogen8_nano freescale/imx8mn-nitrogen8mn freescale/imx8mn-nitrogen8mn_som" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index c5f79c39131..72884d97fd3 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -1,60 +1,40 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# System -BR2_TARGET_GENERIC_GETTY=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/boundarydevices/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/imx8mp-nitrogen8mp.dtb" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_IMX_MKIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -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 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# DDR training binaries +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="boundary" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen_smarc freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y BR2_PACKAGE_FIRMWARE_IMX=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-lf-6.1.22-2.0.0 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader 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-v2022.04 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" 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-nodtb.bin" BR2_TARGET_UBOOT_SPL=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_6.1.y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="boundary" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen_smarc freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/nvidia_bf3_defconfig b/configs/nvidia_bf3_defconfig new file mode 100644 index 00000000000..3f958c00620 --- /dev/null +++ b/configs/nvidia_bf3_defconfig @@ -0,0 +1,12 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_GLOBAL_PATCH_DIR="board/nvidia/bf3/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/nvidia/bf3/linux.config" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/octavo_osd32mp1_brk_defconfig b/configs/octavo_osd32mp1_brk_defconfig index 9a8ec8aa011..92848f62b5f 100644 --- a/configs/octavo_osd32mp1_brk_defconfig +++ b/configs/octavo_osd32mp1_brk_defconfig @@ -1,22 +1,10 @@ -# 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_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-brk/patches" 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" @@ -28,13 +16,9 @@ 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" @@ -47,8 +31,6 @@ 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 @@ -59,6 +41,4 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="osd32mp1_brk_trusted" 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 index 2d0b3405803..4372b4f8aeb 100644 --- a/configs/octavo_osd32mp1_red_defconfig +++ b/configs/octavo_osd32mp1_red_defconfig @@ -1,22 +1,10 @@ -# 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_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-red/patches" 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" @@ -28,13 +16,9 @@ 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" @@ -47,8 +31,6 @@ 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 @@ -59,6 +41,4 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" 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/odroidc2_defconfig b/configs/odroidc2_defconfig index 5f97fc3dd8b..acb6a03bf0e 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -1,42 +1,28 @@ -# Architecture BR2_aarch64=y - -# Linux headers same as kernel, a 5.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# System BR2_TARGET_GENERIC_HOSTNAME="odroidc2" BR2_TARGET_GENERIC_GETTY_PORT="ttyAML0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_OVERLAY="board/hardkernel/odroidc2/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-odroidc2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y - -# U-Boot +BR2_PACKAGE_ODROIDC2_FIRMWARE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y BR2_TARGET_UBOOT_BOARDNAME="odroid-c2" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd" - -# Firmware -BR2_PACKAGE_ODROIDC2_FIRMWARE=y - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MESON_TOOLS=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/hardkernel/odroidc2/boot.cmd" diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 69958e13874..ab819efa235 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidxu4/post-image.sh" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidxu4/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git" diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index 9c454b19153..101796cc121 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -1,50 +1,33 @@ -# Architecture BR2_arm=y BR2_cortex_a8=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" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a10_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" 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="6.1.9" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" 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_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a10_olinuxino/boot.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 8469ce1fd0d..219fe19ba06 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -1,49 +1,32 @@ -# Architecture BR2_arm=y BR2_cortex_a8=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" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloaders +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a13_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a13_olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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="sun5i-a13-olinuxino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" 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_BIN=y BR2_TARGET_UBOOT_SPL=y 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="6.1.9" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun5i-a13-olinuxino" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a13_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a13_olinuxino/genimage.cfg" - -# Additional tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 765504d1fa0..efa2b6a2495 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -1,64 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y - -# Linux headers same as kernel, a 6.6 LTS series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Toolchain -# glibc is needed for sunxi-mali-utgard package. -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - -# Build BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System configuration 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" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.36" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" 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_BIN=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 27cd87d9a1b..f376c6cd3ce 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -1,64 +1,38 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y - -# Linux headers same as kernel, a 6.6 LTS series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Toolchain -# glibc is needed for sunxi-mali-utgard package. -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - -# Build BR2_GLOBAL_PATCH_DIR="board/olimex/a20_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System configuration 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" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.36" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.54" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages BR2_PACKAGE_SUNXI_TOOLS=y BR2_PACKAGE_SUNXI_MALI_UTGARD=y -BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" 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_BIN=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index a7a6eb51a01..a1d23952d7b 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -1,12 +1,7 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=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" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -14,8 +9,6 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" 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="6.1.9" @@ -23,27 +16,20 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" 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_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index 35398ac6da5..8c053ef3d6f 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -1,52 +1,34 @@ -# Architecture BR2_arm=y BR2_cortex_a7=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" BR2_TARGET_GENERIC_ISSUE="Welcome to A33 OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloaders +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a33_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a33_olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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="sun8i-a33-olinuxino" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" 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_BIN=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/olimex/a33_olinuxino/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -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 -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-a33-olinuxino" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a33_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a33_olinuxino/genimage.cfg" - -# Additional tools BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=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/olimex/a33_olinuxino/boot.cmd" diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index dd445e8ce0e..ad446ea18c8 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -1,51 +1,38 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y 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 - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" 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_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_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/olimex/a64-olinuxino/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -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" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -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 -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd" diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index d45c55ada37..7f3a0392007 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -1,33 +1,20 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Linux headers same as kernel, a 6.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# Build BR2_GLOBAL_PATCH_DIR="board/olimex/imx233_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.83" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000" - -# Firmware for WiFi +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y @@ -35,23 +22,15 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_ZD1211_FIRMWARE=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# U-Boot BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino" BR2_TARGET_UBOOT_FORMAT_SD=y - -# To generate SD Image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" - diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index ecfa7813543..b1f9b7645a7 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -1,45 +1,30 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y - -# Build BR2_GLOBAL_PATCH_DIR="board/olimex/stmp1_olinuxino/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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" - -# Kernel 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-20230622-v5.10.180 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc74113e14d76aea9482264ff42e07397b94553d" 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 BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp1xx-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders 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-20230515, based on 2021.04 BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="efadf793a0a5924e2c96362dc1df3e56622ebb97" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="STM32-OLinuXino-LIME" # BR2_TARGET_UBOOT_FORMAT_BIN is not set @@ -48,6 +33,4 @@ BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.stm32" - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig index 6a816597acd..754ec539378 100644 --- a/configs/openblocks_a6_defconfig +++ b/configs/openblocks_a6_defconfig @@ -1,22 +1,10 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GLOBAL_PATCH_DIR="board/openblocks/a6/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# filesystem -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336" @@ -24,3 +12,5 @@ BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_INTREE_DTS_NAME="kirkwood-openblocks_a6" +BR2_TARGET_ROOTFS_JFFS2=y +BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K=y diff --git a/configs/orangepi_lite2_defconfig b/configs/orangepi_lite2_defconfig index c6be1c46b47..ad847a8205c 100644 --- a/configs/orangepi_lite2_defconfig +++ b/configs/orangepi_lite2_defconfig @@ -1,19 +1,32 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Lite2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-lite2/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-lite2" +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_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=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.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y @@ -25,36 +38,6 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-lite2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Lite2" -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_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite2/post-build.sh" -BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-lite2/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=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/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1431619620b..167527235eb 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -5,14 +5,17 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" 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 $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-one" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y 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 @@ -22,12 +25,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" 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_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=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 $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig index 1084d422337..8de158b0b13 100644 --- a/configs/orangepi_one_plus_defconfig +++ b/configs/orangepi_one_plus_defconfig @@ -1,19 +1,24 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi One+" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one-plus/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one-plus/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-one-plus" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=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.0" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h6" -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 @@ -24,23 +29,6 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,h6-v1.0b)/linux-amarula_h6-v1.0b.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-orangepi-one-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi One+" -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-one-plus/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one-plus/post-build.sh" diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 17c6109222d..2b3099db7fc 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -27,7 +27,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" 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_CUSTOM=y diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 068eb096364..1eb54cb43e0 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -1,20 +1,31 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y 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 $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/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_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_RTL8189FS=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -24,25 +35,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" 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_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=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 $(BINARIES_DIR)/genimage.cfg" - -# wireless driver and firmware -BR2_PACKAGE_RTL8189FS=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=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/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index 405e0a67637..baf9788568f 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -7,14 +7,17 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_R1" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi R1" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.31" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-r1/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-r1" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-r1/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_MTD=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -24,7 +27,6 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" 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_CUSTOM=y @@ -35,8 +37,3 @@ 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/orangepi/orangepi-r1/boot.cmd" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" - -# spi flash support -BR2_PACKAGE_MTD=y diff --git a/configs/orangepi_zero2w_defconfig b/configs/orangepi_zero2w_defconfig index 4d8f25f4513..9da9c947547 100644 --- a/configs/orangepi_zero2w_defconfig +++ b/configs/orangepi_zero2w_defconfig @@ -1,58 +1,41 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero2w/patches" - -# Firmware +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero2W" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=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 $(BINARIES_DIR)/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero2w" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" -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="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero2w" 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_OPENSSL=y 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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.6" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero2w" -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 Zero2W" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="256M" -# BR2_TARGET_ROOTFS_TAR is not set - -# host tools BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=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 $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig index 93d53dc3014..b42cd370f6e 100644 --- a/configs/orangepi_zero3_defconfig +++ b/configs/orangepi_zero3_defconfig @@ -1,56 +1,40 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" - -# Firmware +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" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" -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="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" 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_OPENSSL=y 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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" -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 Zero3" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set - -# host tools BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=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 $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 596805bd475..b48c28102e4 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,65 +1,44 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" -BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" - -# Kernel +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-zero" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_ARMBIAN_FIRMWARE=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y +BR2_PACKAGE_XR819_XRADIO=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WIRELESS_TOOLS_LIB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" 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_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Required tools to create the SD image BR2_PACKAGE_HOST_GENIMAGE=y - -# Image -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" - -# Wireless driver and firmware -BR2_PACKAGE_XR819_XRADIO=y -BR2_PACKAGE_ARMBIAN_FIRMWARE=y -BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y - -# Wireless support -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 - -# Spi flash support -BR2_PACKAGE_MTD=y diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 990e16463f3..84227cb392f 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -1,67 +1,46 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_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="2023.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" -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_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" - -# Kernel +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y 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_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y 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 - -# Filesystem -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="128M" - -# host tools +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_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_GENIMAGE=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 $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index c564d8a3425..48c8e993f02 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -1,54 +1,38 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" - -# Firmware +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" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.53" +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_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" BR2_TARGET_ARM_TRUSTED_FIRMWARE_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="2023.07.02" 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_OPENSSL=y 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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.53" -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_TARGET_ROOTFS_EXT2_SIZE="120M" - -# host tools BR2_PACKAGE_HOST_GENIMAGE=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 $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index cba92ad93d7..3617d3a85f4 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -1,30 +1,10 @@ -# Architecture BR2_x86_64=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Required tools to create bootable media -BR2_PACKAGE_HOST_GENIMAGE=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_INSTALL_TOOLS=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 +BR2_TARGET_GENERIC_GETTY_PORT="tty1" 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" - -# Linux headers same as kernel, a 6.1 LTS series -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="6.1.24" @@ -33,8 +13,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/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 @@ -49,17 +27,19 @@ 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_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_INSTALL_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index fe6686b4a21..45d895889ba 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -1,31 +1,9 @@ -# Architecture BR2_x86_64=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Required tools to create bootable media -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=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 +BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" - -# Linux headers same as kernel, a 6.1 LTS series -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="6.1.24" @@ -34,8 +12,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/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 @@ -50,17 +26,21 @@ 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_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/pcengines_apu2_defconfig b/configs/pcengines_apu2_defconfig index a85808554c8..b55d55fe2ec 100644 --- a/configs/pcengines_apu2_defconfig +++ b/configs/pcengines_apu2_defconfig @@ -1,28 +1,17 @@ -# Architecture BR2_x86_64=y - -# Kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_TARGET_GENERIC_HOSTNAME="apu2" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# Default hostname and TTY -BR2_TARGET_GENERIC_HOSTNAME="apu2" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Networking -BR2_SYSTEM_DHCP="eth0" - -# Rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="board/pcengines/apu2/isolinux.cfg" BR2_TARGET_ROOTFS_ISO9660_HYBRID=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloader BR2_TARGET_SYSLINUX=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index c454114d2ad..8975f3b1a21 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -1,49 +1,38 @@ 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_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_CUSTOM_VERSION_VALUE="lts-v2.10.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="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus" 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_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/pine64/pine64/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-pine64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" 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/pine64/pine64/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" diff --git a/configs/pine64_pinecube_defconfig b/configs/pine64_pinecube_defconfig index 5cdaf59fae3..3f88ca08222 100644 --- a/configs/pine64_pinecube_defconfig +++ b/configs/pine64_pinecube_defconfig @@ -1,20 +1,13 @@ -# Target options BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y - -# Toolchain options BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# System configuration BR2_TARGET_GENERIC_HOSTNAME="pinecube" BR2_TARGET_GENERIC_ISSUE="Welcome to Pine64 Pinecube" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/pinecube/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pinecube/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.60" @@ -22,12 +15,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-s3-pinecube" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -38,8 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" - -# Required host utilities for building an SDCard image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/pine64_sopine_defconfig b/configs/pine64_sopine_defconfig index f59f2387ebf..845775338b6 100644 --- a/configs/pine64_sopine_defconfig +++ b/configs/pine64_sopine_defconfig @@ -1,18 +1,22 @@ 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_GENERIC_ISSUE="Welcome to PINE64 SOPINE" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/sopine/genimage.cfg" +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-sopine-baseboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y 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="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 @@ -25,25 +29,9 @@ 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/pine64/sopine/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-sopine-baseboard" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE" -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/pine64/sopine/genimage.cfg" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd" diff --git a/configs/pine64_star64_defconfig b/configs/pine64_star64_defconfig index 9852e6d82b3..33c5826a4a3 100644 --- a/configs/pine64_star64_defconfig +++ b/configs/pine64_star64_defconfig @@ -1,9 +1,9 @@ BR2_riscv=y - -# Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel configuration +BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz" @@ -12,13 +12,12 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# OpenSBI configuration +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="100M" BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y BR2_TARGET_OPENSBI_PLAT="generic" - -# U-Boot configuration +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y @@ -26,16 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y - -# Misc -BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" -BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="100M" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 9f187dcc697..cb6a06653c0 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -1,34 +1,19 @@ -# Architecture BR2_aarch64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" 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.10" @@ -47,12 +32,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-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_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 24b059d6b2b..6df2b2e2731 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -1,54 +1,31 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a57=y - -# Hashes +BR2_neoverse_n1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# UEFI firmware -BR2_TARGET_EDK2=y -BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_ARM64_EFI=y - -# ARM Trusted Firmware +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_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.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - -# Host tools for genimage -BR2_PACKAGE_HOST_GENIMAGE=y +BR2_TARGET_EDK2=y +BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y +BR2_TARGET_GRUB2=y 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_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 30ecf04cacc..6c206cea934 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -1,34 +1,18 @@ -# Architecture BR2_aarch64=y -BR2_cortex_a53=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" 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 - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index bdcd41bbde5..2cc222e2a45 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -1,36 +1,21 @@ -# Architecture BR2_arm=y BR2_cortex_a15=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# 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.10" @@ -51,12 +36,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" 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_defconfig b/configs/qemu_arm_versatile_defconfig index 17eb7165674..e22ef33c065 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -1,27 +1,11 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" @@ -29,7 +13,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/versatile-pb" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index de09400f295..84be67045f6 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -1,39 +1,22 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_ARM_FPU_VFPV3D16=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/vexpress-v2p-ca9" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +# BR2_TARGET_ROOTFS_TAR is not set 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 900bd17fc2e..1c2da472827 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -1,36 +1,26 @@ -# Architecture BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_VFPV3D16=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" - -# optee-test needs toolchain C++ -BR2_TOOLCHAIN_BUILDROOT_CXX=y - -# Filesystem -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" - -# TF-A for booting OP-TEE secure and uboot/linux non secure +BR2_PACKAGE_OPENSSL=y +BR2_PACKAGE_OPTEE_EXAMPLES=y +BR2_PACKAGE_OPTEE_TEST=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" @@ -39,30 +29,14 @@ 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" - -# 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_EXAMPLES=y -BR2_PACKAGE_OPTEE_TEST=y - -# Enable OpenSSL library for some optee-test tests -BR2_PACKAGE_OPENSSL=y -BR2_PACKAGE_LIBOPENSSL=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# U-boot for booting the dear Linux kernel 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_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 6a1c99007f0..feb96bb5333 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -1,37 +1,18 @@ -# Architecture BR2_m68k=y BR2_m68k_cf5208=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_INITRAMFS=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 18a4090702b..689da548928 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -1,37 +1,17 @@ -# Architecture BR2_m68k=y -BR2_m68k_68040=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" -BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index fd1689b8792..572f7c125f6 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -1,34 +1,18 @@ -# Architecture -BR2_microblaze=y BR2_microblazebe=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 88d3b560dbb..03c80919dc5 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -1,34 +1,18 @@ -# Architecture -BR2_microblaze=y BR2_microblazeel=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index a4145608ade..ceb5f91b20c 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -1,37 +1,19 @@ -# Architecture BR2_mips=y BR2_mips_32r2=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 6385914a170..e5ce0c660b3 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -1,37 +1,19 @@ -# Architecture BR2_mipsel=y BR2_mips_32r2=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index c3a94210ce8..d8f3455b275 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -1,37 +1,19 @@ -# Architecture BR2_mips=y BR2_mips_32r6=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index fdd26d18781..89231a2c4fb 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -1,37 +1,19 @@ -# Architecture BR2_mipsel=y BR2_mips_32r6=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 5126b2cc248..de0ba6d9593 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -1,37 +1,18 @@ -# Architecture BR2_mips64=y BR2_MIPS_NABI64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index ad7a76ebdfb..e8d4b4093d2 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -1,37 +1,18 @@ -# Architecture BR2_mips64el=y BR2_MIPS_NABI64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index de671052861..06530044e11 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -1,38 +1,19 @@ -# Architecture BR2_mips64=y BR2_mips_64r6=y BR2_MIPS_NABI64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 51097c3a8e3..d2e0bb7157e 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -1,38 +1,19 @@ -# Architecture BR2_mips64el=y BR2_mips_64r6=y BR2_MIPS_NABI64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig deleted file mode 100644 index 67419827dd9..00000000000 --- a/configs/qemu_nios2_10m50_defconfig +++ /dev/null @@ -1,26 +0,0 @@ -BR2_nios2=y - -# Hashes -BR2_GLOBAL_PATCH_DIR="board/qemu/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" -BR2_LINUX_KERNEL_DEFCONFIG="10m50" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" -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_6_6=y - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 77ecb555909..02c3882ed63 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -1,31 +1,16 @@ -# Architecture BR2_or1k=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index a63bc011cde..dd778e7868a 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -1,34 +1,19 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_e5500=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" 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 - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR 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_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 40016a55241..d006bee7a46 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -1,27 +1,12 @@ -# Architecture BR2_powerpc64=y BR2_powerpc_power7=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="hvc0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" @@ -29,7 +14,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index 763a428ee16..d20a21618a8 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -1,34 +1,18 @@ -# Architecture BR2_powerpc64le=y -BR2_powerpc_power8=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index fbcad654990..5cbacd3f171 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -1,27 +1,11 @@ -# Architecture BR2_powerpc64le=y -BR2_powerpc_power8=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" @@ -29,7 +13,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index e5d4e055b14..bb7dca69304 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -1,40 +1,20 @@ -# Architecture BR2_powerpc=y BR2_powerpc_440fp=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index dc9598b5bf7..eccf86f6a3b 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -1,34 +1,19 @@ -# Architecture BR2_powerpc=y BR2_powerpc_e500mc=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" 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 - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR 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_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 85a974586cd..f35c8557b1e 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -1,37 +1,19 @@ -# Architecture BR2_powerpc=y BR2_powerpc_750=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 5df26eb5efc..13d9aba0b0a 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -1,18 +1,12 @@ -# Architecture BR2_powerpc=y BR2_powerpc_7400=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" @@ -20,19 +14,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Filesystem BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index cc0429e098a..8da2a0472c2 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -1,40 +1,20 @@ -# Architecture BR2_powerpc=y BR2_powerpc_8548=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# Filesystem -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_riscv32_nommu_virt_defconfig b/configs/qemu_riscv32_nommu_virt_defconfig index b958d42d027..49580716bb5 100644 --- a/configs/qemu_riscv32_nommu_virt_defconfig +++ b/configs/qemu_riscv32_nommu_virt_defconfig @@ -1,34 +1,17 @@ -# Architecture BR2_riscv=y BR2_RISCV_32=y # BR2_RISCV_USE_MMU is not set - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System BR2_SYSTEM_DHCP="eth0" -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="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux-nommu.config" -BR2_LINUX_KERNEL_IMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 631526b6956..6064dd66c36 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -1,38 +1,19 @@ -# Architecture BR2_riscv=y BR2_RISCV_32=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" -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)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_DEFCONFIG="rv32" -BR2_LINUX_KERNEL_IMAGE=y - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 81214e54525..bb3fb2c5cb6 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -1,34 +1,16 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System BR2_SYSTEM_DHCP="eth0" -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="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv64-virt/linux-nommu.config" -BR2_LINUX_KERNEL_IMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y 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 31ac1d1ed9d..575e367af81 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -1,38 +1,18 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" -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)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_IMAGE=y - -# Bootloader +BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" - -# host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index b789c43d423..66a05d59e57 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,11 +1,7 @@ -# Architecture BR2_riscv=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index b22af68b046..975633e3abf 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -1,31 +1,18 @@ -# Architecture BR2_s390x=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" - -# Filesystem 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 7b7af6f0198..4b06017aec1 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -1,34 +1,18 @@ -# Architecture BR2_sh=y -BR2_sh4=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" - -# Filesystem -BR2_TARGET_ROOTFS_INITRAMFS=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 18f3805cfa8..9a80bb10657 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -1,33 +1,18 @@ -# Architecture BR2_sh=y BR2_sh4eb=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" - -# Filesystem -BR2_TARGET_ROOTFS_INITRAMFS=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index f72bc5783a7..d409a9ff47c 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -1,32 +1,16 @@ -# Architecture BR2_sparc64=y -BR2_sparc_v9=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index ec90a5802c9..63ca7330b9c 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -1,32 +1,16 @@ -# Architecture BR2_sparc=y -BR2_sparc_v8=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# 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_6_6=y - -# Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 2a24533dd44..8022e43a208 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -1,35 +1,18 @@ -# Architecture BR2_x86_64=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh" - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index a8596dae57f..e4ff52a3d58 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -1,35 +1,17 @@ -# Architecture -BR2_i386=y BR2_x86_pentiumpro=y - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86/post-build.sh" - -# 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" - -# host-qemu for gitlab testing +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 69f65bf99e7..dca2e600d52 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -1,40 +1,23 @@ -# Architecture 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" - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index ab5aaca8a2c..52e28cb9c58 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -1,41 +1,24 @@ -# Architecture 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 - -# Hashes +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/qemu/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# System -BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image +BR2_SYSTEM_DHCP="eth0" 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_6_6=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image" - -# Kernel needs mkimage -BR2_PACKAGE_HOST_UBOOT_TOOLS=y - -# host-qemu for gitlab testing +BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 23ea25eb6f5..dc4f1ea86ce 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -1,47 +1,32 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_ARM_EABIHF=y - -# patches -BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index fc40471b77d..2c1e42543f5 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -1,46 +1,31 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_ARM_EABIHF=y - -# patches -BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero-w" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi0w/config_0w.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 30b7ff9fdec..ce19a7fd5d1 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -1,50 +1,34 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index bfef4683b39..9e301d8d968 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -1,48 +1,32 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index d55410777d3..38c680d5419 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -1,48 +1,33 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 826181a2ecb..da3f6577348 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -1,63 +1,42 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Build Qt5 WebEngine +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_LIBERATION=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_EXAMPLES=y BR2_PACKAGE_QT5BASE_GIF=y -BR2_PACKAGE_QT5BASE_JPEG=y -BR2_PACKAGE_QT5BASE_PNG=y BR2_PACKAGE_QT5WEBENGINE=y BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y -BR2_PACKAGE_RPI_USERLAND=y -BR2_PACKAGE_CA_CERTIFICATES=y -BR2_PACKAGE_NTP=y - BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3_qt5we.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_RPI_USERLAND=y +BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_NTP=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="400M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index d5fa72d57d0..66ed5f00455 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -1,47 +1,32 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4-64/config_4_64bit.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index d7d5ec24997..89cfd58a90f 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -1,47 +1,32 @@ BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig index 18fdfa13825..8cbd533eee5 100644 --- a/configs/raspberrypi5_defconfig +++ b/configs/raspberrypi5_defconfig @@ -1,48 +1,33 @@ BR2_aarch64=y BR2_cortex_a76=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b broadcom/bcm2712d0-rpi-5-b" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 97cb4e734df..694b7925af6 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -1,49 +1,33 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_ARM_EABIHF=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index cff9270ed6a..44c625a4d49 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -1,50 +1,33 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_ARM_FPU_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io_64bit.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Required tool to flash CM4 eMMC memory -BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 2972419ac71..d52eae82a41 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -1,50 +1,33 @@ BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - BR2_SYSTEM_DHCP="eth0" - -# Linux headers same as kernel, a 6.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypicm4io-64/config_cm4io.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Required tool to flash CM4 eMMC memory -BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 7f83e9a258b..796fcf9ab3e 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -1,48 +1,32 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y - -# patches -BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y - +BR2_GLOBAL_PATCH_DIR="board/raspberrypi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,576cc10e1ed50a9eacffc7a05c796051d7343ea4)/linux-576cc10e1ed50a9eacffc7a05c796051d7343ea4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" - -# Build the DTB from the kernel sources BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w" - BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_XZ=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w/config_zero2w.txt" - -# Required tools to create the SD image -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Filesystem / image +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_KMOD_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" - -# Enable compressed kernel module support -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_KMOD_XZ=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index 3efcd8859d0..709b54ff067 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,25 +1,13 @@ -# architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# system -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARDNAME="riotboard" -BR2_TARGET_UBOOT_FORMAT_IMX=y - -# Linux headers same as kernel, a 4.18 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y - -# kernel +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_OVERLAY="board/embest/riotboard/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/embest/riotboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10" @@ -28,15 +16,13 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-riotboard" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# required tools to create the SD card image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="riotboard" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# rootfs -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_OVERLAY="board/embest/riotboard/rootfs_overlay" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/embest/riotboard/genimage.cfg" diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 0778e8afdfe..38b5aad2062 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,49 +1,47 @@ -# Architecture BR2_aarch64=y BR2_cortex_a76_a55=y - -# Linux headers same as kernel, a 6.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y - -# Build +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=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="2024.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y -BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" - -# Kernel +BR2_TARGET_GENERIC_HOSTNAME="rock5b" +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.3" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rock5b" -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="250M" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" diff --git a/configs/rock64_defconfig b/configs/rock64_defconfig index 2fae2298de9..744d3a7159c 100644 --- a/configs/rock64_defconfig +++ b/configs/rock64_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches" BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rock64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -28,7 +28,6 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-mainlin BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="release-2020-07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y diff --git a/configs/rock_pi_n8_defconfig b/configs/rock_pi_n8_defconfig index b7135d63117..3689d18e450 100644 --- a/configs/rock_pi_n8_defconfig +++ b/configs/rock_pi_n8_defconfig @@ -1,12 +1,22 @@ -# Architecture BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 5.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# Bootloader +BR2_TARGET_GENERIC_HOSTNAME="rockpi-n8" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N8" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n8/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n8/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/amarula/linux-amarula.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dcb0132685b07beb82065c5d7521e6c555c55b6" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-rock-pi-n8" +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 @@ -14,33 +24,12 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="ba120841bf40ebaed049d64bb4f980083a1cf6b7" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n8-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_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/amarula/linux-amarula.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="5dcb0132685b07beb82065c5d7521e6c555c55b6" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-rock-pi-n8" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi-n8" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N8" -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/radxa/rockpi-n8/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n8/post-build.sh" diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 0c6cdd477a3..d6c217e9462 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -1,57 +1,49 @@ -# Architecture BR2_aarch64=y BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 6.5 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y - -# Firmware +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/pine64/rockpro64/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_TARGET_GENERIC_HOSTNAME="rockpro64" +BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPRO64" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rockpro64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.14" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" 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_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_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="6.5.7" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment" - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpro64" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPRO64" -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/pine64/rockpro64/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh" diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 0f37d5dc0b4..045bdfede2b 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -2,14 +2,12 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" -# Linux headers same as kernel, a 5.15 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" - BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.14" @@ -19,13 +17,9 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="owl-s500-roseapplepi" - -# Filesystem / image BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders BR2_TARGET_S500_BOOTLOADER=y BR2_TARGET_S500_BOOTLOADER_BOARD="linux/bubble_gum_sd" BR2_TARGET_UBOOT=y @@ -36,8 +30,6 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="a035d2673a90143a1a74557503b2e137b1447ae6" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="actduino_bubble_gum_v10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/s6lx9_microboard_defconfig b/configs/s6lx9_microboard_defconfig index 97b2d3fe798..b2d1d49d79f 100644 --- a/configs/s6lx9_microboard_defconfig +++ b/configs/s6lx9_microboard_defconfig @@ -1,13 +1,11 @@ -BR2_microblaze=y BR2_microblazeel=y -# Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/avnet/s6lx9_microboard/lx9_mmu_defconfig" BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/avnet/s6lx9_microboard/lx9_mmu.dts" +BR2_TARGET_ROOTFS_INITRAMFS=y +# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 6b3719a5076..855efedafa5 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -1,31 +1,9 @@ -# Architecture BR2_arm=y -BR2_arm926t=y - -# system +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y BR2_GLOBAL_PATCH_DIR="board/sheevaplug/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" - -# filesystem -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sheevaplug" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_FORMAT_KWB=y -# BR2_TARGET_UBOOT_NETWORK is not set - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336" @@ -33,3 +11,11 @@ BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_INTREE_DTS_NAME="kirkwood-sheevaplug" +BR2_TARGET_ROOTFS_JFFS2=y +BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=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="sheevaplug" +BR2_TARGET_UBOOT_FORMAT_KWB=y diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index a228cd8cb77..8c8dd2771b0 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -8,9 +8,9 @@ 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_CONFIG_FRAGMENT_FILES="board/sipeed/lichee_rv_dock/linux.fragment" 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 diff --git a/configs/sipeed_licheepi_nano_defconfig b/configs/sipeed_licheepi_nano_defconfig index 6eb4a3069db..8b0da5724e0 100644 --- a/configs/sipeed_licheepi_nano_defconfig +++ b/configs/sipeed_licheepi_nano_defconfig @@ -1,18 +1,11 @@ -# Target options BR2_arm=y - -# System configuration +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y BR2_TARGET_GENERIC_HOSTNAME="licheepi-nano" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Nano" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_nano/genimage.cfg" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.9" @@ -20,27 +13,21 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/licheepi_nano/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/suniv-f1c100s-licheepi-nano" - -# Filesystem images BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_FLASH_64=y BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y BR2_TARGET_ROOTFS_JFFS2_PAD=y - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="licheepi_nano" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/sipeed/licheepi_nano/uboot.fragment" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# Required host utilities +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/sipeed_licheepi_zero_defconfig b/configs/sipeed_licheepi_zero_defconfig index 1fa76923c88..e92c1d854e9 100644 --- a/configs/sipeed_licheepi_zero_defconfig +++ b/configs/sipeed_licheepi_zero_defconfig @@ -1,38 +1,25 @@ -# Target options BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y - -# Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y - -# System configuration BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_zero/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock" - BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y - BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y - -# Filesystem images BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# Bootloaders BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -43,11 +30,9 @@ 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 -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sipeed/licheepi_zero/boot.cmd" - -# Required host utilities for building an SDCard image 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/sipeed/licheepi_zero/boot.cmd" diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 238e082a3d4..00c6a993d8d 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,16 +6,9 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_INIT_TINYINIT=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" @@ -25,13 +16,7 @@ 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_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" +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 28aa143583b..5127bfeae66 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,17 +6,13 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_TARGET_ENABLE_ROOT_LOGIN is not set BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" - -# Kernel +BR2_INIT_TINYINIT=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -28,30 +22,18 @@ 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_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_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" 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_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index ee1b0d83728..d97e1853114 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,16 +6,9 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_INIT_TINYINIT=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" @@ -25,13 +16,7 @@ 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_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" +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index 41a062c7a17..a755872cfd8 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,17 +6,13 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_TARGET_ENABLE_ROOT_LOGIN is not set BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" - -# Kernel +BR2_INIT_TINYINIT=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -28,30 +22,18 @@ 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_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_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" 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_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index a5b09e17ac1..a4d976353fa 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,16 +6,9 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_INIT_TINYINIT=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" @@ -25,13 +16,7 @@ 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_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" +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index 0e80d9c83ad..6067fea7850 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,17 +6,13 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_TARGET_ENABLE_ROOT_LOGIN is not set BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" - -# Kernel +BR2_INIT_TINYINIT=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -28,30 +22,18 @@ 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_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_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" 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_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index 7ba7653e8d5..37c6eb45821 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,16 +6,9 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_INIT_TINYINIT=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" @@ -25,13 +16,7 @@ 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_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" +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 7bdd36e1d09..0a460f15d33 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -1,6 +1,4 @@ -# Architecture BR2_riscv=y -BR2_RISCV_64=y BR2_riscv_custom=y BR2_RISCV_ISA_RVM=y BR2_RISCV_ISA_RVA=y @@ -8,17 +6,13 @@ BR2_RISCV_ISA_RVF=y BR2_RISCV_ISA_RVD=y BR2_RISCV_ISA_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_TARGET_ENABLE_ROOT_LOGIN is not set BR2_GLOBAL_PATCH_DIR="board/canaan/k210-soc/patches" - -# Kernel +BR2_INIT_TINYINIT=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +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" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" @@ -28,30 +22,18 @@ 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_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_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" 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_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/snps_arc700_axs101_defconfig b/configs/snps_arc700_axs101_defconfig index 3a6bd5c0d33..3aa332cd2e4 100644 --- a/configs/snps_arc700_axs101_defconfig +++ b/configs/snps_arc700_axs101_defconfig @@ -1,24 +1,15 @@ -# Architecture BR2_arcle=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_HOSTNAME="axs101" BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform" -BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" - -# Linux headers same as kernel, a 5.16 series -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.16" BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Bootloader +BR2_TARGET_ROOTFS_INITRAMFS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/snps_arc700_nsim_defconfig b/configs/snps_arc700_nsim_defconfig index 3964924bed8..dba329fce6b 100644 --- a/configs/snps_arc700_nsim_defconfig +++ b/configs/snps_arc700_nsim_defconfig @@ -1,18 +1,9 @@ -# Architecture BR2_arcle=y - -# System -BR2_TARGET_GENERIC_HOSTNAME="arc700" - -# Linux headers same as kernel, a 6.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y - -# Kernel +BR2_TARGET_GENERIC_HOSTNAME="arc700" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.8" BR2_LINUX_KERNEL_DEFCONFIG="nsim_700" BR2_LINUX_KERNEL_VMLINUX=y - -# Rootfs BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/snps_archs38_axs103_defconfig b/configs/snps_archs38_axs103_defconfig index 2002520d1bf..714a5c7729c 100644 --- a/configs/snps_archs38_axs103_defconfig +++ b/configs/snps_archs38_axs103_defconfig @@ -1,25 +1,16 @@ -# Architecture BR2_arcle=y BR2_archs38=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_HOSTNAME="axs103" BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform" -BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/synopsys/axs10x/post-build.sh" - -# Linux headers same as kernel, a 5.16 series -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.16" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Bootloader +BR2_TARGET_ROOTFS_INITRAMFS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/snps_archs38_haps_defconfig b/configs/snps_archs38_haps_defconfig index 02e020bb47b..4989a1ff1b1 100644 --- a/configs/snps_archs38_haps_defconfig +++ b/configs/snps_archs38_haps_defconfig @@ -1,18 +1,11 @@ -# Architecture BR2_arcle=y BR2_archs38=y - -# System +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_HOSTNAME="zebu_hs" BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform" -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Linux headers same as kernel, a 5.16 series -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.16" BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp" BR2_LINUX_KERNEL_VMLINUX=y +BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/snps_archs38_hsdk_defconfig b/configs/snps_archs38_hsdk_defconfig index 413ca5098c1..f8710e03dfb 100644 --- a/configs/snps_archs38_hsdk_defconfig +++ b/configs/snps_archs38_hsdk_defconfig @@ -1,6 +1,5 @@ BR2_arcle=y BR2_archs38_full=y -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_PACKAGE_GLIBC_UTILS=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -24,8 +23,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="hsdk" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_FORMAT_ELF=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_ELF=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/socrates_cyclone5_defconfig b/configs/socrates_cyclone5_defconfig index 6ecbf05d8c7..d23e08a2555 100644 --- a/configs/socrates_cyclone5_defconfig +++ b/configs/socrates_cyclone5_defconfig @@ -23,10 +23,10 @@ BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y +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_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="8192" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/solidrun_clearfog_defconfig b/configs/solidrun_clearfog_defconfig index 7f633d30d52..32fbb930bfd 100644 --- a/configs/solidrun_clearfog_defconfig +++ b/configs/solidrun_clearfog_defconfig @@ -1,42 +1,33 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System configuration +BR2_GLOBAL_PATCH_DIR="board/solidrun/clearfog/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.43" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-388-clearfog-base" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_PACKAGE_HOST_GENIMAGE=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.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-spl.kwb" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.kwb" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/solidrun_clearfog_gt_8k_defconfig b/configs/solidrun_clearfog_gt_8k_defconfig index 30b1e17925d..4187f68c2b3 100644 --- a/configs/solidrun_clearfog_gt_8k_defconfig +++ b/configs/solidrun_clearfog_gt_8k_defconfig @@ -2,8 +2,22 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="clearfog-gt-8k" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for SolidRun Clearfog GT-8K" - -# Firmware +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog_gt_8k/post-build-mainline.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog_gt_8k/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-clearfog-gt-8k" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" @@ -12,35 +26,12 @@ 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 - -# U-Boot 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_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="clearfog_gt_8k" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/uboot-fragment.config" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/clearfog_gt_8k/linux-extras.config" -BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-clearfog-gt-8k" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# rootfs -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/clearfog_gt_8k/post-build-mainline.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/clearfog_gt_8k/genimage.cfg" diff --git a/configs/solidrun_macchiatobin_defconfig b/configs/solidrun_macchiatobin_defconfig index f388e37163a..ed511bda999 100644 --- a/configs/solidrun_macchiatobin_defconfig +++ b/configs/solidrun_macchiatobin_defconfig @@ -2,8 +2,21 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="mcbin" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin" - -# Firmware +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build-mainline.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/linux-extras.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" @@ -12,37 +25,12 @@ 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 - -# U-Boot 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_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_mcbin-88f8040" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/uboot-fragment.config" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.5" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/linux-extras.config" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# rootfs -BR2_TARGET_ROOTFS_TAR=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - BR2_PACKAGE_HOST_GENIMAGE=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build-mainline.sh" diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index feb13d84dbf..913830e38ed 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -1,5 +1,4 @@ BR2_riscv=y -BR2_RISCV_64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/spike/riscv64/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 41970d469d9..33f725e1853 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -8,7 +8,7 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.98" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.112" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index c00c043896a..84b22d596c9 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -8,13 +8,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config board/stmicroelectronics/stm32f469-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y @@ -23,10 +24,8 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_OPENOCD=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index 5a9d3e8afc7..7c79b10e1fe 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -8,7 +8,7 @@ BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/stm32f746_disco_sd_defconfig b/configs/stm32f746_disco_sd_defconfig new file mode 100644 index 00000000000..a3de2400703 --- /dev/null +++ b/configs/stm32f746_disco_sd_defconfig @@ -0,0 +1,31 @@ +BR2_arm=y +BR2_cortex_m7=y +BR2_BINFMT_FDPIC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f746-disco/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_INIT_TINYINIT=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32f746-disco/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f746-disco/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" +BR2_LINUX_KERNEL_DEFCONFIG="stm32" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/stm32f746-disco/linux.fragment" +BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y +BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f746-disco" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +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="2024.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f746-disco" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_OPENOCD=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ec2687334c..ef97714e4d8 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -8,13 +8,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f769-disco/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.167" BR2_LINUX_KERNEL_DEFCONFIG="stm32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0xc0000000.config board/stmicroelectronics/stm32f769-disco/linux-sd.fragment" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" @@ -22,10 +23,8 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f769-disco" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_OPENOCD=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 310e179cf78..c1ecbd22c19 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -1,17 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 6.9 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y - -# System configuration -BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches" +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157a-dk1/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8" @@ -20,14 +13,10 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157a-dk1/li BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dk1" BR2_LINUX_KERNEL_INSTALL_TARGET=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_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" @@ -44,13 +33,11 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" -# BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 2a9c31df37c..c35d75853f0 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -1,17 +1,10 @@ -# Architecture BR2_arm=y BR2_cortex_a7=y - -# Linux headers same as kernel, a 6.9 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9=y - -# System configuration -BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp157/patches" +BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/common/stm32mp1xx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/stmicroelectronics/stm32mp157c-dk2/overlay/" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp1xx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.9.8" @@ -20,14 +13,10 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32mp157c-dk2/li BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157c-dk2" BR2_LINUX_KERNEL_INSTALL_TARGET=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_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" @@ -51,6 +40,4 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" - -# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157c_odyssey_defconfig b/configs/stm32mp157c_odyssey_defconfig index 2d3600410a5..5cab460ab70 100644 --- a/configs/stm32mp157c_odyssey_defconfig +++ b/configs/stm32mp157c_odyssey_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y -BR2_GLOBAL_PATCH_DIR="board/seeed/stm32mp157c-odyssey/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_GLOBAL_PATCH_DIR="board/seeed/stm32mp157c-odyssey/patches" BR2_ROOTFS_OVERLAY="board/seeed/stm32mp157c-odyssey/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/seeed/stm32mp157c-odyssey/genimage.cfg" @@ -29,9 +29,9 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-odyssey" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/ti_am62ax_sk_defconfig b/configs/ti_am62ax_sk_defconfig index 25735c28ab2..1144577942b 100644 --- a/configs/ti_am62ax_sk_defconfig +++ b/configs/ti_am62ax_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/ti/am62ax-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am62a7-sk.dtb -l am62 BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62ax-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62a7-sk" @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -25,12 +25,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62ax" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62ax_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62ax_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/ti_am62px_sk_defconfig b/configs/ti_am62px_sk_defconfig new file mode 100644 index 00000000000..4937fb704cc --- /dev/null +++ b/configs/ti_am62px_sk_defconfig @@ -0,0 +1,46 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/ti/am62px-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am62p5-sk.dtb -l am62px-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62px-sk/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am62p5-sk" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62px" +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62px_evm_r5" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62px_evm_a53" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f56669c24fe..0c37fdc167f 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -27,15 +27,16 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1e8b8c9c022..a9ec5e3d536 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" @@ -19,7 +19,7 @@ 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="lts-v2.10.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -27,12 +27,12 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/ts5500_defconfig b/configs/ts5500_defconfig index 871c02e95f2..62d80839b70 100644 --- a/configs/ts5500_defconfig +++ b/configs/ts5500_defconfig @@ -1,26 +1,13 @@ -# architecture -BR2_i386=y -BR2_x86_i586=y - -# Linux headers same as kernel, a 4.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# system BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" BR2_ROOTFS_OVERLAY="board/technologic/ts5500/fs-overlay" - -# kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5500/linux-4.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# rootfs BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# bootloader BR2_TARGET_SYSLINUX=y BR2_TARGET_SYSLINUX_MBR=y diff --git a/configs/uevm5432_defconfig b/configs/uevm5432_defconfig index 03dc789fa83..b03a63d4748 100644 --- a/configs/uevm5432_defconfig +++ b/configs/uevm5432_defconfig @@ -1,22 +1,13 @@ -# Architecture BR2_arm=y BR2_cortex_a15=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y - -# System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_SYSTEM_DHCP="eth0" - -# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/uevm5432/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/uevm5432/genimage.cfg" - -# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10" @@ -24,13 +15,9 @@ BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/omap5-uevm" 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 - -# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -40,8 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# Required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 21dfe2577aa..697b6c51691 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,12 +1,14 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -19,25 +21,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_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_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" -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_NEEDS_GNUTLS=y -BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_VERSAL=y +BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_BOOTGEN=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/versal_vek280_defconfig b/configs/versal_vek280_defconfig new file mode 100644 index 00000000000..fcf440ed892 --- /dev/null +++ b/configs/versal_vek280_defconfig @@ -0,0 +1,44 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/versal/vek280/patches board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vek280-revB" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vek280-revB" +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_VERSAL=y +BR2_TARGET_XILINX_PREBUILT_BOARD="vek280" +BR2_PACKAGE_HOST_BOOTGEN=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 253a6d2cffa..9fc694a8988 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -1,12 +1,14 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" @@ -19,26 +21,23 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_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_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y -BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" -BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" BR2_TARGET_XILINX_PREBUILT_VERSAL=y +BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" +BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_BOOTGEN=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 18e0997f19d..fb0bc94d15e 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -30,8 +30,8 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_OPENSBI=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" diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 22eb5299451..1bd00c57803 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,46 +1,31 @@ -# Architecture BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# Image BR2_ROOTFS_OVERLAY="board/wandboard/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" - -# Filesystem +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-wandboard nxp/imx/imx6dl-wandboard nxp/imx/imx6q-wandboard-revb1 nxp/imx/imx6dl-wandboard-revb1 nxp/imx/imx6q-wandboard-revd1 nxp/imx/imx6dl-wandboard-revd1 nxp/imx/imx6qp-wandboard-revd1" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=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="2024.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" -BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.27" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-wandboard nxp/imx/imx6dl-wandboard nxp/imx/imx6q-wandboard-revb1 nxp/imx/imx6dl-wandboard-revb1 nxp/imx/imx6q-wandboard-revd1 nxp/imx/imx6dl-wandboard-revd1 nxp/imx/imx6qp-wandboard-revd1" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 7389919396a..9b0e01d38ab 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -1,18 +1,11 @@ -# architecture BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y - -# Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y - -# system +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" - -# rootfs overlay BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" - -# Kernel +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6" @@ -20,33 +13,19 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7s-warp" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# U-Boot -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="warp7" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y - -# wifi firmware for brcm43430 BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# For automatic firmware loading -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - -# wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y - -# Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y - -# required tools to create the eMMC image +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="warp7" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index f955a0c4ade..a00992c8b66 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -23,13 +23,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 75ebc2a3ba3..a90dfd6c264 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -23,13 +23,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc702" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc702" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index ce539eefafa..1c662cd5662 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -23,13 +23,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 925faeac8e7..392576a0629 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" @@ -23,13 +23,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index ce768056384..8cbc172a413 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/kd240/patches board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${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_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" @@ -17,31 +19,28 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" -BR2_TARGET_XILINX_PREBUILT_BOARD="kd240" BR2_TARGET_XILINX_PREBUILT_KRIA=y +BR2_TARGET_XILINX_PREBUILT_BOARD="kd240" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/kd240/patches board/xilinx/patches" diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 21d01e5f2a5..d5a292b1438 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${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_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" @@ -17,30 +19,27 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" -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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index f83ef35be37..06efa86e148 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" BR2_ROOTFS_POST_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_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -17,31 +19,28 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" -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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" -BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" BR2_TARGET_XILINX_PREBUILT_KRIA=y +BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index df5eba7ca08..c7a25eefb16 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=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_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -23,22 +25,19 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -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_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index 793a677ab20..bcd6b164880 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=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_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" @@ -23,23 +25,20 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index fdf5e807950..3a13834c966 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,13 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=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_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -23,23 +25,20 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" -BR2_TARGET_UBOOT_FORMAT_ITB=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0" BR2_TARGET_XILINX_PREBUILT=y -BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 4ca11507e17..15de559debc 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -429,9 +429,9 @@ 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 the +flit+, +pep517+, +setuptools+, - +setuptools-rust+ or +maturin+ mechanisms. We cover them through a - xref:python-package-tutorial[tutorial] and a + for Python modules that use the +flit+, +hatch+, +pep517+, +poetry+ + +setuptools+, +setuptools-rust+ or +maturin+ mechanisms. We cover + them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. * *Makefiles for Lua modules*: We have a dedicated infrastructure for @@ -576,23 +576,120 @@ name. The +NN+ is the start order number which needs to be carefully chosen. For example, a program that requires networking to be up should not start before +S40network+. The scripts are started in alphabetical order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+ -start thereafter. +starts thereafter. [source,sh] ---- include::S01syslogd[] ---- -*Note:* programs that support reloading their configuration in some -fashion (+SIGHUP+) should provide a +reload()+ function similar to +Scripts should use long form options where possible for clarity. + +==== Start script configuration + +Both start scripts and unit files can source command line arguments +from +/etc/default/foo+, where +foo+ is the daemon name as set in the ++DAEMON+ variable. In general, if such a file does not exist it should +not block the start of the daemon, unless there is some site specific +command line argument the daemon requires to start. For start scripts ++FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in +the script, and the user can override this from +/etc/default/foo+. + +==== Handling the PID file + +A PID file is needed to keep track of what the main process of a +service is. How to handle it depends on whether the service creates +its own PID file, and if it deletes it on shutdown. + +* If your service doesn't create its own PID file, invoke the daemon + in foreground mode, and use +start-stop-daemon --make-pidfile + --background+ to let +start-stop-daemon+ create the PID file. See + +S01syslogd+ for example: ++ +[source,sh] +---- +start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/sbin/$DAEMON" \ + -- -n $SYSLOGD_ARGS +---- + +* If your service creates its own PID file, pass the +--pidfile+ + option to both +start-stop-daemon+ *and the daemon itself* (or set + it appropriately in a configuration file, depending on what the + daemon supports) so they agree on where the PID file is. See + +S45NetworkManager+ for example: ++ +[source,sh] +---- +start-stop-daemon --start --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" \ + -- --pid-file="$PIDFILE" $NETWORKMANAGER_ARGS +---- + +* If your service removes its PID file on shutdown, use a loop testing + that the PID file has disappeared on stop, see +S45NetworkManager+ + for example: ++ +[source,sh] +---- +while [ -f "$PIDFILE" ]; do + sleep 0.1 +done +---- + +* If your service doesn't remove its PID file on shutdown, use a loop + with +start-stop-daemon+ checking if the service is still running, + and delete the PID file after the process is gone. See +S01syslogd+ + for example: ++ +[source,sh] +---- +while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/sbin/$DAEMON"; do + sleep 0.1 +done +rm -f "$PIDFILE" +---- ++ +Note the +--test+ flag, which tells +start-stop-daemon+ to not +actually stop the service, but test if it would be possible to, which +fails if the service is not running. + +==== Stopping the service + +The stop function should check that the daemon process is actually +gone before returning, otherwise restart might fail because the new +instance is started before the old one has actually stopped. How to do +that depends on how the PID file for the service is handled (see +above). It is recommended to always append +--exec "/sbin/$DAEMON"+ to +all +start-stop-daemon+ commands to ensure signals are sent to a PID +that matches +$DAEMON+. + +==== Reloading service configuration + +Programs that support reloading their configuration in some fashion +(e.g. +SIGHUP+) should provide a +reload()+ function similar to +stop()+. The +start-stop-daemon+ command supports +--stop --signal -HUP+ for this. It is recommended to always append +--exec -"/sbin/$DAEMON"+ to all +start-stop-daemon+ commands to ensure signals -are set to a PID that matches +$DAEMON+. - -Both start scripts and unit files can source command line arguments from -+/etc/default/foo+, in general, if such a file does not exist it should -not block the start of the daemon, unless there is some site specirfic -command line argument the daemon requires to start. For start scripts a -+FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and -the user can override this from +/etc/default/foo+. +HUP+ for this. When sending signals this way, whether SIGHUP or +others, make sure to use the symbolic names and not signal +numbers. Signal numbers can vary between CPU architectures, and names +are also easier to read. + +==== Return codes + +The action functions of the start script should return a success (or +failure) code, usually the return code of the relevant +start-stop-daemon action. The last one of those should be the return +code of the start script as a whole, to allow automatically checking +for success, e.g. when calling the start script from other +scripts. Note that without an explicit +return+ the return code of the +last command in a script or function becomes its return code, so an +explicit return is not always necessary. + +==== Logging + +When a service forks to the background, or +start-stop-daemon +--background+ does that, stdout and stderr are generally closed, and +anything log messages the service may write there get lost. If +possible, configure your service to log to syslog (preferably), or a +dedicated log file. diff --git a/docs/manual/adding-packages-golang.adoc b/docs/manual/adding-packages-golang.adoc index 3ddbe57afe0..aa25426591a 100644 --- a/docs/manual/adding-packages-golang.adoc +++ b/docs/manual/adding-packages-golang.adoc @@ -49,7 +49,8 @@ infrastructure should depend on +BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS+ because Buildroot will automatically add a dependency on +host-go+ to such packages. If you need CGO support in your package, you must add a dependency on -+BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+. ++BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+; for host packages, +add a dependency on +BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS+. The main macro of the Go package infrastructure is +golang-package+. It is similar to the +generic-package+ macro. The diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index f33770f95c6..b42c06e54c0 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -51,9 +51,9 @@ 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 +setuptools+ Python build system is used. The five -supported ones are +flit+, +pep517+, +setuptools+, +setuptools-rust+ -and +maturin+. +this case the +setuptools+ Python build system is used. The seven +supported ones are +flit+, +hatch+, +pep517+, +poetry+, +setuptools+, ++setuptools-rust+ and +maturin+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -96,14 +96,14 @@ 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 five supported values are +flit+, +pep517+ and - +setuptools+, +setuptools-rust+ and +maturin+. 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 +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+. + by the package. The seven supported values are +flit+, +hatch+, + +pep517+, +poetry+, +setuptools+, +setuptools-rust+ and +maturin+. + 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 +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 diff --git a/docs/website/download.html b/docs/website/download.html index 60b84cc9418..3dd4351e1ee 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,108 +8,108 @@
Download
-

Latest long term support release: 2024.02.5

+

Latest long term support release: 2024.02.8

- +
- +
-

buildroot-2024.02.5.tar.gz

-

PGP signature

+

buildroot-2024.02.8.tar.gz

+

PGP signature

- +
- +
-

buildroot-2024.02.5.tar.xz

-

PGP signature

+

buildroot-2024.02.8.tar.xz

+

PGP signature

-

Latest stable release: 2024.08

+

Latest stable release: 2024.11

- +
- +
-

buildroot-2024.08.tar.gz

-

PGP signature

+

buildroot-2024.11.tar.gz

+

PGP signature

- +
- +
-

buildroot-2024.08.tar.xz

-

PGP signature

+

buildroot-2024.11.tar.xz

+

PGP signature

- -

Latest release candidate: 2024.08-rc3

+ This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
diff --git a/docs/website/news.html b/docs/website/news.html index abd2f8e5438..c646f1c37aa 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,225 @@

News

    +
  • +
    +
    +
    +

    2024.11 released

    +

    8 December 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.11-rc3 released

    +

    5 December 2024

    +
    +
    +

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

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.11-rc2 released

    +

    23 November 2024

    +
    +
    +

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

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.02.8 released

    +

    14 November 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.08.2 released

    +

    14 November 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.11-rc1 released

    +

    13 November 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    Buildroot Developers Meeting 2025

    +

    2 October 2024

    +
    +
    + The Buildroot community is organizing a 3-day Buildroot + Developers Meeting on Feb 3-5, 2025, in Brussels (Belgium) + right after the FOSDEM + conference. Buildroot developers and contributors are invited + to join to meet together, review and merge pending patches, + learn how to contribute, discuss on-going topics and work on + specific ideas or + issues. See the + dedicated event page for more details and registration. +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.02.7 released

    +

    21 October 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.08.1 released

    +

    20 October 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.02.6 released

    +

    9 September 2024

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2024.05.3 released, 2024.05.x series EOL

    +

    9 September 2024

    +
    +
    +

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

    + +

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

    +
    +
    +
    • +
  • @@ -19,8 +238,9 @@

    2024.08 released

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

    @@ -36,7 +256,7 @@

    2024.08-rc3 released

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

    Head to the downloads page to pick up the @@ -57,7 +277,7 @@

    2024.08-rc2 released

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

    Go to the downloads page to pick up the @@ -116,7 +336,7 @@

    2024.08-rc1 released

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

    Go to the downloads page to pick up the @@ -197,7 +417,7 @@

    2024.05 released

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

    2024.02.3 released

    The 2024.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2024.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -234,7 +454,7 @@

    2024.05-rc2 released

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

    Go to the downloads page to pick up the @@ -255,7 +475,7 @@

    2024.05-rc1 released

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

    Go to the downloads page to pick up the @@ -277,7 +497,7 @@

    2024.02.2 released

    The 2024.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2024.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -318,7 +538,7 @@

    2023.11.3 released, 2023.11.x series EOL

    The 2023.11.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.11.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -340,7 +560,7 @@

    2024.02.1 released

    The 2024.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2024.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -359,7 +579,7 @@

    2024.02 released

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

    2024.02-rc2 released

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

    Go to the downloads page to pick up the @@ -402,7 +622,7 @@

    2023.02.10 released

    The 2023.02.10 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.9 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -421,7 +641,7 @@

    2023.11.2 released

    The 2023.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -439,7 +659,7 @@

    2024.02-rc1 released

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

    Go to the downloads page to pick up the @@ -461,7 +681,7 @@

    2023.02.9 released

    The 2023.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -480,7 +700,7 @@

    2023.11.1 released

    The 2023.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -520,7 +740,7 @@

    2023.02.8 released

    The 2023.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -539,7 +759,7 @@

    2023.08.4 released, 2023.08.x series EOL

    The 2023.08.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.08.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -561,7 +781,7 @@

    2023.11 released

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

    2023.11-rc2 released

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

    Head to the downloads page to pick up the @@ -601,7 +821,7 @@

    2023.02.7 released

    The 2023.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -620,7 +840,7 @@

    2023.08.3 released

    The 2023.08.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.08.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -638,7 +858,7 @@

    2023.11-rc1 released

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

    Go to the downloads page to pick up the @@ -660,7 +880,7 @@

    2023.02.6 released

    The 2023.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -679,7 +899,7 @@

    2023.08.2 released

    The 2023.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -698,7 +918,7 @@

    2023.08.1 released

    The 2023.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -717,7 +937,7 @@

    2023.02.5 released

    The 2023.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -736,7 +956,7 @@

    2023.05.3 released, 2023.05.x series EOL

    The 2023.05.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.05.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -758,7 +978,7 @@

    2023.08 released

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

    2023.02.4 released

    The 2023.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -796,7 +1016,7 @@

    2023.05.2 released

    The 2023.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -814,7 +1034,7 @@

    2023.08-rc3 released

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

    Head to the downloads page to pick up the @@ -835,7 +1055,7 @@

    2023.08-rc2 released

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

    Head to the downloads page to pick up the @@ -857,7 +1077,7 @@

    2023.08-rc1 released

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

    Go to the downloads page to pick up the 2023.08-rc1 @@ -878,7 +1098,7 @@

    2023.02.3 released

    The 2023.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -897,7 +1117,7 @@

    2023.05.1 released

    The 2023.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -916,7 +1136,7 @@

    2023.02.2 released

    The 2023.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -935,7 +1155,7 @@

    2023.05 released

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

    2023.05-rc3 released

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

    Head to the downloads page to pick up the @@ -974,7 +1194,7 @@

    2023.05-rc2 released

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

    Head to the downloads page to pick up the @@ -995,7 +1215,7 @@

    2023.05-rc1 released

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

    Go to the downloads page to pick up the @@ -1017,7 +1237,7 @@

    2023.02.1 released

    The 2023.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2023.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1036,7 +1256,7 @@

    2022.02.12 released, 2022.02.x series EOL

    The 2022.02.12 bugfix release is out, fixing a number of important / security related issues discovered since the 2022.02.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1058,7 +1278,7 @@

    2022.02.11 released

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

    2022.11.3 released, 2022.11.x series EOL

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

    2023.02 released

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

    2023.02-rc3 released

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

    Head to the downloads page to pick up the @@ -1142,7 +1362,7 @@

    2022.02.10 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1161,7 +1381,7 @@

    2022.11.2 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1179,7 +1399,7 @@

    2023.02-rc2 released

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

    Head to the downloads page to pick up the @@ -1200,7 +1420,7 @@

    2023.02-rc1 released

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

    Go to the downloads page to pick up the @@ -1222,7 +1442,7 @@

    2022.02.9 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1241,7 +1461,7 @@

    2022.11.1 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1260,7 +1480,7 @@

    2022.02.8 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1279,7 +1499,7 @@

    2022.08.3 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1298,7 +1518,7 @@

    2022.11 released

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

    2022.11-rc3 released

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

    Head to the downloads page to pick up the @@ -1338,7 +1558,7 @@

    2022.02.7 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1357,7 +1577,7 @@

    2022.08.2 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1375,7 +1595,7 @@

    2022.11-rc2 released

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

    Head to the downloads page to pick up the @@ -1396,7 +1616,7 @@

    2022.11-rc1 released

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

    Go to the downloads page to pick up the @@ -1418,7 +1638,7 @@

    2022.08.1 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1437,7 +1657,7 @@

    2022.02.6 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1456,7 +1676,7 @@

    2022.05.3 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1478,7 +1698,7 @@

    2022.08 released

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

    2022.08-rc2 released

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

    Head to the downloads page to pick up the @@ -1518,7 +1738,7 @@

    2022.02.5 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1537,7 +1757,7 @@

    2022.05.2 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1555,7 +1775,7 @@

    2022.08-rc1 released

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

    Go to the downloads page to pick up the @@ -1577,7 +1797,7 @@

    2022.02.4 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1596,7 +1816,7 @@

    2022.05.1 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1615,7 +1835,7 @@

    2022.02.3 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1634,7 +1854,7 @@

    2022.05 released

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

    2022.05-rc2 released

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

    Head to the downloads page to pick up the @@ -1674,7 +1894,7 @@

    2022.02.2 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1692,7 +1912,7 @@

    2022.05-rc1 released

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

    Go to the downloads page to pick up the @@ -1714,7 +1934,7 @@

    2022.02.1 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1733,7 +1953,7 @@

    2021.02.12 released, 2021.02.x series EOL

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1755,7 +1975,7 @@

    2021.02.11 released

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1774,7 +1994,7 @@

    2021.11.3 released, 2021.11.x series EOL

    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 + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1796,7 +2016,7 @@

    2022.02 released

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

    2022.02-rc3 released

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

    Head to the downloads page to pick up the @@ -1839,7 +2059,7 @@

    2021.02.10 released

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

    2021.11.2 released

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

    2022.02-rc2 released

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

    Head to the downloads page to pick up the @@ -1897,7 +2117,7 @@

    2022.02-rc1 released

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

    Go to the downloads page to pick up the @@ -1919,7 +2139,7 @@

    2021.02.9 released

    The 2021.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1938,7 +2158,7 @@

    2021.11.1 released

    The 2021.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1957,7 +2177,7 @@

    2021.02.8 released

    The 2021.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1976,7 +2196,7 @@

    2021.08.3 released, 2021.08.x series EOL

    The 2021.08.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.08.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -1998,7 +2218,7 @@

    2021.11 released

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

    2021.11-rc3 released

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

    Head to the downloads page to pick up the @@ -2037,7 +2257,7 @@

    2021.11-rc2 released

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

    Head to the downloads page to pick up the @@ -2059,7 +2279,7 @@

    2021.02.7 released

    The 2021.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2078,7 +2298,7 @@

    2021.08.2 released

    The 2021.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2096,7 +2316,7 @@

    2021.11-rc1 released

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

    Go to the downloads page to pick up the @@ -2118,7 +2338,7 @@

    2021.02.6 released

    The 2021.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2137,7 +2357,7 @@

    2021.05.3 released, 2021.05.x series EOL

    The 2021.05.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.05.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2159,7 +2379,7 @@

    2021.08.1 released

    The 2021.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2178,7 +2398,7 @@

    2021.02.5 released

    The 2021.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2197,7 +2417,7 @@

    2021.05.2 released

    The 2021.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2216,7 +2436,7 @@

    2021.08 released

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

    2021.08-rc3 released

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

    Head to the downloads page to pick up the @@ -2255,7 +2475,7 @@

    2021.08-rc2 released

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

    Head to the downloads page to pick up the @@ -2277,7 +2497,7 @@

    2021.02.4 released

    The 2021.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2296,7 +2516,7 @@

    2021.05.1 released

    The 2021.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2314,7 +2534,7 @@

    2021.08-rc1 released

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

    Go to the downloads page to pick up the @@ -2336,7 +2556,7 @@

    2021.02.3 released

    The 2021.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2355,7 +2575,7 @@

    2021.05 released

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

    2021.05-rc3 released

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

    Head to the downloads page to pick up the @@ -2394,7 +2614,7 @@

    2021.05-rc2 released

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

    Head to the downloads page to pick up the @@ -2416,7 +2636,7 @@

    2021.02.2 released

    The 2021.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2434,7 +2654,7 @@

    2021.05-rc1 released

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

    Go to the downloads page to pick up the @@ -2456,7 +2676,7 @@

    2021.02.1 released

    The 2021.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2021.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2475,7 +2695,7 @@

    2020.02.12 released, 2020.02.x series EOL

    The 2020.02.12 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2497,7 +2717,7 @@

    2020.11.4 released, 2020.11.x series EOL

    The 2020.11.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.11.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2519,7 +2739,7 @@

    2021.02 released

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

    2021.02-rc3 released

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

    Head to the downloads page to pick up the @@ -2562,7 +2782,7 @@

    2020.02.11 released

    The 2020.02.11 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.10 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2581,7 +2801,7 @@

    2020.11.3 released

    The 2020.11.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.11.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2599,7 +2819,7 @@

    2021.02-rc2 released

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

    Head to the downloads page to pick up the @@ -2620,7 +2840,7 @@

    2021.02-rc1 released

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

    Go to the downloads page to pick up the @@ -2642,7 +2862,7 @@

    2020.02.10 released

    The 2020.02.10 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.9 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2661,7 +2881,7 @@

    2020.11.2 released

    The 2020.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2680,7 +2900,7 @@

    2020.02.9 released

    The 2020.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2699,7 +2919,7 @@

    2020.08.3 released, 2020.08.x series EOL

    The 2020.08.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.08.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2721,7 +2941,7 @@

    2020.11.1 released

    The 2020.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2740,7 +2960,7 @@

    2020.11 released

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

    2020.11-rc3 released

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

    Head to the downloads page to pick up the @@ -2780,7 +3000,7 @@

    2020.02.8 released

    The 2020.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2799,7 +3019,7 @@

    2020.08.2 released

    The 2020.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2817,7 +3037,7 @@

    2020.11-rc2 released

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

    Head to the downloads page to pick up the @@ -2838,7 +3058,7 @@

    2020.11-rc1 released

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

    Go to the downloads page to pick up the @@ -2860,7 +3080,7 @@

    2020.02.7 released

    The 2020.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2879,7 +3099,7 @@

    2020.05.3 released

    The 2020.05.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.05.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2901,7 +3121,7 @@

    2020.08.1 released

    The 2020.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2920,7 +3140,7 @@

    2020.02.6 released

    The 2020.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2939,7 +3159,7 @@

    2020.08 released

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

    2020.02.5 released

    The 2020.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2977,7 +3197,7 @@

    2020.05.2 released

    The 2020.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -2995,7 +3215,7 @@

    2020.08-rc3 released

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

    Head to the downloads page to pick up the @@ -3016,7 +3236,7 @@

    2020.08-rc2 released

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

    Head to the downloads page to pick up the @@ -3041,7 +3261,7 @@

    2020.08-rc1 released

    of August 2020. It contains a number of new packages, new defconfigs, toolchain improvements, package updates and more. See - the CHANGES. Go + the CHANGES. Go to the downloads page to pick up the 2020.08-rc1 release.

    @@ -3059,7 +3279,7 @@

    2020.02.4 released

    The 2020.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3078,7 +3298,7 @@

    2020.05.1 released

    The 2020.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3097,7 +3317,7 @@

    2020.02.3 released

    The 2020.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3116,7 +3336,7 @@

    2020.05 released

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

    2020.05-rc3 released

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

    Head to the downloads page to pick up the @@ -3155,7 +3375,7 @@

    2020.05-rc2 released

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

    Head to the downloads page to pick up the @@ -3177,7 +3397,7 @@

    2020.02.2 released

    The 2020.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3195,7 +3415,7 @@

    2020.05-rc1 released

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

    Go to the downloads page to pick up the @@ -3217,7 +3437,7 @@

    2020.02.1 released

    The 2020.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2020.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3236,7 +3456,7 @@

    2019.11.3 released, 2019.11.x series EOL

    The 2019.11.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.11.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3258,7 +3478,7 @@

    2019.02.11 released, 2019.02.x series EOL

    The 2019.02.11 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.10 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3280,7 +3500,7 @@

    2019.02.10 released

    The 2019.02.10 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.9 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3299,7 +3519,7 @@

    2019.11.2 released

    The 2019.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3318,7 +3538,7 @@

    2020.02 released

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

    2020.02-rc3 released

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

    Head to the downloads page to pick up the @@ -3360,7 +3580,7 @@

    2020.02-rc2 released

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

    Head to the downloads page to pick up the @@ -3382,7 +3602,7 @@

    2020.02-rc1 released

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

    @@ -3405,7 +3625,7 @@

    2019.02.9 released

    The 2019.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3424,7 +3644,7 @@

    2019.11.1 released

    The 2019.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3443,7 +3663,7 @@

    2019.02.8 released

    The 2019.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3462,7 +3682,7 @@

    2019.08.3 released

    The 2019.08.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.08.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3484,7 +3704,7 @@

    2019.11 released

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

    2019.11-rc3 released

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

    Head to the downloads page to pick up the @@ -3523,7 +3743,7 @@

    2019.11-rc2 released

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

    Head to the downloads page to pick up the @@ -3545,7 +3765,7 @@

    2019.02.7 released

    The 2019.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3564,7 +3784,7 @@

    2019.08.2 released

    The 2019.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3583,7 +3803,7 @@

    2019.11-rc1 released

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

    @@ -3606,7 +3826,7 @@

    2019.02.6 released

    The 2019.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3625,7 +3845,7 @@

    2019.05.3 released

    The 2019.05.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.05.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3647,7 +3867,7 @@

    2019.08.1 released

    The 2019.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3666,7 +3886,7 @@

    2019.05.2 released

    The 2019.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3685,7 +3905,7 @@

    2019.02.5 released

    The 2019.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3704,7 +3924,7 @@

    2019.08 released

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

    2019.08-rc3 released

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

    Head to the downloads page to pick up the @@ -3743,7 +3963,7 @@

    2019.08-rc2 released

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

    Head to the downloads page to pick up the @@ -3765,7 +3985,7 @@

    2019.08-rc1 released

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

    @@ -3788,7 +4008,7 @@

    2019.02.4 released

    The 2019.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3807,7 +4027,7 @@

    2019.05.1 released

    The 2019.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3826,7 +4046,7 @@

    2019.02.3 released

    The 2019.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3845,7 +4065,7 @@

    2019.05 released

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

    2019.05-rc3 released

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

    Head to the downloads page to pick up the @@ -3884,7 +4104,7 @@

    2019.05-rc2 released

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

    Head to the downloads page to pick up the @@ -3906,7 +4126,7 @@

    2019.05-rc1 released

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

    @@ -3930,7 +4150,7 @@

    2019.02.2 released

    The 2019.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3949,7 +4169,7 @@

    2019.02.1 released

    The 2019.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2019.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3968,7 +4188,7 @@

    2018.02.12 released, 2018.02.x series EOL

    The 2018.02.12 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -3990,7 +4210,7 @@

    2018.11.4 released

    The 2018.11.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.11.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4012,7 +4232,7 @@

    2019.02 released

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

    2019.02-rc3 released

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

    Head to the downloads page to pick up the @@ -4056,7 +4276,7 @@

    2018.11.3 released

    The 2018.11.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.11.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4075,7 +4295,7 @@

    2018.02.11 released

    The 2018.02.11 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.10 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4094,7 +4314,7 @@

    2019.02-rc2 released

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

    Head to the downloads page to pick up the @@ -4116,7 +4336,7 @@

    2019.02-rc1 released

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

    @@ -4140,7 +4360,7 @@

    2018.02.10 released

    The 2018.02.10 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.9 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4159,7 +4379,7 @@

    2018.11.2 released

    The 2018.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4178,7 +4398,7 @@

    2018.02.9 released

    The 2018.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4197,7 +4417,7 @@

    2018.08.4 released, 2018.08 series EOL

    The 2018.08.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.08.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4218,7 +4438,7 @@

    2018.11.1 released

    The 2018.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4237,7 +4457,7 @@

    2018.11 released

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

    2018.11-rc3 released

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

    Head to the downloads page to pick up the @@ -4278,7 +4498,7 @@

    2018.02.8 released

    The 2018.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4297,7 +4517,7 @@

    2018.08.3 released

    The 2018.08.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.08.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4316,7 +4536,7 @@

    2018.11-rc2 released

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

    Head to the downloads page to pick up the @@ -4338,7 +4558,7 @@

    2018.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the - CHANGES + CHANGES file for details and/or read the announcement.

    @@ -4362,7 +4582,7 @@

    2018.02.7 released

    The 2018.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4381,7 +4601,7 @@

    2018.08.2 released

    The 2018.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4400,7 +4620,7 @@

    2018.08.1 released

    The 2018.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4419,7 +4639,7 @@

    2018.02.6 released

    The 2018.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4438,7 +4658,7 @@

    2018.05.3 released

    The 2018.05.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.05.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4457,7 +4677,7 @@

    2018.08 released

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

    2018.08-rc3 released

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

    Head to the downloads page to pick up the @@ -4498,7 +4718,7 @@

    2018.02.5 released

    The 2018.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4517,7 +4737,7 @@

    2018.05.2 released

    The 2018.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4536,7 +4756,7 @@

    2018.08-rc2 released

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

    Head to the downloads page to pick up the @@ -4558,7 +4778,7 @@

    2018.08-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the - CHANGES + CHANGES file for details and/or read the announcement.

    @@ -4582,7 +4802,7 @@

    2018.02.4 released

    The 2018.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4601,7 +4821,7 @@

    2018.05.1 released

    The 2018.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4620,7 +4840,7 @@

    2018.02.3 released

    The 2018.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4639,7 +4859,7 @@

    2018.05 released

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

    2018.05-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -4680,7 +4900,7 @@

    2018.05-rc2 released

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

    Head to the downloads page to pick up the @@ -4702,7 +4922,7 @@

    2018.05-rc1 released

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

    @@ -4726,7 +4946,7 @@

    2018.02.2 released

    The 2018.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4745,7 +4965,7 @@

    2017.02.11 released

    The 2017.02.11 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.10 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4766,7 +4986,7 @@

    2018.02.1 released

    The 2018.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2018.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4785,7 +5005,7 @@

    2018.02 released

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

    2018.02-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -4829,7 +5049,7 @@

    2018.02-rc2 released

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

    Head to the downloads page to pick up the @@ -4851,7 +5071,7 @@

    2018.02-rc1 released

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

    @@ -4875,7 +5095,7 @@

    2017.02.10 released

    The 2017.02.10 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.9 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4894,7 +5114,7 @@

    2017.11.2 released

    The 2017.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4913,7 +5133,7 @@

    2017.02.9 released

    The 2017.02.9 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.8 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4932,7 +5152,7 @@

    2017.11.1 released

    The 2017.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4951,7 +5171,7 @@

    2017.11 released

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

    2017.08.2 released

    The 2017.08.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.08.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -4989,7 +5209,7 @@

    2017.02.8 released

    The 2017.02.8 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.7 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5008,7 +5228,7 @@

    2017.11-rc2 released

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

    Head to the downloads page to pick up the @@ -5030,7 +5250,7 @@

    2017.11-rc1 released

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

    @@ -5053,7 +5273,7 @@

    2017.02.7 released

    The 2017.02.7 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.6 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5072,7 +5292,7 @@

    2017.08.1 released

    The 2017.08.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5091,7 +5311,7 @@

    2017.02.6 released

    The 2017.02.6 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.5 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5110,7 +5330,7 @@

    2017.08 released

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

    @@ -5129,7 +5349,7 @@

    2017.08-rc3 released

    Another release candidate, on the road to the final 2017.08 release. A number of fixes and cleanups in various packages and defconfigs. See - the CHANGES + the CHANGES file for details.

    @@ -5154,7 +5374,7 @@

    2017.08-rc2 released

    Another release candidate, on the road to the final 2017.08 release. A number of fixes and cleanups in various packages and defconfigs. See - the CHANGES + the CHANGES file for details.

    @@ -5178,7 +5398,7 @@

    2017.08-rc1 released

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

    @@ -5202,7 +5422,7 @@

    2017.05.2 released

    The 2017.05.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.05.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5221,7 +5441,7 @@

    2017.02.5 released

    The 2017.02.5 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.4 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5240,7 +5460,7 @@

    2017.05.1 released

    The 2017.05.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.05 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5259,7 +5479,7 @@

    2017.02.4 released

    The 2017.02.4 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.3 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5278,7 +5498,7 @@

    2017.02.3 released

    The 2017.02.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5297,7 +5517,7 @@

    2017.05 released

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

    2017.05-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5338,7 +5558,7 @@

    2017.05-rc2 released

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

    Head to the downloads page to pick up the @@ -5360,7 +5580,7 @@

    2017.05-rc1 released

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

    @@ -5384,7 +5604,7 @@

    2017.02.2 released

    The 2017.02.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5403,7 +5623,7 @@

    2017.02.1 released

    The 2017.02.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2017.02 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5422,7 +5642,7 @@

    2016.11.3 released

    The 2016.11.3 bugfix release is out, fixing a number of important / security related issues discovered since the 2016.11.2 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5443,7 +5663,7 @@

    2017.02 released

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

    2017.02-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5486,7 +5706,7 @@

    2017.02-rc2 released

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

    @@ -5509,7 +5729,7 @@

    2017.02-rc1 released

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

    @@ -5534,7 +5754,7 @@

    2016.11.2 released

    The 2016.11.2 bugfix release is out, fixing a number of important / security related issues discovered since the 2016.11.1 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5553,7 +5773,7 @@

    2016.11.1 released

    The 2016.11.1 bugfix release is out, fixing a number of important / security related issues discovered since the 2016.11 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5572,7 +5792,7 @@

    2016.11 released

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

    2016.11-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5613,7 +5833,7 @@

    2016.11-rc2 released

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

    @@ -5637,7 +5857,7 @@

    2016.11-rc1 released

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

    @@ -5664,7 +5884,7 @@

    2016.08.1 released

    potential entire root filesystem removal issue with the external toolchain handling discovered since the 2016.08 release. See the - CHANGES + CHANGES file for more details, read the announcement and go to the downloads page to pick up the @@ -5683,7 +5903,7 @@

    2016.08 released

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

    2016.08-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5724,7 +5944,7 @@

    2016.08-rc2 released

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

    Head to the downloads page to pick up the @@ -5746,7 +5966,7 @@

    2016.08-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details and read the announcement

    @@ -5771,7 +5991,7 @@

    2016.05 released

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

    2016.05-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5812,7 +6032,7 @@

    2016.05-rc2 released

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

    Head to the downloads page to pick up the @@ -5834,7 +6054,7 @@

    2016.05-rc1 released

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

    @@ -5859,7 +6079,7 @@

    2016.02 released

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

    2016.02-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -5900,7 +6120,7 @@

    2016.02-rc2 released

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

    Head to the downloads page to pick up the @@ -5922,7 +6142,7 @@

    2016.02-rc1 released

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

    @@ -5948,7 +6168,7 @@

    2015.11.1 released

    The 2015.11.1 bugfix release is out - Thanks to everyone contributing. This release fixes critical issues discovered since the 2015.11 release. See the - CHANGES + CHANGES file for more details, and go to the downloads page to pick up the 2015.11.1 release.

    @@ -5966,7 +6186,7 @@

    2015.11 released

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

    2015.11-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -6007,7 +6227,7 @@

    2015.11-rc2 released

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

    Head to the downloads page to pick up @@ -6029,7 +6249,7 @@

    2015.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details. See also the announcement e-mail.

    @@ -6055,7 +6275,7 @@

    2015.08.1 released

    The 2015.08.1 bugfix release is out - Thanks to everyone contributing. This release fixes critical issues discovered since the 2015.08 release. See the - CHANGES + CHANGES file for more details, and go to the downloads page to pick up the 2015.08.1 release.

    @@ -6073,7 +6293,7 @@

    2015.08 released

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

    2015.08-rc2 released

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

    @@ -6115,7 +6335,7 @@

    2015.08-rc1 released

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

    @@ -6138,7 +6358,7 @@

    2015.05 released

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

    2015.05-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up @@ -6179,7 +6399,7 @@

    2015.05-rc2 released

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

    Head to the downloads page to pick up the @@ -6200,7 +6420,7 @@

    2015.05-rc1 released

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

    @@ -6223,7 +6443,7 @@

    2015.02 released

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

    2015.02-rc3 released

    Release candidate 3 is out with more cleanups and security / build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -6265,7 +6485,7 @@

    2015.02-rc2 released

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

    Head to the downloads page to pick up the @@ -6287,7 +6507,7 @@

    2015.02-rc1 released

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

    @@ -6311,7 +6531,7 @@

    2014.11 released

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

    @@ -6329,7 +6549,7 @@

    2014.11-rc3 released

    Release candidate 3 is out with more cleanups and build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to @@ -6352,7 +6572,7 @@

    2014.11-rc2 released

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

    Head to the downloads page to pick up the @@ -6399,7 +6619,7 @@

    2014.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2014.11-rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -6422,7 +6642,7 @@

    2014.08 released

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

    2014.08-rc3 released

    Release candidate 3 is out with more cleanups and build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -6463,7 +6683,7 @@

    2014.08-rc2 released

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

    Head to the downloads page to pick up the @@ -6485,7 +6705,7 @@

    2014.08-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2014.08-rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -6508,7 +6728,7 @@

    2014.05 released

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

    2014.05-rc3 released

    Release candidate 3 is out with more cleanups and build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -6549,7 +6769,7 @@

    2014.05-rc2 released

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

    Head to the downloads page to @@ -6572,7 +6792,7 @@

    2014.05-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2014.05-rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -6595,7 +6815,7 @@

    27 February 2014

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

    @@ -6613,7 +6833,7 @@

    25 February 2014

    Release candidate 3 is out with more cleanups and build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -6635,7 +6855,7 @@

    20 February 2014

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

    Head to the downloads page to pick up the @@ -6657,7 +6877,7 @@

    2014.02-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2014.02-rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -6727,7 +6947,7 @@

    2013.11 released

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

    @@ -6761,7 +6981,7 @@

    2013.11-rc3 released

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

    Head to the downloads page to pick up the @@ -6783,7 +7003,7 @@

    2013.11-rc2 released

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

    Head to the downloads page to pick up the @@ -6839,7 +7059,7 @@

    2013.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.11_rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -6883,7 +7103,7 @@

    2013.08.1 released

    The 2013.08.1 bugfix release is out - Thanks to everyone contributing. This release fixes critical issues discovered since the 2013.08 release. See the - CHANGES + CHANGES file for more details, and go to the downloads page to pick up the 2013.08.1 release.

    @@ -6926,7 +7146,7 @@

    2013.08 released

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

    @@ -6944,7 +7164,7 @@

    2013.08-rc3 released

    Another week, another release candidate with more cleanups and build fixes. See the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.08_rc3/CHANGES">CHANGES file for details.

    Head to the downloads page to pick up the @@ -6966,7 +7186,7 @@

    2013.08-rc2 released

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

    Head to the downloads page to pick up the @@ -6988,7 +7208,7 @@

    2013.08-rc1 released

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

    Head to the downloads page to pick up the @@ -7010,7 +7230,7 @@

    2013.05 released

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

    2013.05-rc3 released

    Another week, another release candidate with more cleanups and build fixes. See the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.05_rc3/CHANGES">CHANGES file for details.

    Head to the downloads page to pick up the @@ -7051,7 +7271,7 @@

    2013.05-rc2 released

    Another week, another release candidate with more cleanups and build fixes. See the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.05_rc2/CHANGES">CHANGES file for details.

    Head to the downloads page to pick up the @@ -7073,7 +7293,7 @@

    2013.05-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.05_rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -7096,7 +7316,7 @@

    2013.02 released

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

    @@ -7114,7 +7334,7 @@

    2013.02-rc3 released

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

    Head to the downloads page to pick up the @@ -7136,7 +7356,7 @@

    2013.02-rc2 released

    Another week, another release candidate with more cleanups and build fixes. See the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.02_rc2/CHANGES">CHANGES file for details.

    Head to the downloads page to pick up the @@ -7158,7 +7378,7 @@

    2013.02-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2013.02_rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -7230,7 +7450,7 @@

    2012.11.1 released

    contributing. This release fixes critical issues discovered since the 2012.11 release, most importantly with non-largefile builds on recent Ubuntu versions. See the - CHANGES + CHANGES file for more details, and go to the downloads page to pick up the 2012.11.1 release.

    @@ -7248,7 +7468,7 @@

    2012.11 released

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

    @@ -7265,7 +7485,7 @@

    2012.11-rc2 released

    RC2 is out with more bugfixes - See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7287,7 +7507,7 @@

    2012.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2012.11_rc1/CHANGES">CHANGES file for details, and read the announcement.

    @@ -7336,7 +7556,7 @@

    2012.08 released

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

    @@ -7353,7 +7573,7 @@

    2012.08-rc3 released

    We have a new release candidate! Various fixes, and addition of licensing information on many - packages. See CHANGES + packages. See CHANGES file for details

    Head to the downloads page to pick up the @@ -7375,7 +7595,7 @@

    2012.08-rc2 released

    We have a new release candidate! Various fixes, and addition of licensing information on many - packages. See CHANGES + packages. See CHANGES file for details

    Head to the downloads page to pick up the @@ -7397,7 +7617,7 @@

    2012.08-rc1 released

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

    Head to the downloads page to pick up the @@ -7444,7 +7664,7 @@

    2012.05 released

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

    2012.05-rc3 released

    RC3 is out with more bugfixes - See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7484,7 +7704,7 @@

    2012.05-rc2 released

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

    Head to the downloads page to pick up the @@ -7506,7 +7726,7 @@

    2012.05-rc1 released

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

    @@ -7532,7 +7752,7 @@

    Autobuilder Results Online

    integration testing, is now online at autobuild.buildroot.org. The code behind it can be found - in git.

    + in git.

    Thanks to Thomas Petazzoni for running the web interface, and to The GCC Compile @@ -7553,7 +7773,7 @@

    2012.02 released

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

    2012.02-rc3 released

    RC3 is out with more bugfixes - See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7593,7 +7813,7 @@

    2012.02-rc2 released

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

    Head to the downloads page to pick up the @@ -7615,7 +7835,7 @@

    2012.02-rc1 released

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

    @@ -7657,7 +7877,7 @@

    2011.11 released

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

    2011.11-rc3 released

    RC3 is out with more bugfixes - See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7697,7 +7917,7 @@

    2011.11-rc2 released

    Another week, another release candidate with a bunch of cleanups and build fixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7719,7 +7939,7 @@

    2011.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details, and read the announcement @@ -7742,7 +7962,7 @@

    2011.08 released

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

    @@ -7758,7 +7978,7 @@

    2011.08-rc2 released

    RC2 is out with more bugfixes. See - the CHANGES + the CHANGES file for details, and read the announcement. @@ -7781,7 +8001,7 @@

    2011.08-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details, and read the announcement. @@ -7804,7 +8024,7 @@

    2011.05 released

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

    @@ -7820,7 +8040,7 @@

    2011.05-rc2 released

    RC2 is out with more bugfixes. See - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7842,7 +8062,7 @@

    2011.05-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details, and read the announcement. @@ -7865,7 +8085,7 @@

    2011.02 released

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

    2011.02-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7905,7 +8125,7 @@

    2011.02-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details, and read the announcement. @@ -7928,7 +8148,7 @@

    2010.11 released

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

    2010.11-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -7968,7 +8188,7 @@

    2010.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see - the CHANGES + the CHANGES file for details, and read the announcement. @@ -8014,7 +8234,7 @@

    2010.08 released

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

    2010.08-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -8058,7 +8278,7 @@

    2010.08-rc1 released

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

    Head to the downloads page to pick up the @@ -8080,7 +8300,7 @@

    2010.05 released

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

    2010.05-rc3 released

    RC3 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -8140,7 +8360,7 @@

    2010.05-rc1 released

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

    Head to the downloads page to pick up the @@ -8179,7 +8399,7 @@

    2010.02 released

    The stable 2010.02 release is out - Thanks to everyone contributing and testing the release candidates. See the - CHANGES + CHANGES file for more details, and go to the downloads page to pick up the 2010.02 @@ -8197,7 +8417,7 @@

    2010.02-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -8219,7 +8439,7 @@

    2010.02-rc1 released

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

    Head to the downloads page to pick up the @@ -8242,7 +8462,7 @@

    2009.11 released

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

    @@ -8259,7 +8479,7 @@

    2009.11-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -8281,7 +8501,7 @@

    2009.11-rc1 released

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

    Head to the downloads page to pick up the @@ -8331,7 +8551,7 @@

    2009.08 released

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

    @@ -8349,7 +8569,7 @@

    2009.08-rc3 released

    A number of bugfixes have been added to the tree since RC2 (especially thanks to Thomas Petazzoni) - See - the CHANGES + the CHANGES file for details. This is very much expected to be the final release candidate, so give it a good test and expect a final 2009.08 release next weekend unless critical issues are @@ -8374,7 +8594,7 @@

    2009.08-rc2 released

    RC2 is out with more cleanups and bugfixes, see - the CHANGES + the CHANGES file for details.

    Head to the downloads page to pick up the @@ -8396,7 +8616,7 @@

    2009.08-rc1 released

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

    Head to the downloads page to pick up the @@ -8419,7 +8639,7 @@

    2009.05 released

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

    @@ -8436,7 +8656,7 @@

    2009.05-rc3 released

    We had a number of fixes post-RC2, so RC3 is out - (see CHANGES + (see CHANGES for details). Now is the moment to test and verify that everything is working for your favorite config - Expect a final 2009.05 very soon.

    @@ -8459,7 +8679,7 @@

    2009.05-rc2 released

    RC2 is out with more cleanups and bug fixes - (see CHANGES). + (see CHANGES). Unless big issues are found, expect this to be the last release candidate before the release - So give it a good test.

    @@ -8503,7 +8723,7 @@

    2009.05-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES + href="https://gitlab.com/buildroot.org/buildroot/-/blob/2009.05_rc1/CHANGES">CHANGES file for details.

    Head to the downloads page to pick up the diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index bfb83663c6a..e90393be404 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -13,29 +13,13 @@ Program.

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

    +
    Current sponsors
    -
    -
    -
    -
    -
    - - - -
    -
    - Tap2Open - financially sponsored the Buildroot Association - in 2020 and 2023.
    -
    -
    -
    -
    @@ -45,10 +29,10 @@
    - Smile sponsored the + Smile is sponsoring the Buildroot project by hosting - the Buildroot - Developers Meeting of February 2023 in Brussels, + the Buildroot + Developers Meeting of February 2025 in Brussels, after the FOSDEM conference.
    @@ -68,30 +52,12 @@ Armadeus Systems financially sponsored the Buildroot - Association in 2022.
    + Association in 2024.
    -
    -
    -
    -
    -
    - - - -
    -
    - Logilin - financially sponsored the Buildroot Association - in 2022.
    -
    -
    -
    -
    -
    @@ -110,13 +76,14 @@
    - Smile provided the meeting location for the - ELCE 2019 - meeting and sponsored the Buildroot Summer Camp that took place on July 1-5 2016 - in Toulouse, France. Smile sponsored the participation of Romain Naour and paid - the food expenses for the meeting participants. - In 2018, Smile sponsored of LLVM/Clang integration into Buildroot, see the final - report. + Smile provided the + meeting location Buildroot Developers days after + FOSDEM 2023, 2024 and 2025, for the + ELCE + 2019 meeting and sponsored the Buildroot Summer + Camp 2016: Smile sponsored the participation of Romain + Naour. In 2018, Smile sponsored of LLVM/Clang + integration into Buildroot.
    @@ -173,8 +140,8 @@
    Amarula - Solutions sponsored the event by contributing - financially to the Buildroot Association. + Solutions sponsored the Buildroot + Association in 2018.
    @@ -212,7 +179,8 @@ Logilin sponsored the ELCE 2018 Buildroot Developers meeting by contributing financially to the Buildroot - Association. + Association, and sponsored the Buildroot + Association in 2020, 2021 and 2022.
    @@ -376,6 +344,24 @@
    +
    +
    +
    +
    +
    + + + +
    +
    + Tap2Open + financially sponsored the Buildroot Association + in 2020 and 2023.
    +
    +
    +
    +
    +
    diff --git a/linux/Config.in b/linux/Config.in index 8b9891c1b0b..503e8591062 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -172,6 +172,12 @@ config BR2_LINUX_KERNEL_USE_DEFCONFIG config BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG bool "Use the architecture default configuration" + # We know that the default configuration on some architectures + # requires host-openssl, so select it for the latest kernel + # version. This is mainly needed to fix autobuilder testing. + select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL if \ + BR2_LINUX_KERNEL_LATEST_VERSION && \ + (BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || BR2_sparc || BR2_x86_64) help This option will use the default configuration for the selected architecture. I.e, it is equivalent to running diff --git a/linux/linux.hash b/linux/linux.hash index 97dafc12413..61dfe6795a9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -4,8 +4,8 @@ sha256 feb9e514930d5968daa0b8b5486d3295d1fb2b34accf876207641884d4baef39 linux- sha256 d9f2355d5f7e42f63ef9b51bf146f99f8a3cd6d999bc201394f14f54db100b3c linux-6.1.125.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 a84ab5328c8a5a0e5c4a39a06b07479a7769c73af49a4c9ce59eeb644829d3b1 linux-5.15.176.tar.xz -sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz -sha256 180754f3df0e8d7f206625255b3f5a6e1f441feec83336df42613ca8f6b1887c linux-5.4.286.tar.xz +sha256 239e57280f8c9159187e383d7b730d29f5cc8e1b30be218f004e0c90d1137f52 linux-5.10.233.tar.xz +sha256 1e3e5fc052c8e15f8eaa37d30bf4f0b3eef7430dd234d9fed0d0005852a06d10 linux-5.4.289.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 607bed7de5cda31a443df4c8a78dbe5e8a9ad31afde2a4d28fe99ab4730e8de1 linux-4.19.325.tar.xz # Locally computed diff --git a/linux/linux.mk b/linux/linux.mk index 50fed6d2655..12699b8ee43 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -163,6 +163,7 @@ endif LINUX_MAKE_FLAGS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ + KCFLAGS="$(LINUX_CFLAGS)" \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ @@ -184,7 +185,12 @@ endif # sanitize the arguments passed from user space in registers. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_8),y) -LINUX_MAKE_ENV += KCFLAGS=-Wno-attribute-alias +LINUX_CFLAGS += -Wno-attribute-alias +endif + +# Disable FDPIC if enabled by default in toolchain +ifeq ($(BR2_BINFMT_FDPIC),y) +LINUX_CFLAGS += -mno-fdpic endif ifeq ($(BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT),y) @@ -337,6 +343,12 @@ LINUX_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig else ifeq ($(BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG),y) ifeq ($(BR2_powerpc64le),y) LINUX_KCONFIG_DEFCONFIG = ppc64le_defconfig +else ifeq ($(BR2_powerpc64),y) +LINUX_KCONFIG_DEFCONFIG = ppc64_defconfig +else ifeq ($(BR2_powerpc),y) +LINUX_KCONFIG_DEFCONFIG = ppc_defconfig +else ifeq ($(BR2_arc750d)$(BR2_arc770d),y) +LINUX_KCONFIG_DEFCONFIG = axs101_defconfig else LINUX_KCONFIG_DEFCONFIG = defconfig endif diff --git a/package/Config.in b/package/Config.in index cb0bfd36f3c..fc3aa34f9a3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -172,7 +172,6 @@ menu "Development tools" source "package/bats-core/Config.in" source "package/binutils/Config.in" source "package/bitwise/Config.in" - source "package/bsdiff/Config.in" source "package/bustle/Config.in" source "package/check/Config.in" source "package/cmake/Config.in" @@ -439,6 +438,7 @@ comment "X window managers" depends on BR2_PACKAGE_XORG7 source "package/enlightenment/Config.in" + source "package/evilwm/Config.in" source "package/fluxbox/Config.in" source "package/matchbox/Config.in" source "package/metacity/Config.in" @@ -477,6 +477,7 @@ endmenu source "package/apcupsd/Config.in" source "package/avrdude/Config.in" source "package/bcache-tools/Config.in" + source "package/bfscripts/Config.in" source "package/biosdevname/Config.in" source "package/brickd/Config.in" source "package/brltty/Config.in" @@ -536,6 +537,7 @@ endmenu source "package/i7z/Config.in" source "package/input-event-daemon/Config.in" source "package/intel-microcode/Config.in" + source "package/iotools/Config.in" source "package/ipmitool/Config.in" source "package/ipmiutil/Config.in" source "package/irda-utils/Config.in" @@ -632,6 +634,7 @@ endmenu source "package/sunxi-cedarx/Config.in" source "package/sunxi-mali-utgard/Config.in" source "package/sunxi-mali-utgard-driver/Config.in" + source "package/superiotool/Config.in" source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" @@ -648,6 +651,7 @@ endmenu source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" + source "package/uefisettings/Config.in" source "package/uhubctl/Config.in" source "package/umtprd/Config.in" source "package/upower/Config.in" @@ -673,6 +677,8 @@ if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" source "package/erlang-base64url/Config.in" source "package/erlang-eimp/Config.in" + source "package/erlang-fast-xml/Config.in" + source "package/erlang-fast-yaml/Config.in" source "package/erlang-goldrush/Config.in" source "package/erlang-idna/Config.in" source "package/erlang-jiffy/Config.in" @@ -685,14 +691,12 @@ menu "Erlang libraries/modules" source "package/erlang-p1-pkix/Config.in" source "package/erlang-p1-sip/Config.in" source "package/erlang-p1-stringprep/Config.in" - source "package/erlang-p1-stun/Config.in" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" - source "package/erlang-p1-xml/Config.in" - source "package/erlang-p1-xmpp/Config.in" - source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-yconf/Config.in" source "package/erlang-p1-zlib/Config.in" + source "package/erlang-stun/Config.in" + source "package/erlang-xmpp/Config.in" endmenu endif source "package/execline/Config.in" @@ -776,6 +780,7 @@ menu "Lua libraries/modules" source "package/lua-testmore/Config.in" source "package/lua-ubjson/Config.in" source "package/lua-utf8/Config.in" + source "package/lua-uuid/Config.in" source "package/lua-valua/Config.in" source "package/lua-zlib/Config.in" source "package/luabitop/Config.in" @@ -890,6 +895,7 @@ menu "Perl libraries/modules" source "package/perl-mailtools/Config.in" source "package/perl-math-int64/Config.in" source "package/perl-math-prime-util/Config.in" + source "package/perl-mime-base32/Config.in" source "package/perl-mime-base64-urlsafe/Config.in" source "package/perl-mime-tools/Config.in" source "package/perl-module-implementation/Config.in" @@ -972,6 +978,7 @@ menu "External python modules" source "package/python-aioconsole/Config.in" source "package/python-aiodns/Config.in" source "package/python-aiofiles/Config.in" + source "package/python-aiohappyeyeballs/Config.in" source "package/python-aiohttp/Config.in" source "package/python-aiohttp-cors/Config.in" source "package/python-aiohttp-debugtoolbar/Config.in" @@ -984,6 +991,7 @@ menu "External python modules" source "package/python-aiojobs/Config.in" source "package/python-aiologstash/Config.in" source "package/python-aiomonitor/Config.in" + source "package/python-aiomqtt/Config.in" source "package/python-aioprocessing/Config.in" source "package/python-aioredis/Config.in" source "package/python-aiorwlock/Config.in" @@ -997,6 +1005,7 @@ menu "External python modules" source "package/python-anyio/Config.in" source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" + source "package/python-argcomplete/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" source "package/python-argon2-cffi-bindings/Config.in" @@ -1090,6 +1099,7 @@ menu "External python modules" source "package/python-docopt/Config.in" source "package/python-docutils/Config.in" source "package/python-dominate/Config.in" + source "package/python-dotenv/Config.in" source "package/python-dpkt/Config.in" source "package/python-dtschema/Config.in" source "package/python-ecdsa/Config.in" @@ -1151,6 +1161,7 @@ menu "External python modules" source "package/python-ibmiotf/Config.in" source "package/python-idna/Config.in" source "package/python-ifaddr/Config.in" + source "package/python-immutabledict/Config.in" source "package/python-incremental/Config.in" source "package/python-inflect/Config.in" source "package/python-inflection/Config.in" @@ -1165,6 +1176,7 @@ menu "External python modules" source "package/python-ipython/Config.in" source "package/python-ipython-genutils/Config.in" source "package/python-iso8601/Config.in" + source "package/python-iterable-io/Config.in" source "package/python-itsdangerous/Config.in" source "package/python-iwlib/Config.in" source "package/python-janus/Config.in" @@ -1186,6 +1198,8 @@ menu "External python modules" source "package/python-kiwisolver/Config.in" source "package/python-kmod/Config.in" source "package/python-lark/Config.in" + source "package/python-legacy-cgi/Config.in" + source "package/python-libconf/Config.in" source "package/python-libconfig/Config.in" source "package/python-libevdev/Config.in" source "package/python-libusb1/Config.in" @@ -1242,6 +1256,7 @@ menu "External python modules" source "package/python-paramiko/Config.in" source "package/python-parso/Config.in" source "package/python-passlib/Config.in" + source "package/python-path/Config.in" source "package/python-pathpy/Config.in" source "package/python-pathspec/Config.in" source "package/python-pathtools/Config.in" @@ -1259,15 +1274,19 @@ menu "External python modules" source "package/python-posix-ipc/Config.in" source "package/python-priority/Config.in" source "package/python-prompt-toolkit/Config.in" + source "package/python-propcache/Config.in" + source "package/python-proto-plus/Config.in" source "package/python-protobuf/Config.in" source "package/python-psutil/Config.in" source "package/python-psycopg2/Config.in" + source "package/python-psygnal/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" + source "package/python-pyaml/Config.in" source "package/python-pyasn1/Config.in" source "package/python-pyasn1-modules/Config.in" source "package/python-pyasynchat/Config.in" @@ -1282,6 +1301,7 @@ menu "External python modules" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" source "package/python-pydantic-core/Config.in" + source "package/python-pydantic-settings/Config.in" source "package/python-pydevmem/Config.in" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" @@ -1318,6 +1338,7 @@ menu "External python modules" source "package/python-pysmi/Config.in" source "package/python-pysnmp/Config.in" source "package/python-pysnmp-mibs/Config.in" + source "package/python-pysnmpcrypto/Config.in" source "package/python-pysocks/Config.in" source "package/python-pyspnego/Config.in" source "package/python-pytablereader/Config.in" @@ -1343,6 +1364,7 @@ menu "External python modules" source "package/python-requests-oauthlib/Config.in" source "package/python-requests-toolbelt/Config.in" source "package/python-rfc3987/Config.in" + source "package/python-rgbmatrix/Config.in" source "package/python-rpds-py/Config.in" source "package/python-rpi-gpio/Config.in" source "package/python-rpi-ws281x/Config.in" @@ -1356,6 +1378,8 @@ menu "External python modules" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" source "package/python-scipy/Config.in" + source "package/python-sdbus/Config.in" + source "package/python-sdbus-networkmanager/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" @@ -1370,6 +1394,7 @@ menu "External python modules" source "package/python-setuptools/Config.in" source "package/python-sh/Config.in" source "package/python-shutilwhich/Config.in" + source "package/python-simple-websocket/Config.in" source "package/python-simpleaudio/Config.in" source "package/python-simplegeneric/Config.in" source "package/python-simplejson/Config.in" @@ -1405,6 +1430,7 @@ menu "External python modules" source "package/python-tftpy/Config.in" source "package/python-thrift/Config.in" source "package/python-tinycss2/Config.in" + source "package/python-tinyhtml5/Config.in" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" @@ -1472,6 +1498,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-zipstream-ng/Config.in" source "package/python-zlmdb/Config.in" source "package/python-zope-interface/Config.in" source "package/python-zopfli/Config.in" @@ -1599,6 +1626,7 @@ menu "Crypto" source "package/libxcrypt/Config.in" source "package/mbedtls/Config.in" source "package/nettle/Config.in" + source "package/oath-toolkit/Config.in" source "package/openssl/Config.in" source "package/parsec-tool/Config.in" source "package/pkcs11-helper/Config.in" @@ -1872,7 +1900,6 @@ endif source "package/json-javascript/Config.in" 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 @@ -1983,6 +2010,7 @@ menu "Networking" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" source "package/cni-plugins/Config.in" + source "package/cpp-httplib/Config.in" source "package/cppzmq/Config.in" source "package/curlpp/Config.in" source "package/czmq/Config.in" @@ -1990,6 +2018,7 @@ menu "Networking" source "package/daq3/Config.in" source "package/davici/Config.in" source "package/dht/Config.in" + source "package/dpdk/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" source "package/fmlib/Config.in" @@ -2151,6 +2180,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dlib/Config.in" source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" @@ -2466,6 +2496,7 @@ endif source "package/htpdate/Config.in" source "package/httping/Config.in" source "package/i2pd/Config.in" + source "package/iana-assignments/Config.in" source "package/ibrdtn-tools/Config.in" source "package/ibrdtnd/Config.in" source "package/ifenslave/Config.in" @@ -2625,6 +2656,7 @@ endif source "package/stunnel/Config.in" source "package/suricata/Config.in" source "package/system-config-printer/Config.in" + source "package/tailscale/Config.in" source "package/tcpdump/Config.in" source "package/tcping/Config.in" source "package/tcpreplay/Config.in" @@ -2870,6 +2902,7 @@ menu "System tools" source "package/tar/Config.in" source "package/tealdeer/Config.in" source "package/thermald/Config.in" + source "package/tinyinit/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" source "package/tpm2-tools/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 569eac2dbd6..2c55fa7bc38 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -4,6 +4,7 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/agent-proxy/Config.in.host" source "package/amlogic-boot-fip/Config.in.host" + source "package/andes-spi-burn/Config.in.host" source "package/android-tools/Config.in.host" source "package/asn1c/Config.in.host" source "package/babeltrace2/Config.in.host" diff --git a/package/Makefile.in b/package/Makefile.in index 808b71a93e9..829636900ba 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -39,7 +39,13 @@ $(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \ endif # Compute GNU_TARGET_NAME +# FDPIC on ARM requires a special target name: it has no OS field and must +# use the suffix -uclinuxfdpiceabi. +ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_BINFMT_FDPIC),y:y) +GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-uclinuxfdpiceabi +else GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI) +endif # FLAT binary format needs uclinux, except RISC-V which needs the # regular linux name. diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index 4170587f3a3..c3e7fda3406 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,4 +1,3 @@ -# From: https://www.intel.com/content/www/us/en/download/776303/acpi-component-architecture-downloads-unix-format-source-code-and-build-environment-with-an-intel-license.html -sha256 54a299487925fd3e0551c95f9d5cee4f4984930273983eff67aa5cd46f8f338b acpica-unix-20240321.tar.gz # locally computed hash +sha256 57988fb55541e694dfa3323bd19db74b65d37e942bebef559ed51e8cd9348b43 acpica-unix-20240927.tar.gz sha256 b28f54dc421531bbe269afd8c28bf6fdfd6affbe50c2831464f777ec1766d4a5 source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index a3d682257d6..a2abcf75581 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACPICA_VERSION = 20240321 +ACPICA_VERSION = 20240927 ACPICA_SOURCE = acpica-unix-$(ACPICA_VERSION).tar.gz -ACPICA_SITE = https://downloadmirror.intel.com/819451 +ACPICA_SITE = https://github.com/user-attachments/files/17171019 ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 ACPICA_LICENSE_FILES = source/include/acpi.h ACPICA_DEPENDENCIES = host-bison host-flex diff --git a/package/acsccid/acsccid.hash b/package/acsccid/acsccid.hash index 5310d78144a..e5fe669ceb3 100644 --- a/package/acsccid/acsccid.hash +++ b/package/acsccid/acsccid.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.10/ -sha1 6284a693b8edb511f2f80d9069af9b4a41fd55ae acsccid-1.1.10.tar.bz2 -md5 4d2b7f34414aed029084c96dd05a0e7d acsccid-1.1.10.tar.bz2 +# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.11/ +sha1 75d3d17fb9d9ee7d0b291b460e2c6eb3c71654c5 acsccid-1.1.11.tar.bz2 +md5 0bbbce89a934861b7c5b003da962f1d9 acsccid-1.1.11.tar.bz2 # Locally computed -sha256 5ee112febdcac6656629025f3a85923f155f6ca150b2d24fd716f9043265528e acsccid-1.1.10.tar.bz2 +sha256 2fcda6ed1f5d2f07e202b51f9a600a61c83e1a73a96f51ed0f9e4f781c9c1282 acsccid-1.1.11.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk index 463f0f24d6c..93cca8e09d0 100644 --- a/package/acsccid/acsccid.mk +++ b/package/acsccid/acsccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACSCCID_VERSION = 1.1.10 +ACSCCID_VERSION = 1.1.11 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid ACSCCID_LICENSE = LGPL-2.1+ diff --git a/package/aespipe/aespipe.hash b/package/aespipe/aespipe.hash index 4fe7d0753ba..cb60e7dc1ed 100644 --- a/package/aespipe/aespipe.hash +++ b/package/aespipe/aespipe.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4g/ -sha1 fb6b0108176d653f0e5b3be2385b132be791d800 aespipe-v2.4g.tar.bz2 -md5 c216c6c9e939fac69f859af0ad2fd8ef aespipe-v2.4g.tar.bz2 +sha1 f1148f4aa82979755b13130b74643b449de55f6e aespipe-v2.4h.tar.bz2 +md5 6c4552f10771eda471c964b34b1fae4a aespipe-v2.4h.tar.bz2 # Locally computed: -sha256 bfb97e7de161e8d7ce113b163bda1d1a8ec77d2c1afab56dcc8153d7a90187fc aespipe-v2.4g.tar.bz2 +sha256 eab311fc26ea43289bc3adf660d6270492494960725d2026ec4917294a1aba49 aespipe-v2.4h.tar.bz2 diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index 4769536d2f9..054849a1477 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -AESPIPE_VERSION = 2.4g +AESPIPE_VERSION = 2.4h AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 25ecc589fce..deeca838b16 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -14,12 +14,18 @@ ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib ALSA_PLUGINS_CONF_OPTS = \ --disable-jack \ --disable-usbstream \ - --disable-pulseaudio \ --disable-libav \ --disable-maemo-plugin \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +ALSA_PLUGINS_DEPENDENCIES += pulseaudio +ALSA_PLUGINS_CONF_OPTS += --enable-pulseaudio +else +ALSA_PLUGINS_CONF_OPTS += --disable-pulseaudio +endif + ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) ALSA_PLUGINS_DEPENDENCIES += alsa-utils endif diff --git a/package/andes-spi-burn/Config.in.host b/package/andes-spi-burn/Config.in.host new file mode 100644 index 00000000000..09d5ddb2b45 --- /dev/null +++ b/package/andes-spi-burn/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_ANDES_SPI_BURN + bool "host andes-spi-burn" + depends on BR2_riscv + help + Andes Technology SPI_burn tool to program bootloader and + device-tree blob onto flash memory of AE350 platform. + + https://github.com/andestech/IntelJ3 diff --git a/package/andes-spi-burn/andes-spi-burn.hash b/package/andes-spi-burn/andes-spi-burn.hash new file mode 100644 index 00000000000..5022f0fc1b5 --- /dev/null +++ b/package/andes-spi-burn/andes-spi-burn.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 72a5b016ebe0da77662a10edb8078c29cfcbedd8c0ff523d299248e0b1fb84dd andes-spi-burn-5b8193c35360febd8445cfa32adc6b13a861616d.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/andes-spi-burn/andes-spi-burn.mk b/package/andes-spi-burn/andes-spi-burn.mk new file mode 100644 index 00000000000..8ee5fb28970 --- /dev/null +++ b/package/andes-spi-burn/andes-spi-burn.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# andes-spi-burn +# +################################################################################ + +ANDES_SPI_BURN_VERSION = 5b8193c35360febd8445cfa32adc6b13a861616d +ANDES_SPI_BURN_SITE = $(call github,andestech,IntelJ3,$(ANDES_SPI_BURN_VERSION)) +ANDES_SPI_BURN_LICENSE = Apache-2.0 +ANDES_SPI_BURN_FILES = LICENSE + +define HOST_ANDES_SPI_BURN_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile_SPIburn +endef + +define HOST_ANDES_SPI_BURN_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/SPI_burn $(HOST_DIR)/bin/SPI_burn +endef + +$(eval $(host-generic-package)) diff --git a/package/apr/0004-Merge-r1920082-from-1.8.x.patch b/package/apr/0004-Merge-r1920082-from-1.8.x.patch new file mode 100644 index 00000000000..5d198def34c --- /dev/null +++ b/package/apr/0004-Merge-r1920082-from-1.8.x.patch @@ -0,0 +1,71 @@ +From 36ea6d5a2bfc480dd8032cc8651e6793552bc2aa Mon Sep 17 00:00:00 2001 +From: Eric Covener +Date: Tue, 20 Aug 2024 21:50:42 +0000 +Subject: [PATCH] Merge r1920082 from 1.8.x: + +use 0600 perms for named shared mem consistently + + + + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1920083 13f79535-47bb-0310-9956-ffa450edef68 +Upstream: https://github.com/apache/apr/commit/36ea6d5a2bfc480dd8032cc8651e6793552bc2aa +Signed-off-by: Peter Korsgaard +--- + shmem/unix/shm.c | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c +index 096884d99..ea9b94277 100644 +--- a/shmem/unix/shm.c ++++ b/shmem/unix/shm.c +@@ -287,10 +287,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, + status = APR_SUCCESS; + + #if APR_USE_SHMEM_MMAP_TMP +- /* FIXME: Is APR_OS_DEFAULT sufficient? */ +- status = apr_file_open(&file, filename, +- APR_READ | APR_WRITE | APR_CREATE | APR_EXCL, +- APR_OS_DEFAULT, pool); ++ status = apr_file_open(&file, filename, ++ APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL, ++ APR_FPROT_UREAD | APR_FPROT_UWRITE, pool); + if (status != APR_SUCCESS) { + return status; + } +@@ -319,8 +318,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, + } + #endif /* APR_USE_SHMEM_MMAP_TMP */ + #if APR_USE_SHMEM_MMAP_SHM +- /* FIXME: SysV uses 0600... should we? */ +- tmpfd = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0644); ++ tmpfd = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0600); + if (tmpfd == -1) { + return errno; + } +@@ -361,10 +359,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, + #elif APR_USE_SHMEM_SHMGET + new_m->realsize = reqsize; + +- /* FIXME: APR_OS_DEFAULT is too permissive, switch to 600 I think. */ +- status = apr_file_open(&file, filename, ++ status = apr_file_open(&file, filename, + APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL, +- APR_OS_DEFAULT, pool); ++ APR_FPROT_UREAD | APR_FPROT_UWRITE, pool); + if (status != APR_SUCCESS) { + return status; + } +@@ -555,8 +552,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m, + #if APR_USE_SHMEM_MMAP_SHM + const char *shm_name = make_shm_open_safe_name(filename, pool); + +- /* FIXME: SysV uses 0600... should we? */ +- tmpfd = shm_open(shm_name, O_RDWR, 0644); ++ tmpfd = shm_open(shm_name, O_RDWR, 0600); + if (tmpfd == -1) { + return errno; + } +-- +2.39.5 + diff --git a/package/apr/apr.mk b/package/apr/apr.mk index d4526a41725..5a41891cef7 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -16,6 +16,9 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES +# 0004-Merge-r1920082-from-1.8.x.patch +APR_IGNORE_CVES += CVE-2023-49582 + APR_CONF_OPTS = --disable-sctp # avoid apr_hints.m4 by setting apr_preload_done=yes and set diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash index 0800fa21689..110ec40c097 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash @@ -1,2 +1,4 @@ # taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc sha256 6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz +# taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz.sha256asc +sha256 8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk index 03bb4dc5dae..fce80f2f3af 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk @@ -6,7 +6,7 @@ ARM_GNU_TOOLCHAIN_VERSION = 13.2.rel1 ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_GNU_TOOLCHAIN_VERSION)/binrel -ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz +ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-$(HOSTARCH)-arm-none-eabi.tar.xz ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+ HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi diff --git a/package/autoconf/0001-dont-add-dirty-to-version.patch b/package/autoconf/0001-dont-add-dirty-to-version.patch index 8df2276865b..a1a50d28383 100644 --- a/package/autoconf/0001-dont-add-dirty-to-version.patch +++ b/package/autoconf/0001-dont-add-dirty-to-version.patch @@ -1,7 +1,7 @@ autoconf: don't append -dirty to version Don't append -dirty to autoconf version number if the buildroot git tree -has uncommited changes. +has uncommitted changes. This script is meant for the autoconf developers, but it also activates if you build autoconf in a subdirectory of a git tree (E.G. like how it's diff --git a/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch b/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch deleted file mode 100644 index 72faaa0abe7..00000000000 --- a/package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001 -From: Sahil Kang -Date: Mon, 11 Mar 2024 03:01:21 -0700 -Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795) - -* AVRO-3957: [C] Fix misformatted type in docs - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - -* AVRO-3957: [C] Fix type in quickstop example - -This removes the following warning: - - avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type - 'const char **' [-Wincompatible-pointer-types] - avro_value_get_string(&first_value, &p, &size); - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - ---------- - -Signed-off-by: Sahil Kang -Signed-off-by: Sahil Kang - -Upstream: https://github.com/apache/avro/commit/52f051dbeefad0b7e73187becad6c33747b047d3 -Signed-off-by: Fabrice Fontaine ---- - lang/c/docs/index.txt | 2 +- - lang/c/examples/quickstop.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs/index.txt b/docs/index.txt -index a439a052631..df16f9d9678 100644 ---- a/docs/index.txt -+++ b/docs/index.txt -@@ -178,7 +178,7 @@ different versions of the Avro library. That means that it's really - only safe to use these hash values internally within the context of a - single execution of a single application. - --The +reset+ method “clears out” an +avro_value_t instance, making sure -+The +reset+ method “clears out” an +avro_value_t+ instance, making sure - that it's ready to accept the contents of a new value. For scalars, - this is usually a no-op, since the new value will just overwrite the old - one. For arrays and maps, this removes any existing elements from the -diff --git a/examples/quickstop.c b/examples/quickstop.c -index ff9e9700590..b26dad10c04 100644 ---- a/examples/quickstop.c -+++ b/examples/quickstop.c -@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema) - if (rval == 0) { - int64_t id; - int32_t age; -- int32_t *p; -+ const char *p; - size_t size; - avro_value_t id_value; - avro_value_t first_value; diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index 83b5759a16e..8c6b4b625c7 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.11.3/c/avro-c-1.11.3.tar.gz.sha512 -sha512 56ce8c6f0b06b779679a6e7a2b738ec94277920e9b3d7c6f1062a0b47db80b90dccf89df9d977ec1f120211f7c2f33845e18df4961818e5c5cc93aaec18e1302 avro-c-1.11.3.tar.gz +# From https://downloads.apache.org/avro/avro-1.12.0/c/avro-c-1.12.0.tar.gz.sha512 +sha512 71f0a8b63e212a12d38c05ef0c8e17822af7eb38698e07550a15f49d3f976f015f31cd804784df76c16e6cf7129c0d1a5028cb78032ad0259b4d151dcf022099 avro-c-1.12.0.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index d7efdc2003f..0f1ada72f8b 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update python-avro -AVRO_C_VERSION = 1.11.3 +AVRO_C_VERSION = 1.12.0 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/babeld/0001-Fix-uclibc-build-issue.patch b/package/babeld/0001-Fix-uclibc-build-issue.patch new file mode 100644 index 00000000000..fb2f69e98bb --- /dev/null +++ b/package/babeld/0001-Fix-uclibc-build-issue.patch @@ -0,0 +1,38 @@ +From f8e5fbb33690b516b8516590def5136e6619de4c Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Tue, 17 Sep 2024 21:48:01 +0200 +Subject: [PATCH] Fix uclibc build issue + +This patch fixes the following compilation error raised by the bump to +version 1.13.1 in Buildroot [1] using uclibc as the C library for the +cross-compilation toolchain: + +net.c: In function 'babel_send': +net.c:199:27: error: 'IPV6_DONTFRAG' undeclared (first use in this function) + 199 | cmsg->cmsg_type = IPV6_DONTFRAG;; + +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20240917201030.11583-1-dario.binacchi@amarulasolutions.com/ +Signed-off-by: Dario Binacchi +Upstream: https://github.com/jech/babeld/pull/121 +--- + net.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net.c b/net.c +index 7a7b57844e6c..30de3dafe1d9 100644 +--- a/net.c ++++ b/net.c +@@ -37,6 +37,10 @@ THE SOFTWARE. + #include + #include + ++#if defined(__UCLIBC__) ++#include ++#endif ++ + #include "babeld.h" + #include "util.h" + #include "net.h" +-- +2.43.0 + diff --git a/package/babeld/Config.in b/package/babeld/Config.in index c7010e1fb18..80d27082306 100644 --- a/package/babeld/Config.in +++ b/package/babeld/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_BABELD Babel is a loop-avoiding distance-vector routing protocol for IPv6 and IPv4 with fast convergence properties. - http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ + https://www.irif.fr/~jch/software/babel/ diff --git a/package/babeld/babeld.hash b/package/babeld/babeld.hash index 1c534d6184a..ab2ffc6ef81 100644 --- a/package/babeld/babeld.hash +++ b/package/babeld/babeld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22549e27645ecb9ef4c715a3cbeea01fa2dc7ea6951e8f97dc9c4a7b2a1de8f5 babeld-babeld-1.9.2-git4.tar.gz +sha256 15f24d26da0ccfc073abcdef0309f281e4684f2aa71126f826572c4c845e8dd9 babeld-1.13.1.tar.gz sha256 b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd LICENCE diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk index ac32e798c85..e9d20111f93 100644 --- a/package/babeld/babeld.mk +++ b/package/babeld/babeld.mk @@ -4,9 +4,8 @@ # ################################################################################ -BABELD_VERSION = babeld-1.9.2 -BABELD_SITE = https://github.com/jech/babeld -BABELD_SITE_METHOD = git +BABELD_VERSION = 1.13.1 +BABELD_SITE = https://www.irif.fr/~jch/software/files BABELD_LICENSE = MIT BABELD_LICENSE_FILES = LICENCE diff --git a/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch b/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch index ec7ea83ffd1..bd61843acf5 100644 --- a/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch +++ b/package/babeltrace2/0001-configure-simplify-warning-flags-detection.patch @@ -40,6 +40,8 @@ Reviewed-by: Michael Jeanson [Retrieved from: https://github.com/efficios/babeltrace/commit/28ba44ad9ca14153e96c94a9100423ea224c1af3] Signed-off-by: Fabrice Fontaine +[Dario: adapt to 2.0.6] +Signed-off-by: Dario Binacchi --- configure.ac | 74 +++++++++------ m4/ax_compiler_flags.m4 | 158 ------------------------------- @@ -56,7 +58,7 @@ diff --git a/configure.ac b/configure.ac index 055fba101..7ebcf2ad4 100644 --- a/configure.ac +++ b/configure.ac -@@ -660,25 +660,35 @@ target. +@@ -694,25 +694,35 @@ CFLAGS=${save_CFLAGS} # Detect C and LD warning flags supported by the compiler. @@ -110,14 +112,11 @@ index 055fba101..7ebcf2ad4 100644 dnl dnl Some versions of SWIG (like 3.0.12) generate code that produces dnl -Wcast-function-type warnings. This warning is present in gcc >= 8. This -@@ -692,24 +702,32 @@ AX_COMPILER_FLAGS( - dnl +@@ -727,24 +737,32 @@ dnl Ref: https://github.com/swig/swig/issues/1259 -Wno-cast-function-type dnl + -Wno-suggest-attribute=format dnl - ]) -- --# CFLAGS from AX_COMPILER_FLAGS. --AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}" + -Wno-missing-field-initializers dnl + ], + [WARN_CFLAGS], @@ -131,6 +130,9 @@ index 055fba101..7ebcf2ad4 100644 + [WARN_CFLAGS="${WARN_CFLAGS} -Werror"] +) +-# CFLAGS from AX_COMPILER_FLAGS. +-AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}" +- -# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is +# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is # written in such a way that it triggers a -Wold-style-definition warning. So diff --git a/package/babeltrace2/babeltrace2.hash b/package/babeltrace2/babeltrace2.hash index 164e65cded9..3caf52a7926 100644 --- a/package/babeltrace2/babeltrace2.hash +++ b/package/babeltrace2/babeltrace2.hash @@ -1,5 +1,5 @@ # From https://www.efficios.com/files/babeltrace/babeltrace2-2.0.4.tar.bz2.sha256 -sha256 774f116685dab5db9c51577dde43c8c1df482aae6bb78a089b1e9e7c8b489bca babeltrace2-2.0.4.tar.bz2 +sha256 a01c7e75e642de0b5b91f32cc706234c99eb556fcd52c9959045dc23a9ec52c9 babeltrace2-2.0.6.tar.bz2 # Hash for license files sha256 d919c6347409efde6dea63c6f349fb06bc060a2b721fc3df07b5f720b5f1d60e LICENSE diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index 2b2ab7db407..f3f1543c0e3 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -5,7 +5,7 @@ ################################################################################ BABELTRACE2_SITE = https://www.efficios.com/files/babeltrace -BABELTRACE2_VERSION = 2.0.4 +BABELTRACE2_VERSION = 2.0.6 BABELTRACE2_SOURCE = babeltrace2-$(BABELTRACE2_VERSION).tar.bz2 BABELTRACE2_LICENSE = MIT, LGPL-2.1 (src/common/list.h), GPL-2.0 (test code) BABELTRACE2_LICENSE_FILES = mit-license.txt lgpl-2.1.txt gpl-2.0.txt LICENSE diff --git a/package/batctl/batctl.hash b/package/batctl/batctl.hash index 7bc6fee67f7..b5d71fe8941 100644 --- a/package/batctl/batctl.hash +++ b/package/batctl/batctl.hash @@ -1,6 +1,6 @@ -# From https://downloads.open-mesh.org/batman/releases/batman-adv-2023.1/batctl-2023.1.tar.gz.sha1 -sha1 8d899c6323e228b9b370caf28e6d67621cb7d35d batctl-2023.1.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2024.2/batctl-2024.2.tar.gz.sha1 +sha1 a0eb5c0d55ee04518db7b2ee5da14bc4c912e30f batctl-2024.2.tar.gz # Locally calculated -sha256 e5bf47305d955abb199244bd0e5fffab96108b1affabd0d9705533f8059395f1 batctl-2023.1.tar.gz +sha256 cb02953093ffc2c700d122c03a3d9e4d867f646d3038f31d0a901e58ff995d07 batctl-2024.2.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk index 197e4beb72a..182f32c71cd 100644 --- a/package/batctl/batctl.mk +++ b/package/batctl/batctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATCTL_VERSION = 2023.1 +BATCTL_VERSION = 2024.2 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h) BATCTL_LICENSE_FILES = LICENSES/preferred/GPL-2.0 LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index b95dfa34dda..b4e3e44ea64 100644 --- a/package/batman-adv/batman-adv.hash +++ b/package/batman-adv/batman-adv.hash @@ -1,7 +1,7 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz.sha1 -sha1 e3d6e8d4db772156d7ad021b9a166832633a2ea5 batman-adv-2023.1.tar.gz +# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz.sha1 +sha1 de2a55d8d15b350efa6e6d3e6d29b6e3a6f4c04f batman-adv-2024.2.tar.gz # locally computed -sha256 f46a7286660a5ec3506a1be7ef60b471c51ac70550597d598040479ab7b936b8 batman-adv-2022.3.tar.gz +sha256 7692a6dee7a2f3f66732e9aec8c7164e0c1818167f3af063bff3fffbb0199643 batman-adv-2024.2.tar.gz # Hash for license files sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index 5b50572d115..9893da7e9f6 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2023.1 +BATMAN_ADV_VERSION = 2024.2 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 diff --git a/package/bc/bc.mk b/package/bc/bc.mk index 06b6feae4fa..5691ca9e675 100644 --- a/package/bc/bc.mk +++ b/package/bc/bc.mk @@ -5,7 +5,7 @@ ################################################################################ BC_VERSION = 1.07.1 -BC_SITE = http://ftp.gnu.org/gnu/bc +BC_SITE = $(BR2_GNU_MIRROR)/bc BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/bcc/bcc.hash b/package/bcc/bcc.hash index b37e125b1ac..7ed164eda0b 100644 --- a/package/bcc/bcc.hash +++ b/package/bcc/bcc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 321575fa94f3274040379dd2d4535217f45099f4240b58a4dfc171aa8c78402f bcc-src-with-submodule.tar.gz +sha256 5641b1db0b9ec60a6afd67b4607c790f49e580c207638bb4ebcea2805c6f373b bcc-v0.31.0-git4.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE.txt diff --git a/package/bcc/bcc.mk b/package/bcc/bcc.mk index e496c4b3444..d5d72aa9c03 100644 --- a/package/bcc/bcc.mk +++ b/package/bcc/bcc.mk @@ -4,9 +4,10 @@ # ################################################################################ -BCC_VERSION = 0.29.1 -BCC_SITE = https://github.com/iovisor/bcc/releases/download/v$(BCC_VERSION) -BCC_SOURCE = bcc-src-with-submodule.tar.gz +BCC_VERSION = v0.31.0 +BCC_SITE = https://github.com/iovisor/bcc +BCC_SITE_METHOD = git +BCC_GIT_SUBMODULES = YES BCC_LICENSE = Apache-2.0 BCC_LICENSE_FILES = LICENSE.txt BCC_INSTALL_STAGING = YES diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index 8fa49b4585e..8705c0f87be 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2 gc-8.2.4.tar.gz +sha256 7649020621cb26325e1fb5c8742590d92fb48ce5c259b502faf7d9fb5dabb160 gc-8.2.8.tar.gz sha256 a9b077aeb4e9e1aaf9742119d8023ef26f52f445cdc3f60d390bf59e1647f54a README.QUICK diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index 0e9c9d849c4..ca2fbdb1d43 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BDWGC_VERSION = 8.2.4 +BDWGC_VERSION = 8.2.8 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES diff --git a/package/bfscripts/Config.in b/package/bfscripts/Config.in new file mode 100644 index 00000000000..73f55e25d84 --- /dev/null +++ b/package/bfscripts/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_BFSCRIPTS + bool "bfscripts" + depends on BR2_USE_MMU # bash + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_BASH # runtime + help + Collection of scripts that are used for Mellanox/NVIDIA + Bluefield SoC management. + + Currently, it installs: bfcfg, bfrshlog and bfup. + + https://github.com/Mellanox/bfscripts diff --git a/package/bfscripts/S99bfup b/package/bfscripts/S99bfup new file mode 100644 index 00000000000..6c301993dcb --- /dev/null +++ b/package/bfscripts/S99bfup @@ -0,0 +1,20 @@ +#!/bin/sh +# +# notify to the root PCIe (/dev/rshimN/misc) that Linux is up +# and that BF3 board is ready + +DAEMON="bfup" + +case "$1" in + start) + printf "bfup: " + /usr/bin/$DAEMON + exit_code=$? + [ $exit_code = 0 ] && echo "OK" || echo "FAIL" + ;; + *) + echo "Usage: $0 {start}" + exit 1 +esac + +exit $? diff --git a/package/bfscripts/bfscripts.hash b/package/bfscripts/bfscripts.hash new file mode 100644 index 00000000000..05f2966ab92 --- /dev/null +++ b/package/bfscripts/bfscripts.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 92123fcaeb8eb9ba7f296e2457e82f56831c6fd19c1ad1a5949b7bc7d5d0a837 bfscripts-3.9.7-1.tar.gz +sha256 ab52bc4ac5e66e42e0ce14172c4d1d40969919db98cc0e11d2f6178dcc97bf4d LICENSE diff --git a/package/bfscripts/bfscripts.mk b/package/bfscripts/bfscripts.mk new file mode 100644 index 00000000000..aec788e7cbd --- /dev/null +++ b/package/bfscripts/bfscripts.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# bfscripts +# +################################################################################ + +BFSCRIPTS_VERSION = 3.9.7-1 +BFSCRIPTS_SITE = $(call github,Mellanox,bfscripts,$(BFSCRIPTS_VERSION)) +BFSCRIPTS_LICENSE = BSD-2-Clause +BFSCRIPTS_LICENSE_FILES = LICENSE + +BFSCRIPTS_FILES_TO_INSTALL = \ + bfcfg \ + bfrshlog \ + bfup + +define BFSCRIPTS_INSTALL_TARGET_CMDS + $(foreach f,$(BFSCRIPTS_FILES_TO_INSTALL),\ + $(INSTALL) -D -m 0755 $(@D)/$(f) $(TARGET_DIR)/usr/bin/$(f) + ) +endef + +define BFSCRIPTS_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/bfscripts/S99bfup \ + $(TARGET_DIR)/etc/init.d/S99bfup +endef + +$(eval $(generic-package)) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index abcbf0a9380..fd83196e5a7 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.18.31/bind-9.18.31.tar.xz.asc -# with key 706B6C28620E76F91D11F7DF510A642A06C52CEC -sha256 51b258969275c5206ef745a5aac03dbe98f1c8031fefed378d53597e7987b1b3 bind-9.18.31.tar.xz +# Verified from https://ftp.isc.org/isc/bind9/9.18.32/bind-9.18.32.tar.xz.asc +# with key D99CCEAF879747014F038D63182E23579462EFAA +sha256 dc840cdf9d54578d98400f2edf7008b1b33a1721be6e490eb1e42d0d11d9cff4 bind-9.18.32.tar.xz sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 52b1e56c40c..aa3c3222f56 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.18.31 +BIND_VERSION = 9.18.32 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. diff --git a/package/binutils-bare-metal/2.42 b/package/binutils-bare-metal/2.42 deleted file mode 120000 index dfad0ed2f45..00000000000 --- a/package/binutils-bare-metal/2.42 +++ /dev/null @@ -1 +0,0 @@ -../binutils/2.42 \ No newline at end of file diff --git a/package/binutils-bare-metal/2.43.1 b/package/binutils-bare-metal/2.43.1 new file mode 120000 index 00000000000..f605915e354 --- /dev/null +++ b/package/binutils-bare-metal/2.43.1 @@ -0,0 +1 @@ +../binutils/2.43.1/ \ No newline at end of file diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk index 778a5235f48..97a242a6f2b 100644 --- a/package/binutils-bare-metal/binutils-bare-metal.mk +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -4,14 +4,14 @@ # ################################################################################ -HOST_BINUTILS_BARE_METAL_VERSION = 2.42 -HOST_BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils -HOST_BINUTILS_BARE_METAL_SOURCE = binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).tar.xz +BINUTILS_BARE_METAL_VERSION = 2.43.1 +BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils +BINUTILS_BARE_METAL_SOURCE = binutils-$(BINUTILS_BARE_METAL_VERSION).tar.xz -HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ -HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB -HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu -HOST_BINUTILS_BARE_METAL_CPE_ID_PRODUCT = binutils +BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ +BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB +BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu +BINUTILS_BARE_METAL_CPE_ID_PRODUCT = binutils HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch deleted file mode 100644 index 4753ae13c49..00000000000 --- a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Fri, 16 Feb 2024 22:33:29 +1030 -Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 - -The assertion in nios2_elf32_install_imm16 triggers when the PLT is -twice the maximum allowable size for a branch from PLTn to reach -.PLTresolve, and on no other call to nios2_elf32_install_imm16. That -makes the assertion completely useless. We can handle a PIC PLT -exceeding 0x8000 in size by bouncing branches that won't reach through -previous branches. - - PR 27597 - * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. - (nios2_build_one_stub): Don't bother masking value passed to - nios2_elf32_install_imm16. - (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow - of PLTn branch to .PLTresolve by bouncing through prior branches. - -Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- - 1 file changed, 24 insertions(+), 16 deletions(-) - -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index bebf4239958..7f61e2f8507 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) - { - bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); - -- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); -- - bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), - sec->contents + offset); - } -@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, - hiadj (sym_value)); - nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, -- (sym_value & 0xffff)); -+ sym_value); - stub_sec->size += 12; - break; - default: -@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, - /* Emit the PLT entry. */ - if (bfd_link_pic (info)) - { -+ bfd_vma br_offset; -+ - nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, - 3); - plt_index = (h->plt.offset - 24) / 12; - got_offset = (plt_index + 3) * 4; - nios2_elf32_install_imm16 (splt, h->plt.offset, -- hiadj(plt_index * 4)); -+ hiadj (plt_index * 4)); - nios2_elf32_install_imm16 (splt, h->plt.offset + 4, -- (plt_index * 4) & 0xffff); -- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, -- 0xfff4 - h->plt.offset); -+ plt_index * 4); -+ br_offset = -(h->plt.offset + 12); -+ /* If this plt entry is too far away from the start of .plt -+ for the "br" to reach .PLTresolve, bounce through one or -+ more of the previous "br" instructions. */ -+ if (br_offset < (bfd_vma) -32768) -+ { -+ br_offset += 32768 / 12 * 12 - 4; -+ while (br_offset < (bfd_vma) -32768) -+ br_offset += 32768 / 12 * 12; -+ } -+ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); -+ - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); - -@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, - nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); - got_address = (sgotplt->output_section->vma + sgotplt->output_offset - + got_offset); -- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); -- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, -- got_address & 0xffff); -+ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); -+ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); - - /* Fill in the entry in the global offset table. */ - bfd_put_32 (output_bfd, -@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - BFD_ASSERT ((got_pcrel & 0xf) == 0); - nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); - nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); -- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); -- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); -+ nios2_elf32_install_imm16 (splt, 12, got_pcrel); -+ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); - } - else - { -@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, - - nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); - nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); -- nios2_elf32_install_imm16 (splt, res_size + 4, -- res_start & 0xffff); -+ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); - nios2_elf32_install_imm16 (splt, res_size + 12, - hiadj (got_address)); - nios2_elf32_install_imm16 (splt, res_size + 16, -- (got_address + 4) & 0xffff); -+ got_address + 4); - nios2_elf32_install_imm16 (splt, res_size + 20, -- (got_address + 8) & 0xffff); -+ got_address + 8); - } - } - } --- -2.34.1 - diff --git a/package/binutils/2.40/0001-sh-conf.patch b/package/binutils/2.43.1/0001-sh-conf.patch similarity index 84% rename from package/binutils/2.40/0001-sh-conf.patch rename to package/binutils/2.43.1/0001-sh-conf.patch index ffa23a88a79..c3810178500 100644 --- a/package/binutils/2.40/0001-sh-conf.patch +++ b/package/binutils/2.43.1/0001-sh-conf.patch @@ -1,4 +1,4 @@ -From 87551ade276aa0db86c4567b3ac219c4f979b538 Mon Sep 17 00:00:00 2001 +From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:38:13 +0100 Subject: [PATCH] sh-conf @@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 417fc5a970c..fa8ba331796 100755 +index 670684d83d1..967c6708a0c 100755 --- a/configure +++ b/configure -@@ -4067,7 +4067,7 @@ case "${target}" in +@@ -4042,7 +4042,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -33,10 +33,10 @@ index 417fc5a970c..fa8ba331796 100755 sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac -index 3a1eb0357e5..d700c14ddf5 100644 +index 88b4800e298..2c8d08ff6ec 100644 --- a/configure.ac +++ b/configure.ac -@@ -1300,7 +1300,7 @@ case "${target}" in +@@ -1269,7 +1269,7 @@ case "${target}" in nvptx*-*-*) noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" ;; @@ -46,5 +46,5 @@ index 3a1eb0357e5..d700c14ddf5 100644 sh*-*-elf) ;; -- -2.40.1 +2.43.0 diff --git a/package/binutils/2.40/0002-poison-system-directories.patch b/package/binutils/2.43.1/0002-poison-system-directories.patch similarity index 87% rename from package/binutils/2.40/0002-poison-system-directories.patch rename to package/binutils/2.43.1/0002-poison-system-directories.patch index 4b927b630e0..8da0ec31dfc 100644 --- a/package/binutils/2.40/0002-poison-system-directories.patch +++ b/package/binutils/2.43.1/0002-poison-system-directories.patch @@ -1,4 +1,4 @@ -From a6d90a842e349545ceb27f022317618dd99378ce Mon Sep 17 00:00:00 2001 +From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Dec 2015 11:45:38 +0100 Subject: [PATCH] poison-system-directories @@ -6,6 +6,8 @@ Subject: [PATCH] poison-system-directories Patch adapted to binutils 2.23.2 and extended to use BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. +[Waldemar: rebase on top of 2.43] +Signed-off-by: Waldemar Brodkorb [Waldemar: rebase on top of 2.39] Signed-off-by: Waldemar Brodkorb [Romain: rebase on top of 2.33.1] @@ -81,10 +83,10 @@ Signed-off-by: Scott Garman 9 files changed, 89 insertions(+) diff --git a/ld/config.in b/ld/config.in -index ad0dc6a106c..d21edaddce7 100644 +index f7c9da3d02a..e4fdbf6db5b 100644 --- a/ld/config.in +++ b/ld/config.in -@@ -58,6 +58,9 @@ +@@ -74,6 +74,9 @@ language is requested. */ #undef ENABLE_NLS @@ -95,10 +97,10 @@ index ad0dc6a106c..d21edaddce7 100644 #undef EXTRA_SHLIB_EXTENSION diff --git a/ld/configure b/ld/configure -index 43b44be1dc6..28f054ea3f8 100755 +index 44d79c2445d..e28cea11977 100755 --- a/ld/configure +++ b/ld/configure -@@ -839,6 +839,7 @@ with_lib_path +@@ -844,6 +844,7 @@ with_lib_path enable_targets enable_64_bit_bfd with_sysroot @@ -106,7 +108,7 @@ index 43b44be1dc6..28f054ea3f8 100755 enable_gold enable_got enable_compressed_debug_sections -@@ -1521,6 +1522,8 @@ Optional Features: +@@ -1535,6 +1536,8 @@ Optional Features: --enable-checking enable run-time checks --enable-targets alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -115,7 +117,7 @@ index 43b44be1dc6..28f054ea3f8 100755 --enable-gold[=ARG] build gold [ARG={default,yes,no}] --enable-got= GOT handling scheme (target, single, negative, multigot) -@@ -15504,7 +15507,18 @@ else +@@ -15587,7 +15590,18 @@ else fi @@ -135,10 +137,10 @@ index 43b44be1dc6..28f054ea3f8 100755 # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : diff --git a/ld/configure.ac b/ld/configure.ac -index 77edac3258c..a74dac63038 100644 +index bdf51a062fa..3d370ff92ce 100644 --- a/ld/configure.ac +++ b/ld/configure.ac -@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) +@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot) AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -156,10 +158,10 @@ index 77edac3258c..a74dac63038 100644 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 05649ff61b8..1818c227473 100644 +index 0dee944cf2a..83bd82d2a2e 100644 --- a/ld/ld.h +++ b/ld/ld.h -@@ -163,6 +163,14 @@ typedef struct +@@ -166,6 +166,14 @@ typedef struct in the linker script. */ bool force_group_allocation; @@ -175,10 +177,10 @@ index 05649ff61b8..1818c227473 100644 enum endian_enum endian; diff --git a/ld/ld.texi b/ld/ld.texi -index db3a9f09b45..9dacc934f80 100644 +index 89e3913317a..b80cf05617f 100644 --- a/ld/ld.texi +++ b/ld/ld.texi -@@ -2949,6 +2949,18 @@ string identifying the original linked file does not change. +@@ -3234,6 +3234,18 @@ string identifying the original linked file does not change. Passing @code{none} for @var{style} disables the setting from any @code{--build-id} options earlier on the command line. @@ -198,14 +200,13 @@ index db3a9f09b45..9dacc934f80 100644 @item --package-metadata=@var{JSON} Request the creation of a @code{.note.package} ELF note section. The diff --git a/ld/ldfile.c b/ld/ldfile.c -index b8fd4e5d8e0..1f1d8e23bc9 100644 +index 87be885d31a..9bc7adca4bc 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); +@@ -327,6 +327,22 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) else new_dirs->name = xstrdup (name); -+ + +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES + if (command_line.poison_system_directories + && ((!strncmp (name, "/lib", 4)) @@ -222,27 +223,27 @@ index b8fd4e5d8e0..1f1d8e23bc9 100644 + } +#endif + - } - - /* Try to open a BFD for a lang_input_statement. */ + /* Accumulate script and command line sourced + search paths at the end of the current list. */ + #if BFD_SUPPORTS_PLUGINS diff --git a/ld/ldlex.h b/ld/ldlex.h -index 0538f0a06a1..d1de3aec23d 100644 +index defe3fcbbb9..0ff12614926 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -166,6 +166,8 @@ enum option_values +@@ -170,6 +170,8 @@ enum option_values OPTION_CTF_VARIABLES, OPTION_NO_CTF_VARIABLES, OPTION_CTF_SHARE_TYPES, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - OPTION_WARN_EXECSTACK, - OPTION_NO_WARN_EXECSTACK, - OPTION_WARN_RWX_SEGMENTS, + OPTION_ERROR_EXECSTACK, + OPTION_NO_ERROR_EXECSTACK, + OPTION_WARN_EXECSTACK_OBJECTS, diff --git a/ld/ldmain.c b/ld/ldmain.c -index 9290a189b0d..e2e3074e872 100644 +index 037099b9d37..204feedc6e3 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c -@@ -321,6 +321,8 @@ main (int argc, char **argv) +@@ -347,6 +347,8 @@ main (int argc, char **argv) command_line.warn_mismatch = true; command_line.warn_search_mismatch = true; command_line.check_section_addresses = -1; @@ -252,10 +253,10 @@ index 9290a189b0d..e2e3074e872 100644 /* 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 c5960385572..da0a7829914 100644 +index 4aa0124ce2f..c4d76943821 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c -@@ -613,6 +613,14 @@ static const struct ld_option ld_options[] = +@@ -648,6 +648,14 @@ static const struct ld_option ld_options[] = " is: share-unconflicted (default),\n" " share-duplicated"), TWO_DASHES }, @@ -270,7 +271,7 @@ index c5960385572..da0a7829914 100644 }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -625,6 +633,7 @@ parse_args (unsigned argc, char **argv) +@@ -660,6 +668,7 @@ parse_args (unsigned argc, char **argv) int ingroup = 0; char *default_dirlist = NULL; char *shortopts; @@ -278,7 +279,7 @@ index c5960385572..da0a7829914 100644 struct option *longopts; struct option *really_longopts; int last_optind; -@@ -1692,6 +1701,14 @@ parse_args (unsigned argc, char **argv) +@@ -1785,6 +1794,14 @@ parse_args (unsigned argc, char **argv) } break; @@ -293,7 +294,7 @@ index c5960385572..da0a7829914 100644 case OPTION_PUSH_STATE: input_flags.pushed = xmemdup (&input_flags, sizeof (input_flags), -@@ -1837,6 +1854,10 @@ parse_args (unsigned argc, char **argv) +@@ -1938,6 +1955,10 @@ parse_args (unsigned argc, char **argv) command_line.soname = NULL; } @@ -304,6 +305,3 @@ index c5960385572..da0a7829914 100644 while (ingroup) { einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.40.1 - diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index cb65f5f5e4c..16a57a5cb4e 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,14 +7,11 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_42_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_40_X - bool "binutils 2.40" - config BR2_BINUTILS_VERSION_2_41_X bool "binutils 2.41" @@ -25,14 +22,17 @@ config BR2_BINUTILS_VERSION_ARC config BR2_BINUTILS_VERSION_2_42_X bool "binutils 2.42" +config BR2_BINUTILS_VERSION_2_43_X + bool "binutils 2.43.1" + endchoice config BR2_BINUTILS_VERSION string default "arc-2023.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X default "2.42" if BR2_BINUTILS_VERSION_2_42_X + default "2.43.1" if BR2_BINUTILS_VERSION_2_43_X config BR2_BINUTILS_GPROFNG bool "gprofng support" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index ac724d5c158..084793fc9fd 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,7 +1,7 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz +sha512 20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824 binutils-2.43.1.tar.xz # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 3d42425049b..15373673e9e 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-2023.09-release else -BINUTILS_VERSION = 2.41 +BINUTILS_VERSION = 2.42 endif endif # BINUTILS_VERSION diff --git a/package/bird/bird.hash b/package/bird/bird.hash index a62fbba630e..a781e314df0 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 bird-2.0.12.tar.gz +sha256 48e85c622de164756c132ea77ad1a8a95cc9fd0137ffd0d882746589ce75c75d bird-2.15.1.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index f1b2ee6c5ea..34d79129542 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.12 +BIRD_VERSION = 2.15.1 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README @@ -12,6 +12,8 @@ BIRD_CPE_ID_VENDOR = nic BIRD_SELINUX_MODULES = bird BIRD_DEPENDENCIES = host-flex host-bison +BIRD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + # 0001-configure.ac-fix-build-with-autoconf-2.70.patch BIRD_AUTORECONF = YES diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 060cae24f5f..425e99ce8b1 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_BITCOIN depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST @@ -46,9 +46,9 @@ config BR2_PACKAGE_BITCOIN_WALLET endif -comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" +comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 11" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_11 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 9bd08430854..c7dad34d0a4 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,7 +1,7 @@ -# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS +# Hash from: https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS # After checking pgp signature from: -# https://bitcoincore.org/bin/bitcoin-core-26.2/SHA256SUMS.asc -sha256 78d59418741f45cbdaa9bf20ebc49a5e95ff9f7172f72fc78d14307eaf341b3c bitcoin-26.2.tar.gz +# https://bitcoincore.org/bin/bitcoin-core-28.0/SHA256SUMS.asc +sha256 700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f bitcoin-28.0.tar.gz # Hash for license file -sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING +sha256 779d9beab4eef2340bb1e86e91f8f55dea9b0985a2d03fbcbb52bd713e091e1b COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 9ca29092adc..9a5f4d6494a 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 26.2 +BITCOIN_VERSION = 28.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT diff --git a/package/blake3/blake3.hash b/package/blake3/blake3.hash index 2a00d19b02e..9c3792edf6e 100644 --- a/package/blake3/blake3.hash +++ b/package/blake3/blake3.hash @@ -1,3 +1,5 @@ # sha256 computed locally -sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz -sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSE +sha256 ddd24f26a31d23373e63d9be2e723263ac46c8b6d49902ab08024b573fd2a416 blake3-1.5.4.tar.gz +sha256 00fcc7a934ddbc9ece2a7cc063ac788e284b703b1d705ccbba72d462aa97921e LICENSE_A2 +sha256 a5695f57ea0c221e0e8b7d784ff774c35e88c3d3270353646a925880bb3492cc LICENSE_A2LLVM +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENSE_CC0 diff --git a/package/blake3/blake3.mk b/package/blake3/blake3.mk index 3b1ccb44ccf..f8ef2386f50 100644 --- a/package/blake3/blake3.mk +++ b/package/blake3/blake3.mk @@ -4,11 +4,11 @@ # ################################################################################ -BLAKE3_VERSION = 1.5.1 +BLAKE3_VERSION = 1.5.4 BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION)) BLAKE3_SUBDIR = c -BLAKE3_LICENSE = Apache-2.0, CC0-1.0 -BLAKE3_LICENSE_FILES = LICENSE +BLAKE3_LICENSE = Apache-2.0 or Apache-2.0 with exceptions or CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE_A2 LICENSE_A2LLVM LICENSE_CC0 # The package is a dependency to ccache so ccache cannot be a dependency HOST_BLAKE3_ADD_CCACHE_DEPENDENCY = NO diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 6898ae377ee..8a5abe3f7f2 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -16,6 +16,7 @@ BLUEZ_ALSA_AUTORECONF = YES BLUEZ_ALSA_CONF_OPTS = \ --enable-a2dpconf \ --enable-aplay \ + --enable-cli \ --disable-debug-time \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d @@ -73,6 +74,12 @@ else BLUEZ_ALSA_CONF_OPTS += --disable-rfcomm endif +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MIDI),y) +BLUEZ_ALSA_CONF_OPTS += --enable-midi +else +BLUEZ_ALSA_CONF_OPTS += --disable-midi +endif + ifeq ($(BR2_PACKAGE_LIBOPENAPTX),y) BLUEZ_ALSA_DEPENDENCIES += libopenaptx BLUEZ_ALSA_CONF_OPTS += --with-libopenaptx --enable-aptx --enable-aptx-hd @@ -80,4 +87,25 @@ else BLUEZ_ALSA_CONF_OPTS += --without-libopenaptx --disable-aptx --disable-aptx-hd endif +ifeq ($(BR2_PACKAGE_OPUS),y) +BLUEZ_ALSA_DEPENDENCIES += opus +BLUEZ_ALSA_CONF_OPTS += --enable-opus +else +BLUEZ_ALSA_CONF_OPTS += --disable-opus +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +BLUEZ_ALSA_DEPENDENCIES += systemd +BLUEZ_ALSA_CONF_OPTS += --enable-systemd +else +BLUEZ_ALSA_CONF_OPTS += --disable-systemd +endif + +ifeq ($(BR2_PACKAGE_SPANDSP),y) +BLUEZ_ALSA_DEPENDENCIES += spandsp +BLUEZ_ALSA_CONF_OPTS += --enable-msbc +else +BLUEZ_ALSA_CONF_OPTS += --disable-msbc +endif + $(eval $(autotools-package)) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 1fd4e0fff34..7acf62b2267 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.78 +BLUEZ5_UTILS_HEADERS_VERSION = 5.79 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch new file mode 100644 index 00000000000..dc823e92776 --- /dev/null +++ b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch @@ -0,0 +1,33 @@ +From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= +Date: Sat, 2 Nov 2024 16:10:18 +0000 +Subject: [PATCH] gdbus: define MAX_INPUT for musl + +This is the same solution as was done in src/shared/util.c + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee +Signed-off-by: Fiona Klute +--- + gdbus/object.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gdbus/object.c b/gdbus/object.c +index 84f116bf1..7b0476f1a 100644 +--- a/gdbus/object.c ++++ b/gdbus/object.c +@@ -20,6 +20,12 @@ + #include + + #include "gdbus.h" ++ ++/* define MAX_INPUT for musl */ ++#ifndef MAX_INPUT ++#define MAX_INPUT _POSIX_MAX_INPUT ++#endif ++ + #include "src/shared/util.h" + + #define info(fmt...) +-- +2.45.2 + diff --git a/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch new file mode 100644 index 00000000000..09ebe5edf10 --- /dev/null +++ b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch @@ -0,0 +1,35 @@ +From b1fd409960001a77cda2a09ecc00147ebd9c3667 Mon Sep 17 00:00:00 2001 +From: Fiona Klute +Date: Mon, 9 Dec 2024 16:40:43 +0100 +Subject: [PATCH BlueZ] build: Leave config files writable for owner + +This is needed for builds running as non-root users, so the build +process and any distribution tools can create/move/delete files in the +config directory without adjusting permissions separately. Limiting +writes from the running service needs to be done in the systemd unit +(already the case) or init script. + +See also: https://lore.kernel.org/linux-bluetooth/4d1206df-598b-4a68-8655-74981b62ecca@gmx.de/T/ +Reviewed-by: Bastien Nocera +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=b1fd409960001a77cda2a09ecc00147ebd9c3667 +Signed-off-by: Fiona Klute (WIWA) +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 297d0774c..29018a91c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth + statedir = $(localstatedir)/lib/bluetooth + + bluetoothd-fix-permissions: +- install -dm555 $(DESTDIR)$(confdir) ++ install -dm755 $(DESTDIR)$(confdir) + install -dm700 $(DESTDIR)$(statedir) + + if DATAFILES +-- +2.45.2 + diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 41e39e0b5c3..9b39b19c089 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 bluez-5.78.tar.xz +sha256 4164a5303a9f71c70f48c03ff60be34231b568d93a9ad5e79928d34e6aa0ea8a bluez-5.79.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 717c10e870d..e3b47e1e809 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.78 +BLUEZ5_UTILS_VERSION = 5.79 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,6 +13,9 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# required because 0002-Leave-config-files-writable-for-owner.patch +# modifies Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -22,13 +25,12 @@ BLUEZ5_UTILS_DEPENDENCIES = \ BLUEZ5_UTILS_CONF_OPTS = \ --enable-library \ --disable-cups \ - --disable-datafiles \ --disable-manpages \ --disable-asan \ --disable-lsan \ --disable-ubsan \ --disable-pie \ - --with-dbusconfdir=/etc + --with-dbusconfdir=/usr/share ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) BLUEZ5_UTILS_CONF_OPTS += --enable-obex diff --git a/package/bmap-tools/bmap-tools.mk b/package/bmap-tools/bmap-tools.mk index 3455063e218..3c661cb9e29 100644 --- a/package/bmap-tools/bmap-tools.mk +++ b/package/bmap-tools/bmap-tools.mk @@ -8,9 +8,7 @@ BMAP_TOOLS_VERSION = 3.8.0 BMAP_TOOLS_SITE = $(call github,yoctoproject,bmaptool,v$(BMAP_TOOLS_VERSION)) BMAP_TOOLS_LICENSE = GPL-2.0 BMAP_TOOLS_LICENSE_FILES = LICENSE -BMAP_TOOLS_SETUP_TYPE = setuptools -BMAP_TOOLS_DEPENDENCIES = host-python-poetry-core -HOST_BMAP_TOOLS_DEPENDENCIES = host-python-poetry-core +BMAP_TOOLS_SETUP_TYPE = poetry $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 367ec37f6ca..c0d17f7670e 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -103,7 +103,7 @@ BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MA BOOST_DEPENDENCIES += python3 endif -HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ +HOST_BOOST_OPTS += toolset=gcc threading=multi \ variant=release link=shared runtime-link=shared -j$(PARALLEL_JOBS) -q \ --ignore-site-config --layout=system --prefix=$(HOST_DIR) \ --user-config=$(@D)/user-config.jam @@ -116,8 +116,7 @@ else BOOST_ABI = sysv endif -BOOST_OPTS += --no-cmake-config \ - toolset=gcc \ +BOOST_OPTS += toolset=gcc \ threading=multi \ abi=$(BOOST_ABI) \ variant=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ diff --git a/package/bsdiff/0001-Add-missing-header-for-u_char.patch b/package/bsdiff/0001-Add-missing-header-for-u_char.patch deleted file mode 100644 index 56affb4102c..00000000000 --- a/package/bsdiff/0001-Add-missing-header-for-u_char.patch +++ /dev/null @@ -1,17 +0,0 @@ -bspatch: Fix missing header for u_char - -Fixes http://autobuild.buildroot.net/results/31a/31a837cf6e34b02dce498f2b12e40d6d16a5a8e6/ - -Signed-off-by: Jörg Krause - -diff -purN bsdiff-4.3.orig/bspatch.c bsdiff-4.3/bspatch.c ---- bsdiff-4.3.orig/bspatch.c 2015-04-30 13:47:26.485903359 +0200 -+++ bsdiff-4.3/bspatch.c 2015-04-30 13:48:14.808908672 +0200 -@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/b - #include - #include - #include -+#include - - static off_t offtin(u_char *buf) - { diff --git a/package/bsdiff/Config.in b/package/bsdiff/Config.in deleted file mode 100644 index 11fd8b9d352..00000000000 --- a/package/bsdiff/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BSDIFF - bool "bsdiff" - select BR2_PACKAGE_BZIP2 - help - Binary patch/diff like xdelta but creates smaller diffs. - Needs bzip2 support. - - http://www.daemonology.net/bsdiff/ diff --git a/package/bsdiff/bsdiff.hash b/package/bsdiff/bsdiff.hash deleted file mode 100644 index 102086b9fc0..00000000000 --- a/package/bsdiff/bsdiff.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.daemonology.net/bsdiff/: -md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz -# locally computed -sha256 fc0a6e634ef77dcf14bf36c7b6d1e57ba1ac5c4809073dfaacb3b5f7ab277eb7 bsdiff.c diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk deleted file mode 100644 index 97a1b3921df..00000000000 --- a/package/bsdiff/bsdiff.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# bsdiff -# -################################################################################ - -BSDIFF_VERSION = 4.3 -BSDIFF_SITE = http://www.daemonology.net/bsdiff -BSDIFF_DEPENDENCIES = bzip2 -BSDIFF_LICENSE = BSD-2-Clause -BSDIFF_LICENSE_FILES = bsdiff.c -BSDIFF_CPE_ID_VENDOR = daemonology - -define BSDIFF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bspatch.c -lbz2 -o $(@D)/bspatch -endef - -define BSDIFF_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff - $(INSTALL) -D -m 755 $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch -endef - -$(eval $(generic-package)) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index f61aca34f9c..37276046b8b 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,6 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.9.0 -sha256 c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1 bubblewrap-0.9.0.tar.xz +# Locally generated after checking GPG signature from +# https://github.com/containers/bubblewrap/releases/tag/v0.10.0 +sha256 65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471 bubblewrap-0.10.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 9dd711ce475..94ae72d4d2e 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.9.0 +BUBBLEWRAP_VERSION = 0.10.0 BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION) BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 5d2a30806ac..9733dd21568 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -40,7 +40,7 @@ CONFIG_FEATURE_SYSLOG=y # # Build Options # -CONFIG_STATIC=y +# CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 310eb54d3ec..22fe5965f86 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -68,6 +68,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_UNZIP),unzip) \ $(if $(BR2_PACKAGE_USBUTILS),usbutils) \ $(if $(BR2_PACKAGE_UTIL_LINUX),util-linux) \ + $(if $(BR2_PACKAGE_TINYINIT),tinyinit) \ $(if $(BR2_PACKAGE_VIM),vim) \ $(if $(BR2_PACKAGE_WATCHDOG),watchdog) \ $(if $(BR2_PACKAGE_WGET),wget) \ diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index e1cf9f657a5..8dc84ada89b 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 072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061 c-ares-1.32.2.tar.gz +sha256 35410aa625cc9ee95b66475f54aea7c81c673fb63d75fad5eee267711503b72a c-ares-1.34.2.tar.gz # Hash for license file -sha256 8a9994f85a8e531e1a3217ab7ba509787c6b93056aabe702137ce662db8321c2 LICENSE.md +sha256 460f5e768fda3752ca2169a95df062578a10fb126bfd65f3b9b1a1bed2f84807 LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 4b7342cadb1..6685ade9d61 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,8 +4,8 @@ # ################################################################################ -C_ARES_VERSION = 1.32.2 -C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v1.32.2 +C_ARES_VERSION = 1.34.2 +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v1.34.2 C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT diff --git a/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch b/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch new file mode 100644 index 00000000000..986ed43355d --- /dev/null +++ b/package/c-icap/0002-Fix-compile-warning-about-missing-stdio.h-include-fi.patch @@ -0,0 +1,25 @@ +From ae8a1bc4979c797bb1f152fc92cfe6bc05a44594 Mon Sep 17 00:00:00 2001 +From: Christos Tsantilas +Date: Tue, 20 Nov 2018 17:10:16 +0200 +Subject: [PATCH] Fix compile warning about missing stdio.h include file + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/c-icap/c-icap-server/commit/ae8a1bc4979c797bb1f152fc92cfe6bc05a44594 +--- + tests/test_base64.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_base64.c b/tests/test_base64.c +index 8a4a76c..7692197 100644 +--- a/tests/test_base64.c ++++ b/tests/test_base64.c +@@ -1,5 +1,6 @@ + #include "common.h" + #include "simple_api.h" ++#include + + + int main(int argc, char *argv[]) +-- +2.47.1 + diff --git a/package/c-icap/Config.in b/package/c-icap/Config.in index 8f7963c26aa..3c1325ee390 100644 --- a/package/c-icap/Config.in +++ b/package/c-icap/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_C_ICAP depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + # the libmemcached code uses + select BR2_PACKAGE_LIBXCRYPT if \ + BR2_PACKAGE_LIBMEMCACHED && BR2_TOOLCHAIN_USES_GLIBC help c-icap is an implementation of an ICAP server. It can be used with HTTP proxies that support the ICAP protocol to diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 36ef1c8b120..4ece4c4b261 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -43,7 +43,7 @@ endif ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y) C_ICAP_CONF_OPTS += --with-memcached -C_ICAP_DEPENDENCIES += libmemcached +C_ICAP_DEPENDENCIES += libmemcached $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) else C_ICAP_CONF_OPTS += --without-memcached endif diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index c7e264afdba..84f1aaea2e0 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 485932259a75c7c6b72d4b874242c489ea5155d17efa345eb8cc72159f49f356 catch2-3.6.0.tar.gz +sha256 c991b247a1a0d7bb9c39aa35faf0fe9e19764213f28ffba3109388e62ee0269c catch2-3.7.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index 60812b2cffe..3443b723a4d 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.6.0 +CATCH2_VERSION = 3.7.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 744e1674893..6624fdef65a 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6 ccache-4.10.1.tar.xz +sha256 c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a ccache-4.10.2.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index f727ca04bdb..f3f675586d0 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.10.1 +CCACHE_VERSION = 4.10.2 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index d2ecc7265ab..e768a80cdff 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 1b346b3cdd4f8a78a157627bad64a3b3479c67b6a19d15e6d5c8694620eadbc1 checkpolicy-3.6.tar.gz +sha256 fd3e1925477d49946d1116938661af44c1f86f0d681466fd9f02eaa06002a07f checkpolicy-3.7.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 109aaf60720..adf125ebf81 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.6 +CHECKPOLICY_VERSION = 3.7 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = LICENSE diff --git a/package/chrony/S49chrony b/package/chrony/S49chrony deleted file mode 100644 index f75233fe5e8..00000000000 --- a/package/chrony/S49chrony +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Start chrony - -[ -r /etc/default/chrony ] && . /etc/default/chrony - -case "$1" in - start) - printf "Starting chrony: " - chronyd $CHRONY_ARGS && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping chrony: " - killall chronyd && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package/chrony/S49chronyd b/package/chrony/S49chronyd new file mode 100644 index 00000000000..6c1525dd765 --- /dev/null +++ b/package/chrony/S49chronyd @@ -0,0 +1,65 @@ +#!/bin/sh +# +# Start chrony + +DAEMON="chronyd" +# /var/run/chrony is owned by the chrony user, this allows chrony to +# delete the PID file during shutdown, long after dropping privileges. +PIDFILE="/var/run/chrony/$DAEMON.pid" +CHRONY_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 --start --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" \ + -- $CHRONY_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/sbin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" +} + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index e7e6931a2a8..bcf69a59db5 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -24,6 +24,10 @@ define CHRONY_USERS chrony -1 chrony -1 * /run/chrony - - Time daemon endef +define CHRONY_PERMISSIONS + /var/lib/chrony d 755 chrony chrony - - - - - +endef + ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss else @@ -71,10 +75,11 @@ endef define CHRONY_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(INSTALL) -D -m 644 $(@D)/examples/chrony.conf.example2 $(TARGET_DIR)/etc/chrony.conf endef define CHRONY_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/chrony/S49chrony $(TARGET_DIR)/etc/init.d/S49chrony + $(INSTALL) -D -m 755 package/chrony/S49chronyd $(TARGET_DIR)/etc/init.d/S49chronyd endef define CHRONY_INSTALL_INIT_SYSTEMD diff --git a/package/cloudflared/cloudflared.hash b/package/cloudflared/cloudflared.hash index 1aa959f8b04..e924d12481d 100644 --- a/package/cloudflared/cloudflared.hash +++ b/package/cloudflared/cloudflared.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c61ef286962c3bb9c5edb580b89dbf8293083fa09a8f0f59379fe8ec2d04cada cloudflared-2024.6.1-go2.tar.gz +sha256 f96b703ea848bc538322eb957749b0b2395e0cf83213cf310cbde0a3f598eac4 cloudflared-2024.9.1-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/cloudflared/cloudflared.mk b/package/cloudflared/cloudflared.mk index a243686441b..68849e9b825 100644 --- a/package/cloudflared/cloudflared.mk +++ b/package/cloudflared/cloudflared.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLOUDFLARED_VERSION = 2024.6.1 +CLOUDFLARED_VERSION = 2024.9.1 CLOUDFLARED_SITE = $(call github,cloudflare,cloudflared,$(CLOUDFLARED_VERSION)) CLOUDFLARED_LICENSE = Apache-2.0 CLOUDFLARED_LICENSE_FILES = LICENSE diff --git a/package/collectd/0004-configure.ac-fix-protoc-version-check.patch b/package/collectd/0004-configure.ac-fix-protoc-version-check.patch new file mode 100644 index 00000000000..edf5008f037 --- /dev/null +++ b/package/collectd/0004-configure.ac-fix-protoc-version-check.patch @@ -0,0 +1,48 @@ +From 77f33d05355b115d3384d94c1c4e36c56ea28b09 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 30 Oct 2024 12:45:51 -0600 +Subject: [PATCH] configure.ac: fix protoc version check + +The current version check for 3.0.0+ fails to handle cases where +protoc is above version 3.0.0 but does not start with a 3, for +example protoc may have a version of 28.1. + +To fix this use AX_COMPARE_VERSION to properly compare the version. + +Signed-off-by: James Hilliard +Upstream: https://github.com/collectd/collectd/pull/4332 +--- + configure.ac | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86d2378b..1f7a9cdf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4897,13 +4897,16 @@ AC_PATH_PROG([PROTOC], [protoc]) + have_protoc3="no" + if test "x$PROTOC" != "x"; then + AC_MSG_CHECKING([for protoc 3.0.0+]) +- if $PROTOC --version | $EGREP libprotoc.3 >/dev/null; then +- protoc3="yes (`$PROTOC --version`)" +- have_protoc3="yes" +- else +- protoc3="no (`$PROTOC --version`)" +- fi +- AC_MSG_RESULT([$protoc3]) ++ AC_SUBST([PROTOC_VERSION], [`$PROTOC --version | cut -d ' ' -f 2`]) ++ AX_COMPARE_VERSION([$PROTOC_VERSION],[ge],[3], ++ [ ++ have_protoc3="yes" ++ AC_MSG_RESULT([yes ($PROTOC_VERSION)]) ++ ], ++ [ ++ AC_MSG_RESULT([no ($PROTOC_VERSION)]) ++ ] ++ ) + fi + AM_CONDITIONAL([HAVE_PROTOC3], [test "x$have_protoc3" = "xyes"]) + +-- +2.34.1 + diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 02c19945b0a..e3f8434192a 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 containerd-1.7.20-go2.tar.gz +sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c containerd-1.7.23-go2.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index afd03d7d3f7..88b53caf51a 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.20 +CONTAINERD_VERSION = 1.7.23 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE diff --git a/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch b/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch new file mode 100644 index 00000000000..7639509ff23 --- /dev/null +++ b/package/coreutils/0001-coreutils-mcel-port-to-uClibc-ng.patch @@ -0,0 +1,35 @@ +From c4e923a98f34fe5f5ec3b49543e90716ec2a45fc Mon Sep 17 00:00:00 2001 +From: Jean-Michel Hautbois +Date: Tue, 24 Sep 2024 18:08:31 +0200 +Subject: [PATCH] coreutils: mcel: port to uClibc-ng +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Waldemar Brodkorb in: +https://lists.gnu.org/r/bug-gnulib/2024-08/msg00130.html +* lib/mcel.h (mcel_scan): Don't treat uClibc-ng like glibc. + +Upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=9765bc796b3e6ceaa7a10ba07c9c2f1e272a4249 +Signed-off-by: Jean-Michel Hautbois +--- + lib/mcel.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/mcel.h b/lib/mcel.h +index f6f006c..dca4d08 100644 +--- a/lib/mcel.h ++++ b/lib/mcel.h +@@ -221,7 +221,8 @@ mcel_scan (char const *p, char const *lim) + + /* An initial mbstate_t; initialization optimized for some platforms. + For details about these and other platforms, see wchar.in.h. */ +-#if defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) ++#if (defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) \ ++ && !defined __UCLIBC__) + /* Although only a trivial optimization, it's worth it for GNU. */ + mbstate_t mbs; mbs.__count = 0; + #elif (defined __FreeBSD__ || defined __DragonFly__ || defined __OpenBSD__ \ +-- +2.39.2 + diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 7df1048afac..3455c95c587 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa coreutils-9.3.tar.xz +sha256 cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a coreutils-9.5.tar.xz # Locally computed sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 89f494310e7..a6d193b49e8 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 9.3 +COREUTILS_VERSION = 9.5 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ diff --git a/package/cpp-httplib/Config.in b/package/cpp-httplib/Config.in new file mode 100644 index 00000000000..9bd93ee0af8 --- /dev/null +++ b/package/cpp-httplib/Config.in @@ -0,0 +1,21 @@ +comment "cpp-httplib needs a toolchain w/ C++, wchar, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_CPP_HTTPLIB + bool "cpp-httplib" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + help + A C++ header-only HTTP/HTTPS server and client library. + + https://github.com/yhirose/cpp-httplib + +if BR2_PACKAGE_CPP_HTTPLIB +config BR2_PACKAGE_CPP_HTTPLIB_COMPILE + bool "compile as a shared library" + select BR2_PACKAGE_HOST_PYTHON3 + help + Build as library + +endif # BR2_PACKAGE_CPP_HTTPLIB diff --git a/package/cpp-httplib/cpp-httplib.hash b/package/cpp-httplib/cpp-httplib.hash new file mode 100644 index 00000000000..45c22141051 --- /dev/null +++ b/package/cpp-httplib/cpp-httplib.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 6ed5894bbbc4a34a0f4c5e962672d0003d2ea099bbadacc66f6dee2b213ff394 cpp-httplib-0.18.0.tar.gz +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b LICENSE diff --git a/package/cpp-httplib/cpp-httplib.mk b/package/cpp-httplib/cpp-httplib.mk new file mode 100644 index 00000000000..5a02b562b3c --- /dev/null +++ b/package/cpp-httplib/cpp-httplib.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# cpp-httplib +# +################################################################################ + +CPP_HTTPLIB_VERSION = 0.18.0 +CPP_HTTPLIB_SITE = $(call github,yhirose,cpp-httplib,v$(CPP_HTTPLIB_VERSION)) +CPP_HTTPLIB_LICENSE = MIT +CPP_HTTPLIB_LICENSE_FILES = LICENSE +CPP_HTTPLIB_INSTALL_STAGING = YES +CPP_HTTPLIB_CONF_OPTS = \ + -Dcpp-httplib_test=false + +ifeq ($(BR2_PACKAGE_CPP_HTTPLIB_COMPILE),y) +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_compile=true +CPP_HTTPLIB_DEPENDENCIES += host-python3 +else +# Header only library +CPP_HTTPLIB_INSTALL_TARGET = NO +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=enabled +CPP_HTTPLIB_DEPENDENCIES += openssl +else +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=disabled +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=enabled +CPP_HTTPLIB_DEPENDENCIES += zlib +else +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=disabled +endif + +ifeq ($(BR2_PACKAGE_BROTLI),y) +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=enabled +CPP_HTTPLIB_DEPENDENCIES += brotli +else +CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=disabled +endif + +$(eval $(meson-package)) diff --git a/package/crun/crun.hash b/package/crun/crun.hash index b111e941ddb..6f2d676bed3 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz +sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.18.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index be5897dbc25..255c1b88619 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.15 +CRUN_VERSION = 1.18.2 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index 580ea89520f..550a248a27d 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -21,7 +21,7 @@ define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/include/crypto/cryptodev.h endef -define CRYPTODEV_LINUX_CONFIG_FIXUPS +define CRYPTODEV_LINUX_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO) $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_AEAD) endef diff --git a/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch b/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch new file mode 100644 index 00000000000..becb82a6d27 --- /dev/null +++ b/package/dahdi-linux/0003-xpp-sysfs-Use-const-struct-device_device-if-needed.patch @@ -0,0 +1,82 @@ +From ce9de5d1bf9d21c088b01ce9da6f7ff02b0d863d Mon Sep 17 00:00:00 2001 +From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com> +Date: Mon, 23 Sep 2024 08:04:54 -0400 +Subject: [PATCH] xpp, sysfs: Use const struct device_device if needed. + +Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8 +changed struct device_driver to be const, so make the +arguments const on kernels 6.11 and newer. + +Resolves: #63 + +Upstream: https://github.com/asterisk/dahdi-linux/pull/64 +Signed-off-by: Peter Korsgaard +--- + drivers/dahdi/dahdi-sysfs-chan.c | 4 ++++ + drivers/dahdi/dahdi-sysfs.c | 4 ++++ + drivers/dahdi/xpp/xbus-sysfs.c | 8 ++++++++ + 3 files changed, 16 insertions(+) + +diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c +index 09d7317..35b7bd4 100644 +--- a/drivers/dahdi/dahdi-sysfs-chan.c ++++ b/drivers/dahdi/dahdi-sysfs-chan.c +@@ -220,7 +220,11 @@ static void chan_release(struct device *dev) + chan_dbg(DEVICES, chan, "SYSFS\n"); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int chan_match(struct device *dev, const struct device_driver *driver) ++#else + static int chan_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + struct dahdi_chan *chan; + +diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c +index 7477ebc..246514c 100644 +--- a/drivers/dahdi/dahdi-sysfs.c ++++ b/drivers/dahdi/dahdi-sysfs.c +@@ -42,7 +42,11 @@ module_param(tools_rootdir, charp, 0444); + MODULE_PARM_DESC(tools_rootdir, + "root directory of all tools paths (default /)"); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int span_match(struct device *dev, const struct device_driver *driver) ++#else + static int span_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + return 1; + } +diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c +index 177048b..f78a15e 100644 +--- a/drivers/dahdi/xpp/xbus-sysfs.c ++++ b/drivers/dahdi/xpp/xbus-sysfs.c +@@ -397,7 +397,11 @@ static struct attribute *xbus_dev_attrs[] = { + ATTRIBUTE_GROUPS(xbus_dev); + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int astribank_match(struct device *dev, const struct device_driver *driver) ++#else + static int astribank_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n", + dev_name(dev), driver->name); +@@ -771,7 +775,11 @@ static DEVICE_ATTR_READER(refcount_xpd_show, dev, buf) + return len; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0) ++static int xpd_match(struct device *dev, const struct device_driver *driver) ++#else + static int xpd_match(struct device *dev, struct device_driver *driver) ++#endif /* LINUX_VERSION_CODE */ + { + struct xpd_driver *xpd_driver; + xpd_t *xpd; +-- +2.39.5 + diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index e0ca8f1e882..a32f2ae7161 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.4.3/dav1d-1.4.3.tar.xz.sha256 -sha256 42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19 dav1d-1.4.3.tar.xz +# From http://download.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz.sha256 +sha256 14bd6f5157808ed9aedcafbe50df689d304fd4810ac20be6eec1ab037436afd6 dav1d-1.5.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 4e3e8fe1cf5..7358690b623 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.4.3 +DAV1D_VERSION = 1.5.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index 06c8f229b79..fd4f43d16e7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,17 +1,17 @@ # Locally calculated -sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz +sha256 d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b dbus-broker-36.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE -sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS +sha256 ce7b8b8fb05126e556b3f9ed97fe21aa654e4ff411c00a9fd219ecbaae26abe0 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 a2ab28f3a7b4b29c0a361c96e220555904bfd713c78134e66b7551774749b453 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 ec71c7ba4dfd282c434a00bde0c17bc347685be9d3df38d3a0df03adceb9d996 subprojects/libcstdaux-1/AUTHORS sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md -sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS -sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md +sha256 0dcfdbd0298538023ac93ed6be1f5dfd2fa973615b07e3b85d8b1c89970db423 subprojects/libcutf8-1/AUTHORS +sha256 a8d41713b802ad31c6c69bdcf475aa73f7be942986064e662039351ebb266d13 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index 4266441ac9b..0bbdd304af0 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 33 +DBUS_BROKER_VERSION = 36 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) diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host index 0938ab0659b..305198f1ab3 100644 --- a/package/delve/Config.in.host +++ b/package/delve/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_DELVE bool "host delve" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index 5e172a9a9a9..d20c3ea336d 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c085a4bc561c90555555461d5810dd406e723618313f24eb2161421f9306b498 depot-tools-75932421da2cd8b5807a4ac52ed2a6f46d7c2120-git4.tar.gz +sha256 57c82ce07695d439ed9ea6e4dd8a7321203eea45eb3e1ea1c3f461c630dd1460 depot-tools-1b58dc68659445b1d97d8341f8158be25eab4957-git4.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 0d7048b8eb2..4bc9d7a470c 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 75932421da2cd8b5807a4ac52ed2a6f46d7c2120 +DEPOT_TOOLS_VERSION = 1b58dc68659445b1d97d8341f8158be25eab4957 DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause diff --git a/package/dlib/Config.in b/package/dlib/Config.in new file mode 100644 index 00000000000..7862f8d074a --- /dev/null +++ b/package/dlib/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_DLIB + bool "dlib" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + help + Dlib is a modern C++ toolkit containing machine learning + algorithms and tools for creating complex software in C++ to + solve real world problems. + + http://dlib.net + +comment "dlib needs a toolchain w/ C++, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR diff --git a/package/dlib/dlib.hash b/package/dlib/dlib.hash new file mode 100644 index 00000000000..af206386b87 --- /dev/null +++ b/package/dlib/dlib.hash @@ -0,0 +1,13 @@ +# Locally computed +sha256 22513c353ec9c153300c394050c96ca9d088e02966ac0f639e989e50318c82d6 dlib-19.24.6.tar.gz + +# Hashes for license files +sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 dlib/external/libjpeg/README +sha256 debfae299fa4118b0a586af4cf7ac8d38aae81ac4e9995c935862aaee6eb0362 dlib/external/libpng/LICENSE +sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb dlib/external/pybind11/LICENSE +sha256 8d8291caf1cee26d23acf3eb67c9f9a2d58f1c681b16a4fbe8cbfb9e3c0b5a9b dlib/LICENSE.txt +sha256 908b0b565ae9bf61b7b41447cb0b83564f320375723bcc884ec30e5537a0d5dc dlib/test/ffmpeg_data/LICENSE.TXT +sha256 78515536a4b0d896745b6483fccc561987e8e2f2d014dc81d7c2e97c497a0a69 examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt +sha256 a0e7b40719ba74630debe9fae1cb847ee436215451123254a690171d09fb036e examples/video_frames/license.txt +sha256 8d8291caf1cee26d23acf3eb67c9f9a2d58f1c681b16a4fbe8cbfb9e3c0b5a9b LICENSE.txt +sha256 8acb12b218fdb5e071f25eda9ac990d04888388b65095867d9007c278a9f993b python_examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt diff --git a/package/dlib/dlib.mk b/package/dlib/dlib.mk new file mode 100644 index 00000000000..4eb00027754 --- /dev/null +++ b/package/dlib/dlib.mk @@ -0,0 +1,99 @@ +################################################################################ +# +# dlib +# +################################################################################ + +DLIB_VERSION = 19.24.6 +DLIB_SITE = $(call github,davisking,dlib,v$(DLIB_VERSION)) +DLIB_CMAKE_BACKEND = ninja +DLIB_INSTALL_STAGING = YES +DLIB_SUPPORTS_IN_SOURCE_BUILD = NO + +DLIB_LICENSE = \ + BSD-3-Clause (kissfft, pybind11) \ + BSL-1.0 (dlib, tools) \ + CC0-1.0 (examples) \ + libpng-2.0 (libpng) \ + MIT or CC0-1.0 (JoinPaths.cmake) + +DLIB_LICENSE_FILES = \ + dlib/external/libjpeg/README \ + dlib/external/libpng/LICENSE \ + dlib/external/pybind11/LICENSE \ + dlib/LICENSE.txt \ + dlib/test/ffmpeg_data/LICENSE.TXT \ + examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt \ + examples/video_frames/license.txt \ + LICENSE.txt \ + python_examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt + +DLIB_CONF_OPTS = \ + -DDLIB_LINK_WITH_SQLITE3=OFF \ + -DDLIB_USE_CUDA=OFF \ + -DDLIB_USE_MKL_FFT=OFF + +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_FFMPEG_SWSCALE),yy) +DLIB_CONF_OPTS += -DDLIB_USE_FFMPEG=ON +DLIB_DEPENDENCIES += ffmpeg +else +DLIB_CONF_OPTS += -DDLIB_USE_FFMPEG=OFF +endif + +ifeq ($(BR2_PACKAGE_GIFLIB),y) +DLIB_CONF_OPTS += -DDLIB_GIF_SUPPORT=ON +DLIB_DEPENDENCIES += giflib +else +DLIB_CONF_OPTS += -DDLIB_GIF_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +DLIB_CONF_OPTS += -DDLIB_JPEG_SUPPORT=ON +DLIB_DEPENDENCIES += jpeg +else +DLIB_CONF_OPTS += -DDLIB_JPEG_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_LAPACK),y) +DLIB_CONF_OPTS += -DDLIB_USE_LAPACK=ON +DLIB_DEPENDENCIES += lapack +else +DLIB_CONF_OPTS += -DDLIB_USE_LAPACK=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBJXL),y) +DLIB_CONF_OPTS += -DDLIB_JXL_SUPPORT=ON +DLIB_DEPENDENCIES += libjxl +else +DLIB_CONF_OPTS += -DDLIB_JXL_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +DLIB_CONF_OPTS += -DDLIB_PNG_SUPPORT=ON +DLIB_DEPENDENCIES += libpng +else +DLIB_CONF_OPTS += -DDLIB_PNG_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENBLAS),y) +DLIB_CONF_OPTS += -DDLIB_USE_BLAS=ON +DLIB_DEPENDENCIES += openblas +else +DLIB_CONF_OPTS += -DDLIB_USE_BLAS=OFF +endif + +ifeq ($(BR2_PACKAGE_WEBP),y) +DLIB_CONF_OPTS += -DDLIB_WEBP_SUPPORT=ON +DLIB_DEPENDENCIES += webp +else +DLIB_CONF_OPTS += -DDLIB_WEBP_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +DLIB_CONF_OPTS += -DDLIB_NO_GUI_SUPPORT=OFF +DLIB_DEPENDENCIES += xlib_libX11 +else +DLIB_CONF_OPTS += -DDLIB_NO_GUI_SUPPORT=ON +endif + +$(eval $(cmake-package)) diff --git a/package/dmraid/0001-fix-compilation-under-musl.patch b/package/dmraid/0001-fix-compilation-under-musl.patch index a6f5c41075f..3d45641b8d3 100644 --- a/package/dmraid/0001-fix-compilation-under-musl.patch +++ b/package/dmraid/0001-fix-compilation-under-musl.patch @@ -8,7 +8,7 @@ Patch borrowed from Void Linux : https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dmraid/patches/25_musl-libc.patch Upstream package appears dormant, no mailing list and no -maintainence releases since Nov 2010. +maintenance releases since Nov 2010. Upstream-Status: dormant Signed-off-by: Brendan Heading diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 78e73112964..c70d274f966 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f992e895c949852686abef9a6fa9efd622826c4f4d70b83876569a4641c4c8fc docker-cli-27.0.3-go2.tar.gz +sha256 df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4 docker-cli-27.3.1-go2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 1478bdca2e9..39e1367908f 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 27.0.3 +DOCKER_CLI_VERSION = 27.3.1 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 2896eee40c7..0fb97673057 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7ca8746c86ba25491f5bbdc44c41d5cf7f64defa69f4015c601e1a562f7f64fb docker-compose-2.27.1-go2.tar.gz +sha256 100a1c1522fc58658ce08ed4a6213ffb22f0bf5a728718e6e2b1181a127d321f docker-compose-2.29.7-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 44e27787aba..26d90d303fa 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.27.1 +DOCKER_COMPOSE_VERSION = 2.29.7 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 49a002a6478..e03ecceeff4 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -48,6 +48,17 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS help Build the vfs filesystem driver for Docker. +config BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT + bool "support docker-init" + select BR2_PACKAGE_TINI # runtime + help + Support providing a minimal init process for containers, + using tini. Required to use "docker run --init". + + This does not change the Docker engine build, the + docker-init symlink is provided by the tini package + itself. This option only adds the dependency. + endif comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" diff --git a/package/docker-engine/S60dockerd b/package/docker-engine/S60dockerd index def8bea149a..dda6dc74746 100644 --- a/package/docker-engine/S60dockerd +++ b/package/docker-engine/S60dockerd @@ -1,38 +1,72 @@ #!/bin/sh -NAME=dockerd -DAEMON=/usr/bin/$NAME -PIDFILE=/var/run/$NAME.pid -DAEMON_ARGS="" - -[ -r /etc/default/$NAME ] && . /etc/default/$NAME $1 - -do_start() { - echo -n "Starting $NAME: " - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ - && echo "OK" || echo "FAIL" +DAEMON="dockerd" +PIDFILE="/var/run/$DAEMON.pid" + +DOCKERD_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # Dockerd logs only to stdout/stderr, which is lost with + # --background. The wrapper script runs the given command + # (after "--", including dockerd) and forwards stdout/stderr + # to syslog. + # shellcheck disable=SC2086 # we need word splitting for DOCKERD_ARGS + start-stop-daemon --start --background --pidfile "$PIDFILE" \ + --exec /usr/libexec/dockerd-syslog-wrapper.sh \ + -- "/usr/bin/$DAEMON" --pidfile "$PIDFILE" $DOCKERD_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + return "$status" + fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" + return "$status" +} + +restart() { + stop + start } -do_stop() { - echo -n "Stopping $NAME: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - && echo "OK" || echo "FAIL" +reload() { + printf "Reloading %s config: " "$DAEMON" + start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } case "$1" in - start) - do_start - ;; - stop) - do_stop - ;; - restart) - do_stop - sleep 1 - do_start - ;; + start|stop|restart|reload) + "$1";; *) - echo "Usage: $0 {start|stop|restart}" - exit 1 + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index b72b37223bb..2fe19b61d5c 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 db02d9b5d98e85284538d6ead43b549c025acf937e98c09d18395bb331c1e607 docker-engine-27.0.3-go2.tar.gz +sha256 d18208d9e0b6421307342cdef266193984c97c87177b9262b1113e6e9e7e020e docker-engine-27.3.1-go2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c7c51c5ef59..e3db31a2793 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 27.0.3 +DOCKER_ENGINE_VERSION = 27.3.1 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -72,6 +72,8 @@ endef define DOCKER_ENGINE_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/docker-engine/S60dockerd \ $(TARGET_DIR)/etc/init.d/S60dockerd + $(INSTALL) -D -m 755 package/docker-engine/dockerd-syslog-wrapper.sh \ + $(TARGET_DIR)/usr/libexec/dockerd-syslog-wrapper.sh endef define DOCKER_ENGINE_USERS diff --git a/package/docker-engine/dockerd-syslog-wrapper.sh b/package/docker-engine/dockerd-syslog-wrapper.sh new file mode 100644 index 00000000000..3d6a80a7394 --- /dev/null +++ b/package/docker-engine/dockerd-syslog-wrapper.sh @@ -0,0 +1,4 @@ +#!/bin/sh +"${@}" 2>&1 | while read -r LINE; do + logger -t "$(basename "${1}")" "$LINE"; +done diff --git a/package/double-conversion/double-conversion.hash b/package/double-conversion/double-conversion.hash index a2ecd4422cc..e3a5754933c 100644 --- a/package/double-conversion/double-conversion.hash +++ b/package/double-conversion/double-conversion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e40d236343cad807e83d192265f139481c51fc83a1c49e406ac6ce0a0ba7cd35 double-conversion-3.2.1.tar.gz +sha256 04ec44461850abbf33824da84978043b22554896b552c5fd11a9c5ae4b4d296e double-conversion-3.3.0.tar.gz sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING diff --git a/package/double-conversion/double-conversion.mk b/package/double-conversion/double-conversion.mk index af1fbab0782..74e90d30d70 100644 --- a/package/double-conversion/double-conversion.mk +++ b/package/double-conversion/double-conversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOUBLE_CONVERSION_VERSION = 3.2.1 +DOUBLE_CONVERSION_VERSION = 3.3.0 DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) DOUBLE_CONVERSION_LICENSE = BSD-3-Clause DOUBLE_CONVERSION_LICENSE_FILES = COPYING diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk index b24c527a206..b3bcb34097f 100644 --- a/package/doxygen/doxygen.mk +++ b/package/doxygen/doxygen.mk @@ -6,7 +6,7 @@ DOXYGEN_VERSION = 1.8.18 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz -DOXYGEN_SITE = http://doxygen.nl/files +DOXYGEN_SITE = https://sourceforge.net/projects/doxygen/files/rel-$(DOXYGEN_VERSION) DOXYGEN_LICENSE = GPL-2.0 DOXYGEN_LICENSE_FILES = LICENSE DOXYGEN_CPE_ID_VENDOR = doxygen diff --git a/package/dpdk/0001-config-meson-get-cpu_instruction_set-from-meson-opti.patch b/package/dpdk/0001-config-meson-get-cpu_instruction_set-from-meson-opti.patch new file mode 100644 index 00000000000..c1bfb86448c --- /dev/null +++ b/package/dpdk/0001-config-meson-get-cpu_instruction_set-from-meson-opti.patch @@ -0,0 +1,35 @@ +From 121e5d019f0bb6dec0ace2b361611edd10fc8ff8 Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang +Date: Wed, 6 Dec 2023 16:58:10 +0800 +Subject: [PATCH] config/meson: get cpu_instruction_set from meson option + +Workaround error: +| ../git/config/meson.build:178:8: ERROR: Problem encountered: Compiler +does not support "x86_64" arch flag. + +Upstream-Status: Inappropriate [ yocto specific to set cpu_instruction_set ] + +Signed-off-by: Lee Chee Yang +Links: https://git.yoctoproject.org/meta-dpdk/plain/recipes-extended/dpdk/dpdk/0001-config-meson-get-cpu_instruction_set-from-meson-opti.patch +Upstream: Not applicable, see Yocto's status, above +Signed-off-by: Vincent Jardin +--- + config/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/meson.build b/config/meson.build +index a9ccd56deb..f310c7adf6 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -105,7 +105,7 @@ platform = get_option('platform') + + # set the cpu_instruction_set and cflags for it + if meson.is_cross_build() +- cpu_instruction_set = host_machine.cpu() ++ cpu_instruction_set = get_option('cpu_instruction_set') + else + cpu_instruction_set = get_option('cpu_instruction_set') + machine = get_option('machine') +-- +2.37.3 + diff --git a/package/dpdk/0010-Fix-aarch64-build.patch b/package/dpdk/0010-Fix-aarch64-build.patch new file mode 100644 index 00000000000..55c31c36475 --- /dev/null +++ b/package/dpdk/0010-Fix-aarch64-build.patch @@ -0,0 +1,43 @@ +From c5ea091a74bbfa5fb095d2c6fe15be3a7b15cacb Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sun, 8 Sep 2024 13:20:14 +0200 +Subject: [PATCH] Fix aarch64 build + +The condition on which DPDK meson skip the -march detection for Aarch64 +seems incorrect or incomplete. This patch changes the condition in order +to better match the comment (that the options are decided in +config/arm/meson.build). It actually test for the architecture name. + +While this patch might need some discussion with DPDK maintainers to +cover all situations, it can still be useful here in Buildroot, as it +fixes the Aarch64 cross compilation. + +Signed-off-by: Julien Olivain +Signed-off-by: Vincent Jardin +Upstream: to be proposed https://patches.dpdk.org/project/dpdk/list/ +Links: cherry-picked from https://github.com/jolivain/dpdk/commit/c5ea091a74bbfa5fb095d2c6fe15be3a7b15cacb +--- + config/meson.build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/meson.build b/config/meson.build +index 8c8b019c25..ea48e55ce3 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -176,10 +176,10 @@ if not is_ms_compiler + else + machine_args += '-march=' + cpu_instruction_set + # arm manages generic/auto config in config/arm/meson.build +- if cpu_instruction_set != 'generic' and cpu_instruction_set != 'auto' +- compiler_arch_support = cc.has_argument('-march=' + cpu_instruction_set) +- else ++ if host_machine.cpu_family().startswith('aarch') + compiler_arch_support = true ++ else ++ compiler_arch_support = cc.has_argument('-march=' + cpu_instruction_set) + endif + endif + if not compiler_arch_support +-- +2.46.0 + diff --git a/package/dpdk/Config.in b/package/dpdk/Config.in new file mode 100644 index 00000000000..328129ea654 --- /dev/null +++ b/package/dpdk/Config.in @@ -0,0 +1,54 @@ +config BR2_PACKAGE_DPDK_ARCH_SUPPORTS + bool + # DPDK can be used for the following little endian architecture + default y if BR2_aarch64 + # DPDK requires SSE4.2 for x86_64 since v17.08 + default y if BR2_x86_64 && BR2_X86_CPU_HAS_SSE42 + +config BR2_PACKAGE_DPDK + bool "dpdk" + depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # DPDK design + depends on BR2_USE_MMU # pthread() memory mappings + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HOST_PYTHON3 # host-python-pyelftools + help + DPDK (Data Plane Development Kit) is a set of libraries + and drivers for fast packet processing. + + http://dpdk.org/ + + Optional but recommended kernel configurations: + - CONFIG_VFIO_IOMMU_TYPE1 + - CONFIG_VFIO_VIRQFD + - CONFIG_VFIO + - CONFIG_VFIO_NOIOMMU + - CONFIG_VFIO_PCI + - CONFIG_VFIO_PCI_MMAP + - CONFIG_HUGETLBFS + - CONFIG_HUGETLB_PAGE + - CONFIG_PROC_PAGE_MONITOR + + For x86 only, the following can also be useful: + - CONFIG_HPET + - CONFIG_HPET_MMAP + +if BR2_PACKAGE_DPDK + +config BR2_PACKAGE_DPDK_EXAMPLES + bool "Install examples" + +config BR2_PACKAGE_DPDK_TESTS + bool "Install tests" + +endif + +comment "DPDK needs a toolchain w/ dynamic library, threads, wchar, kernel headers >= 4.19" + depends on BR2_USE_MMU # pthread() memory mappings + depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 diff --git a/package/dpdk/dpdk.hash b/package/dpdk/dpdk.hash new file mode 100644 index 00000000000..e9a22736b0b --- /dev/null +++ b/package/dpdk/dpdk.hash @@ -0,0 +1,6 @@ +# Locally computed +sha256 bcae7d42c449fc456dfb279feabcbe0599a29bebb2fe2905761e187339d96b8e dpdk-24.11.1.tar.xz +sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 license/bsd-3-clause.txt +sha256 e19808bccd90c238fac06da2fc3683e094c64f7ba647e9d86f03a98cf5f2ce05 license/exceptions.txt +sha256 6c54c4d44faf3cba829b3d0c21c6955953e758767018fd7244f809b01d4f4845 license/mit.txt +sha256 cae178052c96959741acb7f00634a09a8294e6cafb5ad53e158d63e3510875ab license/README diff --git a/package/dpdk/dpdk.mk b/package/dpdk/dpdk.mk new file mode 100644 index 00000000000..eb05655cba0 --- /dev/null +++ b/package/dpdk/dpdk.mk @@ -0,0 +1,95 @@ +################################################################################ +# +# dpdk +# +################################################################################ + +DPDK_VERSION = 24.11.1 +DPDK_SOURCE = dpdk-$(DPDK_VERSION).tar.xz +DPDK_SITE = https://fast.dpdk.org/rel +DPDK_LICENSE = \ + BSD-3-Clause, \ + MIT + +# Only the Windows target has the 2 following licenses: +# - license/bsd-2-clause.txt +# - license/isc.txt +# which is related to a Windows getopt.[ch] compatibility layer. +# Since Buildroot is not used for Windows target, it is not listed +# here. +# +# All the userland files of DPDK have dual licences BSD or GPL/LGPL +# Since the Linux kernel modules had been removed from the DPDK, there +# is no GPL only code into the DPDK anymore. +# The usage of DPDK with Buildroot is for userland only, it means +# that for the dual licenced files, BSD clause is used but not the +# following ones: +# - license/gpl-2.0.txt +# - license/lgpl-2.1.txt +# See the DPDK's license/README for more details. +# +# The legacy and historical license of the DPDK is BSD-3-clause. +DPDK_LICENSE_FILES = \ + license/README \ + license/bsd-3-clause.txt \ + license/exceptions.txt \ + license/mit.txt + +DPDK_DEPENDENCIES = \ + host-pkgconf \ + host-python-pyelftools + +ifeq ($(BR2_PACKAGE_DPDK_EXAMPLES),y) +DPDK_CONF_OPTS += -Dexamples=all +else +DPDK_CONF_OPTS += -Dexamples= +endif + +ifeq ($(BR2_PACKAGE_DPDK_TESTS),y) +DPDK_CONF_OPTS += -Dtests=true +else +DPDK_CONF_OPTS += -Dtests=false +endif + +ifeq ($(BR2_PACKAGE_LIBBSD),y) +DPDK_DEPENDENCIES += libbsd +endif + +ifeq ($(BR2_PACKAGE_JANSSON),y) +DPDK_DEPENDENCIES += jansson +endif + +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +DPDK_DEPENDENCIES += libpcap +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +DPDK_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +DPDK_DEPENDENCIES += libexecinfo +endif + +ifeq ($(BR2_PACKAGE_NUMACTL),y) +DPDK_DEPENDENCIES += numactl +endif + +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +DPDK_DEPENDENCIES += libarchive +endif + +ifeq ($(BR2_PACKAGE_LIBBPF),y) +DPDK_DEPENDENCIES += libbpf +endif + +ifeq ($(BR2_PACKAGE_RDMA_CORE),y) +DPDK_DEPENDENCIES += rdma-core +endif + +# DPDK's meson shall need to be clean'd, hack here along the enclosed patch +DPDK_CONF_OPTS += -Dcpu_instruction_set=$(BR2_GCC_TARGET_ARCH) +# Keep the following, even if not mandatory, until the removal of the patch +DPDK_MESON_EXTRA_PROPERTIES += platform='generic' + +$(eval $(meson-package)) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index a901656e5d4..cf2dd18d61a 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 86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502 dropbear-2024.85.tar.bz2 +sha256 e78936dffc395f2e0db099321d6be659190966b99712b55c530dd0a1822e0a5e dropbear-2024.86.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index d9504c5525f..e043893aa16 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2024.85 +DROPBEAR_VERSION = 2024.86 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain diff --git a/package/dtc/dtc.hash b/package/dtc/dtc.hash index 5856156f008..f05e902df08 100644 --- a/package/dtc/dtc.hash +++ b/package/dtc/dtc.hash @@ -1,5 +1,5 @@ # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 29edce3d302a15563d8663198bbc398c5a0554765c83830d0d4c0409d21a16c4 dtc-1.7.0.tar.xz +sha256 92d8ca769805ae1f176204230438fe52808f4e1c7944053c9eec0e649b237539 dtc-1.7.2.tar.xz # Hash for license files sha256 78e1e1ce5728a990d59c7de61d4741c49185d5129daf783b386380a214328d68 README.license diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 5868ae0e5a8..5b810c6e659 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTC_VERSION = 1.7.0 +DTC_VERSION = 1.7.2 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index 23c4ef30b31..a45767d506d 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -47,14 +47,9 @@ comment "e2scrub needs bash, coreutils, lvm2, and util-linux" config BR2_PACKAGE_E2FSPROGS_E4DEFRAG bool "e4defrag" depends on !BR2_nios2 # fallocate not implemented - depends on !BR2_TOOLCHAIN_USES_UCLIBC # sync_file_range not impl help Online defragmenter for ext4 filesystem -comment "e4defrag needs a glibc or musl toolchain" - depends on !BR2_nios2 - depends on BR2_TOOLCHAIN_USES_UCLIBC - config BR2_PACKAGE_E2FSPROGS_FSCK bool "fsck" default y diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 28a47c15d18..94ce2d5bc91 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/sha256sums.asc -sha256 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db e2fsprogs-1.47.0.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.1/sha256sums.asc +sha256 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 e2fsprogs-1.47.1.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index cbaac4f40bf..7e2d9a739d7 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.47.0 +E2FSPROGS_VERSION = 1.47.1 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 4c74c7dfb6a..0095d4298df 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c240a8ec7816bc5963d881c84eb18d880e9269c117cfc46a3106b0c5e6e80c66 edk2-platforms-e509ac5a729ebe2a3bc905aed1df23226aca4dc9.tar.gz +sha256 41fa720ac644ec0523c576ff28eba5e0308c9649111ce42f7d408b8d8b30eaf5 edk2-platforms-3f08401365d67e10924c774e6c3f64be56bc15b6.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 7bd86ff1594..23d92216491 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = e509ac5a729ebe2a3bc905aed1df23226aca4dc9 +EDK2_PLATFORMS_VERSION = 3f08401365d67e10924c774e6c3f64be56bc15b6 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt diff --git a/package/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 abcc8975b2f..75bfcc2e233 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,37 +1,36 @@ -From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001 +From bfcc72e5bb96fc9fc1f3558191a1a3f40c7f159a Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Fri, 13 May 2022 14:22:37 +0200 +Date: Fri, 2 Aug 2024 17:32:37 +0200 Subject: [PATCH] Makefile.in: do not download or compile dependencies Signed-off-by: Johan Oudinet -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls +Upstream: N/A, not upstreamable --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index ab0e9d967..6e54168a7 100644 +index 5adf241d5..74aad3156 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -155,7 +155,7 @@ else - endif - endif +@@ -201,7 +201,7 @@ endif + #' main targets + # -all: scripts deps src +all: scripts src deps: $(DEPSDIR)/.got -@@ -169,7 +169,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got +@@ -215,7 +215,7 @@ $(DEPSDIR)/.got: $(DEPSDIR)/.built: $(DEPSDIR)/.got $(REBAR) compile && :> $(DEPSDIR)/.built -src: $(DEPSDIR)/.built +src: $(REBAR) $(SKIPDEPS) compile + $(EXPLICIT_ELIXIR_COMPILE) - update: -- 2.34.1 diff --git a/package/ejabberd/0002-fix-ejabberdctl.patch b/package/ejabberd/0002-fix-ejabberdctl.patch index ae28f3a6328..589640ba4c2 100644 --- a/package/ejabberd/0002-fix-ejabberdctl.patch +++ b/package/ejabberd/0002-fix-ejabberdctl.patch @@ -1,30 +1,29 @@ -From 4283f675f21d3923e200092cec6418014a03ad52 Mon Sep 17 00:00:00 2001 +From d403c0bca48f2678c70763c3faca41c9adc76658 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Thu, 26 Dec 2019 17:06:34 +0100 +Date: Fri, 2 Aug 2024 17:39:07 +0200 Subject: [PATCH] fix ejabberdctl Change default values so ejabberdctl run commands as ejabberd user. Signed-off-by: Johan Oudinet -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls +Upstream: N/A (specific to buildroot) --- ejabberdctl.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ejabberdctl.template b/ejabberdctl.template -index a940c3df7..5166e5a27 100755 +index 83ec7e1bd..513c48c25 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template -@@ -17,7 +17,7 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd) +@@ -17,7 +17,7 @@ ERTS_VSN="{{erts_vsn}}" ERL="{{erl}}" - IEX="{{bindir}}/iex" EPMD="{{epmd}}" + IEX="{{iexpath}}" -INSTALLUSER="{{installuser}}" +INSTALLUSER=ejabberd # check the proper system user is used case $(id -un) in -- -2.20.1 +2.34.1 diff --git a/package/ejabberd/0003-correct-includes.patch b/package/ejabberd/0003-correct-includes.patch deleted file mode 100644 index 338aa28fd2a..00000000000 --- a/package/ejabberd/0003-correct-includes.patch +++ /dev/null @@ -1,1807 +0,0 @@ -From 710b6f7c0cfc9ab300d03f12538da3e26c35207b 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 -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls ---- - 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/ext_mod.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_host_meta.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_bridge_session.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_rtbl.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 +- - 127 files changed, 132 insertions(+), 132 deletions(-) - -diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl -index 027983e61..06150f34a 100644 ---- a/src/ejabberd_auth.erl -+++ b/src/ejabberd_auth.erl -@@ -50,7 +50,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 056d475f8..9284c10f6 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 e4b251a03..8074d8612 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 d52dde868..468ae4b19 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 566152695..a730d61bc 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 06aaacda9..e0c72f74b 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 d7b3a3340..670e57516 100644 ---- a/src/ejabberd_c2s.erl -+++ b/src/ejabberd_c2s.erl -@@ -51,7 +51,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 12ab5abb8..e2d400a48 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 f29f36063..34ac89190 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("ejabberd_stacktrace.hrl"). - -include_lib("kernel/include/file.hrl"). -diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl -index e14ca69e6..83986a69b 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 b4957dd55..53f476962 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 5147a7481..7376acbd7 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 ba369c1f2..6f4f6d9c8 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 1a18e2655..36301cfaf 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 ecb1625c7..8513a430b 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 01fa24852..5ce3077d5 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 3a2c6f318..b80e893cc 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 773a3788e..ab341df09 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 378a55a43..a31e2d14d 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 ab8bb4503..7e8aa79b0 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 b9ae1abb3..dadd50a6f 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 3afa64f37..14c0259df 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 c9317b81c..6464801fe 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 5152e2b38..a2cf3c682 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 ac3d4ec9b..e63231a46 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 21123eb23..b9df5304b 100644 ---- a/src/ejabberd_websocket.erl -+++ b/src/ejabberd_websocket.erl -@@ -46,7 +46,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 741bf8422..78f001d24 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/ext_mod.erl b/src/ext_mod.erl -index 32f1f6fc8..066b40935 100644 ---- a/src/ext_mod.erl -+++ b/src/ext_mod.erl -@@ -46,7 +46,7 @@ - -include("ejabberd_web_admin.hrl"). - -include("logger.hrl"). - -include("translate.hrl"). ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - - -define(REPOS, "https://github.com/processone/ejabberd-contrib"). - -diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl -index 72fc0ae30..27c517493 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 baf0ae444..5b3fd426a 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 1fd198208..821cdac45 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 1a8dbb87a..390abcc8a 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 c08610524..d812865ba 100644 ---- a/src/misc.erl -+++ b/src/misc.erl -@@ -51,7 +51,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 3075366c4..2ad402cd7 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 9b88176fb..c49d5400b 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 74d30b3e3..5d7528fc5 100644 ---- a/src/mod_admin_update_sql.erl -+++ b/src/mod_admin_update_sql.erl -@@ -39,7 +39,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 7f6df0df5..56db12f0b 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 e0ef13907..c5ec48921 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 20ec78295..2aa8b112c 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 58b4a8af6..1d01e867a 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 8595b4aa0..ba01af0f9 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 75f9aa0b9..42e7281a4 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 dfe7482e3..6f5db9417 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 65287826c..58c573502 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 c9fe73b0a..ad9524428 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 5b38560e3..5fa594eff 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 3aec8e106..624e6ee8e 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 64e2a48d0..6b40d1ee4 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 919c53a7b..c84d4a062 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 2b77cf762..0d8cd4749 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 cd5fb07fc..8d09b2f15 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_host_meta.erl b/src/mod_host_meta.erl -index e1f7f141b..357dc7661 100644 ---- a/src/mod_host_meta.erl -+++ b/src/mod_host_meta.erl -@@ -38,7 +38,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_http_api.erl b/src/mod_http_api.erl -index 514a8632c..62030a16f 100644 ---- a/src/mod_http_api.erl -+++ b/src/mod_http_api.erl -@@ -33,7 +33,7 @@ - format_arg/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 4efce9c5c..53072cd1e 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 7c2742280..b803e34e0 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 c1b2ad1ec..029be581d 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 be7abd561..a23346f1a 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 98daa18ad..d2239ce2b 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 7c40b17fc..3ba1448e8 100644 ---- a/src/mod_mam.erl -+++ b/src/mod_mam.erl -@@ -48,7 +48,7 @@ - delete_old_messages_batch/5, delete_old_messages_status/1, delete_old_messages_abort/1, - remove_message_from_archive/3]). - ---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 f9e366860..c7340d0a9 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, delete_old_messages_batch/5]). - - -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 b21e84a7b..626b87d65 100644 ---- a/src/mod_mam_sql.erl -+++ b/src/mod_mam_sql.erl -@@ -34,7 +34,7 @@ - delete_old_messages_batch/4, count_messages_to_delete/3]). - - -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 e3dd397f7..df333038a 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 7066911b9..51ed5e1fb 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 7bd6f2a71..a5bc5860f 100644 ---- a/src/mod_mix_pam.erl -+++ b/src/mod_mix_pam.erl -@@ -36,7 +36,7 @@ - webadmin_user/4, - webadmin_page/3]). - ---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/mod_mqtt_bridge_session.erl b/src/mod_mqtt_bridge_session.erl -index 7d38632d4..0627fb55f 100644 ---- a/src/mod_mqtt_bridge_session.erl -+++ b/src/mod_mqtt_bridge_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"). - -include_lib("public_key/include/public_key.hrl"). - - -type error_reason() :: -diff --git a/src/mod_mqtt_session.erl b/src/mod_mqtt_session.erl -index 37ea8ce02..e88ea64fa 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"). - -include_lib("public_key/include/public_key.hrl"). - - -record(state, {vsn = ?VSN :: integer(), -diff --git a/src/mod_mqtt_ws.erl b/src/mod_mqtt_ws.erl -index 236f0b2d7..7c1f91561 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 e1da09a7e..3a8c45108 100644 ---- a/src/mod_muc.erl -+++ b/src/mod_muc.erl -@@ -79,7 +79,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 234f065d3..3c10fecaf 100644 ---- a/src/mod_muc_admin.erl -+++ b/src/mod_muc_admin.erl -@@ -49,7 +49,7 @@ - get_room_pid/2, get_room_history/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("ejabberd_http.hrl"). -diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl -index 9e724de32..24d57a343 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 4a5192d2f..ba45a2775 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 f66e32036..6a5189efa 100644 ---- a/src/mod_muc_room.erl -+++ b/src/mod_muc_room.erl -@@ -71,7 +71,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_rtbl.erl b/src/mod_muc_rtbl.erl -index d5fe3bbfd..e2c501e7c 100644 ---- a/src/mod_muc_rtbl.erl -+++ b/src/mod_muc_rtbl.erl -@@ -27,7 +27,7 @@ - - -behaviour(gen_mod). - ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - -include("logger.hrl"). - -include("translate.hrl"). - -include("mod_muc_room.hrl"). -diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl -index 1c72a5bd2..6f8425241 100644 ---- a/src/mod_muc_sql.erl -+++ b/src/mod_muc_sql.erl -@@ -43,7 +43,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 9b418049a..5f84feb33 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 4840ced5f..629b4d15a 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 2cd511dfa..a7bb30812 100644 ---- a/src/mod_offline_mnesia.erl -+++ b/src/mod_offline_mnesia.erl -@@ -33,7 +33,7 @@ - remove_old_messages_batch/4]). - -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 a3b9d0545..bad4e45f2 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, remove_old_messages_batch/3]). - ---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 9ac6e9bad..7b50b68c8 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 7359260bc..3772f2a9c 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 37f1eb8bc..e2d0ee04d 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 78eeb9b82..cf0cbc754 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 10ec92e0b..241fa6792 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 52768291d..304dc5c25 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 e3619dc2a..3828989d7 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 a1bb38c82..07772c036 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 3862b33c7..9d6b290c9 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 297c59bb6..124c47490 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 b8f4c4905..071bb3327 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 c911bb6ac..117c6bd49 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 9463ec7d9..bcdfb516f 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 4e3baa342..f982991f2 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 7a433a57d..43e8dbb19 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 7b05d4fff..45dac2ca0 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 03e35cbf4..cea523fae 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 7ea3dac81..1a9933a8f 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 3ef93a4dc..d74cb7640 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 67d9697f7..a8462f5ff 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 cd0a9b8f6..2ddd8a9f5 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 c387ce04c..4cc818434 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 579992739..700b0c89c 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 7c97ce011..5aaf6ff53 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 447fa174d..8d700bbe7 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 d921e5474..a4f3cfb03 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 94f82e10b..5a2389e7c 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 13fcfa6c4..7abdf1023 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 dbd17a9d6..70d861e12 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 970a45256..825478840 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 492a486b9..79163f03a 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 7b02b2e48..737f81219 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 9f77cc1a8..085048017 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 c954761c2..659c767fa 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 87bb22080..a6bc0fa0f 100644 ---- a/src/mod_vcard.erl -+++ b/src/mod_vcard.erl -@@ -45,7 +45,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 b07a83cfc..29dcb5226 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 f877f91bd..0bbe993c0 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 7d1c00e11..d770baa6a 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 d169b78f4..4f244c587 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 64b7ba278..5caa4231d 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 c64adb3ef..d94a84734 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 9a98fed65..66c690bf7 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 ea8d35c50..361a3734b 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 ccb2b0e2a..6722cf44f 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 951993cc0..8582d4537 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 db947bb64..23e87e054 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 839d1589c..dc336a340 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 c3c494c8c..80ff83f79 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.39.2 - diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index e24c7fee6b1..f46e40035df 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_EJABBERD depends on BR2_PACKAGE_ERLANG depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep select BR2_PACKAGE_ERLANG_EIMP + select BR2_PACKAGE_ERLANG_FAST_XML + select BR2_PACKAGE_ERLANG_FAST_YAML select BR2_PACKAGE_ERLANG_IDNA # runtime select BR2_PACKAGE_ERLANG_JIFFY # runtime select BR2_PACKAGE_ERLANG_JOSE # runtime @@ -14,14 +16,12 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_PKIX # runtime select BR2_PACKAGE_ERLANG_P1_SIP select BR2_PACKAGE_ERLANG_P1_STRINGPREP - select BR2_PACKAGE_ERLANG_P1_STUN select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_ERLANG_P1_XML - select BR2_PACKAGE_ERLANG_P1_XMPP - select BR2_PACKAGE_ERLANG_P1_YAML select BR2_PACKAGE_ERLANG_P1_YCONF # runtime select BR2_PACKAGE_ERLANG_P1_ZLIB + select BR2_PACKAGE_ERLANG_STUN + select BR2_PACKAGE_ERLANG_XMPP select BR2_PACKAGE_GETENT select BR2_PACKAGE_OPENSSL help diff --git a/package/ejabberd/S50ejabberd b/package/ejabberd/S50ejabberd index 83513bdc83d..5d01034fb20 100644 --- a/package/ejabberd/S50ejabberd +++ b/package/ejabberd/S50ejabberd @@ -3,52 +3,54 @@ # Start/stop ejabberd # +DAEMON=ejabberd CTL=/usr/sbin/ejabberdctl DEFAULT=/etc/ejabberd/ejabberdctl.cfg INSTALLUSER=ejabberd RUNDIR=/var/run/ejabberd # Read default configuration file if present. +# shellcheck source=/dev/null [ -r "$DEFAULT" ] && . "$DEFAULT" # Create RUNDIR. mkrundir() { - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" + install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" } case "$1" in - start) - mkrundir || exit 1 - printf "Starting ejabberd... " - "$CTL" start - # Wait until ejabberd is up and running. - if "$CTL" started; then - echo "done" - else - echo "failed" - fi - ;; - stop) - printf "Stopping ejabberd... " - "$CTL" stop > /dev/null - if [ $? -eq 3 ] || "$CTL" stopped; then - echo "OK" - else - echo "failed" - fi - ;; - status) - "$CTL" status - ;; - restart|force-reload) - "$0" stop || true - "$0" start - ;; - live) - mkrundir || exit 1 - "$CTL" live - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|live}" - exit 1 + start) + mkrundir || exit 1 + printf 'Starting %s: ' "$DAEMON" + "$CTL" start + # Wait until ejabberd is up and running. + if "$CTL" started; then + echo "done" + else + echo "failed" + fi + ;; + stop) + printf 'Stopping %s: ' "$DAEMON" + "$CTL" stop > /dev/null + if [ $? -eq 3 ] || "$CTL" stopped; then + echo "OK" + else + echo "failed" + fi + ;; + status) + "$CTL" status + ;; + restart|force-reload) + "$0" stop || true + "$0" start + ;; + live) + mkrundir || exit 1 + "$CTL" live + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload|live}" + exit 1 esac diff --git a/package/ejabberd/check-erlang-lib b/package/ejabberd/check-erlang-lib index 63f8bf19264..4e51b542944 100755 --- a/package/ejabberd/check-erlang-lib +++ b/package/ejabberd/check-erlang-lib @@ -9,9 +9,9 @@ # without calling erlang. usage() { - cat <&2 - exit 1 + echo "$@" >&2 + exit 1 } if [ $# -ne 1 ]; then - usage - exit 0 + usage + exit 0 else - library="$1" + library="$1" fi target_dir="${TARGET_DIR:-output/target}" @@ -40,16 +40,17 @@ target_dir="${TARGET_DIR:-output/target}" [ -d "$target_dir" ] || die "TARGET_DIR is not a directory. Please \ specify the TARGET_DIR environment variable." -case "$(ls -1d -- "$target_dir/usr/lib/erlang/lib/$library-"* | wc -l)" in - 0) - echo "not found" - ;; - 1) - echo "$target_dir/usr/lib/erlang/lib/$library-"* \ - | sed -e "s,^$target_dir,," - ;; - *) - die "Several versions of $library have been found. Please \ - remove the unused ones." - ;; +case "$(find "$target_dir/usr/lib/erlang/lib" -maxdepth 1 \ + -name "$library-*" -type d | wc -l)" in + 0) + echo "not found" + ;; + 1) + echo "$target_dir/usr/lib/erlang/lib/$library-"* \ + | sed -e "s,^$target_dir,," + ;; + *) + die "Several versions of $library have been found. Please \ + remove the unused ones." + ;; esac diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 15e879be198..e6d9b2560ed 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,4 +1,4 @@ -# From https://static.process-one.net/ejabberd/downloads/23.04/ejabberd-23.04.tar.gz.sum -sha256 6ff1d41a1ff6261a0c846193647d8ec143e82142859bf1cfdc62299022ceb2ad ejabberd-23.04.tar.gz +# From https://static.process-one.net/ejabberd/downloads/24.07/ejabberd-24.07.tar.gz.sum +sha256 c0fb746acba81a5db41de97c03968c1f681a13b1b6c1a895b7182e33820c18d9 ejabberd-24.07.tar.gz # Locally computed sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 574f9492e82..df9fc1c1d04 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,16 +4,16 @@ # ################################################################################ -EJABBERD_VERSION = 23.04 +EJABBERD_VERSION = 24.07 EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception EJABBERD_LICENSE_FILES = COPYING EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ - erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \ - erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ - erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp + erlang-p1-stringprep erlang-stun erlang-p1-tls \ + erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-fast-yaml \ + erlang-p1-zlib host-erlang-p1-utils host-erlang-xmpp # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch # updates Makefile.in @@ -36,7 +36,8 @@ EJABBERD_CONF_ENV = \ EJABBERD_CONF_OPTS = \ --enable-system-deps \ - --disable-erlang-version-check + --disable-erlang-version-check \ + --with-rebar="$(HOST_DIR)/bin/rebar" define EJABBERD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) all install -C $(@D) diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index a15c64d0419..344ae97018e 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -16,18 +16,8 @@ HOST_ELF2FLT_AUTORECONF = YES # elf2flt needs to link against libbfd.a and libiberty.a which are # provided by host-binutils, but not installed, so we poke directly -# into the host-binutils build directory. Turns out that the location -# of libbfd.a has changed in binutils >= 2.41, so we special case -# binutils 2.39 and 2.40, which are the two remaining versions still -# using the "old" path". Note: the ARC-special binutils version is not -# considered because Buildroot only supports ARC CPUs with a MMU and -# therefore host-elf2flt is never used on ARC. libiberty.a has -# remained at the same location. -ifeq ($(BR2_BINUTILS_VERSION_2_40_X),y) -HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a -else +# into the host-binutils build directory. HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a -endif # It is not exactly a host variant, but more a cross variant, which is # why we pass a special --target option. diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 3adca75140e..4f67cbae214 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 9ee7ac57b188d391cead705d3596a6d3240341786475149db297782a52269aa5 ell-0.65.tar.xz +sha256 6cfc0888edc94de9f0623798609587b2cc11b92b892945f317e8d199afe7b12e ell-0.69.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index a682635539e..6d4e8a5ae76 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.65 +ELL_VERSION = 0.69 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ diff --git a/package/erlang-eimp/erlang-eimp.hash b/package/erlang-eimp/erlang-eimp.hash index 26e8addd2d1..e9ef9c693e3 100644 --- a/package/erlang-eimp/erlang-eimp.hash +++ b/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7023b86bc7cf3551fd876a1361ceb2443bdf1c1be9f98a4d9a9a90eda3353b51 erlang-eimp-1.0.22.tar.gz +sha256 923d9fb5abd7fca36188441e6871e2d2da2f8fc95ed42d78406eb431df587b28 erlang-eimp-1.0.23.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk index 68d0d9e9ed9..1e1a5ece437 100644 --- a/package/erlang-eimp/erlang-eimp.mk +++ b/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.22 +ERLANG_EIMP_VERSION = 1.0.23 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-fast-xml/Config.in b/package/erlang-fast-xml/Config.in new file mode 100644 index 00000000000..04d6634fe81 --- /dev/null +++ b/package/erlang-fast-xml/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ERLANG_FAST_XML + bool "erlang-fast-xml" + select BR2_PACKAGE_ERLANG_P1_UTILS + select BR2_PACKAGE_EXPAT + help + XML utilities for Erlang + + https://github.com/processone/fast_xml diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-fast-xml/erlang-fast-xml.hash similarity index 50% rename from package/erlang-p1-yaml/erlang-p1-yaml.hash rename to package/erlang-fast-xml/erlang-fast-xml.hash index 0138f820470..df5557080cf 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-fast-xml/erlang-fast-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6794470ef35fb3985c4e9aa0ed8d3a0b44e7a5c7bf4c5a1efbeca42060db6806 erlang-p1-yaml-1.0.36.tar.gz +sha256 2f705191a029ca7df7e62a6cd8622701da59a9e221f8514d2c2b1a5c1d23c739 erlang-fast-xml-1.1.52.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-fast-xml/erlang-fast-xml.mk b/package/erlang-fast-xml/erlang-fast-xml.mk new file mode 100644 index 00000000000..a04e3f5e098 --- /dev/null +++ b/package/erlang-fast-xml/erlang-fast-xml.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# erlang-fast-xml +# +################################################################################ + +ERLANG_FAST_XML_VERSION = 1.1.52 +ERLANG_FAST_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_FAST_XML_VERSION)) +ERLANG_FAST_XML_LICENSE = Apache-2.0 +ERLANG_FAST_XML_LICENSE_FILES = LICENSE.txt +ERLANG_FAST_XML_DEPENDENCIES = expat erlang-p1-utils +HOST_ERLANG_FAST_XML_DEPENDENCIES = host-expat host-erlang-p1-utils +ERLANG_FAST_XML_INSTALL_STAGING = YES + +ERLANG_FAST_XML_USE_AUTOCONF = YES + +$(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-yaml/Config.in b/package/erlang-fast-yaml/Config.in similarity index 51% rename from package/erlang-p1-yaml/Config.in rename to package/erlang-fast-yaml/Config.in index 2ab78d1296d..8c9d47f044f 100644 --- a/package/erlang-p1-yaml/Config.in +++ b/package/erlang-fast-yaml/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_ERLANG_P1_YAML - bool "erlang-p1-yaml" +config BR2_PACKAGE_ERLANG_FAST_YAML + bool "erlang-fast-yaml" select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_LIBYAML help Erlang wrapper for libyaml C library - https://github.com/processone/p1_yaml + https://github.com/processone/fast_yaml diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-fast-yaml/erlang-fast-yaml.hash similarity index 50% rename from package/erlang-p1-xmpp/erlang-p1-xmpp.hash rename to package/erlang-fast-yaml/erlang-fast-yaml.hash index 62325786a5c..863781725d6 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-fast-yaml/erlang-fast-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0 erlang-p1-xmpp-1.6.2.tar.gz +sha256 a8d632d97282cfdf54a0172df59d8641f37de690dd886d0b2e4ef0d4ff876077 erlang-fast-yaml-1.0.37.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-fast-yaml/erlang-fast-yaml.mk b/package/erlang-fast-yaml/erlang-fast-yaml.mk new file mode 100644 index 00000000000..675dba08398 --- /dev/null +++ b/package/erlang-fast-yaml/erlang-fast-yaml.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# erlang-fast-yaml +# +################################################################################ + +ERLANG_FAST_YAML_VERSION = 1.0.37 +ERLANG_FAST_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_FAST_YAML_VERSION)) +ERLANG_FAST_YAML_LICENSE = Apache-2.0 +ERLANG_FAST_YAML_LICENSE_FILES = LICENSE.txt +ERLANG_FAST_YAML_DEPENDENCIES = libyaml erlang-p1-utils + +define ERLANG_FAST_YAML_REMOVE_PATHS + $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config + $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config +endef + +ERLANG_FAST_YAML_POST_PATCH_HOOKS = ERLANG_FAST_YAML_REMOVE_PATHS + +$(eval $(rebar-package)) diff --git a/package/erlang-jose/erlang-jose.hash b/package/erlang-jose/erlang-jose.hash index 1e763fd5ba2..abcf11b1d18 100644 --- a/package/erlang-jose/erlang-jose.hash +++ b/package/erlang-jose/erlang-jose.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2186b93ad20d386e6db9f673c135c48568a55de42b5a1d839518c65509af4ea5 erlang-jose-1.11.5.tar.gz +sha256 57c0ebfb0fd41d52bb22ff0398af75acf378475751c0a127af726b7385659ba7 erlang-jose-1.11.10.tar.gz sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md diff --git a/package/erlang-jose/erlang-jose.mk b/package/erlang-jose/erlang-jose.mk index 4df5173b2c2..f147afd5a74 100644 --- a/package/erlang-jose/erlang-jose.mk +++ b/package/erlang-jose/erlang-jose.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JOSE_VERSION = 1.11.5 +ERLANG_JOSE_VERSION = 1.11.10 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-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash index e417d4b1817..0894176fbd7 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 a445b66e76acdf1342eda166344004473bf4f45ad7e7f5ae38fb0333d896eb2d erlang-p1-acme-1.0.22.tar.gz +sha256 59a0113022c87afe25a8664fba76739b0ad481e25081599e0b69a098f6d628ed erlang-p1-acme-1.0.23.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 cb8c7a8a195..5c7c5cc9e90 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.22 +ERLANG_P1_ACME_VERSION = 1.0.23 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 83c40f37d7c..9662c39aca4 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 c506d2aa2e59f1e0086ce32234618189d557a767312179cc1c8df19754131ca2 erlang-p1-cache-tab-1.0.30.tar.gz +sha256 7d30cacd91b4a691e1e4bb458df895fd71803853a624bd0afaba0db4dbfc3f15 erlang-p1-cache-tab-1.0.31.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 e2479b82144..07d28fd2d43 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.30 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.31 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 4ce3295ed31..ff92cd42b2d 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 8d6b2d780d3d6e23a2d205406b30bf96c722f6c8b336a83182d5455e665ae866 erlang-p1-mqtree-1.0.15.tar.gz +sha256 a2b7a000efdc2f4a55b84b5b6cdde000c905856a05fdbd9911275fb9207f7a5b erlang-p1-mqtree-1.0.17.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 d606f737aa8..96b607f88d0 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.15 +ERLANG_P1_MQTREE_VERSION = 1.0.17 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 ac87485d5bb..dd2f8782b7c 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 2a33d96ab007b77759f48613a65794351569e7d2d800700b71e50448eed0e3b8 erlang-p1-oauth2-0.6.11.tar.gz +sha256 6437184239ea3053584834771776062c4e055e897dc6ca94dd8f960f393d891c erlang-p1-oauth2-0.6.14.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 b01a3919636..09bb0e67528 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.11 +ERLANG_P1_OAUTH2_VERSION = 0.6.14 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 2b9c4cc93f7..a1fdad63e03 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 a9adf7d16494c1a1b572b46fc9ee1d28996b3d4bcb7a433395dfe120cee0c0ae erlang-p1-pkix-1.0.9.tar.gz +sha256 da6279d3f8ee31ef04de2b82fb0d42ce8dcd72cedb9a8e6ae7b18e42590cb108 erlang-p1-pkix-1.0.10.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 90c41221849..ba3d88a30a9 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.9 +ERLANG_P1_PKIX_VERSION = 1.0.10 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/0001-correct-include.patch b/package/erlang-p1-sip/0001-correct-include.patch deleted file mode 100644 index 90d68b5184a..00000000000 --- a/package/erlang-p1-sip/0001-correct-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5ad4f871df7cbbc973708cb7380c3410b20bde1c Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Tue, 1 Dec 2020 23:07:51 +0100 -Subject: [PATCH] correct include - -This part of the code was moved into it's own project and was packaged -separately by me. To make the build process work, this small fix is -necessary. - -Author: Philipp Huebner -Signed-off-by: Johan Oudinet ---- - src/esip_socket.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/esip_socket.erl b/src/esip_socket.erl -index 4154faa..db5fa92 100644 ---- a/src/esip_socket.erl -+++ b/src/esip_socket.erl -@@ -37,7 +37,7 @@ - - -include("esip.hrl"). - -include("esip_lib.hrl"). ---include_lib("stun/include/stun.hrl"). -+-include_lib("p1_stun/include/stun.hrl"). - - -define(TCP_SEND_TIMEOUT, 15000). - -define(CONNECT_TIMEOUT, 20000). --- -2.28.0 - diff --git a/package/erlang-p1-sip/Config.in b/package/erlang-p1-sip/Config.in index 70cf819a37d..74494d3c941 100644 --- a/package/erlang-p1-sip/Config.in +++ b/package/erlang-p1-sip/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_ERLANG_P1_SIP bool "erlang-p1-sip" - select BR2_PACKAGE_ERLANG_P1_STUN select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS + select BR2_PACKAGE_ERLANG_STUN help SIP library for Erlang diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index 87c0742bfcd..d2e40e8fdc3 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 895a143fc90f0222649d103dd524def7fed6665c52600c2bba61e9f69d132372 erlang-p1-sip-1.0.49.tar.gz +sha256 9336f02ea99cfad359c78c50fdd9c3061aac7b31966abdc3223f56b3ed7cc377 erlang-p1-sip-1.0.54.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 61f728cb1b8..36758b86814 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,11 +4,11 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.49 +ERLANG_P1_SIP_VERSION = 1.0.54 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 -ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils +ERLANG_P1_SIP_DEPENDENCIES = erlang-stun erlang-p1-tls erlang-p1-utils ERLANG_P1_SIP_INSTALL_STAGING = YES $(eval $(rebar-package)) diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index 50a48af0a4c..6df5048dce2 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 b07daf2148829d513caf2931d463550e70252a78ef99696dcf444d61d93bf940 erlang-p1-stringprep-1.0.29.tar.gz +sha256 8fc39340e73b0f77c2c77ebb486c5c2309ea3ec46afa16cc03db35d200e3a5f5 erlang-p1-stringprep-1.0.30.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 09e339f57a9..4f925c06822 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.29 +ERLANG_P1_STRINGPREP_VERSION = 1.0.30 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.mk b/package/erlang-p1-stun/erlang-p1-stun.mk deleted file mode 100644 index 7438bd21862..00000000000 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-p1-stun -# -################################################################################ - -ERLANG_P1_STUN_VERSION = 1.2.7 -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 -ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils -ERLANG_P1_STUN_INSTALL_STAGING = YES - -$(eval $(rebar-package)) diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index 9a14a442935..b88844b3c1f 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 8c38768998e8ee0aa2bf5831bc25deeb4ea2e08bd52e26b2abfd654504fbe4f9 erlang-p1-tls-1.1.16.tar.gz -sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt +sha256 08235a436f2222d6caf6b17e4e1471c65bf677dd2f5659d9174160dad4f51b7a erlang-p1-tls-1.1.21.tar.gz +sha256 823a9f2a803502343d969639e581c206d415cef3089ddcbc4f7cc02de201b8da LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index c16a1240684..3fa849d1331 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.16 +ERLANG_P1_TLS_VERSION = 1.1.21 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 aa8d25bfa6b..7f5d213693a 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 c62f93ab5ea8d9251d9acda2abf576352d50f4a3299972549180a5387656746a erlang-p1-utils-1.0.25.tar.gz +sha256 bf00dced9f892ec5972c0ff4f9861b391cbffe1a763c73dcfa622c500a1cc55b erlang-p1-utils-1.0.26.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 8b00ee14627..fd9a8f1684c 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.25 +ERLANG_P1_UTILS_VERSION = 1.0.26 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/Config.in b/package/erlang-p1-xml/Config.in deleted file mode 100644 index 504501d912a..00000000000 --- a/package/erlang-p1-xml/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_XML - bool "erlang-p1-xml" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_EXPAT - help - XML utilities for Erlang - - https://github.com/processone/xml diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk deleted file mode 100644 index eee2c74c03a..00000000000 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# erlang-p1-xml -# -################################################################################ - -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 -ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils -HOST_ERLANG_P1_XML_DEPENDENCIES = host-expat host-erlang-p1-utils -ERLANG_P1_XML_INSTALL_STAGING = YES - -ERLANG_P1_XML_USE_AUTOCONF = YES - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch deleted file mode 100644 index f02037fdc1c..00000000000 --- a/package/erlang-p1-xmpp/0001-fix-includes.patch +++ /dev/null @@ -1,16 +0,0 @@ -Without this patch, rebar fails to find include file fxml.hrl. - -Signed-off-by: Christophe Romain - -diff --git a/include/xmpp.hrl b/include/xmpp.hrl -index afa5f61..678858e 100644 ---- a/include/xmpp.hrl -+++ b/include/xmpp.hrl -@@ -25,7 +25,7 @@ - -include("ns.hrl"). - -include("jid.hrl"). - -include("xmpp_codec.hrl"). ---include_lib("fast_xml/include/fxml.hrl"). -+-include_lib("p1_xml/include/fxml.hrl"). - - -type stanza() :: iq() | presence() | message(). diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk deleted file mode 100644 index 2deb25b315e..00000000000 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# erlang-p1-xmpp -# -################################################################################ - -ERLANG_P1_XMPP_VERSION = 1.6.2 -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 -ERLANG_P1_XMPP_INSTALL_STAGING = YES -ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \ - erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml -HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-p1-xml - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk deleted file mode 100644 index 17f4910ee1a..00000000000 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# erlang-p1-yaml -# -################################################################################ - -ERLANG_P1_YAML_VERSION = 1.0.36 -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 -ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils - -define ERLANG_P1_YAML_REMOVE_PATHS - $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config - $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config -endef - -ERLANG_P1_YAML_POST_PATCH_HOOKS = ERLANG_P1_YAML_REMOVE_PATHS - -$(eval $(rebar-package)) diff --git a/package/erlang-p1-yconf/Config.in b/package/erlang-p1-yconf/Config.in index 3777ebbe149..987b5118787 100644 --- a/package/erlang-p1-yconf/Config.in +++ b/package/erlang-p1-yconf/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ERLANG_P1_YCONF bool "erlang-p1-yconf" - select BR2_PACKAGE_ERLANG_P1_YAML + select BR2_PACKAGE_ERLANG_FAST_YAML help YAML configuration processor. diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.hash b/package/erlang-p1-yconf/erlang-p1-yconf.hash index 25d873b58a1..dc2ac9937ed 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 0280358c868977105104cfffa7b1fa2c5bf7856243cee9b7df974dc54904e4da erlang-p1-yconf-1.0.15.tar.gz +sha256 0f33a381cc580dc43284581e61e531293d1d358e35a32e51b8b4fda7b462eba1 erlang-p1-yconf-1.0.16.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 81f7462884b..297ab20bb25 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -4,10 +4,10 @@ # ################################################################################ -ERLANG_P1_YCONF_VERSION = 1.0.15 +ERLANG_P1_YCONF_VERSION = 1.0.16 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 -ERLANG_P1_YCONF_DEPENDENCIES = erlang-p1-yaml +ERLANG_P1_YCONF_DEPENDENCIES = erlang-fast-yaml $(eval $(rebar-package)) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index fa8cdacd8c4..9d4399b9a0e 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 f2e7a3d17bbd752ad3ffd8a24c7948bf7c211c67c953a98c03110ddc497798d1 erlang-p1-zlib-1.0.12.tar.gz +sha256 ae14f266e50c843a46bfcd5fc480112416cd542e82d68c5a97927118ddfb8187 erlang-p1-zlib-1.0.13.tar.gz sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index da55d310afb..fd20464cc96 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.12 +ERLANG_P1_ZLIB_VERSION = 1.0.13 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-p1-stun/Config.in b/package/erlang-stun/Config.in similarity index 71% rename from package/erlang-p1-stun/Config.in rename to package/erlang-stun/Config.in index 70cdd915990..dcf3817a2df 100644 --- a/package/erlang-p1-stun/Config.in +++ b/package/erlang-stun/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_ERLANG_P1_STUN - bool "erlang-p1-stun" +config BR2_PACKAGE_ERLANG_STUN + bool "erlang-stun" select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS help diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-stun/erlang-stun.hash similarity index 51% rename from package/erlang-p1-stun/erlang-p1-stun.hash rename to package/erlang-stun/erlang-stun.hash index 49e1963ff00..c248e89ea82 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-stun/erlang-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86 erlang-p1-stun-1.2.7.tar.gz +sha256 110b06572c6208fdeaa60c32cd549e6798f0a719d51bef97608c2aaa61151c11 erlang-stun-1.2.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-stun/erlang-stun.mk b/package/erlang-stun/erlang-stun.mk new file mode 100644 index 00000000000..abfb1c38536 --- /dev/null +++ b/package/erlang-stun/erlang-stun.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# erlang-stun +# +################################################################################ + +ERLANG_STUN_VERSION = 1.2.14 +ERLANG_STUN_SITE = $(call github,processone,stun,$(ERLANG_STUN_VERSION)) +ERLANG_STUN_LICENSE = Apache-2.0 +ERLANG_STUN_LICENSE_FILES = LICENSE.txt +ERLANG_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils +ERLANG_STUN_INSTALL_STAGING = YES + +$(eval $(rebar-package)) diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-xmpp/Config.in similarity index 70% rename from package/erlang-p1-xmpp/Config.in rename to package/erlang-xmpp/Config.in index c67dc832b7a..d41c413445a 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-xmpp/Config.in @@ -1,11 +1,11 @@ -comment "erlang-p1-xmpp needs a toolchain w/ C++" +comment "erlang-xmpp needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP -config BR2_PACKAGE_ERLANG_P1_XMPP - bool "erlang-p1-xmpp" +config BR2_PACKAGE_ERLANG_XMPP + bool "erlang-xmpp" depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep + select BR2_PACKAGE_ERLANG_FAST_XML select BR2_PACKAGE_ERLANG_IDNA - select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-xmpp/erlang-xmpp.hash similarity index 51% rename from package/erlang-p1-xml/erlang-p1-xml.hash rename to package/erlang-xmpp/erlang-xmpp.hash index 379ca7ef882..df509886f82 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-xmpp/erlang-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 erlang-p1-xml-1.1.49.tar.gz +sha256 2a099bdfb129c416fae6f7e713d94ad39153cf2e7bf6b277a970136190a28ff2 erlang-xmpp-1.8.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-xmpp/erlang-xmpp.mk b/package/erlang-xmpp/erlang-xmpp.mk new file mode 100644 index 00000000000..66d72233462 --- /dev/null +++ b/package/erlang-xmpp/erlang-xmpp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# erlang-xmpp +# +################################################################################ + +ERLANG_XMPP_VERSION = 1.8.3 +ERLANG_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_XMPP_VERSION)) +ERLANG_XMPP_LICENSE = Apache-2.0 +ERLANG_XMPP_LICENSE_FILES = LICENSE.txt +ERLANG_XMPP_INSTALL_STAGING = YES +ERLANG_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \ + erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml +HOST_ERLANG_XMPP_DEPENDENCIES = host-erlang-fast-xml + +$(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 063d3845118..573da1762da 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 196083d63e5e231fb5799e7ce86a944bbca564daabce3de9225a8aca9dcaff15 erofs-utils-1.7.1.tar.gz +sha256 64b6ff7e899f62480283cee63787f37f0f9c4be7a6bc7a23d734aaa873a6cff4 erofs-utils-1.8.2.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 f994ea9d070..40349c309cc 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.7.1 +EROFS_UTILS_VERSION = 1.8.2 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+, GPL-2.0+ or Apache-2.0 (liberofs) EROFS_UTILS_LICENSE_FILES = COPYING LICENSES/Apache-2.0 LICENSES/GPL-2.0 @@ -14,6 +14,10 @@ EROFS_UTILS_AUTORECONF = YES EROFS_UTILS_DEPENDENCIES = host-pkgconf util-linux +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +EROFS_UTILS_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y) EROFS_UTILS_DEPENDENCIES += lz4 EROFS_UTILS_CONF_OPTS += --enable-lz4 @@ -56,12 +60,20 @@ else EROFS_UTILS_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +EROFS_UTILS_DEPENDENCIES += zstd +EROFS_UTILS_CONF_OPTS += --with-libzstd +else +EROFS_UTILS_CONF_OPTS += --without-libzstd +endif + HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 host-xz HOST_EROFS_UTILS_CONF_OPTS += \ --enable-lz4 \ --enable-lzma \ --disable-fuse \ --without-libdeflate \ + --without-libzstd \ --without-selinux \ --without-zlib diff --git a/package/espflash/espflash.hash b/package/espflash/espflash.hash index ebe24ef51fb..0b1e160a478 100644 --- a/package/espflash/espflash.hash +++ b/package/espflash/espflash.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8e5da5e90d03135a1b2af6c0b551e4f2504ad64e659b0e88e8a4ecd98cc6a6b6 espflash-3.1.0-cargo2.tar.gz +sha256 f91a3e33e874bac0d7687d87c3cd692a54325c0dceaf35c983bd3d94519dee25 espflash-3.1.1-cargo2.tar.gz sha256 0886cf791a43c02d71c105b4835b53293704ec407a72f84a87f73e20cb2d3251 LICENSE-APACHE sha256 a75018ab59a13738ed2024a0090ae8f91b7693ae84568aa0e52c3dff99e6748d LICENSE-MIT diff --git a/package/espflash/espflash.mk b/package/espflash/espflash.mk index ad2294e1bfa..bcb343fc58c 100644 --- a/package/espflash/espflash.mk +++ b/package/espflash/espflash.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESPFLASH_VERSION = 3.1.0 +ESPFLASH_VERSION = 3.1.1 ESPFLASH_SITE = $(call github,esp-rs,espflash,v$(ESPFLASH_VERSION)) ESPFLASH_SUBDIR = espflash ESPFLASH_LICENSE = Apache-2.0 or MIT diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 6c442c3729e..6fc0c13d3b4 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 a71b0354010661c5cf178bc606ed50fcb91805cf1897ad0eb2818387a5fd0cd9 ethtool-6.9.tar.xz +sha256 8d91f5c72ae3f25b7e88d4781279dcb320f71e30058914370b1c574c96b31202 ethtool-6.11.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index bd04fca8f3c..fc0622c04ac 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.9 +ETHTOOL_VERSION = 6.11 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/Config.in b/package/eudev/Config.in index 6e7bbe46484..65cfc1d2def 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -3,13 +3,12 @@ config BR2_PACKAGE_EUDEV depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV depends on BR2_USE_MMU # uses fork() depends on BR2_USE_WCHAR # needs C99 compiler - depends on !BR2_STATIC_LIBS # kmod + depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_KMOD help eudev is a fork of systemd-udev with the goal of obtaining better compatibility with existing software such as OpenRC and @@ -23,6 +22,13 @@ if BR2_PACKAGE_EUDEV config BR2_PACKAGE_PROVIDES_UDEV default "eudev" +config BR2_PACKAGE_EUDEV_MODULE_LOADING + bool "enable kernel module loading" + default y + select BR2_PACKAGE_KMOD + help + Enable kernel module loading support + config BR2_PACKAGE_EUDEV_RULES_GEN bool "enable rules generator" help diff --git a/package/eudev/S10udev b/package/eudev/S10udev index 4e799d65073..6f20fc51f5a 100644 --- a/package/eudev/S10udev +++ b/package/eudev/S10udev @@ -16,6 +16,14 @@ # /dev/zero, /dev/null -- that's needed to boot and run this script. # +DAEMON="udevd" + +SETTLE_TIMEOUT=30 +UDEVD_ARGS="-d" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + # Check for config file and read it UDEV_CONFIG=/etc/udev/udev.conf test -r $UDEV_CONFIG || exit 6 @@ -25,10 +33,10 @@ case "$1" in start) printf "Populating %s using udev: " "${udev_root:-/dev}" [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug - /sbin/udevd -d || { echo "FAIL"; exit 1; } + /sbin/udevd $UDEVD_ARGS || { echo "FAIL"; exit 1; } udevadm trigger --type=subsystems --action=add udevadm trigger --type=devices --action=add - udevadm settle --timeout=30 || echo "udevadm settle failed" + udevadm settle --timeout=$SETTLE_TIMEOUT || echo "udevadm settle failed" echo "done" ;; stop) diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 33cc6382911..8318bc1ed4c 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -19,13 +19,20 @@ EUDEV_CONF_OPTS = \ --enable-blkid # eudev requires only the util-linux libraries at build time -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) EUDEV_CONF_OPTS += --with-rootlibdir=/lib --enable-split-usr endif +ifeq ($(BR2_PACKAGE_EUDEV_MODULE_LOADING),y) +EUDEV_CONF_OPTS += --enable-kmod +EUDEV_DEPENDENCIES += kmod +else +EUDEV_CONF_OPTS += --disable-kmod +endif + ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y) EUDEV_CONF_OPTS += --enable-rule-generator else diff --git a/package/evilwm/Config.in b/package/evilwm/Config.in new file mode 100644 index 00000000000..0f0513df0da --- /dev/null +++ b/package/evilwm/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_EVILWM + bool "evilwm" + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXRANDR + help + A minimalist window manager for the X Window System + + https://www.6809.org.uk/evilwm/ diff --git a/package/evilwm/evilwm.hash b/package/evilwm/evilwm.hash new file mode 100644 index 00000000000..7fede9641f1 --- /dev/null +++ b/package/evilwm/evilwm.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 d5945b20b12c91db2412fac0dbda3fb9c3ec8debb8e1b109838992b2b1bbe5d4 evilwm-1.4.3.tar.gz +sha256 e98134d702e297c35e2b1150918a2b0cffea523f67644fa64e8dbb823fb55986 README diff --git a/package/evilwm/evilwm.mk b/package/evilwm/evilwm.mk new file mode 100644 index 00000000000..78b531095b9 --- /dev/null +++ b/package/evilwm/evilwm.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# evilwm +# +################################################################################ + +EVILWM_VERSION = 1.4.3 +EVILWM_SITE = https://www.6809.org.uk/evilwm/dl +EVILWM_LICENSE = evilwm license +EVILWM_LICENSE_FILES = README + +EVILWM_DEPENDENCIES = xlib_libX11 xlib_libXrandr + +define EVILWM_INSTALL_XSESSION_FILE + $(INSTALL) -m 0755 -D package/evilwm/xsession \ + $(TARGET_DIR)/root/.xsession +endef + +EVILWM_POST_INSTALL_TARGET_HOOKS += EVILWM_INSTALL_XSESSION_FILE + +$(eval $(autotools-package)) diff --git a/package/evilwm/xsession b/package/evilwm/xsession new file mode 100644 index 00000000000..9892af719d4 --- /dev/null +++ b/package/evilwm/xsession @@ -0,0 +1,2 @@ +#!/bin/sh +exec evilwm -term xterm diff --git a/package/execline/Config.in b/package/execline/Config.in index 7a2278fa5ae..a7cbba1bb0e 100644 --- a/package/execline/Config.in +++ b/package/execline/Config.in @@ -10,3 +10,12 @@ config BR2_PACKAGE_EXECLINE essentially useful inside an execlineb script. http://skarnet.org/software/execline/ + +if BR2_PACKAGE_EXECLINE + +config BR2_PACKAGE_EXECLINE_MULTICALL + bool "execline multicall binary" + help + Build execline as a multicall binary to save disk space. + +endif diff --git a/package/execline/execline.mk b/package/execline/execline.mk index ee38d3ed3c7..922fc7b5af0 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -19,6 +19,7 @@ EXECLINE_CONF_OPTS = \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(if $(BR2_PACKAGE_EXECLINE_MULTICALL),--enable-multicall,) \ $(SHARED_STATIC_LIBS_OPTS) define EXECLINE_CONFIGURE_CMDS diff --git a/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch b/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch new file mode 100644 index 00000000000..28c9a714665 --- /dev/null +++ b/package/exfatprogs/0001-exfatprogs-fix-argument-validation-check-2.patch @@ -0,0 +1,41 @@ +From 5055bc4e852e18ddbfc618623cdaa2c0572d5f0e Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 2 Nov 2024 19:27:46 +0100 +Subject: [PATCH] exfatprogs: fix argument validation check (2) + +Since commit 7d354e5be83ed3bb981c59b3435ff64da56d185d +("exfatprogs: fix argument validation check"), exfatlabel tool +error out when we try to set a new volume serial or label. + + exfatlabel /dev/sda1 "new label" + exfatlabel -i /dev/sda1 0x12345678 + +Error out only if too few argument is given, ignore +additional arguments. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992419 + +Upstream: https://github.com/exfatprogs/exfatprogs/pull/279 + +Signed-off-by: Romain Naour +--- + label/label.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/label/label.c b/label/label.c +index 12d027b..9c8aff3 100644 +--- a/label/label.c ++++ b/label/label.c +@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) + if (version_only) + exit(EXIT_FAILURE); + +- if (argc - optind != 1) ++ if (argc - optind < 1) + usage(); + + ui.dev_name = argv[serial_mode + 1]; +-- +2.45.0 + diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 9f3100db7f7..5ccad03ca2d 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.2/exfatprogs-1.2.2.tar.xz.sha256 -sha256 61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a exfatprogs-1.2.2.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.5/exfatprogs-1.2.5.tar.xz.sha256 +sha256 f27160dcc1ddd17c96cd41a6ceef7037adc2796ab5c5633d3d85cf532c3ee2f0 exfatprogs-1.2.5.tar.xz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index 40d90725717..a541a631164 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.2.2 +EXFATPROGS_VERSION = 1.2.5 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 18d437abd14..408099e2316 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4ecb6221b28aaae309043b8403555eb6835de671c519c224a3807cea50f48001 eza-0.18.22-cargo2.tar.gz +sha256 65a0dc76c1976d7af72a628196022de71c787092da5c6d961a3fcee21f5d1d6f eza-0.18.24-cargo2.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index 79fd2d36339..4d23116504d 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.18.22 +EZA_VERSION = 0.18.24 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index a148de6764a..0d78d712353 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,5 +1,5 @@ -# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.34-1.dsc -sha1 aaa6bf0158d886e0093effc0e9422717d5c60eee fakeroot_1.34.orig.tar.gz -sha256 5727f16d8903792588efa7a9f8ef8ce71f8756e746b62e45162e7735662e56bb fakeroot_1.34.orig.tar.gz +# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.36-1.dsc +sha1 ea895c6632fcf1b38cc84987d1b4daf833ffd430 fakeroot_1.36.orig.tar.gz +sha256 7fe3cf3daf95ee93b47e568e85f4d341a1f9ae91766b4f9a9cdc29737dea4988 fakeroot_1.36.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 1a0996ca12f..e18cdc5f07f 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.34 +FAKEROOT_VERSION = 1.36 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20240401T084438Z/pool/main/f/fakeroot +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20241022T144244Z/pool/main/f/fakeroot/ HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off diff --git a/package/fbv/0001-cross.patch b/package/fbv/0001-cross.patch deleted file mode 100644 index ab5f0fb48c1..00000000000 --- a/package/fbv/0001-cross.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -urpN fbv-1.0b.orig/configure fbv-1.0b/configure ---- fbv-1.0b.orig/configure 2004-09-07 13:29:27.000000000 +0200 -+++ fbv-1.0b/configure 2008-04-24 10:52:37.000000000 +0200 -@@ -80,6 +80,7 @@ while true ; do - esac - done - -+[ -z "$CC" ] && CC=cc - [ -z "$prefix" ] && prefix="/usr/local" - [ -z "$bindir" ] && bindir="${prefix}/bin" - [ -z "$mandir" ] && mandir="${prefix}/man" -@@ -106,12 +107,12 @@ xdir="/usr/X11R6" - ungif="no" - echo "libungif check" >>./config.log - echo " 1st:" >>./config.log --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs - if [ -e \$\$~test ]; then - libs="-lungif $libs" ; ungif="yes" - else - echo " 2nd: -lX11 -L$xdir/lib" >>./config.log -- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs -+ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs - if [ -e \$\$~test ]; then - libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes" - fi -@@ -124,7 +125,7 @@ echo "libungif: $ungif" >> ./config.log - echo -n "checking for libjpeg presence... " - if [ "$jpeg" != "disabled" ]; then - jpeg="no" --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs - if [ -e \$\$~test ]; then - libs="-ljpeg $libs" ; jpeg="yes" - fi -@@ -135,7 +136,7 @@ echo "libjpeg: $jpeg" >> ./config.log - echo -n "checking for libpng presence... " - if [ "$png" != "disabled" ]; then - png="no" --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs - if [ -e \$\$~test ]; then - libs="-lpng $libs" ; png="yes" - fi diff --git a/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch b/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch new file mode 100644 index 00000000000..131dafc5c1c --- /dev/null +++ b/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch @@ -0,0 +1,29 @@ +From 3547055ba135dc1d8aacea68f16456aabb8c0a91 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 23 Aug 2024 06:11:43 +0200 +Subject: [PATCH] use a function instead of a macro for jpeg detection + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/amadvance/fbv/pull/1 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3fa4666..fc65903 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,8 +28,8 @@ AC_SEARCH_LIBS([png_create_read_struct], [png], [ + ] + ) + +-AC_SEARCH_LIBS([jpeg_create_decompress], [jpeg], [ +- LIBS="-ljpeg" ++AC_SEARCH_LIBS([jpeg_start_decompress], [jpeg], [ ++ LIBS="$LIBS -ljpeg" + CFLAGS="$CFLAGS -DFBV_SUPPORT_JPEG" + ], [ + ] +-- +2.39.2 + diff --git a/package/fbv/0002-fix-24bpp-support-on-big-endian.patch b/package/fbv/0002-fix-24bpp-support-on-big-endian.patch deleted file mode 100644 index 23185ac46b3..00000000000 --- a/package/fbv/0002-fix-24bpp-support-on-big-endian.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -upr a/fb_display.c b/fb_display.c ---- a/fb_display.c 2007-06-01 16:52:45.000000000 +0200 -+++ b/fb_display.c 2007-06-01 16:51:43.000000000 +0200 -@@ -307,7 +307,7 @@ void* convertRGB2FB(int fh, unsigned cha - { - unsigned long i; - void *fbbuff = NULL; -- u_int8_t *c_fbbuff; -+ u_int8_t *c_fbbuff; - u_int16_t *s_fbbuff; - u_int32_t *i_fbbuff; - -@@ -335,6 +335,16 @@ void* convertRGB2FB(int fh, unsigned cha - fbbuff = (void *) s_fbbuff; - break; - case 24: -+ *cpp = 3; -+ c_fbbuff = (unsigned char *) malloc(count * 3 * sizeof(unsigned char)); -+ for(i = 0; i < (3 * count); i += 3) { -+ /* Big endian framebuffer. */ -+ c_fbbuff[i] = rgbbuff[i+2]; -+ c_fbbuff[i+1] = rgbbuff[i+1]; -+ c_fbbuff[i+2] = rgbbuff[i]; -+ } -+ fbbuff = (void *) c_fbbuff; -+ break; - case 32: - *cpp = 4; - i_fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int)); -Only in build_avr32/fbv-1.0b-modified: .fb_display.c.swp -Binary files build_avr32/fbv-1.0b/fb_display.o and build_avr32/fbv-1.0b-modified/fb_display.o differ -Binary files build_avr32/fbv-1.0b/fbv and build_avr32/fbv-1.0b-modified/fbv differ diff --git a/package/fbv/0003-fix-bgr555.patch b/package/fbv/0003-fix-bgr555.patch deleted file mode 100644 index 8f185f0a37a..00000000000 --- a/package/fbv/0003-fix-bgr555.patch +++ /dev/null @@ -1,64 +0,0 @@ -[PATCH] fbv: support bgr555 format - -Signed-off-by: Josh.Wu -diff -Naur fbv-1.0b-ori/fb_display.c fbv-1.0b/fb_display.c ---- fbv-1.0b-ori/fb_display.c 2010-04-02 09:38:15.000000000 +0800 -+++ fbv-1.0b/fb_display.c 2010-04-01 18:54:15.000000000 +0800 -@@ -297,6 +297,14 @@ - ((b >> 3) & 31) ); - } - -+inline static unsigned short make15color_bgr(unsigned char r, unsigned char g, unsigned char b) -+{ -+ return ( -+ (((b >> 3) & 31) << 10) | -+ (((g >> 3) & 31) << 5) | -+ ((r >> 3) & 31) ); -+} -+ - inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b) - { - return ( -@@ -313,6 +321,14 @@ - u_int16_t *s_fbbuff; - u_int32_t *i_fbbuff; - -+ int is_bgr555 = 0; -+ struct fb_var_screeninfo var; -+ getVarScreenInfo(fh, &var); -+ if(var.red.offset == 0 && -+ var.green.offset == 5 && -+ var.blue.offset == 10) -+ is_bgr555 = 1; -+ - switch(bpp) - { - case 8: -@@ -325,15 +341,23 @@ - case 15: - *cpp = 2; - s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); -- for(i = 0; i < count ; i++) -- s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ if(is_bgr555) -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ else -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); - fbbuff = (void *) s_fbbuff; - break; - case 16: - *cpp = 2; - s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); -- for(i = 0; i < count ; i++) -- s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ if(is_bgr555) -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ else -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); - fbbuff = (void *) s_fbbuff; - break; - case 24: diff --git a/package/fbv/0004-giflib.patch b/package/fbv/0004-giflib.patch deleted file mode 100644 index 70433535866..00000000000 --- a/package/fbv/0004-giflib.patch +++ /dev/null @@ -1,84 +0,0 @@ -Adjust source code to work with giflib 5.1x - -Downloaded patch for gif.c from -https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib-5.1.patch?h=packages/fbv - -Signed-off-by: Bernd Kuhls - -diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c ---- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400 -+++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400 -@@ -31,10 +31,10 @@ - #include - #define min(a,b) ((a) < (b) ? (a) : (b)) - #define gflush return(FH_ERROR_FILE); --#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } --#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); } -+#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } -+#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } - #define agflush return(FH_ERROR_FORMAT); --#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } -+#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } - - - int fh_gif_id(char *name) -@@ -81,7 +81,7 @@ - ColorMapObject *cmap; - int cmaps; - -- gft=DGifOpenFileName(name); -+ gft=DGifOpenFileName(name, NULL); - if(gft==NULL){printf("err5\n"); gflush;} ////////// - do - { -@@ -170,7 +170,7 @@ - } - } - while( rt!= TERMINATE_RECORD_TYPE ); -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_OK); - } - -@@ -184,7 +184,7 @@ - int extcode; - GifRecordType rt; - -- gft=DGifOpenFileName(name); -+ gft=DGifOpenFileName(name, NULL); - if(gft==NULL) gflush; - do - { -@@ -197,7 +197,7 @@ - px=gft->Image.Width; - py=gft->Image.Height; - *x=px; *y=py; -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_OK); - break; - case EXTENSION_RECORD_TYPE: -@@ -210,7 +210,7 @@ - } - } - while( rt!= TERMINATE_RECORD_TYPE ); -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_FORMAT); - } - #endif -diff -uNr fbv-1.0b.org/configure fbv-1.0b/configure ---- fbv-1.0b.org/configure 2004-09-07 13:29:27.000000000 +0200 -+++ fbv-1.0b/configure 2015-01-29 19:58:30.374599874 +0100 -@@ -106,9 +106,9 @@ - ungif="no" - echo "libungif check" >>./config.log - echo " 1st:" >>./config.log --$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lgif $libs - if [ -e \$\$~test ]; then -- libs="-lungif $libs" ; ungif="yes" -+ libs="-lgif $libs" ; ungif="yes" - else - echo " 2nd: -lX11 -L$xdir/lib" >>./config.log - $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs diff --git a/package/fbv/0005-include.patch b/package/fbv/0005-include.patch deleted file mode 100644 index 3d1cc17f749..00000000000 --- a/package/fbv/0005-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urpN fbv-1.0b.orig/fb_display.c fbv-1.0b/fb_display.c ---- fbv-1.0b.orig/fb_display.c 2004-09-07 14:09:43.000000000 +0200 -+++ fbv-1.0b/fb_display.c 2008-04-24 10:48:29.000000000 +0200 -@@ -18,8 +18,6 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -- - #include - #include - #include -@@ -31,6 +29,7 @@ - #include - #include - #include -+#include - #include "config.h" - /* Public Use Functions: - * diff --git a/package/fbv/0006-libpng15.patch b/package/fbv/0006-libpng15.patch deleted file mode 100644 index 7872a73cf67..00000000000 --- a/package/fbv/0006-libpng15.patch +++ /dev/null @@ -1,24 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/png.c -+++ b/png.c -@@ -69,7 +69,7 @@ - fclose(fh); return(FH_ERROR_FORMAT); - } - rp=0; -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if(rp) free(rp); -@@ -161,7 +161,7 @@ - fclose(fh); return(FH_ERROR_FORMAT); - } - rp=0; -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if(rp) free(rp); 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 deleted file mode 100644 index 57d5777b61b..00000000000 --- a/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -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/fbv/Config.in b/package/fbv/Config.in index 22062763342..1d11bfb3ef6 100644 --- a/package/fbv/Config.in +++ b/package/fbv/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_FBV bool "fbv" help fbv is a very simple graphic file viewer for the framebuffer - console, capable of displaying GIF, JPEG, PNG and BMP files - using libungif, libjpeg and libpng. + console, capable of displaying JPEG, PNG and BMP files + using libjpeg and libpng. - http://freshmeat.net/projects/fbv/ + https://github.com/amadvance/fbv if BR2_PACKAGE_FBV @@ -23,11 +23,4 @@ config BR2_PACKAGE_FBV_JPEG help Enable support for JPEG using IJG's libjpeg. -config BR2_PACKAGE_FBV_GIF - bool "GIF support" - default y - select BR2_PACKAGE_GIFLIB - help - Enable support for GIF using giflib. - endif # BR2_PACKAGE_FBV diff --git a/package/fbv/fbv.hash b/package/fbv/fbv.hash index 3f25465ba15..94a81650519 100644 --- a/package/fbv/fbv.hash +++ b/package/fbv/fbv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz -sha256 bf21d97bafcaacb5d6bc3d5502030c340f0e0593614078ab017af91e950083af COPYING +sha256 d18505f95546adb8175652e971d9ab3f2bece6ed21d72ff8e62881caa286a22b fbv-7c2000804226ca860ca80f3baa993582e29aa1a2.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index 4edfcf0ed0f..f7a061dfd7b 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -4,11 +4,11 @@ # ################################################################################ -FBV_VERSION = 1.0b -# upstream (http://s-tech.elsat.net.pl/fbv) dead -FBV_SITE = http://sources.buildroot.net/fbv +FBV_VERSION = 7c2000804226ca860ca80f3baa993582e29aa1a2 +FBV_SITE = $(call github,amadvance,fbv,$(FBV_VERSION)) FBV_LICENSE = GPL-2.0 FBV_LICENSE_FILES = COPYING +FBV_AUTORECONF = YES ### image format dependencies and configure options FBV_DEPENDENCIES = # empty @@ -29,29 +29,5 @@ FBV_DEPENDENCIES += jpeg else FBV_CONFIGURE_OPTS += --without-libjpeg endif -ifeq ($(BR2_PACKAGE_FBV_GIF),y) -FBV_DEPENDENCIES += giflib -else -FBV_CONFIGURE_OPTS += --without-libungif -endif - -#fbv doesn't support cross-compilation -define FBV_CONFIGURE_CMDS - (cd $(FBV_DIR); rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - $(FBV_CONFIGURE_OPTS) \ - ) -endef - -define FBV_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FBV_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/fbv $(TARGET_DIR)/usr/bin/fbv -endef $(eval $(autotools-package)) diff --git a/package/fcft/fcft.hash b/package/fcft/fcft.hash index 96d885db1de..431f2218c61 100644 --- a/package/fcft/fcft.hash +++ b/package/fcft/fcft.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 904f40d749d198d97c46c5a459cd3c53fe92f008cf1e3e61949f6cf3036a78b7 3.1.6.tar.gz +sha256 f48c793f354b8be95477e475dde7c98ac9d2628c52ecb42029dc6d20b52d787c 3.1.8.tar.gz sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/fcft/fcft.mk b/package/fcft/fcft.mk index 538d8a07482..62c85a15c56 100644 --- a/package/fcft/fcft.mk +++ b/package/fcft/fcft.mk @@ -4,7 +4,7 @@ # ################################################################################ -FCFT_VERSION = 3.1.6 +FCFT_VERSION = 3.1.8 FCFT_SOURCE = $(FCFT_VERSION).tar.gz FCFT_SITE = https://codeberg.org/dnkl/fcft/archive FCFT_LICENSE = MIT diff --git a/package/findutils/findutils.hash b/package/findutils/findutils.hash index 0284c0e7b21..a4318277844 100644 --- a/package/findutils/findutils.hash +++ b/package/findutils/findutils.hash @@ -1,5 +1,8 @@ -# Locally calculated after checking pgp signature -sha256 a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe findutils-4.9.0.tar.xz +# From: https://lists.gnu.org/archive/html/info-gnu/2024-07/msg00002.html +# After checking pgp signature +# https://ftp.gnu.org/pub/gnu/findutils/findutils-4.10.0.tar.xz.sig +# with key A5189DB69C1164D33002936646502EF796917195 +sha256 1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5 findutils-4.10.0.tar.xz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 9731a350473..ad1fbdd6c68 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -FINDUTILS_VERSION = 4.9.0 +FINDUTILS_VERSION = 4.10.0 FINDUTILS_SOURCE = findutils-$(FINDUTILS_VERSION).tar.xz FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils FINDUTILS_LICENSE = GPL-3.0+ @@ -14,6 +14,7 @@ FINDUTILS_CONF_ENV = \ gl_cv_func_stdin=yes \ ac_cv_func_working_mktime=yes \ gl_cv_func_wcwidth_works=yes +FINDUTILS_CONF_OPTS = --disable-year2038 ifeq ($(BR2_PACKAGE_LIBSELINUX),y) FINDUTILS_DEPENDENCIES += libselinux diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index d1f03a9d388..10f793462f2 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e6f312d8a7e635ef707f3811313f045f0f80312d96dfcc722de973ffa2910204 flannel-0.25.5-go2.tar.gz +sha256 1b8411bd6d4691be374bdae7f95d814aaaa197f83f56861a274d6264144a8b3d flannel-0.26.0-go2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 7705bdbefe9..920705680f8 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.25.5 +FLANNEL_VERSION = 0.26.0 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 787e97ce37d..49ca85994c3 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38d1d910783ab67c07a4d859d1aa95525979ff352b927e25b1ae894c774bb4c4 fluidsynth-2.3.7.tar.gz +sha256 fd4d216a3030abc56a339985ab0506328660cd77b2d71dd98c240c58c03d8f7f fluidsynth-2.4.0.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 98b56ba6962..87e34ca9fee 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.7 +FLUIDSYNTH_VERSION = 2.4.0 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE diff --git a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch index 953705e33b4..a9776d7388d 100644 --- a/package/flutter-engine/0001-disable-pre-canned-sysroot.patch +++ b/package/flutter-engine/0001-disable-pre-canned-sysroot.patch @@ -18,7 +18,7 @@ diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 7987e519d..1de694263 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni -@@ -14,7 +14,7 @@ declare_args() { +@@ -12,7 +12,7 @@ declare_args() { # Whether to use the default sysroot when building for Linux, if an explicit # sysroot isn't set. diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index 020fa2ee8a4..7f41defe684 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.24.0 +FLUTTER_ENGINE_VERSION = 3.24.4 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash index 1fbe6013966..9730f65bf29 100644 --- a/package/flutter-packages/flutter-packages.hash +++ b/package/flutter-packages/flutter-packages.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 388ec45142ddfab711aa82958c82657b8c2238deb6c131cec94a5a993ba4c760 flutter-packages-8af79fbca12699248e96b50b4705da74396cd6a3.tar.gz +sha256 fe87edffd828f7081f5622c592cb5871a2bc107dc03ff2610ddb6599f4f0137b flutter-packages-85c4934bda545beff36133dc63e47de5b5c5c56b.tar.gz sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk index 1a1913043b0..37f8141e7ad 100644 --- a/package/flutter-packages/flutter-packages.mk +++ b/package/flutter-packages/flutter-packages.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PACKAGES_VERSION = 8af79fbca12699248e96b50b4705da74396cd6a3 +FLUTTER_PACKAGES_VERSION = 85c4934bda545beff36133dc63e47de5b5c5c56b FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) FLUTTER_PACKAGES_LICENSE = BSD-3-Clause FLUTTER_PACKAGES_LICENSE_FILES = LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 4f3622e725c..ea7bab28a59 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d52a5d12f17d8bcf868d1ccc01fe0f7ffb05b53d9628aa21b07a18f9d33621f2 flutter_linux_3.24.0-stable.tar.xz +sha256 2ce78d4a51f063efa7f04666ae010d026d119eea6bdea7e08b736840fe88ddb4 flutter_linux_3.24.4-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 26415551bc7..5b69cde4654 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.24.0 +FLUTTER_SDK_BIN_VERSION = 3.24.4 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause diff --git a/package/fping/fping.hash b/package/fping/fping.hash index 4671cd77cfa..8b68798409f 100644 --- a/package/fping/fping.hash +++ b/package/fping/fping.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping-5.1.tar.gz +sha256 a7692d10d73fb0bb76e1f7459aa7f19bbcdbfc5adbedef02f468974b18b0e42f fping-5.2.tar.gz # Hash for license file sha256 6051b27e4b4a648f7bc8b329024da53a6e95ce88fcf0ccc259c371a74b741757 COPYING diff --git a/package/fping/fping.mk b/package/fping/fping.mk index 5986d05b93e..dc43261be86 100644 --- a/package/fping/fping.mk +++ b/package/fping/fping.mk @@ -4,7 +4,7 @@ # ################################################################################ -FPING_VERSION = 5.1 +FPING_VERSION = 5.2 FPING_SITE = http://fping.org/dist FPING_LICENSE = BSD-like FPING_LICENSE_FILES = COPYING diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index e28f63f7154..fbbfd536e46 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -5,7 +5,7 @@ ################################################################################ FREEIPMI_VERSION = 1.6.14 -FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi +FREEIPMI_SITE = $(BR2_GNU_MIRROR)/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 94205754c2d..170d040f963 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -10,28 +10,27 @@ Upstream: Not applicable Signed-off-by: David Gouarin Signed-off-by: Matt Weber [Fabrice: update for 3.2.3] -SIgned-off-by: Fabrice Fontaine +Signed-off-by: Fabrice Fontaine [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi +[Waldemar: update for 3.2.6] +Signed-off-by: Waldemar Brodkorb --- 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 +index 64c2fe0804..9dc7910463 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - # binary! - ${JLIBTOOL}: ${top_makedir}/jlibtool.c +@@ -40,8 +40,8 @@ all install: ${JLIBTOOL} + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c - $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo HOSTCC jlibtool.c + $(Q)${HOSTCC} $< -o $@ ${JLIBTOOL_DEFS} - clean: jlibtool_clean + clean: jlibtool_clean --- -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 deleted file mode 100644 index 42e8c2088c7..00000000000 --- a/package/freeradius-server/0005-modules-rlm_sql-remove-mysql_version.h.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0005-src-modules-rlm_python-fix-build-with-Ofast.patch similarity index 100% rename from package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch rename to package/freeradius-server/0005-src-modules-rlm_python-fix-build-with-Ofast.patch diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index 6ee8f7786c3..2c0991a3991 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig -sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 +# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.6.tar.bz2.sig +sha256 18bbb2318448f13918897ae7a38b36afd3db7dd5c66f78ad24d2e0051269d9b2 freeradius-server-3.2.6.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1ec77a1cc45..94c9331b3dd 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERADIUS_SERVER_VERSION = 3.2.3 +FREERADIUS_SERVER_VERSION = 3.2.6 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 FREERADIUS_SERVER_SITE = https://freeradius.org/ftp/pub/freeradius diff --git a/package/frr/Config.in b/package/frr/Config.in index 0afd8c61a2d..c26b160b2a0 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -1,15 +1,19 @@ config BR2_PACKAGE_FRR bool "frr" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on !BR2_STATIC_LIBS # libyang depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libyang + depends on BR2_INSTALL_LIBSTDCPP # protobuf-c + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBYANG select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PROTOBUF_C help The FRRouting Protocol Suite. @@ -34,7 +38,9 @@ config BR2_PACKAGE_FRR_NHRPD endif -comment "frr needs a toolchain w/ threads, dynamic library" +comment "frr needs a toolchain w/ threads, dynamic library, C++, host gcc >= 7" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 86575dae8c2..ea88fcef9b0 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,11 @@ # Locally calculated -sha256 5f3a32e66efdf2628548165d10327688847443c342788b31c4ea98368cfacbf8 frr-8.5.6.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 a23ab9aba5c45d919f9c6d14febfad8a797b7f63272bde4009c70ff77aac3a77 frr-9.1.2.tar.gz +sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING +sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause +sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 doc/licenses/GPL-2.0 +sha256 6d80da3224cbdcf016ea554e00fc9cd933bd1a3417cb5e5b7abf59f6d126761d doc/licenses/ISC +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/licenses/LGPL-2.1 +sha256 2a1124bf8bc60f1f59b67e15e3d261b5d60fcd9674a3eace0a5502fd4287d528 doc/licenses/LicenseRef-Skiplist-BSD-0-Clause +sha256 074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c doc/licenses/MIT +sha256 b5065838cbac452dfc855ba6e6e031481ad2c68406f70d21ead9321374653e6c doc/licenses/Unlicense diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 8141020cb09..921ef996659 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,15 +4,28 @@ # ################################################################################ -FRR_VERSION = 8.5.6 +FRR_VERSION = 9.1.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) -FRR_LICENSE = GPL-2.0 -FRR_LICENSE_FILES = COPYING +FRR_LICENSE = GPL-2.0+ +FRR_LICENSE_FILES = \ + COPYING \ + doc/licenses/BSD-2-Clause \ + doc/licenses/BSD-3-Clause \ + doc/licenses/GPL-2.0 \ + doc/licenses/ISC \ + doc/licenses/LGPL-2.1 \ + doc/licenses/LicenseRef-Skiplist-BSD-0-Clause \ + doc/licenses/MIT \ + doc/licenses/Unlicense +# tools/gcc-plugins/frr-format.[ch] is not enabled by frr's ./configure, so gcc's +# GPLv3 does not apply +# doc/licenses/GPL-3.0 FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES FRR_DEPENDENCIES = host-frr readline json-c libyang \ + protobuf-c \ $(if $(BR2_PACKAGE_C_ARES),c-ares) \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) @@ -22,6 +35,8 @@ FRR_CONF_ENV = \ ac_cv_lib_cunit_CU_initialize_registry=no \ CFLAGS="$(TARGET_CFLAGS) -DFRR_XREF_NO_NOTE" +# Do not enable -fplugin=frr-format for production, see doc/developer/workflow.rst, +# it is only intended for FRR's developments FRR_CONF_OPTS = --with-clippy=$(HOST_DIR)/bin/clippy \ --sysconfdir=/etc/frr \ --localstatedir=/var/run/frr \ diff --git a/package/fwts/Config.in b/package/fwts/Config.in index 08608d1dd7b..2eebd111b0c 100644 --- a/package/fwts/Config.in +++ b/package/fwts/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_FWTS_ARCH_SUPPORTS default y if BR2_aarch64 default y if BR2_arm default y if BR2_i386 + default y if BR2_RISCV_64 default y if BR2_x86_64 config BR2_PACKAGE_FWTS diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 61f615835e8..6c9f9dc76b0 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ -# Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 2bd45ab1b9f8dc1db2716721e89d982ee4b4eda4b1043cca7b13775c95d5023b fwts-V24.07.00.tar.gz +# Hash from: https://fwts.ubuntu.com/release/SHA256SUMS +sha256 4f352dedd630217a3551bb4f6e8d61f8514be457d37b90c936c3b6cfb6a6fa7e fwts-V24.09.00.tar.gz # Hash for license file sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index fa1f8ed8c4f..91b5e613dc4 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 24.07.00 +FWTS_VERSION = 24.09.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 diff --git a/package/gawk/Config.in b/package/gawk/Config.in index e9cf4c5ff77..86eba0b7b4c 100644 --- a/package/gawk/Config.in +++ b/package/gawk/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_GAWK rather than procedural. Allows for simple data-reformatting jobs with just a few lines of code. - http://www.gnu.org/software/gawk/ + https://www.gnu.org/software/gawk/ comment "gawk needs a toolchain w/ wchar" depends on BR2_USE_MMU diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 3ff0a900307..b029ab330dd 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.3.0.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.3.1.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 ca9c16d3d11d0ff8c69d79dc0b47267e1329a69b39b799895604ed447d3ca90b gawk-5.3.0.tar.xz +sha256 694db764812a6236423d4ff40ceb7b6c4c441301b72ad502bb5c27e00cd56f78 gawk-5.3.1.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index ff1b9920af1..fbb620be7d6 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.3.0 +GAWK_VERSION = 5.3.1 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index 501f12bc335..adaae6c3077 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,15 +4,14 @@ # ################################################################################ -HOST_GCC_BARE_METAL_VERSION = 14.2.0 -HOST_GCC_BARE_METAL_SITE = \ - https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) -HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz +GCC_BARE_METAL_VERSION = 14.2.0 +GCC_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_BARE_METAL_VERSION) +GCC_BARE_METAL_SOURCE = gcc-$(GCC_BARE_METAL_VERSION).tar.xz -HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 -HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB -HOST_GCC_BARE_METAL_CPE_ID_VENDOR = gnu -HOST_GCC_BARE_METAL_CPE_ID_PRODUCT = gcc +GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB +GCC_BARE_METAL_CPE_ID_VENDOR = gnu +GCC_BARE_METAL_CPE_ID_PRODUCT = gcc HOST_GCC_BARE_METAL_DEPENDENCIES = \ host-binutils-bare-metal \ @@ -23,12 +22,12 @@ HOST_GCC_BARE_METAL_DEPENDENCIES = \ # gcc doesn't support in-tree build, so we create a 'build' # subdirectory in the gcc sources, and build from there. -define GCC_BARE_METAL_CONFIGURE_SYMLINK +define HOST_GCC_BARE_METAL_CONFIGURE_SYMLINK mkdir -p $(@D)/build ln -sf ../configure $(@D)/build/configure endef -HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += GCC_BARE_METAL_CONFIGURE_SYMLINK +HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += HOST_GCC_BARE_METAL_CONFIGURE_SYMLINK HOST_GCC_BARE_METAL_SUBDIR = build HOST_GCC_BARE_METAL_MAKE_OPTS = \ diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 6cf55a675da..3d1809a2f97 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,3 +5,9 @@ sha512 0217434073023a8b8316088bf3ee95d53a1b6a7897f6269095429016a8900f9a05e130c3 # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d gdb-arc-2023.09-release.tar.gz + +# Locally calculated (fetched from gcc.gnu.org) +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING3.LIB +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index c3953e15a61..be653bfd488 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# 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 +# From https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.sha256sum +sha256 b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 gdk-pixbuf-2.42.12.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index e041d2cbde3..aebaee52c21 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.42 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).12 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz GDK_PIXBUF_SITE = https://download.gnome.org/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ diff --git a/package/gerbera/0001-buildfix-support-fmtlib-10.patch b/package/gerbera/0001-buildfix-support-fmtlib-10.patch deleted file mode 100644 index b274aab75b0..00000000000 --- a/package/gerbera/0001-buildfix-support-fmtlib-10.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 37957aac0aea776e6f843af2358916f81056a405 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 29 Jun 2023 22:09:15 +0900 -Subject: [PATCH] buildfix: support fmtlib 10 - -With fmtlib10, fmt::format does not accept pugi::xml_node as it is. -Use name() member function, as this usage appear on other places of -gerbera source code. - -Closes #2839 . - -Upstream: https://github.com/gerbera/gerbera/commit/37957aac0aea776e6f843af2358916f81056a405 - -Signed-off-by: Bernd Kuhls ---- - src/config/setup/config_setup_array.cc | 6 +++--- - src/config/setup/config_setup_autoscan.cc | 2 +- - src/config/setup/config_setup_client.cc | 2 +- - src/config/setup/config_setup_dictionary.cc | 6 +++--- - src/config/setup/config_setup_dynamic.cc | 2 +- - src/config/setup/config_setup_transcoding.cc | 2 +- - src/config/setup/config_setup_tweak.cc | 2 +- - src/config/setup/config_setup_vector.cc | 4 ++-- - 8 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/config/setup/config_setup_array.cc b/src/config/setup/config_setup_array.cc -index 62dd5c9a7..a5f8958ce 100644 ---- a/src/config/setup/config_setup_array.cc -+++ b/src/config/setup/config_setup_array.cc -@@ -137,11 +137,11 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o - std::vector result; - if (initArray) { - if (!initArray(optValue, result, ConfigDefinition::mapConfigOption(nodeOption))) { -- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name()); - } - } else { - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name()); - } - } - if (result.empty()) { -@@ -150,7 +150,7 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue.name()); - } - return result; - } -diff --git a/src/config/setup/config_setup_autoscan.cc b/src/config/setup/config_setup_autoscan.cc -index 9ae4e61f8..5e1394585 100644 ---- a/src/config/setup/config_setup_autoscan.cc -+++ b/src/config/setup/config_setup_autoscan.cc -@@ -245,7 +245,7 @@ std::shared_ptr ConfigAutoscanSetup::newOption(const pugi::xml_nod - { - auto result = std::vector(); - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue.name()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_client.cc b/src/config/setup/config_setup_client.cc -index ffd12fc01..857db3c3e 100644 ---- a/src/config/setup/config_setup_client.cc -+++ b/src/config/setup/config_setup_client.cc -@@ -183,7 +183,7 @@ std::shared_ptr ConfigClientSetup::newOption(const pugi::xml_node& - auto result = std::make_shared(); - - if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { -- throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue.name()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_dictionary.cc b/src/config/setup/config_setup_dictionary.cc -index 003b4cc59..69d1a7255 100644 ---- a/src/config/setup/config_setup_dictionary.cc -+++ b/src/config/setup/config_setup_dictionary.cc -@@ -163,11 +163,11 @@ std::map ConfigDictionarySetup::getXmlContent(const pu - std::map result; - if (initDict) { - if (!initDict(optValue, result)) { -- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name()); - } - } else { - if (!createOptionFromNode(optValue, result) && required) { -- throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name()); - } - } - if (result.empty()) { -@@ -176,7 +176,7 @@ std::map ConfigDictionarySetup::getXmlContent(const pu - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue.name()); - } - return result; - } -diff --git a/src/config/setup/config_setup_dynamic.cc b/src/config/setup/config_setup_dynamic.cc -index 0074cb6d3..d6962afe6 100644 ---- a/src/config/setup/config_setup_dynamic.cc -+++ b/src/config/setup/config_setup_dynamic.cc -@@ -192,7 +192,7 @@ std::shared_ptr ConfigDynamicContentSetup::newOption(const pugi::x - auto result = std::make_shared(); - - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue.name()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_transcoding.cc b/src/config/setup/config_setup_transcoding.cc -index 17d1780dc..1f6fb0604 100644 ---- a/src/config/setup/config_setup_transcoding.cc -+++ b/src/config/setup/config_setup_transcoding.cc -@@ -501,7 +501,7 @@ std::shared_ptr ConfigTranscodingSetup::newOption(const pugi::xml_ - auto result = std::make_shared(); - - if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { -- throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue.name()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_tweak.cc b/src/config/setup/config_setup_tweak.cc -index 65dae2759..4da9fca1b 100644 ---- a/src/config/setup/config_setup_tweak.cc -+++ b/src/config/setup/config_setup_tweak.cc -@@ -257,7 +257,7 @@ std::shared_ptr ConfigDirectorySetup::newOption(const pugi::xml_no - auto result = std::make_shared(); - - if (!createOptionFromNode(optValue, result)) { -- throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue.name()); - } - optionValue = std::make_shared(result); - return optionValue; -diff --git a/src/config/setup/config_setup_vector.cc b/src/config/setup/config_setup_vector.cc -index e5efe2767..9a9670569 100644 ---- a/src/config/setup/config_setup_vector.cc -+++ b/src/config/setup/config_setup_vector.cc -@@ -181,7 +181,7 @@ std::vector>> ConfigVectorSetup: - { - std::vector>> result; - if (!createOptionFromNode(optValue, result) && required) { -- throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue); -+ throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue.name()); - } - if (result.empty()) { - log_debug("{} assigning {} default values", xpath, defaultEntries.size()); -@@ -189,7 +189,7 @@ std::vector>> ConfigVectorSetup: - result = defaultEntries; - } - if (notEmpty && result.empty()) { -- throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue); -+ throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue.name()); - } - return result; - } diff --git a/package/gerbera/0002-Build-against-fmt-11.0.0.patch b/package/gerbera/0002-Build-against-fmt-11.0.0.patch deleted file mode 100644 index 27dc05e5cb1..00000000000 --- a/package/gerbera/0002-Build-against-fmt-11.0.0.patch +++ /dev/null @@ -1,136 +0,0 @@ -From bb9e80f4225d4ecb0d75d80c16b0ba3ddb12b1dc Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Mon, 2 Sep 2024 23:30:19 +0200 -Subject: [PATCH] Build against fmt 11.0.0 - -Signed-off-by: Dario Binacchi -Upstream: backport from upstream https://github.com/gerbera/gerbera/commit/f1f266efbb0a6adac160e428cd14c20f6ecd3e5d ---- - README.md | 2 +- - scripts/install-spdlog.sh | 4 +++- - scripts/versions.sh | 2 +- - src/database/sql_format.h | 3 +++ - src/util/logger.h | 5 ++++- - src/util/url_utils.cc | 7 ++++++- - test/scripting/mock/duk_helper.cc | 4 +++- - 7 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/README.md b/README.md -index a1992738f009..990a9af8855f 100644 ---- a/README.md -+++ b/README.md -@@ -53,7 +53,7 @@ sudo make install - | libiconv | | | | Required | Charset conversion | | - | sqlite3 | 3.7.0 | 3.35.5 | 3.36.0 | Required | Database storage | | - | zlib | | | | Required | Data compression | | --| [fmtlib] | 7.1.3 | 7.1.3 | 9.1.0 | Required | Fast string formatting | | -+| [fmtlib] | 7.1.3 | 9.1.0 | 11.0.0 | Required | Fast string formatting | | - | [spdlog] | 1.8.1 | 1.8.5 | 1.11.0 | Required | Runtime logging | | - | [duktape] | 2.1.0 | 2.6.0 | 2.7.0 | Optional | Scripting Support | Enabled | - | mysql | | | | Optional | Alternate database storage | Disabled | -diff --git a/scripts/install-spdlog.sh b/scripts/install-spdlog.sh -index 8a758e35b579..5c1426e3d44f 100755 ---- a/scripts/install-spdlog.sh -+++ b/scripts/install-spdlog.sh -@@ -39,7 +39,9 @@ fi - mkdir build - cd build - --cmake .. -DSPDLOG_FMT_EXTERNAL=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED} -+cmake .. -DSPDLOG_FMT_EXTERNAL=ON \ -+ -DBUILD_SHARED_LIBS=${BUILD_SHARED} \ -+ -DSPDLOG_BUILD_EXAMPLE=OFF - - if command -v nproc >/dev/null 2>&1; then - make "-j$(nproc)" -diff --git a/scripts/versions.sh b/scripts/versions.sh -index 19a0f80f79ac..8c1ffe7d590d 100644 ---- a/scripts/versions.sh -+++ b/scripts/versions.sh -@@ -36,7 +36,7 @@ else - EBML="1.4.4" - EXIV2="v0.27.5" - FFMPEGTHUMBNAILER="2.2.2" -- FMT="9.1.0" -+ FMT="11.0.0" - GOOGLETEST="1.12.1" - LASTFM="0.4.0" - MATROSKA="1.7.1" -diff --git a/src/database/sql_format.h b/src/database/sql_format.h -index 551122eb7cf7..d64edae69372 100644 ---- a/src/database/sql_format.h -+++ b/src/database/sql_format.h -@@ -26,6 +26,9 @@ - #define __SQL_FORMAT_H__ - - #include -+#if FMT_VERSION >= 100202 -+#include -+#endif - - struct SQLIdentifier { - constexpr SQLIdentifier(std::string_view name, char quote_begin, char quote_end) -diff --git a/src/util/logger.h b/src/util/logger.h -index a121ead31e95..d51e60430ed9 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -36,6 +36,9 @@ - - #include - #include -+#if FMT_VERSION >= 100202 -+#include -+#endif - #include - #include - #include -@@ -135,7 +138,7 @@ template - struct fmt::formatter, char>> - : formatter> { - template -- auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) - { - return fmt::formatter>::format( - static_cast>(value), ctx); -diff --git a/src/util/url_utils.cc b/src/util/url_utils.cc -index b1c9fecef863..84f6f3be43d4 100644 ---- a/src/util/url_utils.cc -+++ b/src/util/url_utils.cc -@@ -23,11 +23,16 @@ Gerbera - https://gerbera.io/ - - #include "url_utils.h" // API - -+#include "exceptions.h" -+ -+ - #include -+#if FMT_VERSION >= 100202 -+#include -+#endif - #include - - #include "common.h" --#include "exceptions.h" - - namespace URLUtils { - -diff --git a/test/scripting/mock/duk_helper.cc b/test/scripting/mock/duk_helper.cc -index 71bdc5d025f7..f1ab1cfef8a7 100644 ---- a/test/scripting/mock/duk_helper.cc -+++ b/test/scripting/mock/duk_helper.cc -@@ -24,8 +24,10 @@ - #include "duk_helper.h" - #include - #include --#include - #include -+#if FMT_VERSION >= 100202 -+#include -+#endif - #include - - std::vector DukTestHelper::arrayToVector(duk_context* ctx, duk_idx_t idx) --- -2.43.0 - diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index ee6e3d9b3ab..8a0f052e9ef 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c gerbera-1.12.1.tar.gz +sha256 c77f4a8ccbed5e18499c0854803fec65ae2f26af633818b52584651fbd3eec13 gerbera-2.2.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index f3f05b364d3..ac5b69b6815 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.12.1 +GERBERA_VERSION = 2.2.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md diff --git a/package/git/0001-t-unit-tests-update-clar-to-206accb.patch b/package/git/0001-t-unit-tests-update-clar-to-206accb.patch new file mode 100644 index 00000000000..7c90527453c --- /dev/null +++ b/package/git/0001-t-unit-tests-update-clar-to-206accb.patch @@ -0,0 +1,661 @@ +From ec8bd87077355207d9466b0ecef5246295ee0672 Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Mon, 21 Oct 2024 12:56:33 +0200 +Subject: [PATCH] t/unit-tests: update clar to 206accb + +Update clar from: + + - 1516124 (Merge pull request #97 from pks-t/pks-whitespace-fixes, 2024-08-15). + +To: + + - 206accb (Merge pull request #108 from pks-t/pks-uclibc-without-wchar, 2024-10-21) + +This update includes a bunch of fixes and improvements that we have +discussed in Git when initial support for clar was merged: + + - There is a ".editorconfig" file now. + + - Compatibility with Windows has been improved so that the clar + compiles on this platform without an issue. This has been tested + with Cygwin, MinGW and Microsoft Visual Studio. + + - clar now uses CMake. This does not impact us at all as we wire up + the clar into our own build infrastructure anyway. This conversion + was done such that we can easily run CI jobs against Windows. + + - Allocation failures are now checked for consistently. + + - We now define feature test macros in "clar.c", which fixes + compilation on some platforms that didn't previously pull in + non-standard functions like lstat(3p) or strdup(3p). This was + reported by a user of OpenSUSE Leap. + + - We stop using `struct timezone`, which is undefined behaviour + nowadays and results in a compilation error on some platforms. + + - We now use the combination of mktemp(3) and mkdir(3) on SunOS, same + as we do on NonStop. + + - We now support uClibc without support for . + +The most important bits here are the improved platform compatibility +with Windows, OpenSUSE, SunOS and uClibc. + +Signed-off-by: Patrick Steinhardt +Upstream: https://lore.kernel.org/r/06145a141dd3485f183bcf8248de0db61a7203db.1729506329.git.ps@pks.im +Signed-off-by: Bagas Sanjaya +--- + t/unit-tests/clar/.editorconfig | 13 +++ + t/unit-tests/clar/.github/workflows/ci.yml | 20 +++- + t/unit-tests/clar/.gitignore | 1 + + t/unit-tests/clar/CMakeLists.txt | 28 +++++ + t/unit-tests/clar/clar.c | 127 ++++++++++++--------- + t/unit-tests/clar/clar/print.h | 11 +- + t/unit-tests/clar/clar/sandbox.h | 17 ++- + t/unit-tests/clar/clar/summary.h | 14 +-- + t/unit-tests/clar/test/.gitignore | 4 - + t/unit-tests/clar/test/CMakeLists.txt | 39 +++++++ + t/unit-tests/clar/test/Makefile | 39 ------- + 11 files changed, 189 insertions(+), 124 deletions(-) + create mode 100644 t/unit-tests/clar/.editorconfig + create mode 100644 t/unit-tests/clar/.gitignore + create mode 100644 t/unit-tests/clar/CMakeLists.txt + delete mode 100644 t/unit-tests/clar/test/.gitignore + create mode 100644 t/unit-tests/clar/test/CMakeLists.txt + delete mode 100644 t/unit-tests/clar/test/Makefile + +diff --git a/t/unit-tests/clar/.editorconfig b/t/unit-tests/clar/.editorconfig +new file mode 100644 +index 0000000000..aa343a4288 +--- /dev/null ++++ b/t/unit-tests/clar/.editorconfig +@@ -0,0 +1,13 @@ ++root = true ++ ++[*] ++charset = utf-8 ++insert_final_newline = true ++ ++[*.{c,h}] ++indent_style = tab ++tab_width = 8 ++ ++[CMakeLists.txt] ++indent_style = tab ++tab_width = 8 +diff --git a/t/unit-tests/clar/.github/workflows/ci.yml b/t/unit-tests/clar/.github/workflows/ci.yml +index b1ac2de460..0065843d17 100644 +--- a/t/unit-tests/clar/.github/workflows/ci.yml ++++ b/t/unit-tests/clar/.github/workflows/ci.yml +@@ -10,14 +10,26 @@ jobs: + build: + strategy: + matrix: +- os: [ ubuntu-latest, macos-latest ] ++ platform: ++ - os: ubuntu-latest ++ generator: Unix Makefiles ++ - os: macos-latest ++ generator: Unix Makefiles ++ - os: windows-latest ++ generator: Visual Studio 17 2022 ++ - os: windows-latest ++ generator: MSYS Makefiles ++ - os: windows-latest ++ generator: MinGW Makefiles + +- runs-on: ${{ matrix.os }} ++ runs-on: ${{ matrix.platform.os }} + + steps: + - name: Check out + uses: actions/checkout@v2 + - name: Build + run: | +- cd test +- make ++ mkdir build ++ cd build ++ cmake .. -G "${{matrix.platform.generator}}" ++ cmake --build . +diff --git a/t/unit-tests/clar/.gitignore b/t/unit-tests/clar/.gitignore +new file mode 100644 +index 0000000000..84c048a73c +--- /dev/null ++++ b/t/unit-tests/clar/.gitignore +@@ -0,0 +1 @@ ++/build/ +diff --git a/t/unit-tests/clar/CMakeLists.txt b/t/unit-tests/clar/CMakeLists.txt +new file mode 100644 +index 0000000000..12d4af114f +--- /dev/null ++++ b/t/unit-tests/clar/CMakeLists.txt +@@ -0,0 +1,28 @@ ++cmake_minimum_required(VERSION 3.16..3.29) ++ ++project(clar LANGUAGES C) ++ ++option(BUILD_TESTS "Build test executable" ON) ++ ++add_library(clar INTERFACE) ++target_sources(clar INTERFACE ++ clar.c ++ clar.h ++ clar/fixtures.h ++ clar/fs.h ++ clar/print.h ++ clar/sandbox.h ++ clar/summary.h ++) ++set_target_properties(clar PROPERTIES ++ C_STANDARD 90 ++ C_STANDARD_REQUIRED ON ++ C_EXTENSIONS OFF ++) ++ ++if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ++ include(CTest) ++ if(BUILD_TESTING) ++ add_subdirectory(test) ++ endif() ++endif() +diff --git a/t/unit-tests/clar/clar.c b/t/unit-tests/clar/clar.c +index cef0f023c2..d54e455367 100644 +--- a/t/unit-tests/clar/clar.c ++++ b/t/unit-tests/clar/clar.c +@@ -4,7 +4,12 @@ + * This file is part of clar, distributed under the ISC license. + * For full terms see the included COPYING file. + */ +-#include ++ ++#define _BSD_SOURCE ++#define _DARWIN_C_SOURCE ++#define _DEFAULT_SOURCE ++ ++#include + #include + #include + #include +@@ -13,11 +18,22 @@ + #include + #include + #include ++#include + + /* required for sandboxing */ + #include + #include + ++#if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_WCHAR__) ++ /* ++ * uClibc can optionally be built without wchar support, in which case ++ * the installed is a stub that only defines the `whar_t` ++ * type but none of the functions typically declared by it. ++ */ ++#else ++# define CLAR_HAVE_WCHAR ++#endif ++ + #ifdef _WIN32 + # define WIN32_LEAN_AND_MEAN + # include +@@ -28,6 +44,9 @@ + + # ifndef stat + # define stat(path, st) _stat(path, st) ++ typedef struct _stat STAT_T; ++# else ++ typedef struct stat STAT_T; + # endif + # ifndef mkdir + # define mkdir(path, mode) _mkdir(path) +@@ -60,30 +79,11 @@ + # else + # define p_snprintf snprintf + # endif +- +-# ifndef PRIuZ +-# define PRIuZ "Iu" +-# endif +-# ifndef PRIxZ +-# define PRIxZ "Ix" +-# endif +- +-# if defined(_MSC_VER) || (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +- typedef struct stat STAT_T; +-# else +- typedef struct _stat STAT_T; +-# endif + #else + # include /* waitpid(2) */ + # include + # define _MAIN_CC + # define p_snprintf snprintf +-# ifndef PRIuZ +-# define PRIuZ "zu" +-# endif +-# ifndef PRIxZ +-# define PRIxZ "zx" +-# endif + typedef struct stat STAT_T; + #endif + +@@ -102,7 +102,7 @@ fixture_path(const char *base, const char *fixture_name); + struct clar_error { + const char *file; + const char *function; +- size_t line_number; ++ uintmax_t line_number; + const char *error_msg; + char *description; + +@@ -195,11 +195,12 @@ static void clar_print_shutdown(int test_count, int suite_count, int error_count + static void clar_print_error(int num, const struct clar_report *report, const struct clar_error *error); + static void clar_print_ontest(const char *suite_name, const char *test_name, int test_number, enum cl_test_status failed); + static void clar_print_onsuite(const char *suite_name, int suite_index); ++static void clar_print_onabortv(const char *msg, va_list argp); + static void clar_print_onabort(const char *msg, ...); + + /* From clar_sandbox.c */ + static void clar_unsandbox(void); +-static int clar_sandbox(void); ++static void clar_sandbox(void); + + /* From summary.h */ + static struct clar_summary *clar_summary_init(const char *filename); +@@ -218,6 +219,15 @@ static int clar_summary_shutdown(struct clar_summary *fp); + _clar.trace_payload); \ + } while (0) + ++static void clar_abort(const char *msg, ...) ++{ ++ va_list argp; ++ va_start(argp, msg); ++ clar_print_onabortv(msg, argp); ++ va_end(argp); ++ exit(-1); ++} ++ + void cl_trace_register(cl_trace_cb *cb, void *payload) + { + _clar.pfn_trace_cb = cb; +@@ -271,9 +281,7 @@ static double clar_time_diff(clar_time *start, clar_time *end) + + static void clar_time_now(clar_time *out) + { +- struct timezone tz; +- +- gettimeofday(out, &tz); ++ gettimeofday(out, NULL); + } + + static double clar_time_diff(clar_time *start, clar_time *end) +@@ -386,7 +394,8 @@ clar_run_suite(const struct clar_suite *suite, const char *filter) + + _clar.active_test = test[i].name; + +- report = calloc(1, sizeof(struct clar_report)); ++ if ((report = calloc(1, sizeof(*report))) == NULL) ++ clar_abort("Failed to allocate report.\n"); + report->suite = _clar.active_suite; + report->test = _clar.active_test; + report->test_number = _clar.tests_ran; +@@ -479,9 +488,10 @@ clar_parse_args(int argc, char **argv) + + switch (action) { + case 's': { +- struct clar_explicit *explicit = +- calloc(1, sizeof(struct clar_explicit)); +- assert(explicit); ++ struct clar_explicit *explicit; ++ ++ if ((explicit = calloc(1, sizeof(*explicit))) == NULL) ++ clar_abort("Failed to allocate explicit test.\n"); + + explicit->suite_idx = j; + explicit->filter = argument; +@@ -505,10 +515,8 @@ clar_parse_args(int argc, char **argv) + } + } + +- if (!found) { +- clar_print_onabort("No suite matching '%s' found.\n", argument); +- exit(-1); +- } ++ if (!found) ++ clar_abort("No suite matching '%s' found.\n", argument); + break; + } + +@@ -540,11 +548,17 @@ clar_parse_args(int argc, char **argv) + case 'r': + _clar.write_summary = 1; + free(_clar.summary_filename); +- _clar.summary_filename = *(argument + 2) ? strdup(argument + 2) : NULL; ++ if (*(argument + 2)) { ++ if ((_clar.summary_filename = strdup(argument + 2)) == NULL) ++ clar_abort("Failed to allocate summary filename.\n"); ++ } else { ++ _clar.summary_filename = NULL; ++ } + break; + + default: +- assert(!"Unexpected commandline argument!"); ++ clar_abort("Unexpected commandline argument '%s'.\n", ++ argument[1]); + } + } + } +@@ -566,22 +580,18 @@ clar_test_init(int argc, char **argv) + if (!_clar.summary_filename && + (summary_env = getenv("CLAR_SUMMARY")) != NULL) { + _clar.write_summary = 1; +- _clar.summary_filename = strdup(summary_env); ++ if ((_clar.summary_filename = strdup(summary_env)) == NULL) ++ clar_abort("Failed to allocate summary filename.\n"); + } + + if (_clar.write_summary && !_clar.summary_filename) +- _clar.summary_filename = strdup("summary.xml"); ++ if ((_clar.summary_filename = strdup("summary.xml")) == NULL) ++ clar_abort("Failed to allocate summary filename.\n"); + +- if (_clar.write_summary && +- !(_clar.summary = clar_summary_init(_clar.summary_filename))) { +- clar_print_onabort("Failed to open the summary file\n"); +- exit(-1); +- } ++ if (_clar.write_summary) ++ _clar.summary = clar_summary_init(_clar.summary_filename); + +- if (clar_sandbox() < 0) { +- clar_print_onabort("Failed to sandbox the test runner.\n"); +- exit(-1); +- } ++ clar_sandbox(); + } + + int +@@ -615,10 +625,9 @@ clar_test_shutdown(void) + + clar_unsandbox(); + +- if (_clar.write_summary && clar_summary_shutdown(_clar.summary) < 0) { +- clar_print_onabort("Failed to write the summary file\n"); +- exit(-1); +- } ++ if (_clar.write_summary && clar_summary_shutdown(_clar.summary) < 0) ++ clar_abort("Failed to write the summary file '%s: %s.\n", ++ _clar.summary_filename, strerror(errno)); + + for (explicit = _clar.explicit; explicit; explicit = explicit_next) { + explicit_next = explicit->next; +@@ -649,7 +658,7 @@ static void abort_test(void) + { + if (!_clar.trampoline_enabled) { + clar_print_onabort( +- "Fatal error: a cleanup method raised an exception."); ++ "Fatal error: a cleanup method raised an exception.\n"); + clar_report_errors(_clar.last_report); + exit(-1); + } +@@ -673,7 +682,10 @@ void clar__fail( + const char *description, + int should_abort) + { +- struct clar_error *error = calloc(1, sizeof(struct clar_error)); ++ struct clar_error *error; ++ ++ if ((error = calloc(1, sizeof(*error))) == NULL) ++ clar_abort("Failed to allocate error.\n"); + + if (_clar.last_report->errors == NULL) + _clar.last_report->errors = error; +@@ -688,8 +700,9 @@ void clar__fail( + error->line_number = line; + error->error_msg = error_msg; + +- if (description != NULL) +- error->description = strdup(description); ++ if (description != NULL && ++ (error->description = strdup(description)) == NULL) ++ clar_abort("Failed to allocate description.\n"); + + _clar.total_errors++; + _clar.last_report->status = CL_TEST_FAILURE; +@@ -763,6 +776,7 @@ void clar__assert_equal( + } + } + } ++#ifdef CLAR_HAVE_WCHAR + else if (!strcmp("%ls", fmt)) { + const wchar_t *wcs1 = va_arg(args, const wchar_t *); + const wchar_t *wcs2 = va_arg(args, const wchar_t *); +@@ -798,8 +812,9 @@ void clar__assert_equal( + } + } + } +- else if (!strcmp("%"PRIuZ, fmt) || !strcmp("%"PRIxZ, fmt)) { +- size_t sz1 = va_arg(args, size_t), sz2 = va_arg(args, size_t); ++#endif /* CLAR_HAVE_WCHAR */ ++ else if (!strcmp("%"PRIuMAX, fmt) || !strcmp("%"PRIxMAX, fmt)) { ++ uintmax_t sz1 = va_arg(args, uintmax_t), sz2 = va_arg(args, uintmax_t); + is_equal = (sz1 == sz2); + if (!is_equal) { + int offset = p_snprintf(buf, sizeof(buf), fmt, sz1); +diff --git a/t/unit-tests/clar/clar/print.h b/t/unit-tests/clar/clar/print.h +index c17e2f693b..69d0ee967e 100644 +--- a/t/unit-tests/clar/clar/print.h ++++ b/t/unit-tests/clar/clar/print.h +@@ -21,7 +21,7 @@ static void clar_print_clap_error(int num, const struct clar_report *report, con + { + printf(" %d) Failure:\n", num); + +- printf("%s::%s [%s:%"PRIuZ"]\n", ++ printf("%s::%s [%s:%"PRIuMAX"]\n", + report->suite, + report->test, + error->file, +@@ -136,7 +136,7 @@ static void clar_print_tap_ontest(const char *suite_name, const char *test_name, + + printf(" at:\n"); + printf(" file: '"); print_escaped(error->file); printf("'\n"); +- printf(" line: %" PRIuZ "\n", error->line_number); ++ printf(" line: %" PRIuMAX "\n", error->line_number); + printf(" function: '%s'\n", error->function); + printf(" ---\n"); + +@@ -202,10 +202,15 @@ static void clar_print_onsuite(const char *suite_name, int suite_index) + PRINT(onsuite, suite_name, suite_index); + } + ++static void clar_print_onabortv(const char *msg, va_list argp) ++{ ++ PRINT(onabort, msg, argp); ++} ++ + static void clar_print_onabort(const char *msg, ...) + { + va_list argp; + va_start(argp, msg); +- PRINT(onabort, msg, argp); ++ clar_print_onabortv(msg, argp); + va_end(argp); + } +diff --git a/t/unit-tests/clar/clar/sandbox.h b/t/unit-tests/clar/clar/sandbox.h +index e25057b7c4..bc960f50e0 100644 +--- a/t/unit-tests/clar/clar/sandbox.h ++++ b/t/unit-tests/clar/clar/sandbox.h +@@ -122,14 +122,14 @@ static int build_sandbox_path(void) + + if (mkdir(_clar_path, 0700) != 0) + return -1; +-#elif defined(__TANDEM) +- if (mktemp(_clar_path) == NULL) ++#elif defined(_WIN32) ++ if (_mktemp_s(_clar_path, sizeof(_clar_path)) != 0) + return -1; + + if (mkdir(_clar_path, 0700) != 0) + return -1; +-#elif defined(_WIN32) +- if (_mktemp_s(_clar_path, sizeof(_clar_path)) != 0) ++#elif defined(__sun) || defined(__TANDEM) ++ if (mktemp(_clar_path) == NULL) + return -1; + + if (mkdir(_clar_path, 0700) != 0) +@@ -142,15 +142,14 @@ static int build_sandbox_path(void) + return 0; + } + +-static int clar_sandbox(void) ++static void clar_sandbox(void) + { + if (_clar_path[0] == '\0' && build_sandbox_path() < 0) +- return -1; ++ clar_abort("Failed to build sandbox path.\n"); + + if (chdir(_clar_path) != 0) +- return -1; +- +- return 0; ++ clar_abort("Failed to change into sandbox directory '%s': %s.\n", ++ _clar_path, strerror(errno)); + } + + const char *clar_sandbox_path(void) +diff --git a/t/unit-tests/clar/clar/summary.h b/t/unit-tests/clar/clar/summary.h +index 4dd352e28b..0d0b646fe7 100644 +--- a/t/unit-tests/clar/clar/summary.h ++++ b/t/unit-tests/clar/clar/summary.h +@@ -66,16 +66,12 @@ struct clar_summary *clar_summary_init(const char *filename) + struct clar_summary *summary; + FILE *fp; + +- if ((fp = fopen(filename, "w")) == NULL) { +- perror("fopen"); +- return NULL; +- } ++ if ((fp = fopen(filename, "w")) == NULL) ++ clar_abort("Failed to open the summary file '%s': %s.\n", ++ filename, strerror(errno)); + +- if ((summary = malloc(sizeof(struct clar_summary))) == NULL) { +- perror("malloc"); +- fclose(fp); +- return NULL; +- } ++ if ((summary = malloc(sizeof(struct clar_summary))) == NULL) ++ clar_abort("Failed to allocate summary.\n"); + + summary->filename = filename; + summary->fp = fp; +diff --git a/t/unit-tests/clar/test/.gitignore b/t/unit-tests/clar/test/.gitignore +deleted file mode 100644 +index a477d0c40c..0000000000 +--- a/t/unit-tests/clar/test/.gitignore ++++ /dev/null +@@ -1,4 +0,0 @@ +-clar.suite +-.clarcache +-clar_test +-*.o +diff --git a/t/unit-tests/clar/test/CMakeLists.txt b/t/unit-tests/clar/test/CMakeLists.txt +new file mode 100644 +index 0000000000..7f2c1dc17a +--- /dev/null ++++ b/t/unit-tests/clar/test/CMakeLists.txt +@@ -0,0 +1,39 @@ ++find_package(Python COMPONENTS Interpreter REQUIRED) ++ ++add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/clar.suite" ++ COMMAND "${Python_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/generate.py" --output "${CMAKE_CURRENT_BINARY_DIR}" ++ DEPENDS main.c sample.c clar_test.h ++ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ++) ++ ++add_executable(clar_test) ++set_target_properties(clar_test PROPERTIES ++ C_STANDARD 90 ++ C_STANDARD_REQUIRED ON ++ C_EXTENSIONS OFF ++) ++ ++# MSVC generates all kinds of warnings. We may want to fix these in the future ++# and then unconditionally treat warnings as errors. ++if(NOT MSVC) ++ set_target_properties(clar_test PROPERTIES ++ COMPILE_WARNING_AS_ERROR ON ++ ) ++endif() ++ ++target_sources(clar_test PRIVATE ++ main.c ++ sample.c ++ "${CMAKE_CURRENT_BINARY_DIR}/clar.suite" ++) ++target_compile_definitions(clar_test PRIVATE ++ CLAR_FIXTURE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/" ++) ++target_compile_options(clar_test PRIVATE ++ $,/W4,-Wall> ++) ++target_include_directories(clar_test PRIVATE ++ "${CMAKE_SOURCE_DIR}" ++ "${CMAKE_CURRENT_BINARY_DIR}" ++) ++target_link_libraries(clar_test clar) +diff --git a/t/unit-tests/clar/test/Makefile b/t/unit-tests/clar/test/Makefile +deleted file mode 100644 +index 93c6b2ad32..0000000000 +--- a/t/unit-tests/clar/test/Makefile ++++ /dev/null +@@ -1,39 +0,0 @@ +-# +-# Copyright (c) Vicent Marti. All rights reserved. +-# +-# This file is part of clar, distributed under the ISC license. +-# For full terms see the included COPYING file. +-# +- +-# +-# Set up the path to the clar sources and to the fixtures directory +-# +-# The fixture path needs to be an absolute path so it can be used +-# even after we have chdir'ed into the test directory while testing. +-# +-CURRENT_MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) +-TEST_DIRECTORY := $(abspath $(dir $(CURRENT_MAKEFILE))) +-CLAR_PATH := $(dir $(TEST_DIRECTORY)) +-CLAR_FIXTURE_PATH := $(TEST_DIRECTORY)/resources/ +- +-CFLAGS=-g -I.. -I. -Wall -DCLAR_FIXTURE_PATH=\"$(CLAR_FIXTURE_PATH)\" +- +-.PHONY: clean +- +-# list the objects that go into our test +-objects = main.o sample.o +- +-# build the test executable itself +-clar_test: $(objects) clar_test.h clar.suite $(CLAR_PATH)clar.c +- $(CC) $(CFLAGS) -o $@ "$(CLAR_PATH)clar.c" $(objects) +- +-# test object files depend on clar macros +-$(objects) : $(CLAR_PATH)clar.h +- +-# build the clar.suite file of test metadata +-clar.suite: +- python "$(CLAR_PATH)generate.py" . +- +-# remove all generated files +-clean: +- $(RM) -rf *.o clar.suite .clarcache clar_test clar_test.dSYM + +base-commit: 777489f9e09c8d0dd6b12f9d90de6376330577a2 +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0002-Makefile-adjust-sed-command-for-generating-clar-decl.patch b/package/git/0002-Makefile-adjust-sed-command-for-generating-clar-decl.patch new file mode 100644 index 00000000000..05a541a3e5b --- /dev/null +++ b/package/git/0002-Makefile-adjust-sed-command-for-generating-clar-decl.patch @@ -0,0 +1,37 @@ +From bcc172473a7f24c0598853c8ae555b6efaeb2fd2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= +Date: Mon, 21 Oct 2024 12:56:35 +0200 +Subject: [PATCH] Makefile: adjust sed command for generating + "clar-decls.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This moves the end-of-line marker out of the captured group, matching +the start-of-line marker and for some reason fixing generation of +"clar-decls.h" on some older, more esoteric platforms. + +Signed-off-by: Alejandro R. Sedeño +Signed-off-by: Patrick Steinhardt +Upstream: https://lore.kernel.org/r/17d77f36d41fb2928565a4922eab3a67426d2da6.1729506329.git.ps@pks.im +Signed-off-by: Bagas Sanjaya +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2dde1fd2b8..87c1f9e220 100644 +--- a/Makefile ++++ b/Makefile +@@ -3906,7 +3906,7 @@ GIT-TEST-SUITES: FORCE + + $(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUITES)) GIT-TEST-SUITES + $(QUIET_GEN)for suite in $(CLAR_TEST_SUITES); do \ +- sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)$$\)/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \ ++ sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)\)$$/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \ + done >$@ + $(UNIT_TEST_DIR)/clar.suite: $(UNIT_TEST_DIR)/clar-decls.h + $(QUIET_GEN)awk -f $(UNIT_TEST_DIR)/clar-generate.awk $< >$(UNIT_TEST_DIR)/clar.suite +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0003-Makefile-extract-script-to-generate-clar-declaration.patch b/package/git/0003-Makefile-extract-script-to-generate-clar-declaration.patch new file mode 100644 index 00000000000..58f41f7189a --- /dev/null +++ b/package/git/0003-Makefile-extract-script-to-generate-clar-declaration.patch @@ -0,0 +1,58 @@ +From 4e5e8a0822db050c31b3cdd5ae00c37f4a8a063e Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Mon, 21 Oct 2024 12:56:38 +0200 +Subject: [PATCH] Makefile: extract script to generate clar declarations + +Extract the script to generate function declarations for the clar unit +testing framework into a standalone script. This is done such that we +can reuse it in other build systems. + +Signed-off-by: Patrick Steinhardt +Upstream: https://lore.kernel.org/r/c2e3fbcd8532038158a0ead6f0a2f752f557ab7f.1729506329.git.ps@pks.im +Signed-off-by: Bagas Sanjaya +--- + Makefile | 4 +--- + t/unit-tests/generate-clar-decls.sh | 16 ++++++++++++++++ + 2 files changed, 17 insertions(+), 3 deletions(-) + create mode 100755 t/unit-tests/generate-clar-decls.sh + +diff --git a/Makefile b/Makefile +index 87c1f9e220..a58dcab954 100644 +--- a/Makefile ++++ b/Makefile +@@ -3905,9 +3905,7 @@ GIT-TEST-SUITES: FORCE + fi + + $(UNIT_TEST_DIR)/clar-decls.h: $(patsubst %,$(UNIT_TEST_DIR)/%.c,$(CLAR_TEST_SUITES)) GIT-TEST-SUITES +- $(QUIET_GEN)for suite in $(CLAR_TEST_SUITES); do \ +- sed -ne "s/^\(void test_$${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)\)$$/extern \1;/p" $(UNIT_TEST_DIR)/$$suite.c; \ +- done >$@ ++ $(QUIET_GEN)$(SHELL_PATH) $(UNIT_TEST_DIR)/generate-clar-decls.sh "$@" $(filter %.c,$^) + $(UNIT_TEST_DIR)/clar.suite: $(UNIT_TEST_DIR)/clar-decls.h + $(QUIET_GEN)awk -f $(UNIT_TEST_DIR)/clar-generate.awk $< >$(UNIT_TEST_DIR)/clar.suite + $(CLAR_TEST_OBJS): $(UNIT_TEST_DIR)/clar-decls.h +diff --git a/t/unit-tests/generate-clar-decls.sh b/t/unit-tests/generate-clar-decls.sh +new file mode 100755 +index 0000000000..688e0885f4 +--- /dev/null ++++ b/t/unit-tests/generate-clar-decls.sh +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++if test $# -lt 2 ++then ++ echo "USAGE: $0 ..." 2>&1 ++ exit 1 ++fi ++ ++OUTPUT="$1" ++shift ++ ++for suite in "$@" ++do ++ sed -ne "s/^\(void test_$(basename "${suite%.c}")__[a-zA-Z_0-9][a-zA-Z_0-9]*(void)\)$/extern \1;/p" "$suite" || ++ exit 1 ++done >"$OUTPUT" +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0004-cmake-fix-compilation-of-clar-based-unit-tests.patch b/package/git/0004-cmake-fix-compilation-of-clar-based-unit-tests.patch new file mode 100644 index 00000000000..552eb0c8138 --- /dev/null +++ b/package/git/0004-cmake-fix-compilation-of-clar-based-unit-tests.patch @@ -0,0 +1,39 @@ +From beb7761f4fbc6b71ec6357d56575f57fd2b4c8a9 Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Mon, 21 Oct 2024 12:56:41 +0200 +Subject: [PATCH] cmake: fix compilation of clar-based unit tests + +The compilation of clar-based unit tests is broken because we do not +add the binary directory into which we generate the "clar-decls.h" and +"clar.suite" files as include directories. Instead, we accidentally set +up the source directory as include directory. + +Fix this by including the binary directory instead of the source +directory. Furthermore, set up the include directories as PUBLIC instead +of PRIVATE such that they propagate from "unit-tests.lib" to the +"unit-tests" executable, which needs to include the same directory. + +Reported-by: Ed Reel +Signed-off-by: Patrick Steinhardt +Upstream: https://lore.kernel.org/r/a30017a4d8998e85915d959c16f181a8d4e813f2.1729506329.git.ps@pks.im +Signed-off-by: Bagas Sanjaya +--- + contrib/buildsystems/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt +index 62af7b33d2..093852ad9d 100644 +--- a/contrib/buildsystems/CMakeLists.txt ++++ b/contrib/buildsystems/CMakeLists.txt +@@ -1042,7 +1042,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" "${clar_decls}" "${clar + list(TRANSFORM clar_test_SUITES PREPEND "${CMAKE_SOURCE_DIR}/t/unit-tests/") + list(TRANSFORM clar_test_SUITES APPEND ".c") + add_library(unit-tests-lib ${clar_test_SUITES} "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c") +-target_include_directories(unit-tests-lib PRIVATE "${CMAKE_SOURCE_DIR}/t/unit-tests") ++target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests") + add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c") + target_link_libraries(unit-tests unit-tests-lib common-main) + set_target_properties(unit-tests +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/0005-cmake-set-up-proper-dependencies-for-generated-clar-.patch b/package/git/0005-cmake-set-up-proper-dependencies-for-generated-clar-.patch new file mode 100644 index 00000000000..c9310a93949 --- /dev/null +++ b/package/git/0005-cmake-set-up-proper-dependencies-for-generated-clar-.patch @@ -0,0 +1,84 @@ +From 65d840b397f23ccbc578c15ee7a2dae1a7d1bfc8 Mon Sep 17 00:00:00 2001 +From: Patrick Steinhardt +Date: Mon, 21 Oct 2024 12:56:44 +0200 +Subject: [PATCH] cmake: set up proper dependencies for generated clar + headers + +The auto-generated headers used by clar are written at configure time +and thus do not get regenerated automatically. Refactor the build +recipes such that we use custom commands instead, which also has the +benefit that we can reuse the same infrastructure as our Makefile. + +Signed-off-by: Patrick Steinhardt +Upstream: https://lore.kernel.org/r/bb005979e7eb335b0178094251b5c37682d7d47b.1729506329.git.ps@pks.im +Signed-off-by: Bagas Sanjaya +--- + contrib/buildsystems/CMakeLists.txt | 50 +++++++---------------------- + 1 file changed, 12 insertions(+), 38 deletions(-) + +diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt +index 093852ad9d..9f80ab9265 100644 +--- a/contrib/buildsystems/CMakeLists.txt ++++ b/contrib/buildsystems/CMakeLists.txt +@@ -1002,46 +1002,20 @@ foreach(unit_test ${unit_test_PROGRAMS}) + endforeach() + + parse_makefile_for_scripts(clar_test_SUITES "CLAR_TEST_SUITES" "") +- +-set(clar_decls "") +-set(clar_cbs "") +-set(clar_cbs_count 0) +-set(clar_suites "static struct clar_suite _clar_suites[] = {\n") +-list(LENGTH clar_test_SUITES clar_suites_count) +-foreach(suite ${clar_test_SUITES}) +- file(STRINGS "${CMAKE_SOURCE_DIR}/t/unit-tests/${suite}.c" decls +- REGEX "^void test_${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*\\(void\\)$") +- +- list(LENGTH decls decls_count) +- string(REGEX REPLACE "void (test_${suite}__([a-zA-Z_0-9]*))\\(void\\)" " { \"\\2\", &\\1 },\n" cbs ${decls}) +- string(JOIN "" cbs ${cbs}) +- list(TRANSFORM decls PREPEND "extern ") +- string(JOIN ";\n" decls ${decls}) +- +- string(APPEND clar_decls "${decls};\n") +- string(APPEND clar_cbs +- "static const struct clar_func _clar_cb_${suite}[] = {\n" +- ${cbs} +- "};\n") +- string(APPEND clar_suites +- " {\n" +- " \"${suite}\",\n" +- " { NULL, NULL },\n" +- " { NULL, NULL },\n" +- " _clar_cb_${suite}, ${decls_count}, 1\n" +- " },\n") +- math(EXPR clar_cbs_count "${clar_cbs_count}+${decls_count}") +-endforeach() +-string(APPEND clar_suites +- "};\n" +- "static const size_t _clar_suite_count = ${clar_suites_count};\n" +- "static const size_t _clar_callback_count = ${clar_cbs_count};\n") +-file(WRITE "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" "${clar_decls}") +-file(WRITE "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" "${clar_decls}" "${clar_cbs}" "${clar_suites}") +- + list(TRANSFORM clar_test_SUITES PREPEND "${CMAKE_SOURCE_DIR}/t/unit-tests/") + list(TRANSFORM clar_test_SUITES APPEND ".c") +-add_library(unit-tests-lib ${clar_test_SUITES} "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c") ++add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" ++ COMMAND ${CMAKE_SOURCE_DIR}/t/unit-tests/generate-clar-decls.sh "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" ${clar_test_SUITES} ++ DEPENDS ${CMAKE_SOURCE_DIR}/t/unit-tests/generate-clar-decls.sh ${clar_test_SUITES}) ++add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" ++ COMMAND awk -f "${CMAKE_SOURCE_DIR}/t/unit-tests/clar-generate.awk" "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" > "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" ++ DEPENDS "${CMAKE_SOURCE_DIR}/t/unit-tests/clar-generate.awk" "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h") ++ ++add_library(unit-tests-lib ${clar_test_SUITES} ++ "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c" ++ "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" ++ "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" ++) + target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests") + add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c") + target_link_libraries(unit-tests unit-tests-lib common-main) +-- +An old man doll... just what I always wanted! - Clara + diff --git a/package/git/git.hash b/package/git/git.hash index 6b34d145439..c290ebe6bd0 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 7f123462a28b7ca3ebe2607485f7168554c2b10dfc155c7ec46300666ac27f95 git-2.46.0.tar.xz +sha256 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e git-2.47.0.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index d0b27d7e5c9..f56807a00f1 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.46.0 +GIT_VERSION = 2.47.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index aaf7848a7cf..bfb2942abb1 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 2858e8e47c4c0df32b526c56d5590ec939e8178201ee9526bb070999ce4aa1f2 glibc-2.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685.tar.gz +sha256 6426766187d177412e7f3daed793dec93fce417db5ae99296c0d880aa808091e glibc-2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index db6fa55819f..cee03a16fdb 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.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 +GLIBC_VERSION = 2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0 # 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. diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 8bb64c9edae..6a34f2a1ced 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 ae0935ead29a2dfa34d6b48d70808652bc3ca73b gnupg-2.4.5.tar.bz2 -sha256 f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277 gnupg-2.4.5.tar.bz2 +sha1 2d510a1a7294f2f9ef3f2e280c93c3ad9b0cdb68 gnupg-2.4.7.tar.bz2 +sha256 7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46 gnupg-2.4.7.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index d38aaeec1af..d98829ca806 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.5 +GNUPG2_VERSION = 2.4.7 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ diff --git a/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch b/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch deleted file mode 100644 index e84c72aaed2..00000000000 --- a/package/gnuplot/0002-check-for-defined-FE_UNDERFLOW.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 806641b5ef504488f871b5cbd9e5c356d67d0bd1 Mon Sep 17 00:00:00 2001 -From: Edgar Bonet -Date: Tue, 24 Sep 2024 20:03:18 -0700 -Subject: [PATCH] check for defined(FE_UNDERFLOW) - -According to fenv(3), the macro FE_UNDERFLOW is defined by fenv.h only -if the implementation supports handling of the underflow exception. Do -not assume the presence of fenv.h implies FE_UNDERFLOW is defined. - -Signed-off-by: Edgar Bonet -Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/ci/926d2c26d31f4b69feda372c76a28643ef45359d/ -Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/ci/806641b5ef504488f871b5cbd9e5c356d67d0bd1/ ---- - src/complexfun.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/complexfun.c b/src/complexfun.c -index 7a5d9a13f..7ddb4ed60 100644 ---- a/src/complexfun.c -+++ b/src/complexfun.c -@@ -86,7 +86,7 @@ - int_error(NO_CARET, "%s: error present on entry (errno %d %s)", who, errno, strerror(errno)); - #endif - --#ifdef HAVE_FENV_H -+#if defined (HAVE_FENV_H) && defined (FE_UNDERFLOW) - #define handle_underflow( who, var ) \ - if (errno) { \ - if (fetestexcept(FE_UNDERFLOW)) { \ --- -2.34.1 - diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 4072338885b..980fe6858d6 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.1/ -md5 744fde2362fb20db6cfc58de73f96e9c gnuplot-6.0.1.tar.gz -sha1 ce1aaeff632c78cba2b3ca8142cf130bfd411478 gnuplot-6.0.1.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/6.0.2/ +md5 ea0931758fc180e3b1950931b9869921 gnuplot-6.0.2.tar.gz +sha1 be803916e4ea32720b4a646f2ffc98d6ad3a0dc2 gnuplot-6.0.2.tar.gz # Locally computed -sha256 e85a660c1a2a1808ff24f7e69981ffcbac66a45c9dcf711b65610b26ea71379a gnuplot-6.0.1.tar.gz +sha256 f68a3b0bbb7bbbb437649674106d94522c00bf2f285cce0c19c3180b1ee7e738 gnuplot-6.0.2.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index adb9ce6ad1c..b363e761ef6 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 6.0.1 +GNUPLOT_VERSION = 6.0.2 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-runtime-io_signature-include-spdlog-ranges.h-.patch b/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch deleted file mode 100644 index 6a08b8edee6..00000000000 --- a/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 03c9a40883e610e54b8fc3c3ce1842d68d7ce2e4 Mon Sep 17 00:00:00 2001 -From: Kefu Chai -Date: Mon, 15 Jul 2024 09:27:16 +0800 -Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for - using fmt::join() - -fmt::join() was moved into fmt/ranges.h since fmt 11, so let's -include the corresponding header in spdlog for using it. - -Signed-off-by: Kefu Chai -(cherry picked from commit 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa) -Signed-off-by: Jeff Long -Upstream: https://github.com/gnuradio/gnuradio/commit/ead459813367e7fd679dad067d1b020010d49b4f -[Julien: backported commit ead45981 from v3.10.11.0] -Signed-off-by: Julien Olivain ---- - gr-blocks/lib/message_debug_impl.cc | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc -index 1e81aec0d..415d2be97 100644 ---- a/gr-blocks/lib/message_debug_impl.cc -+++ b/gr-blocks/lib/message_debug_impl.cc -@@ -14,6 +14,11 @@ - #include - #include - #include -+#if __has_include() -+#include -+#elif __has_include() -+#include -+#endif - #include - #include - #include --- -2.46.0 - diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index f41f5a78df5..855fca7ba48 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 55156650ada130600c70bc2ab38eee718fc1d23011be548471e888399f207ddc gnuradio-3.10.7.0.tar.gz +sha256 9ca658e6c4af9cfe144770757b34ab0edd23f6dcfaa6c5c46a7546233e5ecd29 gnuradio-3.10.11.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index bdaab86f353..d844688ff60 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNURADIO_VERSION = 3.10.7.0 +GNURADIO_VERSION = 3.10.11.0 GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING diff --git a/package/gnutls/0001-groups-represent-hybrid-groups-with-an-array-of-IDs.patch b/package/gnutls/0001-groups-represent-hybrid-groups-with-an-array-of-IDs.patch new file mode 100644 index 00000000000..8462d77281b --- /dev/null +++ b/package/gnutls/0001-groups-represent-hybrid-groups-with-an-array-of-IDs.patch @@ -0,0 +1,798 @@ +From 5ed597eb28c408c5968e6dfb839880ba5fa17ba1 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 6 Dec 2024 09:53:18 +0900 +Subject: [PATCH] groups: represent hybrid groups with an array of IDs + +Previously, the supported_groups array contained externally defined +elements, which is legitimate in C99 but caused error with Clang: + + groups.c:93:2: error: initializer element is not a compile-time constant + group_x25519, + ^~~~~~~~~~~~ + +This reworks the array definition of indirection through group +IDs (gnutls_group_t, i.e., integer). + +This also makes pqc-hybrid-kx test more exhaustive. + +Signed-off-by: Daiki Ueno +Upstream: https://gitlab.com/gnutls/gnutls/-/commit/9cc9d5556d258d23a399abfe45715773e719d134 +Signed-off-by: Brandon Maier +--- + lib/algorithms.h | 7 ++ + lib/algorithms/groups.c | 161 ++++++++++++++++++++------------ + lib/ext/key_share.c | 81 ++++++++++++---- + lib/ext/supported_groups.c | 45 +++++---- + lib/gnutls_int.h | 8 +- + lib/includes/gnutls/gnutls.h.in | 4 +- + lib/priority.c | 25 ++--- + lib/session.c | 6 +- + tests/pqc-hybrid-kx.sh | 101 +++++++++++++++++--- + 9 files changed, 315 insertions(+), 123 deletions(-) + +diff --git a/lib/algorithms.h b/lib/algorithms.h +index 2e1b694c6..c4af571ce 100644 +--- a/lib/algorithms.h ++++ b/lib/algorithms.h +@@ -55,6 +55,9 @@ + #define IS_KEM(x) \ + (((x) == GNUTLS_PK_MLKEM768) || ((x) == GNUTLS_PK_EXP_KYBER768)) + ++ ++#define IS_GROUP_HYBRID(group) ((group)->ids[0] != GNUTLS_GROUP_INVALID) ++ + #define SIG_SEM_PRE_TLS12 (1 << 1) + #define SIG_SEM_TLS13 (1 << 2) + #define SIG_SEM_DEFAULT (SIG_SEM_PRE_TLS12 | SIG_SEM_TLS13) +@@ -493,6 +496,10 @@ const gnutls_group_entry_st *_gnutls_tls_id_to_group(unsigned num); + const gnutls_group_entry_st *_gnutls_id_to_group(unsigned id); + gnutls_group_t _gnutls_group_get_id(const char *name); + ++int _gnutls_group_expand( ++ const gnutls_group_entry_st *group, ++ const gnutls_group_entry_st *subgroups[MAX_HYBRID_GROUPS + 1]); ++ + gnutls_ecc_curve_t _gnutls_ecc_bits_to_curve(gnutls_pk_algorithm_t pk, + int bits); + #define MAX_ECC_CURVE_SIZE 66 +diff --git a/lib/algorithms/groups.c b/lib/algorithms/groups.c +index 88d0cf630..2fbe7b8ec 100644 +--- a/lib/algorithms/groups.c ++++ b/lib/algorithms/groups.c +@@ -30,30 +30,6 @@ + /* Supported ECC curves + */ + +-#ifdef HAVE_LIBOQS +-static const gnutls_group_entry_st group_mlkem768 = { +- .name = "MLKEM768", +- .id = GNUTLS_GROUP_INVALID, +- .curve = GNUTLS_ECC_CURVE_INVALID, +- .pk = GNUTLS_PK_MLKEM768, +-}; +- +-static const gnutls_group_entry_st group_kyber768 = { +- .name = "KYBER768", +- .id = GNUTLS_GROUP_INVALID, +- .curve = GNUTLS_ECC_CURVE_INVALID, +- .pk = GNUTLS_PK_EXP_KYBER768, +-}; +-#endif +- +-static const gnutls_group_entry_st group_x25519 = { +- .name = "X25519", +- .id = GNUTLS_GROUP_X25519, +- .curve = GNUTLS_ECC_CURVE_X25519, +- .tls_id = 29, +- .pk = GNUTLS_PK_ECDH_X25519, +-}; +- + static const gnutls_group_entry_st supported_groups[] = { + { + .name = "SECP192R1", +@@ -90,7 +66,13 @@ static const gnutls_group_entry_st supported_groups[] = { + .tls_id = 25, + .pk = GNUTLS_PK_ECDSA, + }, +- group_x25519, ++ { ++ .name = "X25519", ++ .id = GNUTLS_GROUP_X25519, ++ .curve = GNUTLS_ECC_CURVE_X25519, ++ .tls_id = 29, ++ .pk = GNUTLS_PK_ECDH_X25519, ++ }, + #ifdef ENABLE_GOST + /* draft-smyshlyaev-tls12-gost-suites-06, Section 6 */ + { +@@ -191,24 +173,33 @@ static const gnutls_group_entry_st supported_groups[] = { + .tls_id = 0x104 }, + #endif + #ifdef HAVE_LIBOQS ++ { ++ .name = "MLKEM768", ++ .id = GNUTLS_GROUP_EXP_MLKEM768, ++ .pk = GNUTLS_PK_MLKEM768, ++ /* absense of .tls_id means that this group alone cannot be used in TLS */ ++ }, ++ { ++ .name = "KYBER768", ++ .id = GNUTLS_GROUP_EXP_KYBER768, ++ .pk = GNUTLS_PK_EXP_KYBER768, ++ /* absense of .tls_id means that this group alone cannot be used in TLS */ ++ }, + { .name = "SECP256R1-MLKEM768", + .id = GNUTLS_GROUP_EXP_SECP256R1_MLKEM768, +- .curve = GNUTLS_ECC_CURVE_SECP256R1, +- .pk = GNUTLS_PK_ECDSA, +- .tls_id = 0x11EB, +- .next = &group_mlkem768 }, ++ .ids = { GNUTLS_GROUP_SECP256R1, GNUTLS_GROUP_EXP_MLKEM768, ++ GNUTLS_GROUP_INVALID }, ++ .tls_id = 0x11EB }, + { .name = "X25519-MLKEM768", + .id = GNUTLS_GROUP_EXP_X25519_MLKEM768, +- .curve = GNUTLS_ECC_CURVE_INVALID, +- .pk = GNUTLS_PK_MLKEM768, +- .tls_id = 0x11EC, +- .next = &group_x25519 }, ++ .ids = { GNUTLS_GROUP_EXP_MLKEM768, GNUTLS_GROUP_X25519, ++ GNUTLS_GROUP_INVALID }, ++ .tls_id = 0x11EC }, + { .name = "X25519-KYBER768", + .id = GNUTLS_GROUP_EXP_X25519_KYBER768, +- .curve = GNUTLS_ECC_CURVE_X25519, +- .pk = GNUTLS_PK_ECDH_X25519, +- .tls_id = 0x6399, +- .next = &group_kyber768 }, ++ .ids = { GNUTLS_GROUP_X25519, GNUTLS_GROUP_EXP_KYBER768, ++ GNUTLS_GROUP_INVALID }, ++ .tls_id = 0x6399 }, + #endif + { 0, 0, 0 } + }; +@@ -221,14 +212,46 @@ static const gnutls_group_entry_st supported_groups[] = { + } \ + } + ++static inline const gnutls_group_entry_st *group_to_entry(gnutls_group_t group) ++{ ++ if (group == 0) ++ return NULL; ++ ++ GNUTLS_GROUP_LOOP(if (p->id == group) { return p; }); ++ ++ return NULL; ++} ++ ++static inline bool ++group_is_supported_standalone(const gnutls_group_entry_st *group) ++{ ++ return group->pk != 0 && _gnutls_pk_exists(group->pk) && ++ (group->curve == 0 || ++ _gnutls_ecc_curve_is_supported(group->curve)); ++} ++ ++static inline bool group_is_supported(const gnutls_group_entry_st *group) ++{ ++ if (!IS_GROUP_HYBRID(group)) ++ return group_is_supported_standalone(group); ++ ++ for (size_t i = 0; ++ i < MAX_HYBRID_GROUPS && group->ids[i] != GNUTLS_GROUP_INVALID; ++ i++) { ++ const gnutls_group_entry_st *p = group_to_entry(group->ids[i]); ++ if (!p || !group_is_supported_standalone(p)) ++ return false; ++ } ++ ++ return true; ++} ++ + /* Returns the TLS id of the given curve + */ + const gnutls_group_entry_st *_gnutls_tls_id_to_group(unsigned num) + { + GNUTLS_GROUP_LOOP( +- if (p->tls_id == num && +- (p->curve == 0 || +- _gnutls_ecc_curve_is_supported(p->curve))) { return p; }); ++ if (p->tls_id == num && group_is_supported(p)) { return p; }); + + return NULL; + } +@@ -239,10 +262,7 @@ const gnutls_group_entry_st *_gnutls_id_to_group(unsigned id) + return NULL; + + GNUTLS_GROUP_LOOP( +- if (p->id == id && (p->curve == 0 || +- _gnutls_ecc_curve_is_supported(p->curve))) { +- return p; +- }); ++ if (p->id == id && group_is_supported(p)) { return p; }); + + return NULL; + } +@@ -261,27 +281,17 @@ const gnutls_group_entry_st *_gnutls_id_to_group(unsigned id) + **/ + const gnutls_group_t *gnutls_group_list(void) + { +- static gnutls_group_t groups[MAX_ALGOS] = { 0 }; ++ static gnutls_group_t groups[MAX_ALGOS + 1] = { 0 }; + + if (groups[0] == 0) { +- int i = 0; ++ size_t i = 0; + +- const gnutls_group_entry_st *p; +- +- for (p = supported_groups; p->name != NULL; p++) { +- const gnutls_group_entry_st *pp; +- +- for (pp = p; pp != NULL; pp = pp->next) { +- if ((pp->curve != 0 && +- !_gnutls_ecc_curve_is_supported( +- pp->curve)) || +- (pp->pk != 0 && !_gnutls_pk_exists(pp->pk))) +- break; +- } +- if (pp == NULL) ++ for (const gnutls_group_entry_st *p = supported_groups; ++ p->name != NULL; p++) { ++ if (group_is_supported(p)) + groups[i++] = p->id; + } +- groups[i++] = 0; ++ groups[i++] = GNUTLS_GROUP_INVALID; + } + + return groups; +@@ -344,3 +354,34 @@ const char *gnutls_group_get_name(gnutls_group_t group) + + return NULL; + } ++ ++/* Expand GROUP into hybrid SUBGROUPS if any, otherwise an array ++ * containing the GROUP itself. The result will be written to ++ * SUBGROUPS, which will be NUL-terminated. ++ */ ++int _gnutls_group_expand( ++ const gnutls_group_entry_st *group, ++ const gnutls_group_entry_st *subgroups[MAX_HYBRID_GROUPS + 1]) ++{ ++ size_t pos = 0; ++ ++ if (IS_GROUP_HYBRID(group)) { ++ for (size_t i = 0; i < MAX_HYBRID_GROUPS && ++ group->ids[i] != GNUTLS_GROUP_INVALID; ++ i++) { ++ const gnutls_group_entry_st *p = ++ group_to_entry(group->ids[i]); ++ /* This shouldn't happen, as GROUP is assumed ++ * to be supported before calling this ++ * function. */ ++ if (unlikely(!p)) ++ return gnutls_assert_val( ++ GNUTLS_E_INTERNAL_ERROR); ++ subgroups[pos++] = p; ++ } ++ } else { ++ subgroups[pos++] = group; ++ } ++ subgroups[pos] = NULL; ++ return 0; ++} +diff --git a/lib/ext/key_share.c b/lib/ext/key_share.c +index 574521157..8fbe2d2bd 100644 +--- a/lib/ext/key_share.c ++++ b/lib/ext/key_share.c +@@ -232,6 +232,9 @@ static int client_gen_key_share(gnutls_session_t session, + gnutls_buffer_st *extdata) + { + unsigned int length_pos; ++ const gnutls_group_entry_st *groups[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; + int ret; + + _gnutls_handshake_log("EXT[%p]: sending key share for %s\n", session, +@@ -247,8 +250,12 @@ static int client_gen_key_share(gnutls_session_t session, + if (ret < 0) + return gnutls_assert_val(ret); + +- for (const gnutls_group_entry_st *p = group; p != NULL; p = p->next) { +- ret = client_gen_key_share_single(session, p, extdata); ++ ret = _gnutls_group_expand(group, groups); ++ if (ret < 0) ++ return gnutls_assert_val(ret); ++ ++ for (size_t i = 0; groups[i]; i++) { ++ ret = client_gen_key_share_single(session, groups[i], extdata); + if (ret < 0) + return gnutls_assert_val(ret); + } +@@ -345,6 +352,9 @@ static int server_gen_key_share(gnutls_session_t session, + gnutls_buffer_st *extdata) + { + unsigned int length_pos; ++ const gnutls_group_entry_st *groups[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; + int ret; + + _gnutls_handshake_log("EXT[%p]: sending key share for %s\n", session, +@@ -360,8 +370,12 @@ static int server_gen_key_share(gnutls_session_t session, + if (ret < 0) + return gnutls_assert_val(ret); + +- for (const gnutls_group_entry_st *p = group; p != NULL; p = p->next) { +- ret = server_gen_key_share_single(session, p, extdata); ++ ret = _gnutls_group_expand(group, groups); ++ if (ret < 0) ++ return gnutls_assert_val(ret); ++ ++ for (size_t i = 0; groups[i]; i++) { ++ ret = server_gen_key_share_single(session, groups[i], extdata); + if (ret < 0) + return gnutls_assert_val(ret); + } +@@ -594,13 +608,19 @@ static int server_use_key_share(gnutls_session_t session, + const uint8_t *data, size_t data_size) + { + gnutls_buffer_st buffer; ++ const gnutls_group_entry_st *groups[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; ++ int ret; + + _gnutls_ro_buffer_init(&buffer, data, data_size); + +- for (const gnutls_group_entry_st *p = group; p != NULL; p = p->next) { +- int ret; ++ ret = _gnutls_group_expand(group, groups); ++ if (ret < 0) ++ return gnutls_assert_val(ret); + +- ret = server_use_key_share_single(session, p, &buffer); ++ for (size_t i = 0; groups[i]; i++) { ++ ret = server_use_key_share_single(session, groups[i], &buffer); + if (ret < 0) + return gnutls_assert_val(ret); + } +@@ -775,13 +795,19 @@ static int client_use_key_share(gnutls_session_t session, + const uint8_t *data, size_t data_size) + { + gnutls_buffer_st buffer; ++ const gnutls_group_entry_st *groups[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; ++ int ret; + + _gnutls_ro_buffer_init(&buffer, data, data_size); + +- for (const gnutls_group_entry_st *p = group; p != NULL; p = p->next) { +- int ret; ++ ret = _gnutls_group_expand(group, groups); ++ if (ret < 0) ++ return gnutls_assert_val(ret); + +- ret = client_use_key_share_single(session, p, &buffer); ++ for (size_t i = 0; groups[i]; i++) { ++ ret = client_use_key_share_single(session, groups[i], &buffer); + if (ret < 0) + return gnutls_assert_val(ret); + } +@@ -958,18 +984,39 @@ static int key_share_recv_params(gnutls_session_t session, const uint8_t *data, + return 0; + } + ++static inline bool pk_types_overlap_single(const gnutls_group_entry_st *a, ++ const gnutls_group_entry_st *b) ++{ ++ return a->pk == b->pk || (IS_ECDHX(a->pk) && IS_ECDHX(b->pk)) || ++ (IS_KEM(a->pk) && IS_KEM(b->pk)); ++} ++ + static inline bool pk_types_overlap(const gnutls_group_entry_st *a, + const gnutls_group_entry_st *b) + { +- const gnutls_group_entry_st *pa; ++ const gnutls_group_entry_st *sa[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; ++ const gnutls_group_entry_st *sb[MAX_HYBRID_GROUPS + 1] = { ++ NULL, ++ }; ++ int ret; ++ ++ ret = _gnutls_group_expand(a, sa); ++ if (ret < 0) { ++ gnutls_assert(); ++ return false; ++ } + +- for (pa = a; pa != NULL; pa = pa->next) { +- const gnutls_group_entry_st *pb; ++ ret = _gnutls_group_expand(b, sb); ++ if (ret < 0) { ++ gnutls_assert(); ++ return false; ++ } + +- for (pb = b; pb != NULL; pb = pb->next) { +- if (pa->pk == pb->pk || +- (IS_ECDHX(pa->pk) && IS_ECDHX(pb->pk)) || +- (IS_KEM(pa->pk) && IS_KEM(pb->pk))) ++ for (size_t i = 0; sa[i]; i++) { ++ for (size_t j = 0; sb[j]; j++) { ++ if (pk_types_overlap_single(sa[i], sb[j])) + return true; + } + } +diff --git a/lib/ext/supported_groups.c b/lib/ext/supported_groups.c +index 254ec4882..4c31d2f8f 100644 +--- a/lib/ext/supported_groups.c ++++ b/lib/ext/supported_groups.c +@@ -106,9 +106,9 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + unsigned min_dh; + unsigned j; + int serv_ec_idx, serv_dh_idx, +- serv_kem_idx; /* index in server's priority listing */ ++ serv_hybrid_idx; /* index in server's priority listing */ + int cli_ec_pos, cli_dh_pos, +- cli_kem_pos; /* position in listing sent by client */ ++ cli_hybrid_pos; /* position in listing sent by client */ + + if (session->security_parameters.entity == GNUTLS_CLIENT) { + /* A client shouldn't receive this extension in TLS1.2. It is +@@ -134,8 +134,8 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + /* we figure what is the minimum DH allowed for this session, if any */ + min_dh = get_min_dh(session); + +- serv_ec_idx = serv_dh_idx = serv_kem_idx = -1; +- cli_ec_pos = cli_dh_pos = cli_kem_pos = -1; ++ serv_ec_idx = serv_dh_idx = serv_hybrid_idx = -1; ++ cli_ec_pos = cli_dh_pos = cli_hybrid_pos = -1; + + /* This extension is being processed prior to a ciphersuite being selected, + * so we cannot rely on ciphersuite information. */ +@@ -180,14 +180,15 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + break; + serv_ec_idx = j; + cli_ec_pos = i; +- } else if (IS_KEM(group->pk)) { +- if (serv_kem_idx != ++ } else if (IS_GROUP_HYBRID( ++ group)) { ++ if (serv_hybrid_idx != + -1 && + (int)j > +- serv_kem_idx) ++ serv_hybrid_idx) + break; +- serv_kem_idx = j; +- cli_kem_pos = i; ++ serv_hybrid_idx = j; ++ cli_hybrid_pos = i; + } + } else { + if (group->pk == GNUTLS_PK_DH) { +@@ -200,11 +201,13 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + break; + cli_ec_pos = i; + serv_ec_idx = j; +- } else if (IS_KEM(group->pk)) { +- if (cli_kem_pos != -1) ++ } else if (IS_GROUP_HYBRID( ++ group)) { ++ if (cli_hybrid_pos != ++ -1) + break; +- cli_kem_pos = i; +- serv_kem_idx = j; ++ cli_hybrid_pos = i; ++ serv_hybrid_idx = j; + } + } + break; +@@ -212,7 +215,7 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + } + } + +- /* serv_{dh,ec,kem}_idx contain the index of the groups we want to use. ++ /* serv_{dh,ec,hybrid}_idx contain the index of the groups we want to use. + */ + if (serv_dh_idx != -1) { + session->internals.cand_dh_group = +@@ -236,18 +239,20 @@ static int _gnutls_supported_groups_recv_params(gnutls_session_t session, + } + } + +- /* KEM can only be used in TLS 1.3, where no separation from +- * ECDH and DH, and thus only cand_group is set here. ++ /* PQC hybrid key exchange groups can only be used in ++ * TLS 1.3, where no distinction between ECDH and DH ++ * in the group definitions, and thus only cand_group ++ * is set here. + */ +- if (serv_kem_idx != -1) { ++ if (serv_hybrid_idx != -1) { + if (session->internals.cand_group == NULL || + (session->internals.priorities->server_precedence && +- serv_kem_idx < MIN(serv_ec_idx, serv_dh_idx)) || ++ serv_hybrid_idx < MIN(serv_ec_idx, serv_dh_idx)) || + (!session->internals.priorities->server_precedence && +- cli_kem_pos < MIN(cli_ec_pos, cli_dh_pos))) { ++ cli_hybrid_pos < MIN(cli_ec_pos, cli_dh_pos))) { + session->internals.cand_group = + session->internals.priorities->groups +- .entry[serv_kem_idx]; ++ .entry[serv_hybrid_idx]; + } + } + +diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h +index fb2cacb54..01ef59729 100644 +--- a/lib/gnutls_int.h ++++ b/lib/gnutls_int.h +@@ -756,6 +756,8 @@ typedef struct gnutls_cipher_suite_entry_st { + gnutls_mac_algorithm_t prf; + } gnutls_cipher_suite_entry_st; + ++#define MAX_HYBRID_GROUPS 2 ++ + typedef struct gnutls_group_entry_st { + const char *name; + gnutls_group_t id; +@@ -765,8 +767,12 @@ typedef struct gnutls_group_entry_st { + const unsigned *q_bits; + gnutls_ecc_curve_t curve; + gnutls_pk_algorithm_t pk; ++ gnutls_group_t ids[MAX_HYBRID_GROUPS + 1]; /* IDs of subgroups ++ * comprising a ++ * hybrid group, ++ * terminated with ++ * GNUTLS_GROUP_INVALID */ + unsigned tls_id; /* The RFC4492 namedCurve ID or TLS 1.3 group ID */ +- const struct gnutls_group_entry_st *next; + } gnutls_group_entry_st; + + #define GNUTLS_MAC_FLAG_PREIMAGE_INSECURE \ +diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in +index 8b3bb5213..1e44fdd91 100644 +--- a/lib/includes/gnutls/gnutls.h.in ++++ b/lib/includes/gnutls/gnutls.h.in +@@ -1147,8 +1147,10 @@ typedef enum { + GNUTLS_GROUP_EXP_X25519_KYBER768 = 512, + GNUTLS_GROUP_EXP_SECP256R1_MLKEM768 = 513, + GNUTLS_GROUP_EXP_X25519_MLKEM768 = 514, ++ GNUTLS_GROUP_EXP_KYBER768 = 515, ++ GNUTLS_GROUP_EXP_MLKEM768 = 516, + GNUTLS_GROUP_EXP_MIN = GNUTLS_GROUP_EXP_X25519_KYBER768, +- GNUTLS_GROUP_EXP_MAX = GNUTLS_GROUP_EXP_X25519_MLKEM768 ++ GNUTLS_GROUP_EXP_MAX = GNUTLS_GROUP_EXP_MLKEM768 + } gnutls_group_t; + + /* macros to allow specifying a specific curve in gnutls_privkey_generate() +diff --git a/lib/priority.c b/lib/priority.c +index ac4ff2d8c..479dbccd6 100644 +--- a/lib/priority.c ++++ b/lib/priority.c +@@ -2566,7 +2566,7 @@ static void add_dh(gnutls_priority_t priority_cache) + } + } + +-static void add_kem(gnutls_priority_t priority_cache) ++static void add_hybrid(gnutls_priority_t priority_cache) + { + const gnutls_group_entry_st *ge; + unsigned i; +@@ -2579,7 +2579,7 @@ static void add_kem(gnutls_priority_t priority_cache) + sizeof(priority_cache->groups.entry) / + sizeof(priority_cache->groups.entry[0])) { + /* do not add groups which do not correspond to enabled ciphersuites */ +- if (!IS_KEM(ge->pk)) ++ if (!IS_GROUP_HYBRID(ge)) + continue; + priority_cache->groups + .entry[priority_cache->groups.size++] = ge; +@@ -2598,7 +2598,7 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + const gnutls_sign_entry_st *se; + unsigned have_ec = 0; + unsigned have_dh = 0; +- unsigned have_kem = 0; ++ unsigned have_hybrid = 0; + unsigned tls_sig_sem = 0; + const version_entry_st *tlsmax = NULL, *vers; + const version_entry_st *dtlsmax = NULL; +@@ -2807,9 +2807,9 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + priority_cache->cs.entry[priority_cache->cs.size++] = + ce; + +- if (!have_kem) { +- have_kem = 1; +- add_kem(priority_cache); ++ if (!have_hybrid) { ++ have_hybrid = 1; ++ add_hybrid(priority_cache); + } + } + } +@@ -2851,8 +2851,8 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } + } + +- if (have_tls13 && (!have_ec || !have_dh || !have_kem)) { +- /* scan groups to determine have_{ec,dh,kem} */ ++ if (have_tls13 && (!have_ec || !have_dh || !have_hybrid)) { ++ /* scan groups to determine have_{ec,dh,hybrid} */ + for (i = 0; i < priority_cache->_supported_ecc.num_priorities; + i++) { + const gnutls_group_entry_st *ge; +@@ -2865,12 +2865,13 @@ static int set_ciphersuite_list(gnutls_priority_t priority_cache) + } else if (ge->prime && !have_dh) { + add_dh(priority_cache); + have_dh = 1; +- } else if (IS_KEM(ge->pk) && !have_kem) { +- add_kem(priority_cache); +- have_kem = 1; ++ } else if (IS_GROUP_HYBRID(ge) && ++ !have_hybrid) { ++ add_hybrid(priority_cache); ++ have_hybrid = 1; + } + +- if (have_dh && have_ec && have_kem) ++ if (have_dh && have_ec && have_hybrid) + break; + } + } +diff --git a/lib/session.c b/lib/session.c +index a9049a464..7fcbe4fb4 100644 +--- a/lib/session.c ++++ b/lib/session.c +@@ -415,7 +415,11 @@ char *gnutls_session_get_desc(gnutls_session_t session) + snprintf(kx_name, sizeof(kx_name), "(PSK)"); + } + } else if (group && sign_str) { +- if (group->curve) ++ if (IS_GROUP_HYBRID(group)) ++ snprintf(kx_name, sizeof(kx_name), ++ "(HYBRID-%s)-(%s)", group_name, ++ sign_str); ++ else if (group->curve) + snprintf(kx_name, sizeof(kx_name), + "(ECDHE-%s)-(%s)", group_name, + sign_str); +diff --git a/tests/pqc-hybrid-kx.sh b/tests/pqc-hybrid-kx.sh +index da936cf04..4984cd4b4 100644 +--- a/tests/pqc-hybrid-kx.sh ++++ b/tests/pqc-hybrid-kx.sh +@@ -33,34 +33,113 @@ + + . "${srcdir}/scripts/common.sh" + ++# First check any mismatch in the gnutls-cli --list + if ! "${CLI}" --list | grep '^Groups: .*GROUP-X25519-KYBER768.*' >/dev/null; then + if "${CLI}" --list | grep '^Public Key Systems: .*KYBER768.*' >/dev/null; then +- fail "KYBER768 is in Public Key Systems, while GROUP-X25519-KYBER768 is NOT in Groups" ++ fail '' 'KYBER768 is in Public Key Systems, while GROUP-X25519-KYBER768 is NOT in Groups' + fi +- exit 77 + else + if ! "${CLI}" --list | grep '^Public Key Systems: .*KYBER768.*' >/dev/null; then +- fail "KYBER768 is NOT in Public Key Systems, while GROUP-X25519-KYBER768 is in Groups" ++ fail '' 'KYBER768 is NOT in Public Key Systems, while GROUP-X25519-KYBER768 is in Groups' ++ fi ++fi ++ ++if ! "${CLI}" --list | grep '^Groups: .*GROUP-\(SECP256R1\|X25519\)-MLKEM768.*' >/dev/null; then ++ if "${CLI}" --list | grep '^Public Key Systems: .*ML-KEM-768.*' >/dev/null; then ++ fail '' 'ML-KEM-768 is in Public Key Systems, while GROUP-SECP256R1-MLKEM768 or GROUP-X25519-MLKEM768 is NOT in Groups' ++ fi ++else ++ if ! "${CLI}" --list | grep '^Public Key Systems: .*ML-KEM-768.*' >/dev/null; then ++ fail '' 'ML-KEM-768 is NOT in Public Key Systems, while GROUP-SECP256R1-MLKEM768 or GROUP-X25519-MLKEM768 is in Groups' + fi + fi + ++# If none of those hybrid groups is supported, skip the test ++if ! "${CLI}" --list | grep '^Groups: .*GROUP-\(X25519-KYBER768\|SECP256R1-MLKEM768\|X25519-MLKEM768\).*' >/dev/null; then ++ exit 77 ++fi ++ + testdir=`create_testdir pqc-hybrid-kx` + + KEY="$srcdir/../doc/credentials/x509/key-ecc.pem" + CERT="$srcdir/../doc/credentials/x509/cert-ecc.pem" + CACERT="$srcdir/../doc/credentials/x509/ca.pem" + +-eval "${GETPORT}" +-launch_server --echo --priority NORMAL:-GROUP-ALL:+GROUP-X25519-KYBER768 --x509keyfile="$KEY" --x509certfile="$CERT" +-PID=$! +-wait_server ${PID} ++# Test all supported hybrid groups ++for group in X25519-KYBER768 SECP256R1-MLKEM768 X25519-MLKEM768; do ++ if ! "${CLI}" --list | grep "^Groups: .*GROUP-$group.*" >/dev/null; then ++ echo "$group is not supported, skipping" >&2 ++ continue ++ fi ++ ++ eval "${GETPORT}" ++ launch_server --echo --priority "NORMAL:-GROUP-ALL:+GROUP-$group" --x509keyfile="$KEY" --x509certfile="$CERT" ++ PID=$! ++ wait_server ${PID} ++ ++ ${VALGRIND} "${CLI}" -p "${PORT}" localhost --priority "NORMAL:-GROUP-ALL:+GROUP-$group" --x509cafile="$CACERT" --logfile="$testdir/cli.log" /dev/null; then ++ "$group is not supported, skipping" ++ continue ++ fi ++ ++ eval "${GETPORT}" ++ launch_server --echo --priority "NORMAL:-GROUP-ALL:+GROUP-$group" --x509keyfile="$KEY" --x509certfile="$CERT" ++ PID=$! ++ wait_server ${PID} ++ ++ ${VALGRIND} "${CLI}" -p "${PORT}" localhost --priority "NORMAL:-GROUP-ALL:+GROUP-$group" --x509cafile="$CACERT" --logfile="$testdir/cli.log" "$testdir/test.config" ++[overrides] ++ ++disabled-curve = x25519 ++_EOF_ ++ ++for group in X25519-KYBER768 SECP256R1-MLKEM768 X25519-MLKEM768; do ++ if ! "${CLI}" --list | grep "^Groups: .*GROUP-$group.*" >/dev/null; then ++ echo "$group is not supported, skipping" >&2 ++ continue ++ fi + +-${VALGRIND} "${CLI}" -p "${PORT}" localhost --priority NORMAL:-GROUP-ALL:+GROUP-X25519-KYBER768 --x509cafile="$CACERT" --logfile="$testdir/cli.log" -Date: Wed, 5 Sep 2018 16:46:52 +0200 -Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper - -prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. -It is not an error per se, but it breaks subprocess.check_output(). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin -Signed-off-by: Adam Duskett ---- - giscanner/shlibs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 9f8ab5df..7a1a72fe 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) -- output = subprocess.check_output(args) -+ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout - if isinstance(output, bytes): - output = output.decode("utf-8", "replace") - --- -2.25.1 - diff --git a/package/gobject-introspection/0003-giscanner-remove-dependency-on-distutils.msvccompile.patch b/package/gobject-introspection/0003-giscanner-remove-dependency-on-distutils.msvccompile.patch new file mode 100644 index 00000000000..a3231a5ad63 --- /dev/null +++ b/package/gobject-introspection/0003-giscanner-remove-dependency-on-distutils.msvccompile.patch @@ -0,0 +1,104 @@ +From c8310afa42dfa598097eb0e003cef7965b5ed7be Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Wed, 28 Aug 2024 21:26:02 +0200 +Subject: [PATCH] giscanner: remove dependency on distutils.msvccompiler + +It was removed with setuptools 74.0.0. Since we still depend on the +MSVCCompiler class use new_compiler() to get it some other way. + +Remove any reference to MSVC9Compiler, which was for Visual Studio 2008 +which we no longer support anyway. + +Fixes #515 + +Signed-off-by: James Hilliard +Upstream: https://gitlab.gnome.org/GNOME/gobject-introspection/-/commit/a2139dba59eac283a7f543ed737f038deebddc19 +--- + giscanner/ccompiler.py | 7 +++---- + giscanner/msvccompiler.py | 14 +++++++------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index 2912fe0e..766c9a36 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -26,7 +26,6 @@ import tempfile + import sys + import distutils + +-from distutils.msvccompiler import MSVCCompiler + from distutils.unixccompiler import UnixCCompiler + from distutils.cygwinccompiler import Mingw32CCompiler + from distutils.sysconfig import get_config_vars +@@ -167,7 +166,7 @@ class CCompiler(object): + # Now, create the distutils ccompiler instance based on the info we have. + if compiler_name == 'msvc': + # For MSVC, we need to create a instance of a subclass of distutil's +- # MSVC9Compiler class, as it does not provide a preprocess() ++ # MSVCCompiler class, as it does not provide a preprocess() + # implementation + from . import msvccompiler + self.compiler = msvccompiler.get_msvc_compiler() +@@ -453,7 +452,7 @@ class CCompiler(object): + return self.compiler.linker_exe + + def check_is_msvc(self): +- return isinstance(self.compiler, MSVCCompiler) ++ return self.compiler.compiler_type == "msvc" + + # Private APIs + def _set_cpp_options(self, options): +@@ -479,7 +478,7 @@ class CCompiler(object): + # macros for compiling using distutils + # get dropped for MSVC builds, so + # escape the escape character. +- if isinstance(self.compiler, MSVCCompiler): ++ if self.check_is_msvc(): + macro_value = macro_value.replace('\"', '\\\"') + macros.append((macro_name, macro_value)) + elif option.startswith('-U'): +diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py +index 0a543982..e333a80f 100644 +--- a/giscanner/msvccompiler.py ++++ b/giscanner/msvccompiler.py +@@ -19,30 +19,30 @@ + # + + import os +-import distutils ++from typing import Type + + from distutils.errors import DistutilsExecError, CompileError +-from distutils.ccompiler import CCompiler, gen_preprocess_options ++from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler + from distutils.dep_util import newer + + # Distutil's MSVCCompiler does not provide a preprocess() + # Implementation, so do our own here. + + ++DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc")) ++ ++ + def get_msvc_compiler(): + return MSVCCompiler() + + +-class MSVCCompiler(distutils.msvccompiler.MSVCCompiler): ++class MSVCCompiler(DistutilsMSVCCompiler): + + def __init__(self, verbose=0, dry_run=0, force=0): +- super(distutils.msvccompiler.MSVCCompiler, self).__init__() ++ super(DistutilsMSVCCompiler, self).__init__() + CCompiler.__init__(self, verbose, dry_run, force) + self.__paths = [] + self.__arch = None # deprecated name +- if os.name == 'nt': +- if isinstance(self, distutils.msvc9compiler.MSVCCompiler): +- self.__version = distutils.msvc9compiler.VERSION + self.initialized = False + self.preprocess_options = None + if self.check_is_clang_cl(): +-- +2.34.1 + diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in index 345118745ff..681655c2d4c 100644 --- a/package/gobject-introspection/Config.in +++ b/package/gobject-introspection/Config.in @@ -2,6 +2,11 @@ config BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + # gobject-introspection programs cause a hang of Qemu on + # Microblaze, and supporting GOI on Microblaze is not very + # relevant. + depends on !BR2_microblazeel + depends on !BR2_microblazebe config BR2_PACKAGE_GOBJECT_INTROSPECTION bool "gobject-introspection" diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in index 2f09bca77a3..7f3db67da42 100644 --- a/package/gobject-introspection/g-ir-scanner-lddwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in @@ -1,3 +1,2 @@ #!/usr/bin/env sh - -"${HOST_DIR}"/sbin/prelink-rtld --root="$(dirname "$0")/../../" "$@" +@TARGET_OBJDUMP@ -p "$@" diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index f0c7fcd2ca2..b1b44d0b4f1 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -15,7 +15,6 @@ GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scanner GOBJECT_INTROSPECTION_DEPENDENCIES = \ host-autoconf-archive \ host-gobject-introspection \ - host-prelink-cross \ host-qemu \ libffi \ libglib2 \ @@ -46,14 +45,8 @@ GOBJECT_INTROSPECTION_CONF_OPTS = \ -Dgi_cross_binary_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ -Dgi_cross_ldd_wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ -Dbuild_introspection_data=true \ - -Ddoctool=disabled - -ifeq ($(BR2_PACKAGE_CAIRO),y) -GOBJECT_INTROSPECTION_DEPENDENCIES += cairo -GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=enabled -else -GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled -endif + -Ddoctool=disabled \ + -Dcairo=disabled # GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME} GOBJECT_INTROSPECTION_CONF_ENV = \ @@ -78,6 +71,8 @@ define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper + $(SED) "s%@TARGET_OBJDUMP@%$(TARGET_OBJDUMP)%" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 92a124b8aca..fa4dc7a814c 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -238,6 +238,7 @@ config BR2_PACKAGE_GPSD_PYTHON bool "build Python support and modules" depends on BR2_USE_WCHAR # python3 select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_SERIAL # runtime help Python libraries and tools for the gpsd service daemon including gpsfake test harness. diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 86f8c772c93..a84ffa7b6b3 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.22.9.tar.xz.sha256sum -sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.12.tar.xz.sha256sum +sha256 6b0685b92ac735032d7987d1028afaeab0a98ab726e0c51e5b9bfc8f2da7c8b1 gst-omx-1.22.12.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 32891bafa65..c1ab2b19c08 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.22.9 +GST_OMX_VERSION = 1.22.12 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 6cf7c9597fa..d194dd32e6b 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum -sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.12.tar.xz.sha256sum +sha256 015ff62789dab423edafe979b019c7de4c849a2b7e74912b20b74a70e5b68f72 gst-devtools-1.22.12.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 0c085b8b42b..66aec4a8e95 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.9 +GST1_DEVTOOLS_VERSION = 1.22.12 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index b5bc84d672b..b6130ac146a 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum -sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.12.tar.xz.sha256sum +sha256 3b60d4cac2fbcd085a93e9389ca23e0443bee1ca75574d31d4f12bb1bbecab48 gst-libav-1.22.12.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 1b872b7fa92..142ea7ed959 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.9 +GST1_LIBAV_VERSION = 1.22.12 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/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 174c4ad572b..a1ebb39c81b 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum -sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.12.tar.xz.sha256sum +sha256 388b4c4412f42e36a38b17cc34119bc11879bd4d9fbd4ff6d03b2c7fc6b4d494 gst-plugins-bad-1.22.12.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 a61038376f7..7d36c041cc2 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.9 +GST1_PLUGINS_BAD_VERSION = 1.22.12 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 diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 060a871b954..28ee14122b3 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum -sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.12.tar.xz.sha256sum +sha256 73cfadc3a6ffe77ed974cfd6fb391c605e4531f48db21dd6b9f42b8cb69bd8c1 gst-plugins-base-1.22.12.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 512e3fdee21..31a40406f60 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.9 +GST1_PLUGINS_BASE_VERSION = 1.22.12 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 4410da6ef40..1e1b83e1159 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum -sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.12.tar.xz.sha256sum +sha256 9c1913f981900bd8867182639b20907b28ed78ef7a222cfbf2d8ba9dab992fa7 gst-plugins-good-1.22.12.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 2bb826d807f..7ba26677920 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.9 +GST1_PLUGINS_GOOD_VERSION = 1.22.12 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 diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 20394619b0b..497b5ae95ed 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum -sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.12.tar.xz.sha256sum +sha256 d59a1aaf8dd2cc416dc5b5c0b7aecd02b1811bf1229aa724e6c2a503d3799083 gst-plugins-ugly-1.22.12.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 7bb95dd1d00..6542ca9ffe1 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.9 +GST1_PLUGINS_UGLY_VERSION = 1.22.12 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 diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 2f352df92e7..b28ad5975f9 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum -sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.12.tar.xz.sha256sum +sha256 d98d3226efea20d5c440a28988a20319a953f7c594895df2bba4538633108e9f gst-python-1.22.12.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 501ca5e02b7..f5f4d713a26 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.9 +GST1_PYTHON_VERSION = 1.22.12 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 21f380378cd..98b211f7a2b 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum -sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.12.tar.xz.sha256sum +sha256 bf6c7871e7cf3528e4ec87ddc2f2949691cd269f98e536482ae744c1405cf451 gst-rtsp-server-1.22.12.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 87e6413d006..a8c382e115c 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.9 +GST1_RTSP_SERVER_VERSION = 1.22.12 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index ec23ae7c6b6..c6e0048ee75 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum -sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.12.tar.xz.sha256sum +sha256 013ad729b2fe4fccda559bddc626bcb14230cfb90a2271049f8466bfec5d80df gstreamer-vaapi-1.22.12.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 d934bab2333..0cdec46f359 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.9 +GST1_VAAPI_VERSION = 1.22.12 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 2ea29dae617..e6bba207247 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.22.9.tar.xz.sha256sum -sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.12.tar.xz.sha256sum +sha256 792339135ce713088663cc5d44e0aea8217793e88fabfd11571e7abf4a429f2c gst-editing-services-1.22.12.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 e2c0f1ccf81..75c660f31d2 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.12 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 b6ed001eb38..445f1c15f48 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum -sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.12.tar.xz.sha256sum +sha256 ac352f3d02caa67f3b169daa9aa78b04dea0fc08a727de73cb28d89bd54c6f61 gstreamer-1.22.12.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 5b9125e62a9..1577994248a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.9 +GSTREAMER1_VERSION = 1.22.12 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 5b1dcf44a84..e256c4dbfc4 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7 gtest-1.14.0.tar.gz +sha256 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926 gtest-1.15.2.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 832c494ff55..c435fd1286a 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.14.0 +GTEST_VERSION = 1.15.2 GTEST_SITE = $(call github,google,googletest,v$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index fa4ee16a9fc..562727d3dff 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a41b272ceeb920c57263ec851604542d9ec85ee3030506d94662067c7b6ab89e harfbuzz-9.0.0.tar.xz +sha256 b2cb13bd351904cb9038f907dc0dee0ae07127061242fe3556b2795c4e9748fc harfbuzz-10.0.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 946b2b0f703..510c0a946cc 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 9.0.0 +HARFBUZZ_VERSION = 10.0.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/hicolor-icon-theme/hicolor-icon-theme.hash b/package/hicolor-icon-theme/hicolor-icon-theme.hash index ec9635f05a2..5bff03fe4db 100644 --- a/package/hicolor-icon-theme/hicolor-icon-theme.hash +++ b/package/hicolor-icon-theme/hicolor-icon-theme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8 hicolor-icon-theme-0.17.tar.xz +sha256 db0e50a80aa3bf64bb45cbca5cf9f75efd9348cf2ac690b907435238c3cf81d7 hicolor-icon-theme-0.18.tar.xz sha256 b0a64377d4ee87b7dbcf418ce4fb33ec3b2d7081b6732890e4af06b8118c4526 COPYING diff --git a/package/hicolor-icon-theme/hicolor-icon-theme.mk b/package/hicolor-icon-theme/hicolor-icon-theme.mk index 088aecf31c3..f3368a292b7 100644 --- a/package/hicolor-icon-theme/hicolor-icon-theme.mk +++ b/package/hicolor-icon-theme/hicolor-icon-theme.mk @@ -4,10 +4,10 @@ # ################################################################################ -HICOLOR_ICON_THEME_VERSION = 0.17 +HICOLOR_ICON_THEME_VERSION = 0.18 HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz HICOLOR_ICON_THEME_LICENSE = GPL-2.0 HICOLOR_ICON_THEME_LICENSE_FILES = COPYING -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/httping/0001-fix-math-library-linking.patch b/package/httping/0001-fix-math-library-linking.patch deleted file mode 100644 index 582fb9e9178..00000000000 --- a/package/httping/0001-fix-math-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -Move LDFLAGS+=-lm option to the end. -The order of the math library directive '-lm' matters. - -Signed-off-by: Yuvaraj Patil -[Fabrice: make the patch to be applied with fuzz factor 0] -Signed-off-by: Fabrice Fontaine ---- -diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile ---- httping-2.3.4_orig/Makefile 2014-07-23 16:16:36.495546288 +0530 -+++ httping-2.3.4/Makefile 2014-07-23 16:18:42.547541002 +0530 -@@ -36,7 +36,6 @@ DEBUG=yes - WFLAGS=-Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2 - OFLAGS= - CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\" --LDFLAGS+=-lm - - PACKAGE=$(TARGET)-$(VERSION) - PREFIX?=/usr -@@ -97,6 +96,8 @@ ifeq ($(ARM),yes) - CC=arm-linux-gcc - endif - -+LDFLAGS+=-lm -+ - all: $(TARGET) $(TRANSLATIONS) - - $(TARGET): $(OBJS) diff --git a/package/httping/0002-Makefile-allow-build-without-gettext.patch b/package/httping/0002-Makefile-allow-build-without-gettext.patch deleted file mode 100644 index aec1de47d1c..00000000000 --- a/package/httping/0002-Makefile-allow-build-without-gettext.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fe7d6c5a0e5dfe129f228498037393d23d6ae890 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 18 Jul 2017 19:09:03 +0300 -Subject: [PATCH] Makefile: allow build without gettext - -The msgfmt command is part of the gettext package, and is used to generate -binary translation files. When gettext is not installed, build fails. -Translation files are not always needed on size constrained embedded targets. -Add an option to disable translation files generation using the NO_GETTEXT -variable. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/flok99/httping/pull/36 - - Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile b/Makefile -index 46127f4cdde1..160cc1794ec8 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,9 @@ MKDIR=/bin/mkdir - ARCHIVE=/bin/tar cf - - COMPRESS=/bin/gzip -9 - -+ifneq ($(NO_GETTEXT),yes) - TRANSLATIONS=nl.mo ru.mo -+endif - - OBJS=gen.o http.o io.o error.o utils.o main.o tcp.o res.o socks5.o kalman.o cookies.o help.o colors.o - -@@ -118,10 +120,12 @@ install: $(TARGET) $(TRANSLATIONS) - ifneq ($(DEBUG),yes) - $(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET) - endif -+ifneq ($(NO_GETTEXT),yes) - mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES - cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo - mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES - cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo -+endif - - - makefile.inc: --- -2.13.2 - diff --git a/package/httping/Config.in b/package/httping/Config.in index c0e5071ce87..d21b97ea1db 100644 --- a/package/httping/Config.in +++ b/package/httping/Config.in @@ -16,7 +16,16 @@ config BR2_PACKAGE_HTTPING if BR2_PACKAGE_HTTPING -config BR2_PACKAGE_HTTPING_TFO - bool "TCP Fast Open (TFO) support" +config BR2_PACKAGE_HTTPING_SSL + bool "enable SSL support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_CA_CERTIFICATES # runtime + +config BR2_PACKAGE_HTTPING_TUI + bool "enable TUI support" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_DOUBLE endif diff --git a/package/httping/httping.hash b/package/httping/httping.hash index 3178c32377d..e07f3e32e01 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 4bf8641ebc44a6fa52086f82c60a29051e094424996d972263155d267c96d305 httping-0e26c53d5fe504eb7204d64b23513729aa4a5bb0-git4.tar.gz +sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE diff --git a/package/httping/httping.mk b/package/httping/httping.mk index b3a625a8e10..8cb4f7f2f9c 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -4,34 +4,19 @@ # ################################################################################ -HTTPING_VERSION = 2.5 -HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz -HTTPING_SITE = http://www.vanheusden.com/httping -HTTPING_LICENSE = GPL-2.0 -HTTPING_LICENSE_FILES = license.txt -HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \ - $(TARGET_NLS_LIBS) \ - $(if $(BR2_PACKAGE_LIBICONV),-liconv) -HTTPING_DEPENDENCIES = \ - $(TARGET_NLS_DEPENDENCIES) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double) -HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \ - FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \ - NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \ - SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \ - TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \ - NO_GETTEXT=$(if $(BR2_SYSTEM_ENABLE_NLS),no,yes) +HTTPING_VERSION = 0e26c53d5fe504eb7204d64b23513729aa4a5bb0 +HTTPING_SITE = https://github.com/folkertvanheusden/HTTPing +HTTPING_SITE_METHOD = git +HTTPING_LICENSE = AGPL-3.0 +HTTPING_LICENSE_FILES = LICENSE -define HTTPING_BUILD_CMDS - $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \ - $(MAKE) DEBUG=no -C $(@D) -endef +ifeq ($(BR2_PACKAGE_HTTPING_TUI),y) +HTTPING_DEPENDENCIES += ncurses fftw-double +HTTPING_CONF_OPTS += -DUSE_TUI=1 +endif -define HTTPING_INSTALL_TARGET_CMDS - $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef +ifeq ($(BR2_PACKAGE_HTTPING_SSL),y) +HTTPING_DEPENDENCIES += openssl +endif -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 7d8959990ab..db30db66af8 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 caa496a6203084ee3404c688a75ea05b4b10eec93340c503199647216127f347 hwdata-0.384.tar.gz +sha256 577219d44d9686e8177f6291adbff7bacdd785ad4e8a8d0c4b2a14dbf850d6ac hwdata-0.385.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 3394dbd0152..294afdc0613 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.384 +HWDATA_VERSION = 0.385 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index 8010b857f07..f85508b7a64 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,5 +1,5 @@ -# 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 +# From https://www.open-mpi.org/software/hwloc/v2.11/ +sha1 8c15d9707c2390bcdc564df11395a36c8fc775be hwloc-2.11.2.tar.bz2 +sha256 f7f88fecae067100f1a1a915b658add0f4f71561259482910a69baea22fe8409 hwloc-2.11.2.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 8fe9e648a7b..0d03757d835 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.9 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).3 +HWLOC_VERSION_MAJOR = 2.11 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).2 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause diff --git a/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch b/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch deleted file mode 100644 index 63b2a7f82f1..00000000000 --- a/package/i2c-tools/0001-py-smbus-Use-setuptools-instead-of-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 19 Jan 2022 12:08:53 +0100 -Subject: py-smbus: Use setuptools instead of distutils - -As per [1], distutils is deprecated in Python 3.10 and will be removed -entirely in Python 3.12. - -As setuptools is essentially an enhanced version of distutils, it's -trivial to port to that. - -[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated - -Signed-off-by: Ross Burton -Signed-off-by: Jean Delvare - -Upstream: https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=cf3541b8a7ed50782edd05836020d31230fb86c6 - -Signed-off-by: Bernd Kuhls ---- - py-smbus/setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py-smbus/setup.py b/py-smbus/setup.py -index 28a4500..26db33a 100644 ---- a/py-smbus/setup.py -+++ b/py-smbus/setup.py -@@ -1,6 +1,6 @@ - #!/usr/bin/env python - --from distutils.core import setup, Extension -+from setuptools import setup, Extension - - setup( name="smbus", - version="1.1", --- -cgit - diff --git a/package/i2c-tools/i2c-tools.hash b/package/i2c-tools/i2c-tools.hash index 9bfdacb3f1e..bdefefa2cc8 100644 --- a/package/i2c-tools/i2c-tools.hash +++ b/package/i2c-tools/i2c-tools.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/software/utils/i2c-tools/sha256sums.asc -sha256 1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 i2c-tools-4.3.tar.xz +sha256 8b15f0a880ab87280c40cfd7235cfff28134bf14d5646c07518b1ff6642a2473 i2c-tools-4.4.tar.xz # License files sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 2293b6e9076984d02184ff620baac557143e16cfa47d88f0a791d05a1271742c README +sha256 adcc60d0fdf7b4e2ad22fe8a29d65c260ad3fc619b3105439b70914df5f6b5a8 README diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 99388d9537a..43d82b4bbb0 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2C_TOOLS_VERSION = 4.3 +I2C_TOOLS_VERSION = 4.4 I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) diff --git a/package/iana-assignments/Config.in b/package/iana-assignments/Config.in new file mode 100644 index 00000000000..f1b803cfec1 --- /dev/null +++ b/package/iana-assignments/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_IANA_ASSIGNMENTS + bool "IANA assignments" + select BR2_PACKAGE_IANA_ASSIGNMENTS_PEN_REG + help + Mirror of the IANA registries periodically updated + from https://www.iana.org/protocols. + + https://github.com/larseggert/iana-assignments + +if BR2_PACKAGE_IANA_ASSIGNMENTS + +config BR2_PACKAGE_IANA_ASSIGNMENTS_PEN_REG + bool "PEN (Enterprise Numbers) registry" + +endif diff --git a/package/iana-assignments/iana-assignments.hash b/package/iana-assignments/iana-assignments.hash new file mode 100644 index 00000000000..c58fb61df29 --- /dev/null +++ b/package/iana-assignments/iana-assignments.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 e7a1f8153715fa9e0f4c5d102f9271bce425a468f58a445e7c5ecdf7105fd460 iana-assignments-bf358dc8d89b7939557220b8055699b42a4133e9.tar.gz diff --git a/package/iana-assignments/iana-assignments.mk b/package/iana-assignments/iana-assignments.mk new file mode 100644 index 00000000000..df069b94f1b --- /dev/null +++ b/package/iana-assignments/iana-assignments.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# iana-assignments +# +################################################################################ + +IANA_ASSIGNMENTS_VERSION = bf358dc8d89b7939557220b8055699b42a4133e9 +IANA_ASSIGNMENTS_SITE = $(call github,larseggert,iana-assignments,$(IANA_ASSIGNMENTS_VERSION)) + +# The licensing is defined by IANA: https://www.iana.org/help/licensing-terms +# The repository we use is not a real upstream, and contains no license file. +IANA_ASSIGNMENTS_LICENSE = CC0-1.0 + +ifeq ($(BR2_PACKAGE_IANA_ASSIGNMENTS_PEN_REG),y) +define IANA_ASSIGNMENTS_INSTALL_PEN_REG + $(INSTALL) -D -m 0644 $(@D)/enterprise-numbers/enterprise-numbers \ + $(TARGET_DIR)/usr/share/misc/iana/enterprise-numbers +endef +IANA_ASSIGNMENTS_POST_INSTALL_TARGET_HOOKS += IANA_ASSIGNMENTS_INSTALL_PEN_REG +endif + +$(eval $(generic-package)) diff --git a/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch b/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch new file mode 100644 index 00000000000..e65c1c898bb --- /dev/null +++ b/package/ibm-sw-tpm2/0003-src-BnToOsslMath.h-fix-build-with-openssl-3.4.x.patch @@ -0,0 +1,45 @@ +From d59535c8c605f0b23abbefd9b23200b1a5e937fe Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Fri, 6 Dec 2024 20:35:35 +0100 +Subject: [PATCH] src/BnToOsslMath.h: fix build with openssl 3.4.x + +Openssl 3.4.x is out: +https://github.com/openssl/openssl/blob/openssl-3.4.0/NEWS.md#openssl-34 + +So bump the max supported version number similar to how it was done by +commit 89a4cb9cf8 "src/BnToOsslMath.h: fix build with openssl 3.3.x" to fix +build failures with 3.4.x: + + In file included from BnValues.h:327, + from Global.h:80, + from Tpm.h:78, + from AuditCommands.c:62: + TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version + 83 | # error Untested OpenSSL version + | ^~~~~ + +Fixes: +- http://autobuild.buildroot.net/results/be6c679b821183b4385c74471e26d9ad7d3d8967 + +Signed-off-by: Peter Korsgaard +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/17 +--- + src/BnToOsslMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BnToOsslMath.h b/src/BnToOsslMath.h +index 72939ea..165304d 100644 +--- a/src/BnToOsslMath.h ++++ b/src/BnToOsslMath.h +@@ -77,7 +77,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x30300ff0L ++#if OPENSSL_VERSION_NUMBER >= 0x30400ff0L + // Check the bignum_st definition against the one below and either update the + // version check or provide the new definition for this version. + # error Untested OpenSSL version +-- +2.39.5 + diff --git a/package/igt-gpu-tools/Config.in b/package/igt-gpu-tools/Config.in index 809c8e28ac5..de87bf8e999 100644 --- a/package/igt-gpu-tools/Config.in +++ b/package/igt-gpu-tools/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_IGT_GPU_TOOLS depends on BR2_USE_MMU # fork() depends on BR2_ENABLE_LOCALE depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # elfutils + depends on BR2_USE_WCHAR # elfutils, procps-ng depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng select BR2_PACKAGE_CAIRO @@ -24,9 +24,9 @@ config BR2_PACKAGE_IGT_GPU_TOOLS https://gitlab.freedesktop.org/drm/igt-gpu-tools -comment "igt-gpu-tools needs udev /dev management and toolchain w/ threads, wchar, dynamic library, locale, headers >= 4.11" +comment "igt-gpu-tools needs udev /dev management and toolchain w/ NPTL, wchar, dynamic library, locale, headers >= 4.11" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 844ba0d4fe8..72e8c892423 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,3 +1,6 @@ -# https://github.com/linux-integrity/ima-evm-utils/releases/download/v1.6/ima-evm-utils-1.6.tar.gz.sha256 -sha256 3d09e77a09e985b285891f13d458653f44913879147679dce30bdbf00380d40e ima-evm-utils-1.6.tar.gz -sha256 d037fb0b5fdb4d1e09e246a56bdb8049fc6d9b1f9270c0ec2ae4bc8f9285165b LICENSES.txt +# https://github.com/linux-integrity/ima-evm-utils/releases/download/v1.6.2/ima-evm-utils-1.6.2.tar.gz.sha256 +sha256 9346a5ccd5ca77caf6a9d2ac0d83873c04d0372414a632126df4e7a88bedff4a ima-evm-utils-1.6.2.tar.gz +# locally computed +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LGPL +sha256 9d2cf91f1292121f94b412abfdea1dd2d83984704f594b0a14de88d7b1cfb42c LICENSES.txt diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 858efee8da8..b7eb8ff5305 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.6 +IMA_EVM_UTILS_VERSION = 1.6.2 IMA_EVM_UTILS_SITE = https://github.com/linux-integrity/ima-evm-utils/releases/download/v$(IMA_EVM_UTILS_VERSION) IMA_EVM_UTILS_LICENSE = LGPL-2.0+ (libimaevm), GPL-2.0+ (evmctl) -IMA_EVM_UTILS_LICENSE_FILES = LICENSES.txt +IMA_EVM_UTILS_LICENSE_FILES = LICENSES.txt COPYING COPYING.LGPL IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 93138bf25ae..1accd2e2056 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 451fbe2eac26533a896ca0da0356354ecc38680f273fce7d121c6a22251ed21e intel-gmmlib-22.4.1.tar.gz +sha256 dbf7cc401de7ff386306a23c1c61b3cf7bd86a4d9001b3a1d16a81e6b0e3ab2b intel-gmmlib-22.5.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index a21c3bf1e53..3698d2fff04 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.4.1 +INTEL_GMMLIB_VERSION = 22.5.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 109d90c4289..565dd4ee689 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98702b946edb24454a3b780f8dd5b3091c6c795478467c1c00fe4d16c4371291 intel-media-24.3.1.tar.gz +sha256 cbc2ccdae2cf84bd1e36a9d5acec4861922ae68f849e89ddcc2f2c5579bd6022 intel-media-24.4.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index ee1f03ddb43..d4d9e534278 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.3.1 +INTEL_MEDIADRIVER_VERSION = 24.4.1 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index ba756af4133..381e8e6487e 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b92594e8e30be3b879526f4ac38bef60ea684cc8e93d2e7f24eb45205d0211b9 intel-vpl-gpu-rt-24.3.1.tar.gz +sha256 ec11fbe64a84b15e98ef376a7e6de5fe15f5afda59711a7e1c145ee2268af41d intel-vpl-gpu-rt-24.4.1.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index 7d7771aae98..735bc910d01 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 24.3.1 +INTEL_VPL_GPU_RT_VERSION = 24.4.1 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE diff --git a/package/iotools/Config.in b/package/iotools/Config.in new file mode 100644 index 00000000000..ffa1a366673 --- /dev/null +++ b/package/iotools/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_IOTOOLS + bool "iotools" + help + Tools for poking all types of IO, supported are: + - CMOS NVRAM (via /dev/nvram) + - CPU ID (x86) + - IO port (x86, PowerPC) + - MMIO + - MSR (x86) + - PCI configuration space + - SCOM (PowerPC) + - SMBus + + https://github.com/andy-shev/iotools diff --git a/package/iotools/iotools.hash b/package/iotools/iotools.hash new file mode 100644 index 00000000000..a72d2a69837 --- /dev/null +++ b/package/iotools/iotools.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9cb6184030b2e5c2e6a7c7a2d016d29d42d4075a77e1ba982bdc3cd919491faf iotools-1.8.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/iotools/iotools.mk b/package/iotools/iotools.mk new file mode 100644 index 00000000000..d855f44a055 --- /dev/null +++ b/package/iotools/iotools.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# iotools +# +################################################################################ + +IOTOOLS_VERSION = 1.8 +IOTOOLS_SITE = $(call github,andy-shev,iotools,v$(IOTOOLS_VERSION)) +IOTOOLS_LICENSE = GPL-2.0+ +IOTOOLS_LICENSE_FILES = COPYING + +IOTOOLS_MAKE_OPTS = \ + CROSS_COMPILE=$(TARGET_CROSS) + +ifeq ($(BR2_STATIC_LIBS),y) +IOTOOLS_MAKE_OPTS += STATIC=1 +else +IOTOOLS_MAKE_OPTS += STATIC=0 +endif + +define IOTOOLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IOTOOLS_MAKE_OPTS) all +endef + +define IOTOOLS_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/iotools $(TARGET_DIR)/usr/bin/iotools +endef + +$(eval $(generic-package)) diff --git a/package/iperf/0001-checksums.c-needs-to-define-_GNU_SOURCE.patch b/package/iperf/0001-checksums.c-needs-to-define-_GNU_SOURCE.patch new file mode 100644 index 00000000000..5233be0f7cb --- /dev/null +++ b/package/iperf/0001-checksums.c-needs-to-define-_GNU_SOURCE.patch @@ -0,0 +1,53 @@ +From 3ac9376c2bc67433b9cd21e7d7650c1c7e939bcc Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 11 Nov 2024 11:41:28 +0100 +Subject: [PATCH] checksums.c needs to define _GNU_SOURCE + +When compiling with musl libc [1], iperf2 fail to build with error: + + checksums.c: In function 'udpchecksum': + checksums.c:175:17: error: 'const struct udphdr' has no member named 'check' + 175 | if (!udp_hdr->check) { + | ^~ + +This failure was introduced in commit [2], in version 2.2.1. This is +due to the switch from using (which always define "struct +udphdr" members), to which define members in musl libc +only when _GNU_SOURCE is defined. See [3]. + +Note: those use of udphdr members in checksums.c were introduced in +commit [4], in version 2.1.1. + +This commit fixes the issue by defining _GNU_SOURCE in checksums.c. + +This issue was found in the iperf integration in Buildroot Linux [5]. + +[1] https://www.musl-libc.org/ +[2] https://sourceforge.net/p/iperf2/code/ci/2a5fe6ffd4519ef3c6fc95704096646f897bd124/ +[3] https://git.musl-libc.org/cgit/musl/tree/include/netinet/udp.h?h=v1.2.5#n11 +[4] https://sourceforge.net/p/iperf2/code/ci/2ba97baecb4930e373ee5f51fc84115246e85096/ +[5] https://buildroot.org/ + +Upstream: https://sourceforge.net/p/iperf2/tickets/342/ +Signed-off-by: Julien Olivain +--- + src/checksums.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/checksums.c b/src/checksums.c +index 852f1952..d7a8109e 100644 +--- a/src/checksums.c ++++ b/src/checksums.c +@@ -47,6 +47,9 @@ + * by Robert J. McMahon (rjmcmahon@rjmcmahon.com, bob.mcmahon@broadcom.com) + * ------------------------------------------------------------------- + */ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif + #include "headers.h" + + /* +-- +2.47.0 + diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index e4d40d5940f..626f23f3873 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/iperf2/files/ -md5 34bb6ac1abeb801bf3f729794dc5ac36 iperf-2.2.0.tar.gz -sha1 bcbd101ab36f3faacaab1a765a96806ca49a1495 iperf-2.2.0.tar.gz +md5 dc7ef2413a09b619e52cad199ad038ba iperf-2.2.1.tar.gz +sha1 9b30b1f3140d4f714555fee5ed21aa2bf4046aee iperf-2.2.1.tar.gz # Locally computed: -sha256 16810a9575e4c6dd65e4a18ab5df3cdac6730b3c832cf080a8990f132f68364a iperf-2.2.0.tar.gz +sha256 754ab0a7e28033dbea81308ef424bc7df4d6e2fe31b60cc536b61b51fefbd8fb iperf-2.2.1.tar.gz sha256 5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1 COPYING diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 303614668a3..62ed9d6e5f9 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF_VERSION = 2.2.0 +IPERF_VERSION = 2.2.1 IPERF_SITE = https://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 ee0149daedf..2aef76578a0 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.17.1.tar.gz.sha256 -sha256 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa iperf-3.17.1.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.18.tar.gz.sha256 +sha256 c0618175514331e766522500e20c94bfb293b4424eb27d7207fb427b88d20bab iperf-3.18.tar.gz # Locally computed sha256 3dc3e2076dd9cdea2b66d8fe213997ff25fb6171594f055b59fe25321b438f6f LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 1d2b57208ad..744ee070a48 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.17.1 +IPERF3_VERSION = 3.18 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index 9516ff8596d..dd2b0e6b6d7 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -5,22 +5,15 @@ config BR2_PACKAGE_IPMITOOL IPMItool provides a simple command-line interface to IPMI-enabled devices. + ipmitool will look up the IANA PEN (Enterprise Numbers) + registry in /usr/share/misc/iana/. The IANA PEN is optional, + it can be provided by the iana-assignment package or by a + rootfs overlay. + 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 diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 4f2151904d4..159bb7c8b69 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -14,6 +14,7 @@ IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf IPMITOOL_CONF_OPTS = --disable-registry-download +IPMITOOL_CONF_ENV = IANADIR=/usr/share/misc/iana ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi @@ -49,20 +50,4 @@ 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/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch b/package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch new file mode 100644 index 00000000000..3deb42ae95a --- /dev/null +++ b/package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch @@ -0,0 +1,73 @@ +From 0359ee6dc57ee8aa21a3f0f7404422c0f9372d3a Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sun, 22 Sep 2024 14:00:42 +0200 +Subject: [PATCH] bridge: mst: fix a musl build issue + +This patch fixes a compilation error raised by the bump to version 6.11.0 +in Buildroot using musl as the C library for the cross-compilation +toolchain. + +After setting the CFLGAS + +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +IPROUTE2_CFLAGS += -D__UAPI_DEF_IN6_ADDR=0 -D__UAPI_DEF_SOCKADDR_IN6=0 \ + -D__UAPI_DEF_IPV6_MREQ=0 +endif + +to fix the following errors: + +In file included from ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/arpa/inet.h:9, + from ../include/libnetlink.h:14, + from mst.c:10: +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' + 23 | struct in6_addr { + | ^~~~~~~~ +In file included from ../include/uapi/linux/if_bridge.h:19, + from mst.c:7: +../include/uapi/linux/in6.h:33:8: note: originally defined here + 33 | struct in6_addr { + | ^~~~~~~~ +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' + 34 | struct sockaddr_in6 { + | ^~~~~~~~~~~~ +../include/uapi/linux/in6.h:50:8: note: originally defined here + 50 | struct sockaddr_in6 { + | ^~~~~~~~~~~~ +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' + 42 | struct ipv6_mreq { + | ^~~~~~~~~ +../include/uapi/linux/in6.h:60:8: note: originally defined here + 60 | struct ipv6_mreq { + +I got this further errors + +../include/uapi/linux/in6.h:72:25: error: field 'flr_dst' has incomplete type + 72 | struct in6_addr flr_dst; + | ^~~~~~~ +../include/uapi/linux/if_bridge.h:711:41: error: field 'ip6' has incomplete type + 711 | struct in6_addr ip6; + | ^~~ + +fixed by including the netinet/in.h header. + +Signed-off-by: Dario Binacchi +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=6a77abab92516e65f07f8657fc4e384c4541ce0e +--- + bridge/mst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bridge/mst.c b/bridge/mst.c +index 873ca5369fd6..c8f7e6606c3c 100644 +--- a/bridge/mst.c ++++ b/bridge/mst.c +@@ -4,6 +4,7 @@ + */ + + #include ++#include + #include + #include + +-- +2.43.0 + diff --git a/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch b/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch new file mode 100644 index 00000000000..d1981f74e2d --- /dev/null +++ b/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch @@ -0,0 +1,56 @@ +From 62c4dfff5ff596984ece7960fba49b05d69f37a7 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sun, 22 Sep 2024 14:11:18 +0200 +Subject: [PATCH] bridge: mst: fix a further musl build issue + +This patch fixes the following build errors: + +In file included from mst.c:11: +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC' + 50 | type value); \ + | ^~~~ +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC' + 55 | type value) \ + | ^~~~ +../include/json_print.h: In function 'print_tv': +../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] + 58 | value); \ + | ^~~~~ + | | + | const struct timeval * +../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~~~~~ +../include/json_print.h:50:42: note: expected 'const struct timeval *' but argument is of type 'const struct timeval *' + 50 | type value); \ + | ^ +../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' + 80 | _PRINT_FUNC(tv, const struct timeval *) + +Signed-off-by: Dario Binacchi +Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=043ef90e2fa94397eb5c85330889ca4146a6d58a +--- + bridge/mst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bridge/mst.c b/bridge/mst.c +index c8f7e6606c3c..fccb7fd68140 100644 +--- a/bridge/mst.c ++++ b/bridge/mst.c +@@ -4,6 +4,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +2.43.0 + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 0760183b9e6..028a3243964 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 91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce iproute2-6.10.0.tar.xz +sha256 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 iproute2-6.11.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 08b890b3311..c452b64cdea 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.10.0 +IPROUTE2_VERSION = 6.11.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index a3e48d60a9a..6baf433dcb7 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/20240117/sha256sums.asc -sha256 7ed46e876e4157e1d20c40ec945e1ce0f3af3b10b5f6373e423135c6f22cd116 iputils-20240117.tar.gz +# https://github.com/iputils/iputils/releases/download/20240905/sha256sums.asc +sha256 599cda8e3f5f7ce4c612456ab1101369da8f79aa0f83c8e877290a1c7bb56010 iputils-20240905.tar.gz # Locally computed sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 08d849e69de..ec8c24e4e04 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPUTILS_VERSION = 20240117 +IPUTILS_VERSION = 20240905 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 9f88b2d6f10..b0a72efd7ae 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 5901ab3fbb74bb75ec9adda35daeff595e4d238882fee7fc8c805b30ca79d943 iwd-2.17.tar.xz +sha256 bd167ab368b6ba302b6c948a4f41f02d233a12e20d5094b1c0393325309f8a60 iwd-3.0.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index c516bab4717..3a178795da9 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.17 +IWD_VERSION = 3.0 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ diff --git a/package/kbd/kbd.hash b/package/kbd/kbd.hash index 63f7286d30b..25866751f40 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 ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683 kbd-2.5.1.tar.xz +sha256 519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926 kbd-2.6.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index 15912419f83..953adccd0bf 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -KBD_VERSION = 2.5.1 +KBD_VERSION = 2.6.4 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd KBD_CONF_OPTS = \ diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 82325ab014a..a80c87124bd 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 caf71b67cf242c600878718dab8227947062a28485078b8bf68ac72aef51e12c kodi-inputstream-adaptive-21.4.10-Omega.tar.gz +sha256 8bd781ba3012966f6ef45a085d6e09d7feee1cefe582d96563c7661affb68551 kodi-inputstream-adaptive-21.5.6-Omega.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index b6825c1ff00..96ae071745a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.4.10-Omega +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 21.5.6-Omega KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index ee94a52502c..774c7e8e66a 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 21.0-Omega +KODI_JSONSCHEMABUILDER_VERSION = 21.1-Omega KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 5e960f2f46a..3ead10c479f 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 56f5e976c53f6911ce4179126807da82d8fec1ead092c2add1d97e48e3468d8a kodi-peripheral-xarcade-21.0.0-Omega.tar.gz +sha256 50e363e3bc02a1e0585294b08f920e077af5290203cd76aae02ac363ee98f3e5 kodi-peripheral-xarcade-21.0.1-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 3c89f0bb79b..f3364e3520d 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 21.0.0-Omega +KODI_PERIPHERAL_XARCADE_VERSION = 21.0.1-Omega KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 560eea27e6b..60e1c4ece85 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 aa463ad43e0dda1aaf10f5fca562823d91762671ad5b5077f5dbaeb7dc425fa7 kodi-pvr-iptvsimple-21.8.5-Omega.tar.gz +sha256 22a76504872b20703c5f77e5025dea4cecd777985c0584f2b6f5e0b64e268142 kodi-pvr-iptvsimple-21.10.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 04b83273449..7c63cf06ab2 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 21.8.5-Omega +KODI_PVR_IPTVSIMPLE_VERSION = 21.10.0-Omega KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index b6add33bb79..568ec564cd5 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0aedb77bd9f3a36375feec7f3769d596dbc536b66d584eb933fb11ec7cff8514 kodi-pvr-mediaportal-tvserver-21.0.3-Omega.tar.gz +sha256 8193889ef3033e2df471660bae77a02e7c12d519928eed19b19142c548070b1c kodi-pvr-mediaportal-tvserver-21.0.4-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index 8ada1a1eb10..ec018214114 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.3-Omega +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 21.0.4-Omega KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 5b8b6b7e4d1..130bcbe5b26 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 dd4974d3bf664067787da271ad8f76a8ecf61e73909050991aae99e0c2863eaa kodi-pvr-nextpvr-21.1.1-Omega.tar.gz +sha256 3df0ed9a1f7dd61feba1fd8281cdd5b6e3ee153f78eba3e645e5d2213f7c5793 kodi-pvr-nextpvr-21.2.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index 788415b8960..cd0378bff80 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 21.1.1-Omega +KODI_PVR_NEXTPVR_VERSION = 21.2.0-Omega KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 75f9ed03985..871d64c1912 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 468d5ad4703c36d73dc8d08008d19c0e9b44474b86b4d5e618b97c3003214b6e kodi-pvr-plutotv-21.3.1-Omega.tar.gz +sha256 cacdae70fa5b35f2913b036bf6e1915c7aff45c6bfae782f27e184a5b9a77d5f kodi-pvr-plutotv-21.3.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index d363f206d79..1227e5910cf 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 21.3.1-Omega +KODI_PVR_PLUTOTV_VERSION = 21.3.2-Omega KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index 2b1139e054a..f0bb4df7df2 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 e0fc9ef1db89e97c11dadccc06901ac0fbff03ff9f22ba7a8de665ce85c28aa8 kodi-pvr-vuplus-21.2.1-Omega.tar.gz +sha256 b807baf970b034762d6bccb8be63c16a4a50508f3fc5b87d53d0804f4e94ac4d kodi-pvr-vuplus-21.3.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index c289042a02a..21ccec410d9 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 21.2.1-Omega +KODI_PVR_VUPLUS_VERSION = 21.3.0-Omega KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 3a78f23b350..2214674bf2e 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 11819542b32a8dc9a4b6f5cc2fb98153298be1156bbf36a1b2aaf569be9842ab kodi-pvr-waipu-21.8.6-Omega.tar.gz +sha256 1fd3a101f09c471deaa83ac5b673be71df97957060e4aedb4d7a890e355608f2 kodi-pvr-waipu-21.8.7-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 15a25a871a7..97a830115e6 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.8.6-Omega +KODI_PVR_WAIPU_VERSION = 21.8.7-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index 126640f0327..484e12324c1 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 20361e6de6bd783203e73dc19f8aa0bfc1e269508bfc7933477fbaa1e8a4b9e9 kodi-pvr-zattoo-21.0.3-Omega.tar.gz +sha256 7e1fab309232e7115efa0868c8c3c13c2e7639628ef8bc59a93bf4aa82a3b20d kodi-pvr-zattoo-21.0.4-Omega.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 50d3651cb9e..6a981e12b70 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 = 21.0.3-Omega +KODI_PVR_ZATTOO_VERSION = 21.0.4-Omega 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-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index a65f11402a8..21e1617412d 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7644f9ad16e0f2ae9b4796cdc5cdd92761e835b5edb4f114311d2578c0aeffe6 kodi-screensaver-asteroids-9f761cb7d5842e61da9c608c9f58067bcb986d89.tar.gz +sha256 41c20f2fec17b60a3baa98edff80ba01053a80ada0ffd056459c2f4ae6588867 kodi-screensaver-asteroids-9cdcb84a4464fee5ae4b6ab3b300e6a3824ec084.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index f96eb4e8301..53c71f73d21 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 9f761cb7d5842e61da9c608c9f58067bcb986d89 +KODI_SCREENSAVER_ASTEROIDS_VERSION = 9cdcb84a4464fee5ae4b6ab3b300e6a3824ec084 KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index ed53dd5015d..3cf17c5e137 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 85550f949598d3904bcb77e3d2e6b7fa2d0d9334a7939b964a94d98ffe0e36ea kodi-skin-confluence-b2f2fe26ab47ca3c317d5d7927687e41584e46ed.tar.gz +sha256 61bded39800f751f4285c2e5bca26d4a4064fbeb3f90c253697b5aef07b1b328 kodi-skin-confluence-34e77d0122eab8c6e3fb502c623ba29749b19031.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 2898c045393..dcff19793c3 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 = b2f2fe26ab47ca3c317d5d7927687e41584e46ed +KODI_SKIN_CONFLUENCE_VERSION = 34e77d0122eab8c6e3fb502c623ba29749b19031 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 c3c06d0210b..426c8f1ed5e 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 21.0-Omega +KODI_TEXTUREPACKER_VERSION = 21.1-Omega KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 15d1e471cdb..5ece904a4ac 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -3,7 +3,7 @@ sha512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6 sha512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc commons-lang3-3.14.0-bin.tar.gz sha512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f commons-text-1.11.0-bin.tar.gz # Locally computed -sha256 7f54c1fd8456ac46221fbc85e447362bdc209163c6cb19fca98d106560071b7c kodi-21.0-Omega.tar.gz +sha256 ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef kodi-21.1-Omega.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index e941847f777..ae73cdffa6a 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 21.0 +KODI_VERSION_MAJOR = 21.1 KODI_VERSION_NAME = Omega KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) diff --git a/package/less/less.hash b/package/less/less.hash index c44e2467736..b97d0fac419 100644 --- a/package/less/less.hash +++ b/package/less/less.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # using DSA key F153A7C833235259 -# https://www.greenwoodsoftware.com/less/less-643.sig -sha256 2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8 less-643.tar.gz +# https://www.greenwoodsoftware.com/less/less-661.sig +sha256 2b5f0167216e3ef0ffcb0c31c374e287eb035e4e223d5dae315c2783b6e738ed less-661.tar.gz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/less/less.mk b/package/less/less.mk index 7431d80cc4e..25bbbd6d886 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -4,7 +4,7 @@ # ################################################################################ -LESS_VERSION = 643 +LESS_VERSION = 661 LESS_SITE = http://www.greenwoodsoftware.com/less LESS_LICENSE = GPL-3.0+ LESS_LICENSE_FILES = COPYING diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index c3fc0d85e10..76f1bd0f328 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed libabseil-cpp-20230802.1.tar.gz +sha256 f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3 libabseil-cpp-20240722.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index a5dfc8eb194..a27d0134763 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20230802.1 +LIBABSEIL_CPP_VERSION = 20240722.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 62ecaa1ac29..08d618945b2 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_LIBBLOCKDEV_LVM2 depends on BR2_ENABLE_LOCALE # parted depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED + select BR2_PACKAGE_LIBYAML select BR2_PACKAGE_LVM2 comment "lvm2 support needs a toolchain w/ locale, gcc >= 5" @@ -72,6 +73,25 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART comment "part plugin needs a toolchain w/ locale, gcc >= 5" depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +config BR2_PACKAGE_LIBBLOCKDEV_SMART + bool "smart" + depends on BR2_PACKAGE_HAS_UDEV # libatasmart + select BR2_PACKAGE_LIBATASMART + +comment "smart support needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + +config BR2_PACKAGE_LIBBLOCKDEV_SMARTMONTOOLS + bool "smartmontools" + depends on BR2_INSTALL_LIBSTDCPP # smartmontools + depends on BR2_USE_MMU # smartmontools + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_SMARTMONTOOLS # runtime + +comment "smartmontools support needs a toolchain w/ C++" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 1438fad7417..1466c88451a 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db libblockdev-3.1.1.tar.gz +sha256 318b9e2cedfdfe88161f28079fcb63239aeb5592223f4485b861cfc6ef11189a libblockdev-3.2.1.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 9ffa15a7a9d..4cac9056663 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.1.1 -LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 +LIBBLOCKDEV_VERSION = 3.2.1 +LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION) LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE LIBBLOCKDEV_INSTALL_STAGING = YES @@ -47,7 +47,7 @@ LIBBLOCKDEV_CONF_OPTS += --without-loop endif ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_LVM2),y) -LIBBLOCKDEV_DEPENDENCIES += lvm2 parted +LIBBLOCKDEV_DEPENDENCIES += libyaml lvm2 parted LIBBLOCKDEV_CONF_OPTS += --with-lvm else LIBBLOCKDEV_CONF_OPTS += --without-lvm @@ -67,6 +67,20 @@ else LIBBLOCKDEV_CONF_OPTS += --without-part endif +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SMART),y) +LIBBLOCKDEV_DEPENDENCIES += libatasmart +LIBBLOCKDEV_CONF_OPTS += --with-smart +else +LIBBLOCKDEV_CONF_OPTS += --without-smart +endif + +ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SMARTMONTOOLS),y) +LIBBLOCKDEV_DEPENDENCIES += json-glib +LIBBLOCKDEV_CONF_OPTS += --with-smartmontools +else +LIBBLOCKDEV_CONF_OPTS += --without-smartmontools +endif + ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SWAP),y) LIBBLOCKDEV_DEPENDENCIES += util-linux LIBBLOCKDEV_CONF_OPTS += --with-swap diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index e84b8d342ee..4699e382c76 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -24,6 +24,13 @@ menuconfig BR2_PACKAGE_LIBCAMERA if BR2_PACKAGE_LIBCAMERA +config BR2_PACKAGE_LIBCAMERA_PYTHON + bool "python bindings" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYBIND + help + Enable libcamera python bindings + config BR2_PACKAGE_LIBCAMERA_V4L2 bool "libcamera v4l2 compatibility layer" help diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 1566356b999..d4554af190e 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 1e0a3feff93577a30bcd4e67aa4c1969aecabcd90f78f540a637bb77553c5a7d libcamera-v0.3.0-git4.tar.gz +sha256 d396bebe49aa7f605403594be3a9e970173d4c98061033c75f816946ff907eb8 libcamera-v0.3.2-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index dfcd340b75a..3367eb60b24 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.3.0 +LIBCAMERA_VERSION = v0.3.2 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ @@ -19,7 +19,6 @@ LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ -Ddocumentation=disabled \ -Dtest=false \ - -Dpycamera=disabled \ -Dwerror=false LIBCAMERA_INSTALL_STAGING = YES LIBCAMERA_LICENSE = \ @@ -45,6 +44,13 @@ ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y) LIBCAMERA_CXXFLAGS = -faligned-new endif +ifeq ($(BR2_PACKAGE_LIBCAMERA_PYTHON),y) +LIBCAMERA_DEPENDENCIES += python3 python-pybind +LIBCAMERA_CONF_OPTS += -Dpycamera=enabled +else +LIBCAMERA_CONF_OPTS += -Dpycamera=disabled +endif + ifeq ($(BR2_PACKAGE_LIBCAMERA_V4L2),y) LIBCAMERA_CONF_OPTS += -Dv4l2=true else diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index fa325efd7de..c2ddee2cc23 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.9.0.tar.xz.asc +# https://curl.se/download/curl-8.11.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz +sha256 c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 curl-8.11.1.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 131300a30f5..dc9d20ec823 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.9.0 +LIBCURL_VERSION = 8.11.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -194,11 +194,6 @@ LIBCURL_CONF_OPTS += \ --disable-tftp endif -define LIBCURL_FIX_DOT_PC - printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in -endef -LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC) - ifeq ($(BR2_PACKAGE_LIBCURL_CURL),) define LIBCURL_TARGET_CLEANUP rm -rf $(TARGET_DIR)/usr/bin/curl diff --git a/package/libdex/0001-add-stack-protector-option.patch b/package/libdex/0001-add-stack-protector-option.patch deleted file mode 100644 index 9021831a39f..00000000000 --- a/package/libdex/0001-add-stack-protector-option.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 107efb2f1a014c4475e122677faddbe0dbef1000 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 23 Jul 2024 14:54:59 +0200 -Subject: [PATCH] add stack-protector option - -Allow the user to disable stack-protector as it is not supported by all -toolchains - -Signed-off-by: Fabrice Fontaine -Upstream: https://gitlab.gnome.org/GNOME/libdex/-/commit/a65d33aebbe43024a046b3f3cc4a1c6c533838d0 ---- - meson.build | 2 +- - meson_options.txt | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index d0ca81d..2f7aac2 100644 ---- a/meson.build -+++ b/meson.build -@@ -126,7 +126,7 @@ test_c_args = [ - ['-Werror=format-security', '-Werror=format=2'], - '-FImsvc_recommended_pragmas.h', - ] --if get_option('buildtype') != 'plain' -+if get_option('buildtype') != 'plain' and get_option('stack-protector') - if host_machine.system() != 'windows' - test_c_args += '-fstack-protector-strong' - endif -diff --git a/meson_options.txt b/meson_options.txt -index 519cd97..9e3364a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,9 @@ option('docs', - option('examples', - type: 'boolean', value: true, - description: 'Build example programs') -+option('stack-protector', -+ type: 'boolean', value: true, -+ description: 'Enable stack-protector') - option('vapi', - type: 'boolean', value: true, - description: 'Generate vapi data (requires vapigen)') --- -GitLab - diff --git a/package/libdex/libdex.hash b/package/libdex/libdex.hash index ec22f330d9f..7e08676fe44 100644 --- a/package/libdex/libdex.hash +++ b/package/libdex/libdex.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libdex/0.6/libdex-0.6.1.sha256sum -sha256 d176de6578571e32a8c0b603b6a5a13fa5f87fb6b5442575b38ec5af16b17a92 libdex-0.6.1.tar.xz +# From https://download.gnome.org/sources/libdex/0.8/libdex-0.8.0.sha256sum +sha256 659ab5d0eb7f10bd36af0cde08055158987690b9714e7f5b001c788ec1d01a25 libdex-0.8.0.tar.xz # License files sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libdex/libdex.mk b/package/libdex/libdex.mk index 360b3892551..0d27b356756 100644 --- a/package/libdex/libdex.mk +++ b/package/libdex/libdex.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBDEX_VERSION_MAJOR = 0.6 -LIBDEX_VERSION = $(LIBDEX_VERSION_MAJOR).1 +# The middle number is even for stable releases, odd for development ones. +LIBDEX_VERSION_MAJOR = 0.8 +LIBDEX_VERSION = $(LIBDEX_VERSION_MAJOR).0 LIBDEX_SOURCE = libdex-$(LIBDEX_VERSION).tar.xz LIBDEX_SITE = https://download.gnome.org/sources/libdex/$(LIBDEX_VERSION_MAJOR) LIBDEX_LICENSE = LGPL-2.1+ diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash index 0ffeca603a5..4d8198de98c 100644 --- a/package/libdnet/libdnet.hash +++ b/package/libdnet/libdnet.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7df1f0a3db9cf03b48cf50ab273fd6a20c1be99eb9344b9663fe3fd9ed9dab65 libdnet-1.16.4.tar.gz +sha256 a4a82275c7d83b85b1daac6ebac9461352731922161f1dcdcccd46c318f583c9 libdnet-1.18.0.tar.gz sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index e678565bdfa..8eebd1050de 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDNET_VERSION = 1.16.4 +LIBDNET_VERSION = 1.18.0 LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) LIBDNET_LICENSE = BSD-3-Clause LIBDNET_LICENSE_FILES = LICENSE diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 9d78d5e4376..aec9f58749e 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2024-June/003518.html -sha256 d9f5079b777dffca9300ccc56b10a93588cdfbc9dde2fae111940dfb6292f251 libdrm-2.4.122.tar.xz -sha512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13 libdrm-2.4.122.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-August/003528.html +sha256 a2b98567a149a74b0f50e91e825f9c0315d86e7be9b74394dae8b298caadb79e libdrm-2.4.123.tar.xz +sha512 d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d libdrm-2.4.123.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index c4498511dba..894e2d8a6f7 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.122 +LIBDRM_VERSION = 2.4.123 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 29948fbba88..9da9281c85e 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587 fribidi-1.0.15.tar.xz +sha256 1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c fribidi-1.0.16.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index ab7fe703074..ca0a39ccb49 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.15 +LIBFRIBIDI_VERSION = 1.0.16 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/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 362f1c10b66..36f47cd5233 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 34c7770bf0090ee88488af98767d08e779f124fa33437e0aabec8abd4609fec6 geos-3.12.2.tar.bz2 +sha256 47ec83ff334d672b9e4426695f15da6e6368244214971fabf386ff8ef6df39e4 geos-3.13.0.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 05b74b60a2c..beb2c077c4f 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.12.2 +LIBGEOS_VERSION = 3.13.0 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index 6647b77c5a3..969ff4b8fab 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5 libgpiod-1.6.4.tar.xz +sha256 ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc libgpiod-1.6.5.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index e7ff1556181..f669643b394 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD_VERSION = 1.6.4 +LIBGPIOD_VERSION = 1.6.5 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ diff --git a/package/libgpiod2/libgpiod2.hash b/package/libgpiod2/libgpiod2.hash index 3b498f0eb94..f51cc80b9f5 100644 --- a/package/libgpiod2/libgpiod2.hash +++ b/package/libgpiod2/libgpiod2.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58 libgpiod-2.1.3.tar.xz +sha256 ee29735890eb1cc0e4b494001da5163d1a9c4735343201d22485db313601ca07 libgpiod-2.2.tar.xz # Hash for license file sha256 f646ad5159efb51c1130a4b43c31f0759750b1e254d2acf510f368ee2e2085c3 COPYING diff --git a/package/libgpiod2/libgpiod2.mk b/package/libgpiod2/libgpiod2.mk index 142289cb3a7..e73f8d699fc 100644 --- a/package/libgpiod2/libgpiod2.mk +++ b/package/libgpiod2/libgpiod2.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD2_VERSION = 2.1.3 +LIBGPIOD2_VERSION = 2.2 LIBGPIOD2_SOURCE = libgpiod-$(LIBGPIOD2_VERSION).tar.xz LIBGPIOD2_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD2_LICENSE = LGPL-2.1+ diff --git a/package/libgtk4/libgtk4.hash b/package/libgtk4/libgtk4.hash index efb944f2aea..636b675d15b 100644 --- a/package/libgtk4/libgtk4.hash +++ b/package/libgtk4/libgtk4.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk/4.12/gtk-4.12.4.sha256sum -sha256 ba67c6498e5599f928edafb9e08a320adfaa50ab2f0da6fc6ab2252fc2d57520 gtk-4.12.4.tar.xz +# From https://download.gnome.org/sources/gtk/4.14/gtk-4.14.5.sha256sum +sha256 5547f2b9f006b133993e070b87c17804e051efda3913feaca1108fa2be41e24d gtk-4.14.5.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk4/libgtk4.mk b/package/libgtk4/libgtk4.mk index 48bfc80c00f..b00a2facade 100644 --- a/package/libgtk4/libgtk4.mk +++ b/package/libgtk4/libgtk4.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGTK4_VERSION_MAJOR = 4.12 -LIBGTK4_VERSION = $(LIBGTK4_VERSION_MAJOR).4 +LIBGTK4_VERSION_MAJOR = 4.14 +LIBGTK4_VERSION = $(LIBGTK4_VERSION_MAJOR).5 LIBGTK4_SOURCE = gtk-$(LIBGTK4_VERSION).tar.xz LIBGTK4_SITE = https://download.gnome.org/sources/gtk/$(LIBGTK4_VERSION_MAJOR) LIBGTK4_LICENSE = LGPL-2.0+ @@ -27,7 +27,6 @@ LIBGTK4_DEPENDENCIES = \ LIBGTK4_CONF_OPTS = \ -Dbuild-tests=false \ -Dbuild-testsuite=false \ - -Dmedia-ffmpeg=disabled \ -Dprint-cpdb=disabled \ -Dvulkan=disabled \ -Dcloudproviders=disabled \ diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index ed1a083d7c4..26b21e1897f 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8702564b0f288707ea72b260b3bf4ba9bf7abfa7dac01353def3a86acd6bbb76 libheif-1.18.1.tar.gz +sha256 c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf libheif-1.18.2.tar.gz sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index e2c3a328bc6..4783ada19e4 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.18.1 +LIBHEIF_VERSION = 1.18.2 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING diff --git a/package/libilbc/libilbc.hash b/package/libilbc/libilbc.hash index be88d6f9c39..dbd17957650 100644 --- a/package/libilbc/libilbc.hash +++ b/package/libilbc/libilbc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fe4827a548e96f0549dd8f30eb6a48c6c55fd4535de6c8e9c6e4f38bea6190bf libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07.tar.gz +sha256 a09a244e5e24607303478aa9995765d2b26c52b15c2721cae5a83c109ed51ed3 libilbc-51d3cf8e157c3c80d7169b738073865eca83f5a3.tar.gz sha256 b7f4cbb4a12cd11a3d1aeda9bd17c99f59b054de4b3ee53045531cd2fa74dd2a gips_iLBClicense.pdf diff --git a/package/libilbc/libilbc.mk b/package/libilbc/libilbc.mk index d8139ba205f..089215f204a 100644 --- a/package/libilbc/libilbc.mk +++ b/package/libilbc/libilbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07 +LIBILBC_VERSION = 51d3cf8e157c3c80d7169b738073865eca83f5a3 LIBILBC_SITE = $(call github,freeswitch,libilbc,$(LIBILBC_VERSION)) LIBILBC_LICENSE = Global IP Sound iLBC Public License v2.0 LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash index adc32c3a269..0049772a785 100644 --- a/package/libjwt/libjwt.hash +++ b/package/libjwt/libjwt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8b257da9b64ba9075fce3a3f670ae02dee7fc95ab7009a2e1ad60905e3f8d48 libjwt-1.17.0.tar.bz2 +sha256 f11c4544f61a31f105720b8329409fea009d6f9ef41c9361f98c2de48152eeae libjwt-1.17.2.tar.bz2 sha256 3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index f143ba4b627..9f94c8683e6 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJWT_VERSION = 1.17.0 +LIBJWT_VERSION = 1.17.2 LIBJWT_SITE = https://github.com/benmcollins/libjwt/releases/download/v$(LIBJWT_VERSION) LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.bz2 LIBJWT_DEPENDENCIES = host-pkgconf jansson diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index 4eaadf957c6..1778acf2e93 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 e0191411cfcd927eebe5392d030fe4283fe27ba1685ab7265104936e0b4283a6 libjxl-0.10.3.tar.gz +sha256 7ce4ec8bb37a435a73ac18c4c9ff56c2dc6c98892bf3f53a328e3eca42efb9cf libjxl-0.11.0.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b7fe3e1b52a..6fc9ca5a6e9 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.10.3 +LIBJXL_VERSION = 0.11.0 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index e74cde2cc08..aca159d972e 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 1db4222e052656700021a30d517f5aa2f882da4a libksba-1.6.6.tar.bz2 -sha256 5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4 libksba-1.6.6.tar.bz2 +sha1 781acfb012cbb5328f41efcf82f723524e8d0128 libksba-1.6.7.tar.bz2 +sha256 cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763 libksba-1.6.7.tar.bz2 # Hash for license files: sha256 f9c59ea5a5e1dfdeebcd134e6a594c21eb088cc95f6653ee99ff2e187c105380 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 03e455145a3..dc22d60113b 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.6 +LIBKSBA_VERSION = 1.6.7 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 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) diff --git a/package/libmanette/libmanette.hash b/package/libmanette/libmanette.hash index b1da3c19f62..3653d672dee 100644 --- a/package/libmanette/libmanette.hash +++ b/package/libmanette/libmanette.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.7.sha256sum -sha256 cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51 libmanette-0.2.7.tar.xz +# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.9.sha256sum +sha256 29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f libmanette-0.2.9.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmanette/libmanette.mk b/package/libmanette/libmanette.mk index 42fb4797957..7872c8b796f 100644 --- a/package/libmanette/libmanette.mk +++ b/package/libmanette/libmanette.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMANETTE_VERSION_MAJOR = 0.2 -LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).7 +LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).9 LIBMANETTE_SOURCE = libmanette-$(LIBMANETTE_VERSION).tar.xz LIBMANETTE_SITE = https://download.gnome.org/sources/libmanette/$(LIBMANETTE_VERSION_MAJOR) LIBMANETTE_LICENSE = LGPL-2.1+ diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 5d1aad15d19..bd29e76bc3c 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,8 +1,8 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html # Checked pgp signature: -# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.2.6.tar.xz.sig +# https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.2.7.tar.xz.sig # with key: # https://www.netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt -sha256 ceeaea2cd92147da19f13a35a7f1a4bc2767ff897e838e4b479cf54b59c777f4 libnftnl-1.2.6.tar.xz +sha256 9122774f968093d5c0bacddd67de480f31fa4073405a7fc058a34b0f387aecb3 libnftnl-1.2.7.tar.xz # Locally computed: sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index 18be55a17d1..65a1431e94f 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.6 +LIBNFTNL_VERSION = 1.2.7 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index c5691356634..521447e0519 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.35/src/SHA256SUMS -sha256 7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f nspr-4.35.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.36/src/SHA256SUMS +sha256 55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895 nspr-4.36.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index e891aa48525..62a2b92db62 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.35 +LIBNSPR_VERSION = 4.36 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src LIBNSPR_SUBDIR = nspr diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 1370b6ad0d8..36e2296d389 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_103_RTM/src/SHA256SUMS -sha256 7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962 nss-3.103.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_106_RTM/src/SHA256SUMS +sha256 026b744e1e0784b890c3846ac9506472a92138c1f4d41dec581949574c585c38 nss-3.106.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 4c620a604b9..0c3c24b6640 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.103 +LIBNSS_VERSION = 3.106 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 99c633882a6..68546c76b41 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 455867060d2b7563eab59fe21779dff469d98465028997178c7efbe4b8763206 libnvme-1.9.tar.gz +sha256 6d5d8ba2cc4c94a61a994c9f7f25b3b26ef973fb5c0daa37729890903f37a1f1 libnvme-1.11.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index da8707db7d1..fc7edda7ff0 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.9 +LIBNVME_VERSION = 1.11.1 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 0c8db52e2e1..03d3def802f 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -133,4 +133,100 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP bool "enable compression" default y +config BR2_PACKAGE_LIBOPENSSL_ENABLE_ARGON2 + bool "enable ARGON2" + default y + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CACHED_FETCH + bool "enable cached fetch" + default y + help + Cache algorithms when they are fetched from a provider. + Normally, a provider indicates if the algorithms it supplies + can be cached or not. Using this option will reduce run-time + memory usage but it also introduces a significant performance + penalty. This option is primarily designed to help with + detecting incorrect reference counting. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_CMP + bool "enable CMP" + default y + help + Build support for Certificate Management Protocol (CMP) and + Certificate Request Message Format (CRMF). + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_THREAD_POOL + bool "enable thread pool" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Build with thread pool functionality. If enabled, OpenSSL + algorithms may use the thread pool to perform parallel + computation. This option in itself does not enable OpenSSL + to spawn new threads. Currently the only supported thread + pool mechanism is the default thread pool. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_ECX + bool "enable ECX" + default y + help + Build with ECX support. Disabling this option can be used + to disable support for X25519, X448, and EdDSA. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_LOADER_ENGINE + bool "enable 'loader_attic' engine" + default y + depends on BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE + help + Build with 'loader_attic' engine support, which is meant + just for internal OpenSSL testing purposes and supports + loading keys, parameters, certificates, and CRLs from files. + When this engine is used, files with such credentials are + read via this engine. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_PADLOCK_ENGINE + bool "enable padlock engine" + default y + help + Build the padlock engine. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_MODULE + bool "enable modules" + default y + help + Build modules. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_QUIC + bool "enable QUIC" + default y + help + Build with QUIC support. + +config BR2_PACKAGE_LIBOPENSSL_SECURE_MEMORY + bool "enable secure memory" + default y + help + Build with secure memory support. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SIV + bool "enable SIV" + default y + help + Build with RFC5297 AES-SIV support. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SM2_PRECOMP_TABLE + bool "enable SM2 precomputed table" + default y + depends on BR2_aarch64 + help + Enable using the SM2 precomputed table. Disabling this option + makes the library smaller. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL_TRACE + bool "enable SSL trace" + default y + help + Build with SSL Trace support. Disabling this option may + provide a small reduction in libssl binary size. + endif # BR2_PACKAGE_LIBOPENSSL diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 52fce1eb3a5..dad30da34e2 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz.sha256 -sha256 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 openssl-3.3.2.tar.gz +# From https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz.sha256 +sha256 e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf openssl-3.4.0.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 82b924c557c..6a59cb2ff00 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.3.2 +LIBOPENSSL_VERSION = 3.4.0 LIBOPENSSL_SITE = https://github.com/openssl/openssl/releases/download/openssl-$(LIBOPENSSL_VERSION) LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 @@ -107,6 +107,19 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_LIBOPENSSL_UNSECURE),,no-unit-test no-crypto-mdebug no-autoerrinit) \ $(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_ARGON2),,no-argon2) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CACHED_FETCH),,no-cached-fetch) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CMP),,no-cmp) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_THREAD_POOL),,no-thread-pool no-default-thread-pool) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_ECX),,no-ecx) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_LOADER_ENGINE),,no-loadereng) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_PADLOCK_ENGINE),,no-padlockeng) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MODULE),,no-module) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_QUIC),,no-quic) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_SECURE_MEMORY),,no-secure-memory) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SIV),,no-siv) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SM2_PRECOMP_TABLE),,no-sm2-precomp) \ + $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_SSL_TRACE),,no-ssl-trace) \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ $(if $(BR2_STATIC_LIBS),no-dso) endef diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 4e0a2ca3175..fac9d3cef2d 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 ba4e0ef34b270e7672a5e5f1b523fe2beab3a40bb33d9389f4ad3a8728f21b52 libselinux-3.6.tar.gz +sha256 ea03f42d13a4f95757997dba8cf0b26321fac5d2f164418b4cc856a92d2b17bd libselinux-3.7.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index f07498d7394..360ab063ca6 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.6 +LIBSELINUX_VERSION = 3.7 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 862e49f52e4..4d1b2161daa 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 41138f46222439e1242f27c1587e95cf54a059259aaf1681db642cc30c4e0d60 libsemanage-3.6.tar.gz +sha256 e166cae29a417dab008db9ca0874023f353a3017b07693a036ed97487eda35b1 libsemanage-3.7.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 7742e7060c1..cf9e9c46fa9 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.6 +LIBSEMANAGE_VERSION = 3.7 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = LICENSE diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 1369d820e18..dcc67ac6380 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c9dc585ea94903d784d597c861cd5dce6459168f95e22b31a0eab1cdd800975a libsepol-3.6.tar.gz +sha256 cd741e25244e7ef6cd934d633614131a266c3eaeab33d8bfa45e8a93b45cc901 libsepol-3.7.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 6361cc66bce..af14778ead9 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.6 +LIBSEPOL_VERSION = 3.7 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = LICENSE diff --git a/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch b/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch new file mode 100644 index 00000000000..603a2b77a8f --- /dev/null +++ b/package/libsha1/0001-test-fix-gcc-14.x-compile-implicit-int.patch @@ -0,0 +1,39 @@ +From d449f26f782be91b3847f88ed2bd937582a575b6 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 25 Aug 2024 11:33:59 +0200 +Subject: [PATCH] test: fix gcc-14.x compile (implicit int) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + test.c:14:8: error: type defaults to ‘int’ in declaration of ‘num_test’ [-Wimplicit-int] + 14 | static num_test; + | ^~~~~~~~ + +Signed-off-by: Peter Seiderer + +Upstream: https://github.com/dottedmag/libsha1/pull/1 + +Signed-off-by: Thomas Bonnefille +--- + test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test.c b/test.c +index 21a6525..1ec89d3 100644 +--- a/test.c ++++ b/test.c +@@ -11,7 +11,7 @@ static void print_hex(const char* data, size_t size) + printf("%x%x", ((unsigned char)data[i])/16, ((unsigned char)data[i])%16); + } + +-static num_test; ++static int num_test; + + static int do_test(const char* data, size_t size, const char* expected_dgst) + { +-- +2.47.1 + diff --git a/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch b/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch new file mode 100644 index 00000000000..79d521002cf --- /dev/null +++ b/package/libsndfile/0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch @@ -0,0 +1,45 @@ +From 0754562e13d2e63a248a1c82f90b30bc0ffe307c Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 10 Oct 2023 16:10:34 -0400 +Subject: [PATCH] mat4/mat5: fix int overflow in dataend calculation + +The clang sanitizer warns of a possible signed integer overflow when +calculating the `dataend` value in `mat4_read_header()`. + +``` +src/mat4.c:323:41: runtime error: signed integer overflow: 205 * -100663296 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:41 in +src/mat4.c:323:48: runtime error: signed integer overflow: 838860800 * 4 cannot be represented in type 'int' +SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/mat4.c:323:48 in +``` + +Cast the offending `rows` and `cols` ints to `sf_count_t` (the type of +`dataend` before performing the calculation, to avoid the issue. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/789 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/0754562e13d2e63a248a1c82f90b30bc0ffe307c +Signed-off-by: Peter Korsgaard +--- + src/mat4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mat4.c b/src/mat4.c +index 0b1b414b..575683ba 100644 +--- a/src/mat4.c ++++ b/src/mat4.c +@@ -320,7 +320,7 @@ mat4_read_header (SF_PRIVATE *psf) + psf->filelength - psf->dataoffset, psf->sf.channels * psf->sf.frames * psf->bytewidth) ; + } + else if ((psf->filelength - psf->dataoffset) > psf->sf.channels * psf->sf.frames * psf->bytewidth) +- psf->dataend = psf->dataoffset + rows * cols * psf->bytewidth ; ++ psf->dataend = psf->dataoffset + (sf_count_t) rows * (sf_count_t) cols * psf->bytewidth ; + + psf->datalength = psf->filelength - psf->dataoffset - psf->dataend ; + +-- +2.39.5 + diff --git a/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch b/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch new file mode 100644 index 00000000000..28d8cfff64a --- /dev/null +++ b/package/libsndfile/0002-au-avoid-int-overflow-while-calculating-data_end.patch @@ -0,0 +1,58 @@ +From a5afea2e24080ddf5c7b8e26c29cdbd94ae8226b Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:36:02 -0400 +Subject: [PATCH] au: avoid int overflow while calculating data_end + +At several points in au_read_header(), we calculate the functional end +of the data segment by adding the (int)au_fmt.dataoffset and the +(int)au_fmt.datasize. This can overflow the implicit int_32 return value +and cause undefined behavior. + +Instead, precalculate the value and assign it to a 64-bit +(sf_count_t)data_end variable. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/a5afea2e24080ddf5c7b8e26c29cdbd94ae8226b +Signed-off-by: Peter Korsgaard +--- + src/au.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/au.c b/src/au.c +index 62bd691d..f68f2587 100644 +--- a/src/au.c ++++ b/src/au.c +@@ -291,6 +291,7 @@ static int + au_read_header (SF_PRIVATE *psf) + { AU_FMT au_fmt ; + int marker, dword ; ++ sf_count_t data_end ; + + memset (&au_fmt, 0, sizeof (au_fmt)) ; + psf_binheader_readf (psf, "pm", 0, &marker) ; +@@ -317,14 +318,15 @@ au_read_header (SF_PRIVATE *psf) + return SFE_AU_EMBED_BAD_LEN ; + } ; + ++ data_end = (sf_count_t) au_fmt.dataoffset + (sf_count_t) au_fmt.datasize ; + if (psf->fileoffset > 0) +- { psf->filelength = au_fmt.dataoffset + au_fmt.datasize ; ++ { psf->filelength = data_end ; + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; + } +- else if (au_fmt.datasize == -1 || au_fmt.dataoffset + au_fmt.datasize == psf->filelength) ++ else if (au_fmt.datasize == -1 || data_end == psf->filelength) + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; +- else if (au_fmt.dataoffset + au_fmt.datasize < psf->filelength) +- { psf->filelength = au_fmt.dataoffset + au_fmt.datasize ; ++ else if (data_end < psf->filelength) ++ { psf->filelength = data_end ; + psf_log_printf (psf, " Data Size : %d\n", au_fmt.datasize) ; + } + else +-- +2.39.5 + diff --git a/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch b/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch new file mode 100644 index 00000000000..f50e4fb552f --- /dev/null +++ b/package/libsndfile/0003-avr-fix-int-overflow-in-avr_read_header.patch @@ -0,0 +1,34 @@ +From 2f8eece78cc8b4dce6c95b3045867f0936714db8 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:46:29 -0400 +Subject: [PATCH] avr: fix int overflow in avr_read_header() + +Pre-cast hdr.frames to sf_count_t, to provide the calculation with +enough numeric space to avoid an int-overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/2f8eece78cc8b4dce6c95b3045867f0936714db8 +Signed-off-by: Peter Korsgaard +--- + src/avr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/avr.c b/src/avr.c +index 6c78ff69..1bc1ffc9 100644 +--- a/src/avr.c ++++ b/src/avr.c +@@ -162,7 +162,7 @@ avr_read_header (SF_PRIVATE *psf) + psf->endian = SF_ENDIAN_BIG ; + + psf->dataoffset = AVR_HDR_SIZE ; +- psf->datalength = hdr.frames * (hdr.rez / 8) ; ++ psf->datalength = (sf_count_t) hdr.frames * (hdr.rez / 8) ; + + if (psf->fileoffset > 0) + psf->filelength = AVR_HDR_SIZE + psf->datalength ; +-- +2.39.5 + diff --git a/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch b/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch new file mode 100644 index 00000000000..c93b1006d7f --- /dev/null +++ b/package/libsndfile/0004-sds-fix-int-overflow-warning-in-sample-calculations.patch @@ -0,0 +1,61 @@ +From 2e9f71dd5d5c85b5bd4a0573d1fa05b5b89b33a7 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:54:21 -0400 +Subject: [PATCH] sds: fix int overflow warning in sample calculations + +The sds_*byte_read() functions compose their uint_32 sample buffers by +shifting 7bit samples into a 32bit wide buffer, and adding them +together. Because the 7bit samples are stored in 32bit ints, code +fuzzers become concerned that the addition operation can overflow and +cause undefined behavior. + +Instead, bitwise-OR the bytes together - which should accomplish the +same arithmetic operation, without risking an int-overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart + +Do the same for the 3byte and 4byte read functions. + +Upstream: https://github.com/libsndfile/libsndfile/commit/2e9f71dd5d5c85b5bd4a0573d1fa05b5b89b33a7 +Signed-off-by: Peter Korsgaard +--- + src/sds.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/sds.c b/src/sds.c +index 6bc76171..2a0f164c 100644 +--- a/src/sds.c ++++ b/src/sds.c +@@ -454,7 +454,7 @@ sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 2) +- { sample = arith_shift_left (ucptr [k], 25) + arith_shift_left (ucptr [k + 1], 18) ; ++ { sample = arith_shift_left (ucptr [k], 25) | arith_shift_left (ucptr [k + 1], 18) ; + psds->read_samples [k / 2] = (int) (sample - 0x80000000) ; + } ; + +@@ -498,7 +498,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 3) +- { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) ; ++ { sample = (((uint32_t) ucptr [k]) << 25) | (ucptr [k + 1] << 18) | (ucptr [k + 2] << 11) ; + psds->read_samples [k / 3] = (int) (sample - 0x80000000) ; + } ; + +@@ -542,7 +542,7 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) + + ucptr = psds->read_data + 5 ; + for (k = 0 ; k < 120 ; k += 4) +- { sample = (((uint32_t) ucptr [k]) << 25) + (ucptr [k + 1] << 18) + (ucptr [k + 2] << 11) + (ucptr [k + 3] << 4) ; ++ { sample = (((uint32_t) ucptr [k]) << 25) | (ucptr [k + 1] << 18) | (ucptr [k + 2] << 11) | (ucptr [k + 3] << 4) ; + psds->read_samples [k / 4] = (int) (sample - 0x80000000) ; + } ; + +-- +2.39.5 + diff --git a/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch b/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch new file mode 100644 index 00000000000..5efb6f2368d --- /dev/null +++ b/package/libsndfile/0005-aiff-fix-int-overflow-when-counting-header-elements.patch @@ -0,0 +1,39 @@ +From 187451dbd3c044f9a76b6c1d950d458de0103180 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 17:26:51 -0400 +Subject: [PATCH] aiff: fix int overflow when counting header elements + +aiff_read_basc_chunk() tries to count the AIFF header size by keeping +track of the bytes returned by psf_binheader_readf(). Though improbable, +it is technically possible for these added bytes to exceed the int-sized +`count` accumulator. + +Use a 64-bit sf_count_t type for `count`, to ensure that it always has +enough numeric space. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/187451dbd3c044f9a76b6c1d950d458de0103180 +Signed-off-by: Peter Korsgaard +--- + src/aiff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/aiff.c b/src/aiff.c +index ac3655e9..6d8f1bc8 100644 +--- a/src/aiff.c ++++ b/src/aiff.c +@@ -1702,7 +1702,7 @@ static int + aiff_read_basc_chunk (SF_PRIVATE * psf, int datasize) + { const char * type_str ; + basc_CHUNK bc ; +- int count ; ++ sf_count_t count ; + + count = psf_binheader_readf (psf, "E442", &bc.version, &bc.numBeats, &bc.rootNote) ; + count += psf_binheader_readf (psf, "E222", &bc.scaleType, &bc.sigNumerator, &bc.sigDenominator) ; +-- +2.39.5 + diff --git a/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch b/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch new file mode 100644 index 00000000000..b240a38e2f6 --- /dev/null +++ b/package/libsndfile/0006-ircam-fix-int-overflow-in-ircam_read_header.patch @@ -0,0 +1,82 @@ +From 5d5319300587e3d4a146332a2f48674ceb8a0257 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 17:43:02 -0400 +Subject: [PATCH] ircam: fix int overflow in ircam_read_header() + +When reading the IRCAM header, it is possible for the calculated +blockwidth to exceed the bounds of a signed int32. + +Use a 64bit sf_count_t to store the blockwidth. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/5d5319300587e3d4a146332a2f48674ceb8a0257 +Signed-off-by: Peter Korsgaard +--- + src/common.h | 2 +- + src/ircam.c | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/common.h b/src/common.h +index cd9ac8b0..01f6ae09 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -439,7 +439,7 @@ typedef struct sf_private_tag + sf_count_t datalength ; /* Length in bytes of the audio data. */ + sf_count_t dataend ; /* Offset to file tailer. */ + +- int blockwidth ; /* Size in bytes of one set of interleaved samples. */ ++ sf_count_t blockwidth ; /* Size in bytes of one set of interleaved samples. */ + int bytewidth ; /* Size in bytes of one sample (one channel). */ + + void *dither ; +diff --git a/src/ircam.c b/src/ircam.c +index 8e7cdba8..3d73ba44 100644 +--- a/src/ircam.c ++++ b/src/ircam.c +@@ -171,35 +171,35 @@ ircam_read_header (SF_PRIVATE *psf) + switch (encoding) + { case IRCAM_PCM_16 : + psf->bytewidth = 2 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_PCM_16 ; + break ; + + case IRCAM_PCM_32 : + psf->bytewidth = 4 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_PCM_32 ; + break ; + + case IRCAM_FLOAT : + psf->bytewidth = 4 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_FLOAT ; + break ; + + case IRCAM_ALAW : + psf->bytewidth = 1 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_ALAW ; + break ; + + case IRCAM_ULAW : + psf->bytewidth = 1 ; +- psf->blockwidth = psf->sf.channels * psf->bytewidth ; ++ psf->blockwidth = (sf_count_t) psf->sf.channels * psf->bytewidth ; + + psf->sf.format = SF_FORMAT_IRCAM | SF_FORMAT_ULAW ; + break ; +-- +2.39.5 + diff --git a/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch b/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch new file mode 100644 index 00000000000..ef4d6c0f044 --- /dev/null +++ b/package/libsndfile/0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch @@ -0,0 +1,48 @@ +From 39f2a4ffe5ab77d1cadc2057c2db046a9a3d5d65 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Wed, 11 Oct 2023 16:12:22 -0400 +Subject: [PATCH] mat4/mat5: fix int overflow when calculating blockwidth + +Pre-cast the components of the blockwidth calculation to sf_count_t to +avoid overflowing integers during calculation. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/39f2a4ffe5ab77d1cadc2057c2db046a9a3d5d65 +Signed-off-by: Peter Korsgaard +--- + src/mat4.c | 2 +- + src/mat5.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/mat4.c b/src/mat4.c +index 575683ba..9f046f0c 100644 +--- a/src/mat4.c ++++ b/src/mat4.c +@@ -104,7 +104,7 @@ mat4_open (SF_PRIVATE *psf) + + psf->container_close = mat4_close ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + switch (subformat) + { case SF_FORMAT_PCM_16 : +diff --git a/src/mat5.c b/src/mat5.c +index da5a6eca..20f0ea64 100644 +--- a/src/mat5.c ++++ b/src/mat5.c +@@ -114,7 +114,7 @@ mat5_open (SF_PRIVATE *psf) + + psf->container_close = mat5_close ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + switch (subformat) + { case SF_FORMAT_PCM_U8 : +-- +2.39.5 + diff --git a/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch b/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch new file mode 100644 index 00000000000..c9b6ff18f27 --- /dev/null +++ b/package/libsndfile/0008-common-fix-int-overflow-in-psf_binheader_readf.patch @@ -0,0 +1,181 @@ +From 6be8906740cdca067f12920bb4a63f728485aff0 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Mon, 16 Oct 2023 12:37:47 -0400 +Subject: [PATCH] common: fix int overflow in psf_binheader_readf() + +The psf_binheader_readf() function attempts to count and return the +number of bytes traversed in the header. During this accumulation, it is +possible to overflow the int-sized byte_count variable. + +Avoid this overflow by checking that the accumulated bytes do not exceed +INT_MAX and throwing an error if they do. This implies that files with +multi-gigabyte headers threaten to produce this error, but I imagine +those files don't really exist - and this error is better than the +undefined behavior which would have resulted previously. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/6be8906740cdca067f12920bb4a63f728485aff0 +Signed-off-by: Peter Korsgaard +--- + src/common.c | 36 ++++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/src/common.c b/src/common.c +index b877aa86..8982379a 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include + #if HAVE_UNISTD_H +@@ -990,6 +991,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + double *doubleptr ; + char c ; + int byte_count = 0, count = 0 ; ++ int read_bytes = 0 ; + + if (! format) + return psf_ftell (psf) ; +@@ -998,6 +1000,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + + while ((c = *format++)) + { ++ read_bytes = 0 ; + if (psf->header.indx + 16 >= psf->header.len && psf_bump_header_allocation (psf, 16)) + break ; + +@@ -1014,7 +1017,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, ucptr, sizeof (int)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (int)) ; + *intptr = GET_MARKER (ucptr) ; + break ; + +@@ -1022,7 +1025,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, sixteen_bytes, sizeof (sixteen_bytes)) ; ++ read_bytes = header_read (psf, sixteen_bytes, sizeof (sixteen_bytes)) ; + { int k ; + intdata = 0 ; + for (k = 0 ; k < 16 ; k++) +@@ -1034,14 +1037,14 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '1' : + charptr = va_arg (argptr, char*) ; + *charptr = 0 ; +- byte_count += header_read (psf, charptr, sizeof (char)) ; ++ read_bytes = header_read (psf, charptr, sizeof (char)) ; + break ; + + case '2' : /* 2 byte value with the current endian-ness */ + shortptr = va_arg (argptr, unsigned short*) ; + *shortptr = 0 ; + ucptr = (unsigned char*) shortptr ; +- byte_count += header_read (psf, ucptr, sizeof (short)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (short)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *shortptr = GET_BE_SHORT (ucptr) ; + else +@@ -1051,7 +1054,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '3' : /* 3 byte value with the current endian-ness */ + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; +- byte_count += header_read (psf, sixteen_bytes, 3) ; ++ read_bytes = header_read (psf, sixteen_bytes, 3) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *intptr = GET_BE_3BYTE (sixteen_bytes) ; + else +@@ -1062,7 +1065,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + intptr = va_arg (argptr, unsigned int*) ; + *intptr = 0 ; + ucptr = (unsigned char*) intptr ; +- byte_count += header_read (psf, ucptr, sizeof (int)) ; ++ read_bytes = header_read (psf, ucptr, sizeof (int)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *intptr = psf_get_be32 (ucptr, 0) ; + else +@@ -1072,7 +1075,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case '8' : /* 8 byte value with the current endian-ness */ + countptr = va_arg (argptr, sf_count_t *) ; + *countptr = 0 ; +- byte_count += header_read (psf, sixteen_bytes, 8) ; ++ read_bytes = header_read (psf, sixteen_bytes, 8) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + countdata = psf_get_be64 (sixteen_bytes, 0) ; + else +@@ -1083,7 +1086,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'f' : /* Float conversion */ + floatptr = va_arg (argptr, float *) ; + *floatptr = 0.0 ; +- byte_count += header_read (psf, floatptr, sizeof (float)) ; ++ read_bytes = header_read (psf, floatptr, sizeof (float)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *floatptr = float32_be_read ((unsigned char*) floatptr) ; + else +@@ -1093,7 +1096,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'd' : /* double conversion */ + doubleptr = va_arg (argptr, double *) ; + *doubleptr = 0.0 ; +- byte_count += header_read (psf, doubleptr, sizeof (double)) ; ++ read_bytes = header_read (psf, doubleptr, sizeof (double)) ; + if (psf->rwf_endian == SF_ENDIAN_BIG) + *doubleptr = double64_be_read ((unsigned char*) doubleptr) ; + else +@@ -1117,7 +1120,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + charptr = va_arg (argptr, char*) ; + count = va_arg (argptr, size_t) ; + memset (charptr, 0, count) ; +- byte_count += header_read (psf, charptr, count) ; ++ read_bytes = header_read (psf, charptr, count) ; + break ; + + case 'G' : +@@ -1128,7 +1131,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + if (psf->header.indx + count >= psf->header.len && psf_bump_header_allocation (psf, count)) + break ; + +- byte_count += header_gets (psf, charptr, count) ; ++ read_bytes = header_gets (psf, charptr, count) ; + break ; + + case 'z' : +@@ -1152,7 +1155,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + case 'j' : /* Seek to position from current position. */ + count = va_arg (argptr, size_t) ; + header_seek (psf, count, SEEK_CUR) ; +- byte_count += count ; ++ read_bytes = count ; + break ; + + case '!' : /* Clear buffer, forcing re-read. */ +@@ -1164,8 +1167,17 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...) + psf->error = SFE_INTERNAL ; + break ; + } ; ++ ++ if (read_bytes > 0 && byte_count > (INT_MAX - read_bytes)) ++ { psf_log_printf (psf, "Header size exceeds INT_MAX. Aborting.", c) ; ++ psf->error = SFE_INTERNAL ; ++ break ; ++ } else ++ { byte_count += read_bytes ; + } ; + ++ } ; /*end while*/ ++ + va_end (argptr) ; + + return byte_count ; +-- +2.39.5 + diff --git a/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch b/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch new file mode 100644 index 00000000000..266fa661b1f --- /dev/null +++ b/package/libsndfile/0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch @@ -0,0 +1,233 @@ +From 71565532463b22c24824101845a533a67bff4c9c Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Thu, 19 Oct 2023 14:07:19 -0400 +Subject: [PATCH] nms_adpcm: fix int overflow in signal estimate + +It is possible (though functionally incorrect) for the signal estimate +calculation in nms_adpcm_update() to overflow the int value of s_e, +resulting in undefined behavior. + +Since adpcm state signal values are never practically larger than +16 bits, use smaller numeric sizes throughout the file to avoid the +overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Authored-by: Arthur Taylor +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/71565532463b22c24824101845a533a67bff4c9c +[Peter: adjust for 1.2.2] +Signed-off-by: Peter Korsgaard +--- + src/nms_adpcm.c | 81 ++++++++++++++++++++++++------------------------- + 1 file changed, 40 insertions(+), 41 deletions(-) + +diff --git a/src/nms_adpcm.c b/src/nms_adpcm.c +index 5999be1f..dca85f0b 100644 +--- a/src/nms_adpcm.c ++++ b/src/nms_adpcm.c +@@ -48,36 +48,36 @@ + /* Variable names from ITU G.726 spec */ + struct nms_adpcm_state + { /* Log of the step size multiplier. Operated on by codewords. */ +- int yl ; ++ short yl ; + + /* Quantizer step size multiplier. Generated from yl. */ +- int y ; ++ short y ; + + /* Coefficents of the pole predictor */ +- int a [2] ; ++ short a [2] ; + + /* Coefficents of the zero predictor */ +- int b [6] ; ++ short b [6] ; + + /* Previous quantized deltas (multiplied by 2^14) */ +- int d_q [7] ; ++ short d_q [7] ; + + /* d_q [x] + s_ez [x], used by the pole-predictor for signs only. */ +- int p [3] ; ++ short p [3] ; + + /* Previous reconstructed signal values. */ +- int s_r [2] ; ++ short s_r [2] ; + + /* Zero predictor components of the signal estimate. */ +- int s_ez ; ++ short s_ez ; + + /* Signal estimate, (including s_ez). */ +- int s_e ; ++ short s_e ; + + /* The most recent codeword (enc:generated, dec:inputted) */ +- int Ik ; ++ char Ik ; + +- int parity ; ++ char parity ; + + /* + ** Offset into code tables for the bitrate. +@@ -109,7 +109,7 @@ typedef struct + } NMS_ADPCM_PRIVATE ; + + /* Pre-computed exponential interval used in the antilog approximation. */ +-static unsigned int table_expn [] = ++static unsigned short table_expn [] = + { 0x4000, 0x4167, 0x42d5, 0x444c, 0x45cb, 0x4752, 0x48e2, 0x4a7a, + 0x4c1b, 0x4dc7, 0x4f7a, 0x5138, 0x52ff, 0x54d1, 0x56ac, 0x5892, + 0x5a82, 0x5c7e, 0x5e84, 0x6096, 0x62b4, 0x64dd, 0x6712, 0x6954, +@@ -117,21 +117,21 @@ static unsigned int table_expn [] = + } ; + + /* Table mapping codewords to scale factor deltas. */ +-static int table_scale_factor_step [] = ++static short table_scale_factor_step [] = + { 0x0, 0x0, 0x0, 0x0, 0x4b0, 0x0, 0x0, 0x0, /* 2-bit */ + -0x3c, 0x0, 0x90, 0x0, 0x2ee, 0x0, 0x898, 0x0, /* 3-bit */ + -0x30, 0x12, 0x6b, 0xc8, 0x188, 0x2e0, 0x551, 0x1150, /* 4-bit */ + } ; + + /* Table mapping codewords to quantized delta interval steps. */ +-static unsigned int table_step [] = ++static unsigned short table_step [] = + { 0x73F, 0, 0, 0, 0x1829, 0, 0, 0, /* 2-bit */ + 0x3EB, 0, 0xC18, 0, 0x1581, 0, 0x226E, 0, /* 3-bit */ + 0x20C, 0x635, 0xA83, 0xF12, 0x1418, 0x19E3, 0x211A, 0x2BBA, /* 4-bit */ + } ; + + /* Binary search lookup table for quantizing using table_step. */ +-static int table_step_search [] = ++static short table_step_search [] = + { 0, 0x1F6D, 0, -0x1F6D, 0, 0, 0, 0, /* 2-bit */ + 0x1008, 0x1192, 0, -0x219A, 0x1656, -0x1656, 0, 0, /* 3-bit */ + 0x872, 0x1277, -0x8E6, -0x232B, 0xD06, -0x17D7, -0x11D3, 0, /* 4-bit */ +@@ -179,23 +179,23 @@ static sf_count_t nms_adpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) + ** Maps [1,20480] to [1,1024] in an exponential relationship. This is + ** approximately ret = b^exp where b = e^(ln(1024)/ln(20480)) ~= 1.0003385 + */ +-static inline int +-nms_adpcm_antilog (int exp) +-{ int ret ; ++static inline short ++nms_adpcm_antilog (short exp) ++{ int_fast32_t r ; + +- ret = 0x1000 ; +- ret += (((exp & 0x3f) * 0x166b) >> 12) ; +- ret *= table_expn [(exp & 0x7c0) >> 6] ; +- ret >>= (26 - (exp >> 11)) ; ++ r = 0x1000 ; ++ r += (((int_fast32_t) (exp & 0x3f) * 0x166b) >> 12) ; ++ r *= table_expn [(exp & 0x7c0) >> 6] ; ++ r >>= (26 - (exp >> 11)) ; + +- return ret ; ++ return (short) r ; + } /* nms_adpcm_antilog */ + + static void + nms_adpcm_update (struct nms_adpcm_state *s) + { /* Variable names from ITU G.726 spec */ +- int a1ul ; +- int fa1 ; ++ short a1ul, fa1 ; ++ int_fast32_t se ; + int i ; + + /* Decay and Modify the scale factor in the log domain based on the codeword. */ +@@ -222,7 +222,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + else if (fa1 > 256) + fa1 = 256 ; + +- s->a [0] = (0xff * s->a [0]) >> 8 ; ++ s->a [0] = (s->a [0] * 0xff) >> 8 ; + if (s->p [0] != 0 && s->p [1] != 0 && ((s->p [0] ^ s->p [1]) < 0)) + s->a [0] -= 192 ; + else +@@ -230,7 +230,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + fa1 = -fa1 ; + } + +- s->a [1] = fa1 + ((0xfe * s->a [1]) >> 8) ; ++ s->a [1] = fa1 + ((s->a [1] * 0xfe) >> 8) ; + if (s->p [0] != 0 && s->p [2] != 0 && ((s->p [0] ^ s->p [2]) < 0)) + s->a [1] -= 128 ; + else +@@ -250,19 +250,18 @@ nms_adpcm_update (struct nms_adpcm_state *s) + s->a [0] = a1ul ; + } ; + +- /* Compute the zero predictor estimate. Rotate past deltas too. */ +- s->s_ez = 0 ; ++ /* Compute the zero predictor estimate and rotate past deltas. */ ++ se = 0 ; + for (i = 5 ; i >= 0 ; i--) +- { s->s_ez += s->d_q [i] * s->b [i] ; ++ { se += (int_fast32_t) s->d_q [i] * s->b [i] ; + s->d_q [i + 1] = s->d_q [i] ; + } ; ++ s->s_ez = se >> 14 ; + +- /* Compute the signal estimate. */ +- s->s_e = s->a [0] * s->s_r [0] + s->a [1] * s->s_r [1] + s->s_ez ; +- +- /* Return to scale */ +- s->s_ez >>= 14 ; +- s->s_e >>= 14 ; ++ /* Complete the signal estimate. */ ++ se += (int_fast32_t) s->a [0] * s->s_r [0] ; ++ se += (int_fast32_t) s->a [1] * s->s_r [1] ; ++ s->s_e = se >> 14 ; + + /* Rotate members to prepare for next iteration. */ + s->s_r [1] = s->s_r [0] ; +@@ -274,7 +273,7 @@ nms_adpcm_update (struct nms_adpcm_state *s) + static int16_t + nms_adpcm_reconstruct_sample (struct nms_adpcm_state *s, uint8_t I) + { /* Variable names from ITU G.726 spec */ +- int dqx ; ++ int_fast32_t dqx ; + + /* + ** The ordering of the 12-bit right-shift is a precision loss. It agrees +@@ -308,17 +307,17 @@ nms_adpcm_codec_init (struct nms_adpcm_state *s, enum nms_enc_type type) + /* + ** nms_adpcm_encode_sample() + ** +-** Encode a linear 16-bit pcm sample into a 2,3, or 4 bit NMS-ADPCM codeword ++** Encode a linear 16-bit pcm sample into a 2, 3, or 4 bit NMS-ADPCM codeword + ** using and updating the predictor state. + */ + static uint8_t + nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) + { /* Variable names from ITU G.726 spec */ +- int d ; ++ int_fast32_t d ; + uint8_t I ; + + /* Down scale the sample from 16 => ~14 bits. */ +- sl = (sl * 0x1fdf) / 0x7fff ; ++ sl = ((int_fast32_t) sl * 0x1fdf) / 0x7fff ; + + /* Compute estimate, and delta from actual value */ + nms_adpcm_update (s) ; +@@ -407,7 +406,7 @@ nms_adpcm_encode_sample (struct nms_adpcm_state *s, int16_t sl) + */ + static int16_t + nms_adpcm_decode_sample (struct nms_adpcm_state *s, uint8_t I) +-{ int sl ; ++{ int_fast32_t sl ; + + nms_adpcm_update (s) ; + sl = nms_adpcm_reconstruct_sample (s, I) ; +-- +2.39.5 + diff --git a/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch b/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch new file mode 100644 index 00000000000..0763a53de40 --- /dev/null +++ b/package/libsndfile/0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch @@ -0,0 +1,39 @@ +From 3fb27a2c93a11dd3321b0b13140d89ebb39060cb Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 11:50:53 -0400 +Subject: [PATCH] nms_adpcm: fix int overflow in sf.frames calc + +When calculating sf.frames from the blocks_total PNMS variable, it is +theoretically possible to overflow the blocks_total int boundaries, +leading to undefined behavior. + +Cast blocks_total to a long-sized sf_count_t before the calculation, to +provide it with enough numeric space and because that is the final +typing regardless. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/3fb27a2c93a11dd3321b0b13140d89ebb39060cb +Signed-off-by: Peter Korsgaard +--- + src/nms_adpcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nms_adpcm.c b/src/nms_adpcm.c +index dca85f0b..61d171c7 100644 +--- a/src/nms_adpcm.c ++++ b/src/nms_adpcm.c +@@ -1090,7 +1090,7 @@ nms_adpcm_init (SF_PRIVATE *psf) + else + pnms->blocks_total = psf->datalength / (pnms->shortsperblock * sizeof (short)) ; + +- psf->sf.frames = pnms->blocks_total * NMS_SAMPLES_PER_BLOCK ; ++ psf->sf.frames = (sf_count_t) pnms->blocks_total * NMS_SAMPLES_PER_BLOCK ; + psf->codec_close = nms_adpcm_close ; + psf->seek = nms_adpcm_seek ; + +-- +2.39.5 + diff --git a/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch b/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch new file mode 100644 index 00000000000..aa30090a690 --- /dev/null +++ b/package/libsndfile/0011-pcm-fix-int-overflow-in-pcm_init.patch @@ -0,0 +1,35 @@ +From 09f8f8d5544d98a5a2d28504c02314a2a816ac37 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 11:57:23 -0400 +Subject: [PATCH] pcm: fix int overflow in pcm_init() + +Cast the int-sized bytewidth variable to a long-sized sf_count_t type +prior to calculating the blockwidth, to provide the calculation with +enough numeric space and sf_count_t is the final typing regardless. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/09f8f8d5544d98a5a2d28504c02314a2a816ac37 +Signed-off-by: Peter Korsgaard +--- + src/pcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pcm.c b/src/pcm.c +index bdf46183..a42e4868 100644 +--- a/src/pcm.c ++++ b/src/pcm.c +@@ -127,7 +127,7 @@ pcm_init (SF_PRIVATE *psf) + return SFE_INTERNAL ; + } ; + +- psf->blockwidth = psf->bytewidth * psf->sf.channels ; ++ psf->blockwidth = (sf_count_t) psf->bytewidth * psf->sf.channels ; + + if ((SF_CODEC (psf->sf.format)) == SF_FORMAT_PCM_S8) + chars = SF_CHARS_SIGNED ; +-- +2.39.5 + diff --git a/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch b/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch new file mode 100644 index 00000000000..8d399862607 --- /dev/null +++ b/package/libsndfile/0012-rf64-fix-int-overflow-in-rf64_read_header.patch @@ -0,0 +1,40 @@ +From 49704025956f03751d3436a0bb42287cd7f434b6 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 12:01:00 -0400 +Subject: [PATCH] rf64: fix int overflow in rf64_read_header() + +When checking for mismatches between the filelength and riff_size, it is +possible to overflow the temporary riff_size value used in the +comparison by adding a static offset; which is probably fine, but it is +offensive to overflow fuzzers. + +Since filelength is always a positive value, simply move the offset to +the other side of the comparison operator as a negative value, avoid the +possibility of an overflow. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/49704025956f03751d3436a0bb42287cd7f434b6 +Signed-off-by: Peter Korsgaard +--- + src/rf64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rf64.c b/src/rf64.c +index 123db445..c60399fb 100644 +--- a/src/rf64.c ++++ b/src/rf64.c +@@ -242,7 +242,7 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) + } ; + } ; + +- if (psf->filelength != riff_size + 8) ++ if (psf->filelength - 8 != riff_size) + psf_log_printf (psf, " Riff size : %D (should be %D)\n", riff_size, psf->filelength - 8) ; + else + psf_log_printf (psf, " Riff size : %D\n", riff_size) ; +-- +2.39.5 + diff --git a/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch b/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch new file mode 100644 index 00000000000..ee324158c48 --- /dev/null +++ b/package/libsndfile/0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch @@ -0,0 +1,55 @@ +From 9a829113c88a51e57c1e46473e90609e4b7df151 Mon Sep 17 00:00:00 2001 +From: Alex Stewart +Date: Tue, 17 Oct 2023 12:19:12 -0400 +Subject: [PATCH] ima_adpcm: fix int overflow in ima_reader_init() + +When calculating sf.frames, pre-cast samplesperblock to sf_count_t, to +provide the calculation with enough numeric space to avoid overflows. + +Other changes in this commit are syntactic, and only to satisfy the git +pre-commit syntax checker. + +CVE: CVE-2022-33065 +Fixes: https://github.com/libsndfile/libsndfile/issues/833 + +Signed-off-by: Alex Stewart +Upstream: https://github.com/libsndfile/libsndfile/commit/9a829113c88a51e57c1e46473e90609e4b7df151 +Signed-off-by: Peter Korsgaard +--- + src/ima_adpcm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/ima_adpcm.c b/src/ima_adpcm.c +index bc61f4e5..7464d1b3 100644 +--- a/src/ima_adpcm.c ++++ b/src/ima_adpcm.c +@@ -187,7 +187,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) + ** to avoid having to branch when pulling apart the nibbles. + */ + count = ((samplesperblock - 2) | 7) + 2 ; +- pimasize = sizeof (IMA_ADPCM_PRIVATE) + psf->sf.channels * (blockalign + samplesperblock + sizeof(short) * count) ; ++ pimasize = sizeof (IMA_ADPCM_PRIVATE) + psf->sf.channels * (blockalign + samplesperblock + sizeof (short) * count) ; + + if (! (pima = calloc (1, pimasize))) + return SFE_MALLOC_FAILED ; +@@ -238,7 +238,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) + case SF_FORMAT_AIFF : + psf_log_printf (psf, "still need to check block count\n") ; + pima->decode_block = aiff_ima_decode_block ; +- psf->sf.frames = pima->samplesperblock * pima->blocks / pima->channels ; ++ psf->sf.frames = (sf_count_t) pima->samplesperblock * pima->blocks / pima->channels ; + break ; + + default : +@@ -391,7 +391,7 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) + static int + wavlike_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima) + { int chan, k, predictor, blockindx, indx, indxstart, diff ; +- short step, bytecode, stepindx [2] = { 0 }; ++ short step, bytecode, stepindx [2] = { 0 } ; + + pima->blockcount ++ ; + pima->samplecount = 0 ; +-- +2.39.5 + diff --git a/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch b/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch new file mode 100644 index 00000000000..dd9f1578114 --- /dev/null +++ b/package/libsndfile/0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch @@ -0,0 +1,411 @@ +From 4755f5bd7854611d92ad0f1295587b439f9950ba Mon Sep 17 00:00:00 2001 +From: Arthur Taylor +Date: Fri, 15 Nov 2024 19:46:53 -0800 +Subject: [PATCH] src/ogg: better error checking for vorbis. Fixes #1035 + +Upstream: https://github.com/libsndfile/libsndfile/commit/4755f5bd7854611d92ad0f1295587b439f9950ba +Signed-off-by: Peter Korsgaard +--- + src/ogg.c | 12 ++-- + src/ogg_opus.c | 17 +++-- + src/ogg_vorbis.c | 170 ++++++++++++++++++++++++++--------------------- + 3 files changed, 114 insertions(+), 85 deletions(-) + +diff --git a/src/ogg.c b/src/ogg.c +index 529941af..e2d679d4 100644 +--- a/src/ogg.c ++++ b/src/ogg.c +@@ -211,12 +211,16 @@ ogg_read_first_page (SF_PRIVATE *psf, OGG_PRIVATE *odata) + + int + ogg_write_page (SF_PRIVATE *psf, ogg_page *page) +-{ int bytes ; ++{ int n ; + +- bytes = psf_fwrite (page->header, 1, page->header_len, psf) ; +- bytes += psf_fwrite (page->body, 1, page->body_len, psf) ; ++ n = psf_fwrite (page->header, 1, page->header_len, psf) ; ++ if (n == page->header_len) ++ n += psf_fwrite (page->body, 1, page->body_len, psf) ; + +- return bytes == page->header_len + page->body_len ; ++ if (n != page->body_len + page->header_len) ++ return -1 ; ++ ++ return n ; + } /* ogg_write_page */ + + sf_count_t +diff --git a/src/ogg_opus.c b/src/ogg_opus.c +index 511653ec..e01224b9 100644 +--- a/src/ogg_opus.c ++++ b/src/ogg_opus.c +@@ -827,15 +827,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + + /* The first page MUST only contain the header, so flush it out now */ + ogg_stream_packetin (&odata->ostream, &op) ; +- for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) +- { if (! (nn = ogg_write_page (psf, &odata->opage))) ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ { nn = ogg_write_page (psf, &odata->opage) ; ++ if (nn < 0) + { psf_log_printf (psf, "Opus : Failed to write header!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; +- } ++ } ; + + /* + ** Metadata Tags (manditory) +@@ -850,15 +851,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + vorbiscomment_write_tags (psf, &op, &opustags_ident, opus_get_version_string (), - (OGG_OPUS_COMMENT_PAD)) ; + op.packetno = 2 ; + ogg_stream_packetin (&odata->ostream, &op) ; +- for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; ) +- { if (! (nn = ogg_write_page (psf, &odata->opage))) ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ { nn = ogg_write_page (psf, &odata->opage) ; ++ if (nn < 0) + { psf_log_printf (psf, "Opus : Failed to write comments!\n") ; + if (psf->error) + return psf->error ; + return SFE_INTERNAL ; + } ; + psf->dataoffset += nn ; +- } ++ } ; + + return 0 ; + } /* ogg_opus_write_header */ +@@ -1132,7 +1134,8 @@ ogg_opus_write_out (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus) + if (nbytes > 0) + { oopus->u.encode.last_segments -= ogg_page_segments (&odata->opage) ; + oopus->pg_pos = oopus->pkt_pos ; +- ogg_write_page (psf, &odata->opage) ; ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + } + else + break ; +diff --git a/src/ogg_vorbis.c b/src/ogg_vorbis.c +index add12396..fae252ca 100644 +--- a/src/ogg_vorbis.c ++++ b/src/ogg_vorbis.c +@@ -82,28 +82,6 @@ + /* How many seconds in the future to not bother bisection searching for. */ + #define VORBIS_SEEK_THRESHOLD 2 + +-typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ; +- +-static int vorbis_read_header (SF_PRIVATE *psf) ; +-static int vorbis_write_header (SF_PRIVATE *psf, int calc_length) ; +-static int vorbis_close (SF_PRIVATE *psf) ; +-static int vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; +-static int vorbis_byterate (SF_PRIVATE *psf) ; +-static int vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ; +-static int vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ; +-static int vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ; +-static sf_count_t vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; +-static sf_count_t vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; +-static sf_count_t vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; +-static sf_count_t vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; +-static int vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ; +- + typedef struct + { int id ; + const char *name ; +@@ -145,6 +123,45 @@ typedef struct + sf_count_t last_page ; + } VORBIS_PRIVATE ; + ++typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ; ++ ++static int vorbis_read_header (SF_PRIVATE *psf) ; ++static int vorbis_write_header (SF_PRIVATE *psf, int calc_length) ; ++static int vorbis_close (SF_PRIVATE *psf) ; ++static int vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ; ++static int vorbis_byterate (SF_PRIVATE *psf) ; ++static int vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ; ++static int vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ; ++static int vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ; ++static sf_count_t vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ; ++static sf_count_t vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ; ++static sf_count_t vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ; ++static sf_count_t vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ; ++static int vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) ; ++static int vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ; ++static void vorbis_log_error (SF_PRIVATE *psf, int error) ; ++ ++ ++static void ++vorbis_log_error(SF_PRIVATE *psf, int error) { ++ switch (error) ++ { case 0: return; ++ case OV_EIMPL: psf->error = SFE_UNIMPLEMENTED ; break ; ++ case OV_ENOTVORBIS: psf->error = SFE_MALFORMED_FILE ; break ; ++ case OV_EBADHEADER: psf->error = SFE_MALFORMED_FILE ; break ; ++ case OV_EVERSION: psf->error = SFE_UNSUPPORTED_ENCODING ; break ; ++ case OV_EFAULT: ++ case OV_EINVAL: ++ default: psf->error = SFE_INTERNAL ; ++ } ; ++} ; ++ + static int + vorbis_read_header (SF_PRIVATE *psf) + { OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; +@@ -380,7 +397,6 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + { ogg_packet header ; + ogg_packet header_comm ; + ogg_packet header_code ; +- int result ; + + vorbis_analysis_headerout (&vdata->vdsp, &vdata->vcomment, &header, &header_comm, &header_code) ; + ogg_stream_packetin (&odata->ostream, &header) ; /* automatically placed in its own page */ +@@ -390,9 +406,9 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length)) + /* This ensures the actual + * audio data will start on a new page, as per spec + */ +- while ((result = ogg_stream_flush (&odata->ostream, &odata->opage)) != 0) +- { ogg_write_page (psf, &odata->opage) ; +- } ; ++ while (ogg_stream_flush (&odata->ostream, &odata->opage)) ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + } + + return 0 ; +@@ -402,6 +418,7 @@ static int + vorbis_close (SF_PRIVATE *psf) + { OGG_PRIVATE* odata = psf->container_data ; + VORBIS_PRIVATE *vdata = psf->codec_data ; ++ int ret = 0 ; + + if (odata == NULL || vdata == NULL) + return 0 ; +@@ -412,34 +429,14 @@ vorbis_close (SF_PRIVATE *psf) + if (psf->file.mode == SFM_WRITE) + { + if (psf->write_current <= 0) +- vorbis_write_header (psf, 0) ; ++ ret = vorbis_write_header (psf, 0) ; + +- vorbis_analysis_wrote (&vdata->vdsp, 0) ; +- while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) +- { +- +- /* analysis, assume we want to use bitrate management */ +- vorbis_analysis (&vdata->vblock, NULL) ; +- vorbis_bitrate_addblock (&vdata->vblock) ; +- +- while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) +- { /* weld the packet into the bitstream */ +- ogg_stream_packetin (&odata->ostream, &odata->opacket) ; +- +- /* write out pages (if any) */ +- while (!odata->eos) +- { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; +- if (result == 0) break ; +- ogg_write_page (psf, &odata->opage) ; +- +- /* this could be set above, but for illustrative purposes, I do +- it here (to show that vorbis does know where the stream ends) */ +- +- if (ogg_page_eos (&odata->opage)) odata->eos = 1 ; +- } +- } +- } +- } ++ if (ret == 0) ++ { /* A write of zero samples tells Vorbis the stream is done and to ++ flush. */ ++ ret = vorbis_write_samples (psf, odata, vdata, 0) ; ++ } ; ++ } ; + + /* ogg_page and ogg_packet structs always point to storage in + libvorbis. They are never freed or manipulated directly */ +@@ -449,7 +446,7 @@ vorbis_close (SF_PRIVATE *psf) + vorbis_comment_clear (&vdata->vcomment) ; + vorbis_info_clear (&vdata->vinfo) ; + +- return 0 ; ++ return ret ; + } /* vorbis_close */ + + int +@@ -688,33 +685,40 @@ vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens) + /*============================================================================== + */ + +-static void ++static int + vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) +-{ +- vorbis_analysis_wrote (&vdata->vdsp, in_frames) ; ++{ int ret ; ++ ++ if ((ret = vorbis_analysis_wrote (&vdata->vdsp, in_frames)) != 0) ++ return ret ; + + /* + ** Vorbis does some data preanalysis, then divvies up blocks for + ** more involved (potentially parallel) processing. Get a single + ** block for encoding now. + */ +- while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1) ++ while ((ret = vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock)) == 1) + { + /* analysis, assume we want to use bitrate management */ +- vorbis_analysis (&vdata->vblock, NULL) ; +- vorbis_bitrate_addblock (&vdata->vblock) ; ++ if ((ret = vorbis_analysis (&vdata->vblock, NULL)) != 0) ++ return ret ; ++ if ((ret = vorbis_bitrate_addblock (&vdata->vblock)) != 0) ++ return ret ; + +- while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) ++ while ((ret = vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) == 1) + { + /* weld the packet into the bitstream */ +- ogg_stream_packetin (&odata->ostream, &odata->opacket) ; ++ if ((ret = ogg_stream_packetin (&odata->ostream, &odata->opacket)) != 0) ++ return ret ; + + /* write out pages (if any) */ + while (!odata->eos) +- { int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ; +- if (result == 0) ++ { ret = ogg_stream_pageout (&odata->ostream, &odata->opage) ; ++ if (ret == 0) + break ; +- ogg_write_page (psf, &odata->opage) ; ++ ++ if (ogg_write_page (psf, &odata->opage) < 0) ++ return -1 ; + + /* This could be set above, but for illustrative purposes, I do + ** it here (to show that vorbis does know where the stream ends) */ +@@ -722,16 +726,22 @@ vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata + odata->eos = 1 ; + } ; + } ; ++ if (ret != 0) ++ return ret ; + } ; ++ if (ret != 0) ++ return ret ; + + vdata->gp += in_frames ; ++ ++ return 0 ; + } /* vorbis_write_data */ + + + static sf_count_t + vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) + { +- int i, m, j = 0 ; ++ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -740,14 +750,17 @@ vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 32767.0f ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames))) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_s */ + + static sf_count_t + vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -756,14 +769,17 @@ vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames))) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_i */ + + static sf_count_t + vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -772,14 +788,17 @@ vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = ptr [j++] ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_f */ + + static sf_count_t + vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) +-{ int i, m, j = 0 ; ++{ int i, m, j = 0, ret ; + OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ; + VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ; + int in_frames = lens / psf->sf.channels ; +@@ -788,7 +807,10 @@ vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens) + for (m = 0 ; m < psf->sf.channels ; m++) + buffer [m][i] = (float) ptr [j++] ; + +- vorbis_write_samples (psf, odata, vdata, in_frames) ; ++ if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0) ++ { vorbis_log_error (psf, ret) ; ++ return 0 ; ++ } ; + + return lens ; + } /* vorbis_write_d */ +@@ -884,7 +906,7 @@ vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) + return 0 ; + + /* Search for a position a half large-block before our target. As Vorbis is +- ** lapped, every sample position come from two blocks, the "left" half of ++ ** lapped, every sample position comes from two blocks, the "left" half of + ** one block and the "right" half of the previous block. The granule + ** position of an Ogg page of a Vorbis stream is the sample offset of the + ** last finished sample in the stream that can be decoded from a page. A +-- +2.39.5 + diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index dc23d94cb15..4caba72c4fe 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -13,6 +13,24 @@ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VALID = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf +# 0001-mat4-mat5-fix-int-overflow-in-dataend-calculation.patch +# 0002-au-avoid-int-overflow-while-calculating-data_end.patch +# 0003-avr-fix-int-overflow-in-avr_read_header.patch +# 0004-sds-fix-int-overflow-warning-in-sample-calculations.patch +# 0005-aiff-fix-int-overflow-when-counting-header-elements.patch +# 0006-ircam-fix-int-overflow-in-ircam_read_header.patch +# 0007-mat4-mat5-fix-int-overflow-when-calculating-blockwid.patch +# 0008-common-fix-int-overflow-in-psf_binheader_readf.patch +# 0009-nms_adpcm-fix-int-overflow-in-signal-estimate.patch +# 0010-nms_adpcm-fix-int-overflow-in-sf.frames-calc.patch +# 0011-pcm-fix-int-overflow-in-pcm_init.patch +# 0012-rf64-fix-int-overflow-in-rf64_read_header.patch +# 0013-ima_adpcm-fix-int-overflow-in-ima_reader_init.patch +LIBSNDFILE_IGNORE_CVES += CVE-2022-33065 + +# 0014-src-ogg-better-error-checking-for-vorbis.-Fixes-1035.patch +LIBSNDFILE_IGNORE_CVES += CVE-2024-50612 + LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash index b18a682ccf7..97259ae93f8 100644 --- a/package/libsolv/libsolv.hash +++ b/package/libsolv/libsolv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b382bba4196b19c36eb34e0ef02546c0b922be601c6f73390c9ab643895b656a libsolv-0.7.25.tar.gz +sha256 ce4aa2f0e3c5c9ab99dced6a1810af3f670f1b98892394edc68ccabe7b272133 libsolv-0.7.30.tar.gz sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 2a9f1bf208b..2317d3e663e 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOLV_VERSION = 0.7.25 +LIBSOLV_VERSION = 0.7.30 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk index bebf1d43b5d..f12d0af8c07 100644 --- a/package/libsoundtouch/libsoundtouch.mk +++ b/package/libsoundtouch/libsoundtouch.mk @@ -4,7 +4,6 @@ # ################################################################################ -# REG LIBSOUNDTOUCH_VERSION = 2.3.3 LIBSOUNDTOUCH_SOURCE = soundtouch-$(LIBSOUNDTOUCH_VERSION).tar.gz LIBSOUNDTOUCH_SITE = https://www.surina.net/soundtouch diff --git a/package/libsoup3/libsoup3.hash b/package/libsoup3/libsoup3.hash index 139771a11e1..23af3479036 100644 --- a/package/libsoup3/libsoup3.hash +++ b/package/libsoup3/libsoup3.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.1.sha256sum -sha256 c1d7cfb89832d35c271f37d544f2cfe21fa60ae9faad4a7ac58996ae4031f7ba libsoup-3.5.1.tar.xz +# From https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.1.sha256sum +sha256 ceb1f1aa2bdd73b2cd8159d3998c96c55ef097ef15e4b4f36029209fa18af838 libsoup-3.6.1.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup3/libsoup3.mk b/package/libsoup3/libsoup3.mk index bc3ae4d0cb7..f2f96c2def4 100644 --- a/package/libsoup3/libsoup3.mk +++ b/package/libsoup3/libsoup3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSOUP3_VERSION_MAJOR = 3.5 +LIBSOUP3_VERSION_MAJOR = 3.6 LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).1 LIBSOUP3_SOURCE = libsoup-$(LIBSOUP3_VERSION).tar.xz LIBSOUP3_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP3_VERSION_MAJOR) diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 93a8d933cc8..e29c5994a32 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44f967aeb0c481676affe59069615252854bc0c072368ce4b26b6809a54daff5 libspdm-3.4.0.tar.gz +sha256 7b8a556be64120bab9c321964e67b90f5e6adb59abf3992c5c7937f37a4e7c8f libspdm-3.5.0.tar.gz sha256 c6ffa7e6889e63893078cb21b89594070183f7e2cf5b4ea01a4fb23eac59ed32 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index e86a79ed67a..9d8da2a3c6f 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.4.0 +LIBSPDM_VERSION = 3.5.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md @@ -20,7 +20,10 @@ LIBSPDM_TARGET_CPU_FAMILY = $(call qstrip,$(BR2_PACKAGE_LIBSPDM_CPU_FAMILY)) LIBSPDM_CFLAGS = \ $(TARGET_CFLAGS) \ -DLIBSPDM_ENABLE_CAPABILITY_EVENT_CAP=0 \ - -DLIBSPDM_ENABLE_CAPABILITY_MEL_CAP=0 + -DLIBSPDM_ENABLE_CAPABILITY_MEL_CAP=0 \ + -DLIBSPDM_ENABLE_CAPABILITY_GET_KEY_PAIR_INFO_CAP=0 \ + -DLIBSPDM_ENABLE_CAPABILITY_SET_KEY_PAIR_INFO_CAP=0 \ + -DLIBSPDM_HAL_PASS_SPDM_CONTEXT=1 LIBSPDM_CONF_OPTS = \ -DARCH=$(LIBSPDM_TARGET_CPU_FAMILY) \ diff --git a/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch b/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch new file mode 100644 index 00000000000..c1f39b7d9a3 --- /dev/null +++ b/package/libssh/0001-cmake-Only-enable-CXX-when-running-the-coverage.patch @@ -0,0 +1,57 @@ +From 328ae3d2306c9f65b5e85a2be98a368c07287a05 Mon Sep 17 00:00:00 2001 +From: Thomas Perale +Date: Sat, 14 Sep 2024 21:07:30 +0200 +Subject: [PATCH] cmake: Only enable CXX when running the coverage + +Commit 25a678190c42b24076fdd805a8d7a722a8a9c798 introduced code coverage +collection. That also introduced a dependency to CXX language. + +When cross-compiling libssh in an environment that doesn't have a C++ compiler +the following error is raised: "No CMAKE_CXX_COMPILER could be found.". + +Since the C++ part is only needed for the coverage part, this commit only enable +that language dependency when actually needing it. + +Signed-off-by: Thomas Perale +Upstream: https://gitlab.com/libssh/libssh-mirror/-/merge_requests/537 +--- + CMakeLists.txt | 3 ++- + cmake/Modules/AddCMockaTest.cmake | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13330ea3..5595a47a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") + include(DefineCMakeDefaults) + include(DefineCompilerFlags) + +-project(libssh VERSION 0.11.1 LANGUAGES C CXX) ++project(libssh VERSION 0.11.1 LANGUAGES C) + + # global needed variable + set(APPLICATION_NAME ${PROJECT_NAME}) +@@ -190,6 +190,7 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + + # Coverage + if (WITH_COVERAGE) ++ ENABLE_LANGUAGE(CXX) + include(CodeCoverage) + setup_target_for_coverage_lcov( + NAME "coverage" +diff --git a/cmake/Modules/AddCMockaTest.cmake b/cmake/Modules/AddCMockaTest.cmake +index 79178183..f49961ba 100644 +--- a/cmake/Modules/AddCMockaTest.cmake ++++ b/cmake/Modules/AddCMockaTest.cmake +@@ -117,6 +117,7 @@ function(ADD_CMOCKA_TEST _TARGET_NAME) + ${TARGET_SYSTEM_EMULATOR} ${_TARGET_NAME} + ) + if (WITH_COVERAGE) ++ ENABLE_LANGUAGE(CXX) + include(CodeCoverage) + append_coverage_compiler_flags_to_target(${_TARGET_NAME}) + endif (WITH_COVERAGE) +-- +2.46.0 + diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index e5eba219b54..b131557ee8c 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.10/libssh-0.10.6.tar.xz.asc -# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1 libssh-0.10.6.tar.xz +# https://www.libssh.org/files/0.11/libssh-0.11.1.tar.xz.asc +# with key 88A228D89B07C2C77D0C780903D5DF8CFDD3E8E7 +sha256 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 libssh-0.11.1.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 8b995c3555d..6f8a1ac3890 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSSH_VERSION_MAJOR = 0.10 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6 +LIBSSH_VERSION_MAJOR = 0.11 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).1 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 40e59f9bcb1..946e30b8077 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 63c800f81f823254d2706637bab551dec176b99b libtirpc-1.3.4.tar.bz2 +sha1 03352908461ad2122e5be4a678893aaa2ad2ac45 libtirpc-1.3.6.tar.bz2 # Locally computed -sha256 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 libtirpc-1.3.4.tar.bz2 +sha256 bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 libtirpc-1.3.6.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 04196f2f7cd..2d2675895c3 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.4 +LIBTIRPC_VERSION = 1.3.6 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/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 256fb651d5c..e7fbc854143 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libunistring/libunistring-1.2.tar.xz.sig -sha256 632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44 libunistring-1.2.tar.xz +# https://ftp.gnu.org/gnu/libunistring/libunistring-1.3.tar.xz.sig +sha256 f245786c831d25150f3dfb4317cda1acc5e3f79a5da4ad073ddca58886569527 libunistring-1.3.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index 05bdec71b55..fc785c28a55 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 1.2 +LIBUNISTRING_VERSION = 1.3 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 2ca8f64a808..a2bb65b9ae4 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz +sha256 2e910e668e5daf1be6a5195a696985d7200adfa5c4d3400ee7b3355affdcf52c libuv-v1.49.2-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 5f96e98a98d..36a5b89fa73 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.48.0 +LIBUV_VERSION = 1.49.2 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index 4f694de34bc..0c8ea1010b4 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc +# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.28.1.tar.xz.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b v4l-utils-1.24.1.tar.bz2 +sha256 0fa075ce59b6618847af6ea191b6155565ccaa44de0504581ddfed795a328a82 v4l-utils-1.28.1.tar.xz # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 1142a7442f1..e8bcc2bdfc1 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,19 +4,13 @@ # ################################################################################ -LIBV4L_VERSION = 1.24.1 -LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 +LIBV4L_VERSION = 1.28.1 +LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.xz LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES LIBV4L_DEPENDENCIES = host-pkgconf -LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap --disable-v4l2-tracer -# needed to get utils/qv4l link flags right -LIBV4L_AUTORECONF = YES -# add host-gettext for AM_ICONV macro -LIBV4L_DEPENDENCIES += host-gettext - -# fix uclibc-ng configure/compile -LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' +LIBV4L_CONF_OPTS = -Ddoxygen-doc=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled +LIBV4L_LDFLAGS = $(TARGET_LDFLAGS) # v4l-utils components have different licences, see v4l-utils.spec for details LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries) @@ -28,16 +22,16 @@ endif ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) LIBV4L_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) -LIBV4L_CONF_ENV += LIBS=$(TARGET_NLS_LIBS) +LIBV4L_LDFLAGS += $(TARGET_NLS_LIBS) endif LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifeq ($(BR2_PACKAGE_JPEG),y) +LIBV4L_CONF_OPTS += -Djpeg=enabled LIBV4L_DEPENDENCIES += jpeg -LIBV4L_CONF_OPTS += --with-jpeg else -LIBV4L_CONF_OPTS += --without-jpeg +LIBV4L_CONF_OPTS += -Djpeg=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) @@ -45,10 +39,10 @@ LIBV4L_DEPENDENCIES += libgl endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBV4L_CONF_OPTS += --with-libudev --with-udevdir=/usr/lib/udev +LIBV4L_CONF_OPTS += -Dlibdvbv5=enabled -Dudevdir=/usr/lib/udev LIBV4L_DEPENDENCIES += udev else -LIBV4L_CONF_OPTS += --without-libudev +LIBV4L_CONF_OPTS += -Dlibdvbv5=disabled endif ifeq ($(BR2_PACKAGE_LIBGLU),y) @@ -56,33 +50,25 @@ LIBV4L_DEPENDENCIES += libglu endif ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) -LIBV4L_CONF_OPTS += --enable-v4l-utils +LIBV4L_CONF_OPTS += -Dv4l-utils=true LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) -# v4l2-ctl needs c++11, use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" - # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support -LIBV4L_CONF_OPTS += --disable-bpf +LIBV4L_CONF_OPTS += -Dbpf=disabled ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) -LIBV4L_CONF_OPTS += --enable-qv4l2 +LIBV4L_CONF_OPTS += -Dqv4l2=enabled LIBV4L_DEPENDENCIES += qt5base -# protect against host version detection of moc-qt5/rcc-qt5/uic-qt5 -LIBV4L_CONF_ENV += \ - ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ - ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ - ac_cv_prog_UIC=$(HOST_DIR)/bin/uic else -LIBV4L_CONF_OPTS += --disable-qv4l2 +LIBV4L_CONF_OPTS += -Dqv4l2=disabled endif else -LIBV4L_CONF_OPTS += --disable-v4l-utils +LIBV4L_CONF_OPTS += -Dv4l-utils=false endif ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y) LIBV4L_DEPENDENCIES += sdl2_image endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libvirt/libvirt.mk b/package/libvirt/libvirt.mk index 1dc61a75495..7f2a33e9266 100644 --- a/package/libvirt/libvirt.mk +++ b/package/libvirt/libvirt.mk @@ -250,6 +250,36 @@ define LIBVIRT_INSTALL_UDEV_RULES endef LIBVIRT_POST_INSTALL_TARGET_HOOKS += LIBVIRT_INSTALL_UDEV_RULES +ifeq ($(BR2_PACKAGE_LIBVIRT_QEMU),y) +define LIBVIRT_USERS_QEMU + qemu -1 kvm -1 * - - - Libvirt qemu/kvm daemon +endef +define LIBVIRT_PERMISSIONS_QEMU + /var/cache/libvirt/qemu d 750 qemu kvm - - - - - + /var/cache/libvirt/qemu/capabilities d 755 root root - - - - - + /var/lib/libvirt/qemu d 751 qemu kvm - - - - - + /var/lib/libvirt/qemu/autostart d 700 root root - - - - - + /var/lib/libvirt/qemu/channel d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/channel/target d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/dump d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/networks d 700 root root - - - - - + /var/lib/libvirt/qemu/networks/autostart d 700 root root - - - - - + /var/lib/libvirt/qemu/nvram d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/save d 755 qemu kvm - - - - - + /var/lib/libvirt/qemu/snapshot d 755 qemu kvm - - - - - + /var/log/libvirt/qemu d 750 root root - - - - - + /var/log/swtpm/libvirt/qemu d 711 root root - - - - - +endef +define LIBVIRT_CREATE_SYMLINKS_QEMU + $(INSTALL) -m 751 -d $(TARGET_DIR)/var/lib/libvirt/qemu + ln -s -f ../../var/lib/libvirt/qemu $(TARGET_DIR)/etc/libvirt/ +endef +endif + +define LIBVIRT_USERS + $(LIBVIRT_USERS_QEMU) +endef + # Adjust directory ownerships and permissions. Notice /var/log is a symlink to # /tmp in the default sysvinit skeleton, so some directories may disappear at # run-time. Set the permissions anyway, since they are valid for the default @@ -263,29 +293,16 @@ define LIBVIRT_PERMISSIONS /var/lib/libvirt/filesystems d 711 root root - - - - - /var/lib/libvirt/images d 711 root root - - - - - /var/lib/libvirt/network d 700 root root - - - - - - /var/lib/libvirt/qemu d 751 qemu kvm - - - - - - /var/lib/libvirt/qemu/autostart d 700 root root - - - - - - /var/lib/libvirt/qemu/networks d 700 root root - - - - - - /var/lib/libvirt/qemu/networks/autostart d 700 root root - - - - - - /var/lib/libvirt/qemu/channel d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/channel/target d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/dump d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/nvram d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/save d 755 qemu kvm - - - - - - /var/lib/libvirt/qemu/snapshot d 755 qemu kvm - - - - - /var/lib/libvirt/secrets d 700 root root - - - - - /var/lib/libvirt/storage d 755 root root - - - - - /var/lib/libvirt/storage/autostart d 755 root root - - - - - /var/cache/libvirt d 711 root root - - - - - /var/cache/libvirt/lxc d 750 root root - - - - - - /var/cache/libvirt/qemu d 750 qemu kvm - - - - - - /var/cache/libvirt/qemu/capabilities d 755 root root - - - - - /var/log/libvirt d 700 root root - - - - - /var/log/libvirt/lxc d 750 root root - - - - - - /var/log/libvirt/qemu d 750 root root - - - - - /var/log/swtpm d 755 root root - - - - - /var/log/swtpm/libvirt d 755 root root - - - - - - /var/log/swtpm/libvirt/qemu d 711 root root - - - - - + $(LIBVIRT_PERMISSIONS_QEMU) endef # libvirt may need to create persistent files (e.g. VM definitions) in these @@ -296,22 +313,15 @@ endef define LIBVIRT_CREATE_SYMLINKS $(INSTALL) -m 700 -d $(TARGET_DIR)/etc/libvirt $(INSTALL) -m 755 -d $(TARGET_DIR)/var/lib/libvirt - $(INSTALL) -m 751 -d $(TARGET_DIR)/var/lib/libvirt/qemu $(INSTALL) -m 700 -d $(TARGET_DIR)/var/lib/libvirt/secrets $(INSTALL) -m 755 -d $(TARGET_DIR)/var/lib/libvirt/storage - ln -s -f ../../var/lib/libvirt/qemu $(TARGET_DIR)/etc/libvirt/ ln -s -f ../../var/lib/libvirt/secrets $(TARGET_DIR)/etc/libvirt/ ln -s -f ../../var/lib/libvirt/storage $(TARGET_DIR)/etc/libvirt/ + $(LIBVIRT_CREATE_SYMLINKS_QEMU) endef LIBVIRT_PRE_INSTALL_TARGET_HOOKS += LIBVIRT_CREATE_SYMLINKS -ifeq ($(BR2_PACKAGE_LIBVIRT_QEMU),y) -define LIBVIRT_USERS - qemu -1 kvm -1 * - - - Libvirt qemu/kvm daemon -endef -endif - ifeq ($(BR2_PACKAGE_LIBVIRT_DAEMON),y) define LIBVIRT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/libvirt/S91virtlogd $(TARGET_DIR)/etc/init.d/S91virtlogd diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index 16034437de9..0e7abd1e197 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 efc19e5a8544704100f814753eb5e09e85a68e3386508b164042c1f1f761bae8 libvpl-2.12.0.tar.gz +sha256 1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd libvpl-2.13.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 25e8730c25c..8933cbabd14 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.12.0 +LIBVPL_VERSION = 2.13.0 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index 05c132641ee..6116cfecb58 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -19,6 +19,12 @@ config BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL unconditionally compiled in for library versions prior to 3.2.0. +config BR2_PACKAGE_LIBWEBSOCKETS_ASYNC_DNS + bool "enable async dns support" + help + Enable asynchronous DNS resolver that directly queries + the configured nameserver over UDP, from the event loop. + endif comment "libwebsockets needs a toolchain w/ dynamic library" diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c00c44cac31..e53febfce45 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -98,4 +98,8 @@ ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_EXTERNAL_POLL=ON endif +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ASYNC_DNS),y) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SYS_ASYNC_DNS=ON +endif + $(eval $(cmake-package)) diff --git a/package/libxcrypt/Config.in b/package/libxcrypt/Config.in index 57ae8f67a32..38c75b5e63d 100644 --- a/package/libxcrypt/Config.in +++ b/package/libxcrypt/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBXCRYPT bool "libxcrypt" + depends on BR2_TOOLCHAIN_USES_GLIBC help libxcrypt is a modern library for one-way hashing of passwords. It supports a wide variety of both diff --git a/package/libxml2/0001-Fix-compilation-with-uclibc.patch b/package/libxml2/0001-Fix-compilation-with-uclibc.patch new file mode 100644 index 00000000000..aedad27e055 --- /dev/null +++ b/package/libxml2/0001-Fix-compilation-with-uclibc.patch @@ -0,0 +1,114 @@ +From fc72e0833a4e5724aef604e2fd9adb1014cb4844 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Mon, 16 Dec 2024 17:23:23 +0100 +Subject: [PATCH] Fix compilation with uclibc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The patch fixes the following errors and warnings raised by the +compilation of the library with uClibc: + +encoding.c: In function ‘xmlEncInputChunk’: +encoding.c:2209:32: warning: comparison between pointer and integer + 2209 | else if (handler->iconv_in != NULL) { + | ^~ +encoding.c: In function ‘xmlEncOutputChunk’: +encoding.c:2269:33: warning: comparison between pointer and integer + 2269 | else if (handler->iconv_out != NULL) { + | ^~ +encoding.c: In function ‘xmlCharEncCloseFunc’: +encoding.c:2681:29: warning: comparison between pointer and integer + 2681 | if ((handler->iconv_out != NULL) || (handler->iconv_in != NULL)) { + | ^~ +encoding.c:2681:60: warning: comparison between pointer and integer + 2681 | if ((handler->iconv_out != NULL) || (handler->iconv_in != NULL)) { + | ^~ +encoding.c:2683:32: warning: comparison between pointer and integer + 2683 | if (handler->iconv_out != NULL) { + | ^~ +encoding.c:2686:32: error: assignment to ‘iconv_t’ {aka ‘long int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion] + 2686 | handler->iconv_out = NULL; + | ^ +encoding.c:2688:31: warning: comparison between pointer and integer + 2688 | if (handler->iconv_in != NULL) { + | ^~ +encoding.c:2691:31: error: assignment to ‘iconv_t’ {aka ‘long int’} from ‘void *’ makes integer from pointer without a cast [-Wint-conversion] + 2691 | handler->iconv_in = NULL; + | ^ +make[4]: *** [Makefile:1147: libxml2_la-encoding.lo] Error 1 + +Signed-off-by: Dario Binacchi +Upstream: https://gitlab.gnome.org/GNOME/libxml2/-/commit/fc72e0833a4e5724aef604e2fd9adb1014cb4844 +--- + encoding.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/encoding.c b/encoding.c +index 14ffafddbc02..41ecde1885e4 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -1264,7 +1264,7 @@ DECLARE_ISO_FUNCS(16) + #endif /* LIBXML_ISO8859X_ENABLED */ + + #ifdef LIBXML_ICONV_ENABLED +- #define EMPTY_ICONV , (iconv_t) 0, (iconv_t) 0 ++ #define EMPTY_ICONV , (iconv_t) -1, (iconv_t) -1 + #else + #define EMPTY_ICONV + #endif +@@ -1389,8 +1389,8 @@ xmlNewCharEncodingHandler(const char *name, + handler->name = up; + + #ifdef LIBXML_ICONV_ENABLED +- handler->iconv_in = NULL; +- handler->iconv_out = NULL; ++ handler->iconv_in = (iconv_t) -1; ++ handler->iconv_out = (iconv_t) -1; + #endif + #ifdef LIBXML_ICU_ENABLED + handler->uconv_in = NULL; +@@ -2200,7 +2200,7 @@ xmlEncInputChunk(xmlCharEncodingHandler *handler, unsigned char *out, + } + } + #ifdef LIBXML_ICONV_ENABLED +- else if (handler->iconv_in != NULL) { ++ else if (handler->iconv_in != (iconv_t) -1) { + ret = xmlIconvWrapper(handler->iconv_in, out, outlen, in, inlen); + } + #endif /* LIBXML_ICONV_ENABLED */ +@@ -2260,7 +2260,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, + } + } + #ifdef LIBXML_ICONV_ENABLED +- else if (handler->iconv_out != NULL) { ++ else if (handler->iconv_out != (iconv_t) -1) { + ret = xmlIconvWrapper(handler->iconv_out, out, outlen, in, inlen); + } + #endif /* LIBXML_ICONV_ENABLED */ +@@ -2672,17 +2672,17 @@ xmlCharEncCloseFunc(xmlCharEncodingHandler *handler) { + * Iconv handlers can be used only once, free the whole block. + * and the associated icon resources. + */ +- if ((handler->iconv_out != NULL) || (handler->iconv_in != NULL)) { ++ if ((handler->iconv_out != (iconv_t) -1) || (handler->iconv_in != (iconv_t) -1)) { + tofree = 1; +- if (handler->iconv_out != NULL) { ++ if (handler->iconv_out != (iconv_t) -1) { + if (iconv_close(handler->iconv_out)) + ret = -1; +- handler->iconv_out = NULL; ++ handler->iconv_out = (iconv_t) -1; + } +- if (handler->iconv_in != NULL) { ++ if (handler->iconv_in != (iconv_t) -1) { + if (iconv_close(handler->iconv_in)) + ret = -1; +- handler->iconv_in = NULL; ++ handler->iconv_in = (iconv_t) -1; + } + } + #endif /* LIBXML_ICONV_ENABLED */ +-- +2.43.0 + diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index ed6c20e9488..eb92ad4324e 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.4.sha256sum -sha256 65d042e1c8010243e617efb02afda20b85c2160acdbfbcb5b26b80cec6515650 libxml2-2.13.4.tar.xz +# From https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.5.sha256sum +sha256 74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6 libxml2-2.13.5.tar.xz # License files, locally calculated sha256 c99aae1afe013e50b8b3701e089222b351258043c3025b64053a233fd25b4be7 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 8a5d703da6e..a8cb86ab2ff 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.13 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) diff --git a/package/libzenoh-c/libzenoh-c.hash b/package/libzenoh-c/libzenoh-c.hash index 66bb5282f44..da4596e4dc6 100644 --- a/package/libzenoh-c/libzenoh-c.hash +++ b/package/libzenoh-c/libzenoh-c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cf8ca9382a17564ceedadf8fe574cd7c73440cd298d2adfbe88fa452427f8526 libzenoh-c-0.11.0-cargo2.tar.gz +sha256 6e3419a3ef9c1d0c65a2749728e332cbc5a8da2ba3dfbc24f310fa8735fb5949 libzenoh-c-1.0.2-cargo2.tar.gz sha256 01a44774f7b1a453595c7c6d7f7308284ba6a1059dc49e14dad6647e1d44a338 LICENSE diff --git a/package/libzenoh-c/libzenoh-c.mk b/package/libzenoh-c/libzenoh-c.mk index f07206f4f77..a6971460496 100644 --- a/package/libzenoh-c/libzenoh-c.mk +++ b/package/libzenoh-c/libzenoh-c.mk @@ -4,10 +4,7 @@ # ################################################################################ -# This 0.11.0 version is really newer than 0.11.0.3, so please don't -# update 0.11.0.3 even if release-monitoring.org claims it's a newer -# version. -LIBZENOH_C_VERSION = 0.11.0 +LIBZENOH_C_VERSION = 1.0.2 LIBZENOH_C_SITE = $(call github,eclipse-zenoh,zenoh-c,$(LIBZENOH_C_VERSION)) LIBZENOH_C_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_C_LICENSE_FILES = LICENSE diff --git a/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch b/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch new file mode 100644 index 00000000000..9f911a750bf --- /dev/null +++ b/package/libzenoh-pico/0001-CMakeLists.txt-don-t-override-the-optimization-level.patch @@ -0,0 +1,64 @@ +From 32d087860abaf5b2374043db7034174aec06b885 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 31 Dec 2024 15:52:57 +0100 +Subject: [PATCH] CMakeLists.txt: don't override the optimization level + +zenoh-pico's CMakeLists.txt has some logic to provide its own compiler +optimization level: -O3 for release builds, -O0 for debug builds. + +Unfortunately, using add_compile_options() means that those settings +take precedence over what the user can pass as custom compiler +flags. And this causes issues for example when doing a debug build +with _FORTIFY_SOURCE enabled, as _FORTIFY_SOURCE support in glibc is +incompatible with unoptimized builds causing this build failure: + +/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/features.h:414:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + 414 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) + | ^~~~~~~ + +which is a warning, but as zenoh-pico builds with -Werror, it turns +into a build failure. + +As it is unclear how CMakeLists.txt can pass a default -O level, while +allowing it to be overridden by the user, we simply remove those +optimization level options. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/eclipse-zenoh/zenoh-pico/pull/847 +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a9fb6d1..97fba56a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,13 +85,13 @@ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) + # Compile options + if(CMAKE_BUILD_TYPE MATCHES "RELEASE" OR "Release") + if(UNIX) +- add_compile_options(-pipe -O3) ++ add_compile_options(-pipe) + elseif(CMAKE_SYSTEM_NAME MATCHES "Generic") +- add_compile_options(-pipe -O3) ++ add_compile_options(-pipe) + endif() + else() + if(UNIX) +- add_compile_options(-c -Wall -Wextra -Werror -Wshadow -Wunused -Wstrict-prototypes -pipe -g -O0) ++ add_compile_options(-c -Wall -Wextra -Werror -Wshadow -Wunused -Wstrict-prototypes -pipe -g) + # C99 pedantic doesn't like struct anonymous in unix header + if (NOT CMAKE_C_STANDARD STREQUAL "99") + add_compile_options(-Wpedantic) +@@ -100,7 +100,7 @@ else() + elseif(MSVC) + add_compile_options(/W4 /WX /Od /wd4127) + elseif(CMAKE_SYSTEM_NAME MATCHES "Generic") +- add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe -g -O0) ++ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe -g) + endif() + endif() + +-- +2.47.1 + diff --git a/package/libzenoh-pico/libzenoh-pico.hash b/package/libzenoh-pico/libzenoh-pico.hash index 3e017b79c82..11c9dc5fa8c 100644 --- a/package/libzenoh-pico/libzenoh-pico.hash +++ b/package/libzenoh-pico/libzenoh-pico.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 db1eca9d84ca581731cf1f3f88aca785d58fb2b1972f2f07d09a0cf022ee02f9 libzenoh-pico-0.11.0.tar.gz +sha256 b2c7645e023cd317a21f6adc0f8c50d71ab3b058a1a630ba4a0f29f9c0eacf3a libzenoh-pico-1.0.2.tar.gz sha256 d386df32cf327bbb25abe894277d3d7e0f447bafc59f4ad362615b0136f30db5 LICENSE diff --git a/package/libzenoh-pico/libzenoh-pico.mk b/package/libzenoh-pico/libzenoh-pico.mk index 9f91926f0eb..28d702c459f 100644 --- a/package/libzenoh-pico/libzenoh-pico.mk +++ b/package/libzenoh-pico/libzenoh-pico.mk @@ -4,10 +4,7 @@ # ################################################################################ -# This 0.11.0 version is really newer than 0.11.0.3, so please don't -# update 0.11.0.3 even if release-monitoring.org claims it's a newer -# version. -LIBZENOH_PICO_VERSION = 0.11.0 +LIBZENOH_PICO_VERSION = 1.0.2 LIBZENOH_PICO_SITE = $(call github,eclipse-zenoh,zenoh-pico,$(LIBZENOH_PICO_VERSION)) LIBZENOH_PICO_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_PICO_LICENSE_FILES = LICENSE diff --git a/package/links/links.hash b/package/links/links.hash index 36a4b905922..30b006b4a82 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998 links-2.29.tar.bz2 +sha256 c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166 links-2.30.tar.bz2 sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/package/links/links.mk b/package/links/links.mk index 30a26b27409..7ebe3af4746 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.29 +LINKS_VERSION = 2.30 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index a10317c4942..4630252c5e2 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -527,6 +527,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX help Firmware files for WLAN and Bluetooth modules wl18xx +config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC33XX + bool "TI cc33xx" + help + Firmware files for cc33xx WLAN and BLE family of chips + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210 bool "Qualcomm Atheros wil6210" help @@ -706,4 +711,14 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ARM_MALI_CSF endmenu +menu "Serial adapters firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_RP2 + bool "Comtrol RocketPort EXPRESS/INFINITY firmware" + help + Firmware files for the Comtrol RocketPort EXPRESS/INFINITY + needed by the Linux rp2 kernel driver. + +endmenu + endif diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 73df66e6505..97004505c65 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 719662d2e8644c097f9a0bfb6e4c97280f8b2943e7bd9b47f77cf039412f5b14 linux-firmware-20240709.tar.xz +sha256 943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671 linux-firmware-20240909.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -40,6 +40,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 416a9ad4b5232b6fbfc47cfadc14e338eb0c4351a59e6ee862c0f336f55c403e WHENCE +sha256 d6a8d8b935d275e4092a0ec578eb430f9ef70bec34165d18bcabfa4a81f65724 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 e40eab8dc85..9ffd52dff5e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20240709 +LINUX_FIRMWARE_VERSION = 20240909 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES @@ -79,8 +79,7 @@ endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT),y) 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/rtl8723bs_config.bin rtl_bt/rtl8723bs_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 @@ -486,6 +485,15 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity endif +# cc33xx +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_CC33XX),y) +LINUX_FIRMWARE_FILES += \ + ti-connectivity/cc33xx_2nd_loader.bin \ + ti-connectivity/cc33xx_fw.bin \ + ti-connectivity/cc33xx-conf.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_WIL6210),y) LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k @@ -910,6 +918,10 @@ LINUX_FIRMWARE_FILES += arm/mali/arch*/mali_csffw.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mali_csffw endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RP2),y) +LINUX_FIRMWARE_FILES += rp2.fw +endif + ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) define LINUX_FIRMWARE_BUILD_CMDS diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7b88014b750..88e9cc0e328 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -117,6 +117,7 @@ endif choice bool "Custom kernel headers series" + default BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD 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 diff --git a/package/linux-pam/0001-build-consistently-include-config.h-first.patch b/package/linux-pam/0001-build-consistently-include-config.h-first.patch new file mode 100644 index 00000000000..e9f36b8a606 --- /dev/null +++ b/package/linux-pam/0001-build-consistently-include-config.h-first.patch @@ -0,0 +1,180 @@ +From cdba2c8cdba9b3500595624fb375c0dda266631b Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Fri, 30 Aug 2024 08:00:00 +0000 +Subject: [PATCH] build: consistently include config.h first + +Make sure that config.h is included before any system header. + +Upstream: https://github.com/linux-pam/linux-pam/commit/5d7eefb1883c557c7a027f68e966e2fae294a9b6 +Signed-off-by: Thomas Petazzoni +--- + libpam/pam_prelude.c | 8 ++++---- + modules/pam_namespace/argv_parse.c | 2 ++ + modules/pam_setquota/pam_setquota.c | 3 ++- + modules/pam_timestamp/sha1.c | 2 +- + modules/pam_unix/audit.c | 3 +-- + modules/pam_unix/bigcrypt_main.c | 2 ++ + modules/pam_unix/md5.c | 4 ++-- + modules/pam_unix/md5_crypt.c | 2 +- + modules/pam_unix/yppasswd.h | 2 ++ + 9 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/libpam/pam_prelude.c b/libpam/pam_prelude.c +index 6c73bf5d..c62e2f2c 100644 +--- a/libpam/pam_prelude.c ++++ b/libpam/pam_prelude.c +@@ -5,17 +5,17 @@ + * (C) Sebastien Tricaud 2005 + */ + +-#include +-#include +- + #ifdef PRELUDE + ++#include "pam_private.h" ++ ++#include ++#include + #include + #include + #include + + #include "pam_prelude.h" +-#include "pam_private.h" + + + #define ANALYZER_CLASS "pam" +diff --git a/modules/pam_namespace/argv_parse.c b/modules/pam_namespace/argv_parse.c +index ac7c9ae0..cbae7831 100644 +--- a/modules/pam_namespace/argv_parse.c ++++ b/modules/pam_namespace/argv_parse.c +@@ -28,6 +28,8 @@ + * Version 1.1, modified 2/27/1999 + */ + ++#include "config.h" ++ + #include + #include + #include +diff --git a/modules/pam_setquota/pam_setquota.c b/modules/pam_setquota/pam_setquota.c +index c15fc669..73445e29 100644 +--- a/modules/pam_setquota/pam_setquota.c ++++ b/modules/pam_setquota/pam_setquota.c +@@ -8,6 +8,8 @@ + Copyright © 2016 Keller Fuchs + */ + ++#include "pam_inline.h" ++ + #include + #include + #include +@@ -22,7 +24,6 @@ + #include + #include + #include +-#include "pam_inline.h" + + #ifndef PATH_LOGIN_DEFS + # define PATH_LOGIN_DEFS "/etc/login.defs" +diff --git a/modules/pam_timestamp/sha1.c b/modules/pam_timestamp/sha1.c +index dff454cf..f21b2870 100644 +--- a/modules/pam_timestamp/sha1.c ++++ b/modules/pam_timestamp/sha1.c +@@ -37,6 +37,7 @@ + */ + /* See http://www.itl.nist.gov/fipspubs/fip180-1.htm for descriptions. */ + ++#include "pam_inline.h" + #include + #include + #include +@@ -47,7 +48,6 @@ + #include + #include + #include "sha1.h" +-#include "pam_inline.h" + + static const unsigned char + padding[SHA1_BLOCK_SIZE] = { +diff --git a/modules/pam_unix/audit.c b/modules/pam_unix/audit.c +index 1547a652..9513aaa9 100644 +--- a/modules/pam_unix/audit.c ++++ b/modules/pam_unix/audit.c +@@ -1,5 +1,3 @@ +-#include "audit.h" +- + #include "config.h" + + #ifdef HAVE_LIBAUDIT +@@ -11,6 +9,7 @@ + + #include + ++#include "audit.h" + #include "passverify.h" + + int audit_log(int type, const char *uname, int retval) +diff --git a/modules/pam_unix/bigcrypt_main.c b/modules/pam_unix/bigcrypt_main.c +index fab212d9..22d325da 100644 +--- a/modules/pam_unix/bigcrypt_main.c ++++ b/modules/pam_unix/bigcrypt_main.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include + #include + +diff --git a/modules/pam_unix/md5.c b/modules/pam_unix/md5.c +index 95b8de4c..78e9af27 100644 +--- a/modules/pam_unix/md5.c ++++ b/modules/pam_unix/md5.c +@@ -18,11 +18,11 @@ + * + */ + ++#include "pam_inline.h" ++ + #include + #include "md5.h" + +-#include "pam_inline.h" +- + #ifndef HIGHFIRST + #define byteReverse(buf, len) /* Nothing */ + #else +diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c +index 9a6bd4f9..9451f376 100644 +--- a/modules/pam_unix/md5_crypt.c ++++ b/modules/pam_unix/md5_crypt.c +@@ -12,11 +12,11 @@ + * + */ + ++#include "pam_inline.h" + #include + #include + #include + #include "md5.h" +-#include "pam_inline.h" + + static const unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +diff --git a/modules/pam_unix/yppasswd.h b/modules/pam_unix/yppasswd.h +index dc686cd7..3a40c3ea 100644 +--- a/modules/pam_unix/yppasswd.h ++++ b/modules/pam_unix/yppasswd.h +@@ -6,6 +6,8 @@ + #ifndef _YPPASSWD_H_RPCGEN + #define _YPPASSWD_H_RPCGEN + ++#include "config.h" ++ + #include + + +-- +2.47.1 + diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash index e798e2beb20..127480095ef 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,5 +1,6 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.17.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.18.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -sha256 9343177f145d2bca66ef03d59528079d3f1663c624b1e2b9d08268efdc6127ce lldpd-1.0.17.tar.gz +# gpg --verify lldpd-1.0.18.tar.gz.gpg lldpd-1.0.18.tar.gz +sha256 4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7 lldpd-1.0.18.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 34e1c8c2491..1b2cef98650 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.17 +LLDPD_VERSION = 1.0.18 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ diff --git a/package/lmdb/lmdb.hash b/package/lmdb/lmdb.hash index d72c66aacec..4b80953dff8 100644 --- a/package/lmdb/lmdb.hash +++ b/package/lmdb/lmdb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dd70a8c67807b3b8532b3e987b0a4e998962ecc28643e1af5ec77696b081c9b0 lmdb-0.9.31.tar.gz +sha256 d19d52725800177b89d235161c0af8ae8b2932207e3c9eb87e95b61f1925206d openldap-LMDB_0.9.33.tar.bz2 sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 libraries/liblmdb/LICENSE diff --git a/package/lmdb/lmdb.mk b/package/lmdb/lmdb.mk index 86d72e1abcc..e4f929c7f0a 100644 --- a/package/lmdb/lmdb.mk +++ b/package/lmdb/lmdb.mk @@ -4,8 +4,9 @@ # ################################################################################ -LMDB_VERSION = 0.9.31 -LMDB_SITE = $(call github,LMDB,lmdb,LMDB_$(LMDB_VERSION)) +LMDB_VERSION = 0.9.33 +LMDB_SOURCE = openldap-LMDB_$(LMDB_VERSION).tar.bz2 +LMDB_SITE = https://git.openldap.org/openldap/openldap/-/archive/LMDB_$(LMDB_VERSION) LMDB_LICENSE = OLDAP-2.8 LMDB_LICENSE_FILES = libraries/liblmdb/LICENSE LMDB_INSTALL_STAGING = YES diff --git a/package/localedef/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch index a65c896eb73..ef126c6bd34 100644 --- a/package/localedef/0001-HACK-only-build-and-install-localedef.patch +++ b/package/localedef/0001-HACK-only-build-and-install-localedef.patch @@ -1,4 +1,4 @@ -From bd5a87ea4a0cc0ba393a16bbeb166903e4085e8b Mon Sep 17 00:00:00 2001 +From 03b1573ca341f1852ac05a884a68ed375cceccc0 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 21 May 2018 16:45:02 +0200 Subject: [PATCH] HACK: only build and install localedef @@ -13,16 +13,16 @@ Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- Rules | 14 ++++++++++---- - locale/Makefile | 6 +++--- - 2 files changed, 13 insertions(+), 7 deletions(-) + locale/Makefile | 3 --- + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Rules b/Rules -index 279ae490ac..1321956be6 100644 +index 9010c5d5b2..f5e5525061 100644 --- a/Rules +++ b/Rules -@@ -221,10 +221,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ +@@ -223,10 +223,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \ $(binaries-all-notests)) - + ifneq "$(strip $(binaries-shared-notests))" "" -$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \ - $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \ @@ -39,13 +39,13 @@ index 279ae490ac..1321956be6 100644 + $(common-objpfx)libc% $(+postinit),$^) \ + $(link-extra-libs) endif - + ifneq "$(strip $(binaries-shared-tests))" "" diff --git a/locale/Makefile b/locale/Makefile -index d7036b0855..68afdddc7f 100644 +index 2810f28605..6b4cc9e831 100644 --- a/locale/Makefile +++ b/locale/Makefile -@@ -76,7 +76,6 @@ +@@ -76,7 +76,6 @@ aux = \ xlocale \ # aux others = \ @@ -53,7 +53,7 @@ index d7036b0855..68afdddc7f 100644 localedef \ # others #others-static = \ -@@ -84,7 +83,6 @@ +@@ -84,7 +83,6 @@ others = \ # locale \ # # others-static install-bin = \ @@ -61,14 +61,14 @@ index d7036b0855..68afdddc7f 100644 localedef \ # install-bin extra-objs = \ -@@ -96,7 +94,6 @@ +@@ -96,7 +94,6 @@ extra-objs = \ generated += C-translit.h before-compile += $(objpfx)C-translit.h - + -extra-libs = libBrokenLocale extra-libs-others = $(extra-libs) - + libBrokenLocale-routines = broken_cur_max --- -2.41.0 +-- +2.45.2 diff --git a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index 1aecc244056..b8e53a23a69 100644 --- a/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -1,4 +1,4 @@ -From add730a680075ed611797b9ea771bf977667a7de Mon Sep 17 00:00:00 2001 +From 1ddee6fdcde6b12df22619380d51b47e6c8f2c08 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 6 Feb 2020 14:36:21 -0600 Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24 @@ -35,10 +35,10 @@ Signed-off-by: Yann E. MORIN 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 4ef387146d..4c6f91117d 100755 +index 1d543548cd..3e13c46b2e 100755 --- a/configure +++ b/configure -@@ -5157,7 +5157,7 @@ printf %s "checking version of $LD... " >&6; } +@@ -5302,7 +5302,7 @@ printf %s "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -46,16 +46,16 @@ index 4ef387146d..4c6f91117d 100755 + 2.1[0-9][0-9]*|2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -5599,7 +5599,7 @@ int + +@@ -5750,7 +5750,7 @@ int main (void) { - + -#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2) +#if !defined __GNUC__ || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) #error insufficient compiler #endif ; --- -2.41.0 +-- +2.45.2 diff --git a/package/localedef/0003-HACK-keep-_ISOC2X_SOURCE-undefined-to-build-localede.patch b/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch similarity index 63% rename from package/localedef/0003-HACK-keep-_ISOC2X_SOURCE-undefined-to-build-localede.patch rename to package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch index 741bd7b47f0..57a8f8e35c1 100644 --- a/package/localedef/0003-HACK-keep-_ISOC2X_SOURCE-undefined-to-build-localede.patch +++ b/package/localedef/0003-HACK-keep-_ISOC23_SOURCE-undefined-to-build-localede.patch @@ -1,7 +1,7 @@ -From babfa64585bef6c53c1d399a1c244aea89437c9e Mon Sep 17 00:00:00 2001 +From efc989e7e5dcbc38ccc32634e49cfc2881c5a318 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 9 Sep 2023 23:58:50 +0200 -Subject: [PATCH] HACK: keep _ISOC2X_SOURCE undefined to build localedef with +Subject: [PATCH] HACK: keep _ISOC23_SOURCE undefined to build localedef with old glibc Fixes: @@ -11,22 +11,25 @@ ld-ctype.c:(.text+0x6cef): undefined reference to `__isoc23_strtoul' Upstream: Not applicable Signed-off-by: Romain Naour +[Thomas: adapted to glibc 2.40, which required the logic to be changed +to _ISOC23_SOURCE] +Signed-off-by: Thomas Petazzoni --- include/features.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/features.h b/include/features.h -index 7c51b4a2e4..f385370d18 100644 +index 093de6f44c..8d9ca6e402 100644 --- a/include/features.h +++ b/include/features.h -@@ -207,7 +207,6 @@ +@@ -215,7 +215,6 @@ # undef _ISOC11_SOURCE # define _ISOC11_SOURCE 1 - # undef _ISOC2X_SOURCE --# define _ISOC2X_SOURCE 1 + # undef _ISOC23_SOURCE +-# define _ISOC23_SOURCE 1 # undef _POSIX_SOURCE # define _POSIX_SOURCE 1 # undef _POSIX_C_SOURCE -- -2.41.0 +2.45.2 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 6940900f8da..b3e8ab5a1be 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.39-74-g198632a05f6c7b9ab67d3331d8caace9ceabb685 +LOCALEDEF_VERSION = 2.40-18-g5641780762723156b0d20a0b9f7df1d76831bab0 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/package/lrzsz/0001-configure-fix-main-prototype.patch b/package/lrzsz/0001-configure-fix-main-prototype.patch new file mode 100644 index 00000000000..dfe4385a1c2 --- /dev/null +++ b/package/lrzsz/0001-configure-fix-main-prototype.patch @@ -0,0 +1,34 @@ +From c2758812867a52a6bb56b87d52c35ebff797e777 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 15 Sep 2024 15:12:07 +0200 +Subject: [PATCH] configure: fix main() prototype + +The pre-generated configure script has a check that doesn't work with +GCC >= 14.x due to a partial main() prototype. Doing AUTORECONF = YES +doesn't work as the configure.in is very old, so let's fix the +configure script directly. + +Signed-off-by: Thomas Petazzoni +Upstream: N/A, patching generated file +[wsa: rebased to 0.12.21rc] +Signed-off-by: Wolfram Sang +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index cc586d5..16a259a 100755 +--- a/configure ++++ b/configure +@@ -1053,7 +1053,7 @@ cat > conftest.$ac_ext << EOF + #line 1054 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +-- +2.45.2 + diff --git a/package/lrzsz/0002-lib-long-options.c-include-stdlib.h.patch b/package/lrzsz/0002-lib-long-options.c-include-stdlib.h.patch new file mode 100644 index 00000000000..6229114e0a4 --- /dev/null +++ b/package/lrzsz/0002-lib-long-options.c-include-stdlib.h.patch @@ -0,0 +1,44 @@ +From aa6779c2846f13bf58575486b374ef06b2844fe8 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Tue, 21 May 2024 11:13:17 +0200 +Subject: [PATCH] lib/long-options.c: include stdlib.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following error (compiled with GCC 14.x): + +long-options.c:70:11: error: implicit declaration of function ‘exit’ +[-Wimplicit-function-declaration] + 70 | exit (0); + | ^~~~ + +Upstream: https://github.com/UweOhse/lrzsz/pull/4 +Signed-off-by: Thomas Petazzoni +--- + lib/long-options.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/lib/long-options.c b/lib/long-options.c +index 76b9796..19c84e0 100644 +--- a/lib/long-options.c ++++ b/lib/long-options.c +@@ -22,6 +22,15 @@ + #endif + + #include ++ ++/* This needs to come after some library #include ++ to get __GNU_LIBRARY__ defined. */ ++#ifdef __GNU_LIBRARY__ ++/* Don't include stdlib.h for non-GNU C libraries because some of them ++ contain conflicting prototypes for getopt. */ ++#include ++#endif /* GNU C library. */ ++ + #include + #include "long-options.h" + +-- +2.46.0 + diff --git a/package/lrzsz/0003-include-stdio.h-to-remove-warning.patch b/package/lrzsz/0003-include-stdio.h-to-remove-warning.patch new file mode 100644 index 00000000000..e4a958cdfa5 --- /dev/null +++ b/package/lrzsz/0003-include-stdio.h-to-remove-warning.patch @@ -0,0 +1,26 @@ +From e164c9cd3207321e162f054357fcd37b06cb0b8a Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Mon, 2 Mar 2020 22:38:16 +0000 +Subject: [PATCH] include stdio.h to remove warning + +Upstream: https://github.com/UweOhse/lrzsz/commit/937a2ff696fb600672eb0e8fab87f75d5e4fbc25 +Signed-off-by: Thomas Petazzoni +--- + src/lsyslog.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lsyslog.c b/src/lsyslog.c +index 6baf4a2..d21ab35 100644 +--- a/src/lsyslog.c ++++ b/src/lsyslog.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #endif + + #if __STDC__ +-- +2.46.0 + diff --git a/package/lrzsz/0004-FTBFS-fix-missing-includes.patch b/package/lrzsz/0004-FTBFS-fix-missing-includes.patch new file mode 100644 index 00000000000..51b5f09c261 --- /dev/null +++ b/package/lrzsz/0004-FTBFS-fix-missing-includes.patch @@ -0,0 +1,124 @@ +From a9faaf7f02811e7409074362700e963609885ba6 Mon Sep 17 00:00:00 2001 +From: Wolfram Sang +Date: Fri, 29 Nov 2024 14:14:25 +0100 +Subject: [PATCH] FTBFS fix missing includes + +From: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff + +Description: Fixes FTBFS (missing includes) +Author: Martin A. Godisch +Bug-Debian: https://bugs.debian.org/1066514 +Forwarded: no + +Signed-off-by: Wolfram Sang +Upstream: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff +--- + lib/error.c | 1 + + src/canit.c | 1 + + src/lrz.c | 1 + + src/lsyslog.c | 1 + + src/lsz.c | 1 + + src/tcp.c | 1 + + src/zperr.c | 1 + + src/zreadline.c | 1 + + 8 files changed, 8 insertions(+) + +diff --git a/lib/error.c b/lib/error.c +index 8b96b91..3861578 100644 +--- a/lib/error.c ++++ b/lib/error.c +@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #endif + + #include ++#include + + #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC || defined(__cplusplus) + # if __STDC__ || defined(__cplusplus) +diff --git a/src/canit.c b/src/canit.c +index f947a25..ae91807 100644 +--- a/src/canit.c ++++ b/src/canit.c +@@ -24,6 +24,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/lrz.c b/src/lrz.c +index 2f6a5ad..63e1326 100644 +--- a/src/lrz.c ++++ b/src/lrz.c +@@ -27,6 +27,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/lsyslog.c b/src/lsyslog.c +index d21ab35..24d8cd1 100644 +--- a/src/lsyslog.c ++++ b/src/lsyslog.c +@@ -18,6 +18,7 @@ + 02111-1307, USA. + + */ ++#define _GNU_SOURCE + #include "config.h" + #ifdef ENABLE_SYSLOG + #include "zglobal.h" +diff --git a/src/lsz.c b/src/lsz.c +index b9d2545..1598150 100644 +--- a/src/lsz.c ++++ b/src/lsz.c +@@ -28,6 +28,7 @@ + #define SS_NORMAL 0 + #include + #include ++#include + #include + #include + #include +diff --git a/src/tcp.c b/src/tcp.c +index 7e1ba3f..cdf9187 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "zglobal.h" + #include +diff --git a/src/zperr.c b/src/zperr.c +index 31963de..0b9dc29 100644 +--- a/src/zperr.c ++++ b/src/zperr.c +@@ -22,6 +22,7 @@ + #include "zglobal.h" + #include + #include ++#include + #include + + #ifdef __STDC__ +diff --git a/src/zreadline.c b/src/zreadline.c +index dd9736b..7bc3736 100644 +--- a/src/zreadline.c ++++ b/src/zreadline.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.45.2 + diff --git a/package/lrzsz/lrzsz.hash b/package/lrzsz/lrzsz.hash index cd8dd6f4893..5c2f2ef9514 100644 --- a/package/lrzsz/lrzsz.hash +++ b/package/lrzsz/lrzsz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz +sha256 4d845f239ddcd86735b5dbf01f3869b072ffb6f6c8aa24c346dc4a3c95453c55 lrzsz-0.12.21rc.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 7247a4bd597..12d52b8ebd6 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -4,8 +4,8 @@ # ################################################################################ -LRZSZ_VERSION = 0.12.20 -LRZSZ_SITE = http://www.ohse.de/uwe/releases +LRZSZ_VERSION = 0.12.21rc +LRZSZ_SITE = http://www.ohse.de/uwe/testing LRZSZ_CONF_OPTS = --disable-timesync LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING diff --git a/package/lsuio/lsuio.hash b/package/lsuio/lsuio.hash index 2df6d074f40..1c408697b2e 100644 --- a/package/lsuio/lsuio.hash +++ b/package/lsuio/lsuio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c88b3850248b2d3419e025abd7b9b0991c8bd33a2d4983f9608408a29900bfb5 lsuio-0.2.0.tar.gz +sha256 fe799ea2920f07b3d950ae9b6b3dec8c0838437f4571fc8091b94fd765b3d415 lsuio-ba46808da148552462e50ba66d8d15cc5b9a3a00.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk index 193de15aefa..46647d17ee3 100644 --- a/package/lsuio/lsuio.mk +++ b/package/lsuio/lsuio.mk @@ -4,8 +4,9 @@ # ################################################################################ -LSUIO_VERSION = 0.2.0 -LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user +# no tag yet +LSUIO_VERSION = ba46808da148552462e50ba66d8d15cc5b9a3a00 +LSUIO_SITE = $(call github,DigitalBrains1,lsuio,$(LSUIO_VERSION)) LSUIO_LICENSE = GPL-2.0 LSUIO_LICENSE_FILES = COPYING diff --git a/package/lua-compat53/lua-compat53.hash b/package/lua-compat53/lua-compat53.hash index 1930063fdcf..cd2c35d6210 100644 --- a/package/lua-compat53/lua-compat53.hash +++ b/package/lua-compat53/lua-compat53.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 bff8e597384776de7c139bee7d6a6f2c05c3eb7315d08733473fa986720cec60 compat53-0.12-1.src.rock -sha256 870cdff7e4db4c2e84a335b2b9e242b9f963830550026e2057a5885e945982e5 lua-compat-5.3-0.12/LICENSE +sha256 987e286e63e568c2a7d50b6a66ea9d4189254be49ebd6477ed8945e23e195c44 compat53-0.14.3-1.src.rock +sha256 870cdff7e4db4c2e84a335b2b9e242b9f963830550026e2057a5885e945982e5 lua-compat-5.3-0.14.3/LICENSE diff --git a/package/lua-compat53/lua-compat53.mk b/package/lua-compat53/lua-compat53.mk index 12ac5c011bd..048a52279f4 100644 --- a/package/lua-compat53/lua-compat53.mk +++ b/package/lua-compat53/lua-compat53.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_COMPAT53_VERSION_UPSTREAM = 0.12 +LUA_COMPAT53_VERSION_UPSTREAM = 0.14.3 LUA_COMPAT53_VERSION = $(LUA_COMPAT53_VERSION_UPSTREAM)-1 LUA_COMPAT53_NAME_UPSTREAM = compat53 LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM) diff --git a/package/lua-livr/Config.in b/package/lua-livr/Config.in index 76fd1c75438..ac749025a70 100644 --- a/package/lua-livr/Config.in +++ b/package/lua-livr/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LUA_LIVR bool "lua-livr" + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime help Lightweight validator supporting Language Independent Validation Rules Specification (LIVR). diff --git a/package/lua-livr/lua-livr.hash b/package/lua-livr/lua-livr.hash index 50e4d3c6a7b..1df12730650 100644 --- a/package/lua-livr/lua-livr.hash +++ b/package/lua-livr/lua-livr.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 7f00fc561c5913bb53a21ec21f060118d9795c65a0d7a37903e311bdedcfff2a lua-livr-0.4.0-1.src.rock -sha256 6840bae0e48c559cc6aa765d7744d920f8a05f608c4d1223fde8e6b8e7c48c5d lua-LIVR-0.4.0/COPYRIGHT +sha256 4e0f5fd78c05893d8d6312bd067e9e6d6492ff363719f2da574ab0726fd76e86 lua-livr-0.5.0-1.src.rock +sha256 6840bae0e48c559cc6aa765d7744d920f8a05f608c4d1223fde8e6b8e7c48c5d lua-LIVR-0.5.0/COPYRIGHT diff --git a/package/lua-livr/lua-livr.mk b/package/lua-livr/lua-livr.mk index 56600c80b2c..28a9d418c06 100644 --- a/package/lua-livr/lua-livr.mk +++ b/package/lua-livr/lua-livr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LIVR_VERSION = 0.4.0-1 +LUA_LIVR_VERSION = 0.5.0-1 LUA_LIVR_NAME_UPSTREAM = lua-LIVR LUA_LIVR_LICENSE = MIT LUA_LIVR_LICENSE_FILES = $(LUA_LIVR_SUBDIR)/COPYRIGHT diff --git a/package/lua-lsdbus/lua-lsdbus.hash b/package/lua-lsdbus/lua-lsdbus.hash index 93a086f16cb..43029f61e9a 100644 --- a/package/lua-lsdbus/lua-lsdbus.hash +++ b/package/lua-lsdbus/lua-lsdbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9a967720736b0f6ff9b3f527846de28aaf74f58775af6358c13c31c0ac37b832 lua-lsdbus-ca7509b41a26b4a3c9b9d2c523be090bdbcc89fe.tar.gz +sha256 33d14d52df702dbb2b1e5b7770cb4e4efb11df2da0b743c5f9a19e16a09783fe lua-lsdbus-ae5e674e5e792dd72e4164c436ca7b064158e7c6.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/lua-lsdbus/lua-lsdbus.mk b/package/lua-lsdbus/lua-lsdbus.mk index 865a5f8f344..606fa16c5e5 100644 --- a/package/lua-lsdbus/lua-lsdbus.mk +++ b/package/lua-lsdbus/lua-lsdbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LSDBUS_VERSION = ca7509b41a26b4a3c9b9d2c523be090bdbcc89fe +LUA_LSDBUS_VERSION = ae5e674e5e792dd72e4164c436ca7b064158e7c6 LUA_LSDBUS_SITE = $(call github,kmarkus,lsdbus,$(LUA_LSDBUS_VERSION)) LUA_LSDBUS_DEPENDENCIES = luainterpreter mxml systemd LUA_LSDBUS_LICENSE = LGPL-2.1 diff --git a/package/lua-uuid/Config.in b/package/lua-uuid/Config.in new file mode 100644 index 00000000000..b2f259f2fd4 --- /dev/null +++ b/package/lua-uuid/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_UUID + bool "lua-uuid" + help + Generates uuids in pure Lua. + + https://github.com/Tieske/uuid diff --git a/package/lua-uuid/lua-uuid.hash b/package/lua-uuid/lua-uuid.hash new file mode 100644 index 00000000000..d5942078e09 --- /dev/null +++ b/package/lua-uuid/lua-uuid.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 e615c1fb1c22e50af5860e45794c027b1a5524cb8e7e6206ad3fed8e78b1f59e uuid-1.0.0-1.src.rock +sha256 27e7bf0219274247f4014cfb5070abfb2bb27e66c17a2dbd61427cf7fed81199 uuid/LICENSE.md diff --git a/package/lua-uuid/lua-uuid.mk b/package/lua-uuid/lua-uuid.mk new file mode 100644 index 00000000000..5d763071f8e --- /dev/null +++ b/package/lua-uuid/lua-uuid.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# lua-uuid +# +################################################################################ + +LUA_UUID_VERSION = 1.0.0-1 +LUA_UUID_NAME_UPSTREAM = uuid +LUA_UUID_SUBDIR = uuid +LUA_UUID_LICENSE = Apache-2.0 +LUA_UUID_LICENSE_FILES = $(LUA_UUID_SUBDIR)/LICENSE.md + +$(eval $(luarocks-package)) diff --git a/package/luajit/0002-install-inc.patch b/package/luajit/0002-install-inc.patch index 163a5d36fc7..eec77a5f829 100644 --- a/package/luajit/0002-install-inc.patch +++ b/package/luajit/0002-install-inc.patch @@ -14,4 +14,4 @@ Index: b/Makefile +INSTALL_DEFINC= $(DPREFIX)/include INSTALL_INC= $(INSTALL_DEFINC) - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) + export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index 54ae3f99315..eddd2a24194 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 346b028d9ba85e04b7e23a43cc51ec076574d2efc0d271d4355141b0145cd6e0 luajit-04dca7911ea255f37be799c18d74c305b921c1a6.tar.gz +sha256 cbf1647acbd340c62b9c342dae43290762efa1b26d8bf8457f143fabf8ed86c7 luajit-97813fb924edf822455f91a5fbbdfdb349e5984f.tar.gz # Locally calculated sha256 1130331ac861a4b4520e9c8ad0814efdc6f1e79ea55ea9c460c73733d13ccb5f COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 951206b83f9..301973db7e6 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = 04dca7911ea255f37be799c18d74c305b921c1a6 +LUAJIT_VERSION = 97813fb924edf822455f91a5fbbdfdb349e5984f LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT diff --git a/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch index 8d0be40320c..aef6fb8e1de 100644 --- a/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch +++ b/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch @@ -1,4 +1,4 @@ -From 7c74ad9c349e381decc84c218112ea8e7bcc0b9c Mon Sep 17 00:00:00 2001 +From 1c35333cd7836c3cc9b39cf6c5599d2221268e94 Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 23 Mar 2023 09:57:59 +0000 Subject: [PATCH] cmdline: use freopen() to reopen standard streams @@ -19,15 +19,17 @@ with Taken from: https://github.com/gentoo/gentoo/blob/master/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch Signed-off-by: Simon Rowe +[Julien: rebased patch on v2.03.27] +Signed-off-by: Julien Olivain --- tools/lvmcmdline.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index 1e12bedca..534368575 100644 +index 7209ebd9b..3c0c957b1 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3384,7 +3384,11 @@ static int _check_standard_fds(void) +@@ -3378,7 +3378,11 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -39,7 +41,7 @@ index 1e12bedca..534368575 100644 if (err) perror("stdin stream open"); else -@@ -3394,7 +3398,11 @@ static int _check_standard_fds(void) +@@ -3388,7 +3392,11 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -51,7 +53,7 @@ index 1e12bedca..534368575 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3402,7 +3410,11 @@ static int _check_standard_fds(void) +@@ -3396,7 +3404,11 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -64,5 +66,5 @@ index 1e12bedca..534368575 100644 strerror(errno)); return 0; -- -2.22.3 +2.46.2 diff --git a/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch index 0b57fb6fd22..747c3cbc83e 100644 --- a/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch +++ b/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch @@ -1,4 +1,4 @@ -From 6d6b953cf7d2b8d06e7b0363b1b06cb2e902aa0f Mon Sep 17 00:00:00 2001 +From 760ac03a8d8870ad47776075c1e59b6395d308bf Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 23 Mar 2023 10:07:02 +0000 Subject: [PATCH] log: use freopen() to reopen standard streams @@ -19,17 +19,19 @@ with Taken from: https://github.com/gentoo/gentoo/blob/master/sys-fs/lvm2/files/lvm2-2.03.14-freopen_n2.patch Signed-off-by: Simon Rowe +[Julien: rebased patch on v2.03.27] +Signed-off-by: Julien Olivain --- lib/log/log.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/log/log.c b/lib/log/log.c -index 7b4d537b3..5f62c048c 100644 +index 3eda7d343..0bcd9552d 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) - _check_and_replace_standard_log_streams(old_stream, new_stream); + _check_and_replace_standard_log_streams(*stream, new_stream); +#ifdef __GLIBC__ *stream = new_stream; @@ -40,5 +42,5 @@ index 7b4d537b3..5f62c048c 100644 } -- -2.22.3 +2.46.2 diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 74c5f4f1bc7..1abaeb04970 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa LVM2.2.03.23.tgz +sha512 02607797f067b2b26d615b9a182ad70017e61d436e3866acf820a04154e503fb59114e9a4540a273d9f570d0337332ca995fb3be83c11eadaca53c1b826eb810 LVM2.2.03.27.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 4fcfddb1bbd..2fc24be60ea 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.23 +LVM2_VERSION = 2.03.27 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES diff --git a/package/lz4/0001-build-Support-BUILD_SHARED-no.patch b/package/lz4/0001-build-Support-BUILD_SHARED-no.patch deleted file mode 100644 index d2d8639a3bb..00000000000 --- a/package/lz4/0001-build-Support-BUILD_SHARED-no.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 04bd118cfe9..548bb21e65d 100644 --- a/package/lz4/lz4.hash +++ b/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b lz4-1.9.4.tar.gz +sha256 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b lz4-1.10.0.tar.gz sha256 8b58c446121a109ccf32edc094bba3010a3d85e4ee3702950db55e4d3e87736c lib/LICENSE -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING +sha256 609b910ef05c9c855ecc1da155a36ed0f57514eac452cf93446530b5ea4b3bc3 programs/COPYING diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 202dc172f7a..60d321babe4 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZ4_VERSION = 1.9.4 +LZ4_VERSION = 1.10.0 LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 31a74cab606..3dc2359c82a 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 a8e319a83744b1f1fb6988dfa189d61887f866e9140cc9a49eb003b2b0655e88 mawk-1.3.4-20240123.tgz +sha256 a39967927dfa1b0116efc45b944a0f5b5b4c34f8e842a4b223dcdd7b367399e0 mawk-1.3.4-20240905.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index 9aadf6d9727..1a5e80ae8e5 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20240123 +MAWK_VERSION = 1.3.4-20240905 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 84ea4b2ac7a..01c0f61b443 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.31.sha256 -sha256 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.32.sha256 +sha256 4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe mc-4.8.32.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index a6c3e0bc845..b7e7e107c7f 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.31 +MC_VERSION = 4.8.32 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ diff --git a/package/memcached/0001-logger.c-initialize-rport.patch b/package/memcached/0001-logger.c-initialize-rport.patch deleted file mode 100644 index 002a6896018..00000000000 --- a/package/memcached/0001-logger.c-initialize-rport.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b3431c4fcaf65e66fda80ef89b79ff3da1912b4f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 25 Dec 2021 20:05:29 +0100 -Subject: [PATCH] logger.c: initialize rport - -Fix the following build failure raised since version 1.6.11 and -https://github.com/memcached/memcached/commit/617d7cd64d04698b76fee74882627690017e20ad: - -logger.c: In function '_logger_parse_cce': -logger.c:297:13: error: 'rport' may be used uninitialized in this function [-Werror=maybe-uninitialized] - 297 | total = snprintf(scratch, LOGGER_PARSE_SCRATCH, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 298 | "ts=%d.%d gid=%llu type=conn_close rip=%s rport=%hu transport=%s reason=%s cfd=%d\n", - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 299 | (int) e->tv.tv_sec, (int) e->tv.tv_usec, (unsigned long long) e->gid, - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 300 | rip, rport, transport_map[le->transport], - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 301 | reason_map[le->reason], le->sfd); - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/7a46ac38d10b1859034017e0294961daa8f48dd2 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/memcached/memcached/pull/1077 ---- - logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/logger.c b/logger.c -index 667f3c7..394adae 100644 ---- a/logger.c -+++ b/logger.c -@@ -269,7 +269,7 @@ static int _logger_parse_extw(logentry *e, char *scratch) { - - static int _logger_parse_cne(logentry *e, char *scratch) { - int total; -- unsigned short rport; -+ unsigned short rport = 0; - char rip[64]; - struct logentry_conn_event *le = (struct logentry_conn_event *) e->data; - const char * const transport_map[] = { "local", "tcp", "udp" }; -@@ -286,7 +286,7 @@ static int _logger_parse_cne(logentry *e, char *scratch) { - - static int _logger_parse_cce(logentry *e, char *scratch) { - int total; -- unsigned short rport; -+ unsigned short rport = 0; - char rip[64]; - struct logentry_conn_event *le = (struct logentry_conn_event *) e->data; - const char * const transport_map[] = { "local", "tcp", "udp" }; --- -2.33.0 - diff --git a/package/memcached/0002-fix-build-on-uclibc-ng.patch b/package/memcached/0002-fix-build-on-uclibc-ng.patch deleted file mode 100644 index a5af7a2adbd..00000000000 --- a/package/memcached/0002-fix-build-on-uclibc-ng.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c84e5e55e0e9e793849f721d30979242ed6a6ee3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 1 Oct 2023 14:12:38 +0200 -Subject: [PATCH] fix build on uclibc-ng - -Fix the following build failure with uclibc-ng raised since version -1.6.18 and -https://github.com/memcached/memcached/commit/875371a75cbf1f92350de2d1fa0fae4a35ed572b: - -/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: memcached-thread.o: in function `thread_setname': -thread.c:(.text+0xea2): undefined reference to `pthread_setname_np' - -Fixes: - - http://autobuild.buildroot.org/results/e856d381f5ec7d2727f21c8bd46dacb456984416 - -Signed-off-by: Fabrice Fontaine -Upstream: unsent yet (waiting feedback on first patch) ---- - configure.ac | 1 + - extstore.c | 2 +- - thread.c | 2 +- - 3 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d94f6fb..5ec5088 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -686,6 +686,7 @@ AC_CHECK_FUNCS(clock_gettime) - AC_CHECK_FUNCS(preadv) - AC_CHECK_FUNCS(pread) - AC_CHECK_FUNCS(eventfd) -+AC_CHECK_FUNCS([pthread_setname_np],[AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Define to 1 if support pthread_setname_np])]) - AC_CHECK_FUNCS([accept4], [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if support accept4])]) - AC_CHECK_FUNCS([getopt_long], [AC_DEFINE(HAVE_GETOPT_LONG, 1, [Define to 1 if support getopt_long])]) - -diff --git a/extstore.c b/extstore.c -index b079465..f6a6180 100644 ---- a/extstore.c -+++ b/extstore.c -@@ -119,7 +119,7 @@ struct store_engine { - #define THR_NAME_MAXLEN 16 - static void thread_setname(pthread_t thread, const char *name) { - assert(strlen(name) < THR_NAME_MAXLEN); --#if defined(__linux__) -+#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP) - pthread_setname_np(thread, name); - #endif - } -diff --git a/thread.c b/thread.c -index ee120fa..76651c2 100644 ---- a/thread.c -+++ b/thread.c -@@ -635,7 +635,7 @@ static void thread_libevent_process(evutil_socket_t fd, short which, void *arg) - #define THR_NAME_MAXLEN 16 - void thread_setname(pthread_t thread, const char *name) { - assert(strlen(name) < THR_NAME_MAXLEN); --#if defined(__linux__) -+#if defined(__linux__) && defined(HAVE_PTHREAD_SETNAME_NP) - pthread_setname_np(thread, name); - #endif - } --- -2.40.1 - diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index bd2072df0b8..781897b6b79 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.22.tar.gz.sha1 -sha1 7a691f390d59616dbebfc9e2e4942d499c39a338 memcached-1.6.22.tar.gz +# From http://www.memcached.org/files/memcached-1.6.29.tar.gz.sha1 +sha1 a9699aed111d86b6e37b3ce5e6ef4e7539582d5f memcached-1.6.29.tar.gz # Locally computed -sha256 34783a90a4ccf74c4107085fd92b688749d23b276cfdad9f04e4f725a05d1ca7 memcached-1.6.22.tar.gz +sha256 269643d518b7ba2033c7a1f66fdfc560d72725a2822194d90c8235408c443a49 memcached-1.6.29.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 05ae69eb329..a01d5aa9d67 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.22 +MEMCACHED_VERSION = 1.6.29 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' @@ -13,8 +13,6 @@ 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 diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash index 9d77f068e2c..e87d52fa728 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 d3ed68d8637195ff35de97b12c8fa148cebffb1ee0fd0d43909ec1643c0c296a mender-artifact-3.8.0-go2.tar.gz -sha256 b8462a14975e30fb0dff14ed50e7563e833ccce13c2aa93f95386ffe877ed673 LIC_FILES_CHKSUM.sha256 +sha256 3fc2d45bedf28843f84c4b8fcc6a9592e1dc176fc91123d99a5172935d7c78a0 mender-artifact-3.11.2-go2.tar.gz +sha256 8c41e20f891ae04abd2d32367248eaf33e1bd2f1328789ab60b8b0d10cc414a1 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -8,21 +8,25 @@ sha256 b8462a14975e30fb0dff14ed50e7563e833ccce13c2aa93f95386ffe877ed673 LIC_FI # sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache 2.0 licenses. -sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 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/genproto/googleapis/api/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/googleapis/rpc/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/grpc/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/appengine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/kms/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/iam/LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/compute/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/compute/metadata/LICENSE sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd vendor/go.opencensus.io/LICENSE sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/golang/groupcache/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/gopkg.in/square/go-jose.v2/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/github.com/oklog/run/LICENSE - +sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/mendersoftware/openssl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/googleapis/enterprise-certificate-proxy/LICENSE +sha256 dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d vendor/github.com/go-jose/go-jose/v3/json/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/go-jose/go-jose/v3/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/google/s2a-go/LICENSE.md # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -44,36 +48,27 @@ sha256 fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9 vendor 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 +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/time/LICENSE +sha256 f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf vendor/github.com/klauspost/compress/internal/snapref/LICENSE # # ISC licenses. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT licenses. sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE -sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE +sha256 2be6c75f36f3022ea015fea7b1b7135ce67d477ee721d0fc6c98678badb13b8b vendor/github.com/urfave/cli/LICENSE sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE -sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +sha256 7709cc030f078b17809884f92f33a2016944e1180312dc3f1371b02313d313ed vendor/github.com/klauspost/pgzip/LICENSE sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md -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 +sha256 f566a9f97bacdaf00d9f21dd991e81dc11201c4e016c86b470799429a1c9a79c vendor/github.com/klauspost/compress/zstd/internal/xxhash/LICENSE.txt # # MPL-2.0 licenses. sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE @@ -81,15 +76,8 @@ sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor 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 d6b1a865f1c8c697d343bd4e0ce61025f91898486a1f00d727f32e8644af77d3 vendor/github.com/hashicorp/vault/api/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 6ade624a23c..399c194c99a 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.8.0 +HOST_MENDER_ARTIFACT_VERSION = 3.11.2 HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION)) HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, MPL-2.0 HOST_MENDER_ARTIFACT_LICENSE_FILES = \ @@ -13,16 +13,21 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/minio/sha256-simd/LICENSE \ vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/google.golang.org/genproto/LICENSE \ + vendor/google.golang.org/genproto/googleapis/api/LICENSE \ + vendor/google.golang.org/genproto/googleapis/rpc/LICENSE \ vendor/google.golang.org/grpc/LICENSE \ vendor/google.golang.org/appengine/LICENSE \ - vendor/cloud.google.com/go/LICENSE \ vendor/cloud.google.com/go/kms/LICENSE \ vendor/cloud.google.com/go/iam/LICENSE \ vendor/cloud.google.com/go/compute/LICENSE \ + vendor/cloud.google.com/go/compute/metadata/LICENSE \ vendor/go.opencensus.io/LICENSE \ vendor/github.com/golang/groupcache/LICENSE \ - vendor/gopkg.in/square/go-jose.v2/LICENSE \ - vendor/github.com/oklog/run/LICENSE \ + vendor/github.com/mendersoftware/openssl/LICENSE \ + vendor/github.com/googleapis/enterprise-certificate-proxy/LICENSE \ + vendor/github.com/go-jose/go-jose/v3/json/LICENSE \ + vendor/github.com/go-jose/go-jose/v3/LICENSE \ + vendor/github.com/google/s2a-go/LICENSE.md \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ @@ -40,51 +45,48 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ 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/golang.org/x/crypto/LICENSE \ + vendor/golang.org/x/time/LICENSE \ + vendor/github.com/klauspost/compress/internal/snapref/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/klauspost/pgzip/LICENSE \ 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/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/klauspost/compress/zstd/internal/xxhash/LICENSE.txt \ 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 + vendor/github.com/hashicorp/go-multierror/LICENSE + +HOST_MENDER_ARTIFACT_DEPENDENCIES = host-pkgconf host-openssl host-xz + +ifeq ($(BR2_PACKAGE_HOST_ZSTD),y) +HOST_MENDER_ARTIFACT_DEPENDENCIES += host-zstd +endif -HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz +HOST_MENDER_ARTIFACT_GO_ENV += \ + PATH=$(BR_PATH) \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ + PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig" \ + PKG_CONFIG_PATH="$(HOST_DIR)/lib/pkgconfig" \ + PKG_CONFIG_SYSROOT_DIR="/" HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) diff --git a/package/mender-connect/mender-connect.hash b/package/mender-connect/mender-connect.hash index 33ad999180d..5f7e082e1be 100644 --- a/package/mender-connect/mender-connect.hash +++ b/package/mender-connect/mender-connect.hash @@ -1,17 +1,16 @@ # Locally computed: -sha256 96b81bb4c72eb8c1756febb94101c0dea5a6d4884591824e61a5f2509cd9ca9b mender-connect-2.1.0-go2.tar.gz -sha256 78b3954421ec6499c3f9735b96d52288574ae80c747416a52548d7f526f26e8c LIC_FILES_CHKSUM.sha256 +sha256 7e83c4cabc090ed26088036c6c68fc8e73546fa4a75db817f676dc8b1e8a3c8f mender-connect-2.2.1-go2.tar.gz +sha256 c57e1178f932015d7f08b4d76c4b18e4a55083a6fbc97629cd25ef426bf1db30 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 +sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE +sha256 a4e99d13c6cd0e4faf3867ae5c9815ff88cab3cefdefe0dc1ec9ac28b1152944 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 @@ -19,6 +18,8 @@ sha256 0f02aac22084ef463aa5f42f566feeec6aa4c99653519744a8c25cb079da5b5d vendor # BSD-3-Clause sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 0b77fdea862f869ef4f201ac5649bdbd38ccb055c7f6454dffae9e2adb4941c1 vendor/github.com/gorilla/websocket/LICENSE # # ISC sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE diff --git a/package/mender-connect/mender-connect.mk b/package/mender-connect/mender-connect.mk index 36ddd5f7db9..f4f7e0f1957 100644 --- a/package/mender-connect/mender-connect.mk +++ b/package/mender-connect/mender-connect.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_CONNECT_VERSION = 2.1.0 +MENDER_CONNECT_VERSION = 2.2.1 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 @@ -14,12 +14,13 @@ 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/golang.org/x/net/LICENSE \ + vendor/github.com/gorilla/websocket/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/creack/pty/LICENSE \ vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE \ diff --git a/package/mender-grubenv/Config.in b/package/mender-grubenv/Config.in index f27eb09e34d..8505458793e 100644 --- a/package/mender-grubenv/Config.in +++ b/package/mender-grubenv/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_MENDER_GRUBENV depends on BR2_PACKAGE_MENDER # runtime depends on BR2_TARGET_GRUB2 depends on !(BR2_TARGET_GRUB2_HAS_LEGACY_BOOT && BR2_TARGET_GRUB2_HAS_EFI_BOOT) + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_BINARIES # flock -w help Contains the boot scripts and tools used by Mender to integrate with the GRUB bootloader. diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash index 193bff073be..d7f784493c4 100644 --- a/package/mender-grubenv/mender-grubenv.hash +++ b/package/mender-grubenv/mender-grubenv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b7a08eb3d996afb38c1a4f7c51b7eb44aec6197ff713ce75e4f39d5b448cfc82 mender-grubenv-2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b.tar.gz -sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 0bac59698165a8dafdd282610246addd7bebf41612efa88c77b779f8ffb5ed9d mender-grubenv-38e5043a215f696d126a2d707c9db9aeb93cfb2d.tar.gz +sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index 8679ad92367..a47531fe587 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -4,14 +4,13 @@ # ################################################################################ -MENDER_GRUBENV_VERSION = 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b +MENDER_GRUBENV_VERSION = 38e5043a215f696d126a2d707c9db9aeb93cfb2d MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) MENDER_GRUBENV_LICENSE = Apache-2.0 MENDER_GRUBENV_LICENSE_FILES = LICENSE # Grub2 must be built first so this package can overwrite the config files # provided by grub. -MENDER_GRUBENV_DEPENDENCIES = grub2 -MENDER_GRUBENV_INSTALL_IMAGES = YES +MENDER_GRUBENV_DEPENDENCIES = grub2 util-linux MENDER_GRUBENV_MAKE_ENV = \ $(TARGET_CONFIGURE_OPTS) \ @@ -30,16 +29,17 @@ MENDER_GRUBENV_MODULES_MISSING_PC = \ $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC)),\ $(MENDER_GRUBENV_MANDATORY_MODULES)) -MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/grub +MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot define MENDER_GRUBENV_INSTALL_I386_CFG mkdir -p $(BINARIES_DIR)/boot-part/grub - cp -dpfr $(@D)/mender_grub.cfg \ + cp -dpfr $(MENDER_GRUBENV_BUILDDIR)/mender_grub.cfg \ $(TARGET_DIR)/boot/grub/grub.cfg cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \ - $(TARGET_DIR)/boot/grub/grub-mender-grubenv \ + $(TARGET_DIR)/boot/grub-mender-grubenv \ $(BINARIES_DIR)/boot-part/ endef +MENDER_GRUBENV_TARGET_FINALIZE_HOOKS += MENDER_GRUBENV_INSTALL_I386_CFG endif # BR2_TARGET_GRUB2_HAS_LEGACY_BOOT ifeq ($(BR2_TARGET_GRUB2_HAS_EFI_BOOT),y) @@ -51,13 +51,14 @@ 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 \ + cp -dpfr $(MENDER_GRUBENV_BUILDDIR)/mender_grub.cfg \ $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ $(BINARIES_DIR)/efi-part/EFI/BOOT cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub-mender-grubenv \ $(BINARIES_DIR)/efi-part/ endef +MENDER_GRUBENV_TARGET_FINALIZE_HOOKS += MENDER_GRUBENV_INSTALL_EFI_CFG endif # BR2_TARGET_GRUB2_HAS_EFI_BOOT ifeq ($(BR2_PACKAGE_MENDER_GRUBENV)$(BR_BUILDING),yy) @@ -86,9 +87,4 @@ define MENDER_GRUBENV_INSTALL_TARGET_CMDS echo 'ENV_DIR=/boot/grub-mender-grubenv' > $(TARGET_DIR)/etc/mender_grubenv.config endef -define MENDER_GRUBENV_INSTALL_IMAGES_CMDS - $(MENDER_GRUBENV_INSTALL_I386_CFG) - $(MENDER_GRUBENV_INSTALL_EFI_CFG) -endef - $(eval $(generic-package)) diff --git a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index 9cedcd0942a..55f7512e2ee 100644 --- a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch +++ b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -24,6 +24,8 @@ http://autobuild.buildroot.net/results/c17/c17bbb12d9deadd64a441b36e324cfbbe8aba Signed-off-by: Matthew Weber [Updated for 0.57.1 - get_builtin_option() vs. get_option(OptionKey())] Signed-off-by: Peter Seiderer +[Bernd: rebased for 1.6.0] +Signed-off-by: Bernd Kuhls --- mesonbuild/compilers/mixins/clike.py | 3 +++ 1 file changed, 3 insertions(+) @@ -32,10 +34,18 @@ diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/ index 09ad837b1..b7f6b9f22 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -978,6 +978,9 @@ class CLikeCompiler(Compiler): - elif env.machines[self.for_machine].is_cygwin(): - shlibext = ['dll', 'dll.a'] - prefixes = ['cyg'] + prefixes +@@ -27,6 +27,7 @@ + from ... import mlog + from ...linkers.linkers import GnuLikeDynamicLinkerMixin, SolarisDynamicLinker, CompCertDynamicLinker + from ...mesonlib import LibType ++from ...options import OptionKey + from .. import compilers + from ..compilers import CompileCheckMode + from .visualstudio import VisualStudioLikeCompiler +@@ -1038,6 +1038,9 @@ class CLikeCompiler(Compiler): + # TI C6000 compiler can use both extensions for static or dynamic libs. + stlibext = ['a', 'lib'] + shlibext = ['dll', 'so'] + elif env.coredata.get_option(OptionKey('default_library')) == 'static': + # Linux/BSDs + shlibext = ['a'] diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 150fd6d1bb3..e02d878d795 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc -sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.6.0/meson-1.6.0.tar.gz.asc +sha256 999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496 meson-1.6.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 467569d28b0..f36091e5843 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.3.1 +MESON_VERSION = 1.6.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/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host index d4eb0d74c31..f0d36f37a12 100644 --- a/package/moby-buildkit/Config.in.host +++ b/package/moby-buildkit/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MOBY_BUILDKIT bool "host moby-buildkit" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 8874ba4171f..6e8d1e3804b 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7c4aecf92f7f27f1cbb2cbda3c185c385f2b7af84f6bd7c0ce31b84742b15691 mongoose-7.14.tar.gz +sha256 efcb5aa89b85d40373dcff3241316ddc0f2f130ad7f05c9c964f8cc1e2078a0b mongoose-7.15.tar.gz sha256 7e2bc5dabbc27b431a530540161ba860906f12109d4b84b1e4bc8879f1afc3bc LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index d2cd45451ef..e3c57c8e8a5 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.14 +MONGOOSE_VERSION = 7.15 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE diff --git a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch index 31b20b3cbc9..3bee55cb5e2 100644 --- a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch +++ b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch @@ -10,6 +10,8 @@ Upstream: N/A (specific to buildroot) Signed-off-by: Jens Maus [Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: Dario Binacchi +[Bernd: rebased against 5.34.2] +Signed-off-by: Bernd Kuhls --- configure.ac | 2 +- libmonit/configure.ac | 2 +- @@ -21,7 +23,7 @@ index 3c3d30a2..f4c5ea07 100644 +++ b/configure.ac @@ -8,7 +8,7 @@ # Example: 5.0_beta2 - AC_INIT([monit], [5.33.0], [monit-general@nongnu.org]) + AC_INIT([monit], [5.34.2], [monit-general@nongnu.org]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4 config]) diff --git a/package/monit/monit.hash b/package/monit/monit.hash index 1d9feca57bf..276e0a19d8d 100644 --- a/package/monit/monit.hash +++ b/package/monit/monit.hash @@ -1,4 +1,4 @@ -# From https://mmonit.com/monit/dist/monit-5.33.0.tar.gz.sha256 -sha256 1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 monit-5.33.0.tar.gz +# From https://mmonit.com/monit/dist/monit-5.34.2.tar.gz.sha256 +sha256 291ca3d898e9b425b6d0c1768728fecd6c1cf4c268c79db15fda26285ad5b832 monit-5.34.2.tar.gz # Locally computed sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/package/monit/monit.mk b/package/monit/monit.mk index e3a4fac936b..a2d8073c319 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -4,8 +4,8 @@ # ################################################################################ -MONIT_VERSION = 5.33.0 -MONIT_SITE = http://mmonit.com/monit/dist +MONIT_VERSION = 5.34.2 +MONIT_SITE = https://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING MONIT_CPE_ID_VENDOR = mmonit diff --git a/package/mosh/0001-Bump-C-version-to-C-17.patch b/package/mosh/0001-Bump-C-version-to-C-17.patch new file mode 100644 index 00000000000..eea3889828f --- /dev/null +++ b/package/mosh/0001-Bump-C-version-to-C-17.patch @@ -0,0 +1,49 @@ +From eee1a8cf413051c2a9104e8158e699028ff56b26 Mon Sep 17 00:00:00 2001 +From: Alex Chernyakhovsky +Date: Sun, 30 Jul 2023 16:19:46 -0400 +Subject: [PATCH] Bump C++ version to C++17 + +Protobuf versions since 3.6.0 have long had a C++11 dependency; even +more recent versions have picked up an Abseil dependency bumping that +to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so +remove the conditional C++ standards version check that mosh +previously had and replace it with an unconditional C++17 check. + +This means that all future commits can use C++17 features. According +to https://en.cppreference.com/w/cpp/compiler_support/17 this means +that minimum effective compiler versions for mosh become: + +gcc 7 (May 2017) +clang 5 (September 2017) + +This, in turn, implies that future versions of mosh will no longer be +available for RHEL/CentOS 7 (June 2014). + +Closes: #1267 + +Signed-off-by: James Hilliard +Upstream: https://github.com/mobile-shell/mosh/commit/eee1a8cf413051c2a9104e8158e699028ff56b26 +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ee70c7b..7f7dc3b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x], + # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + +-# Protobuf 3.6+ requires C++11. +-AS_IF([pkg-config --atleast-version 3.6.0 protobuf], +- [AX_CXX_COMPILE_STDCXX([11])]) ++# Protobuf transitively requires at least C++14, get ahead of the ++# curve and require at least C++17. ++AX_CXX_COMPILE_STDCXX([17]) + + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" +-- +2.34.1 + diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index c938f70719e..3c41a17401c 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -9,9 +9,7 @@ MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS - -# protobuf needs c++11 (since 3.6.0) -MOSH_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +MOSH_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) MOSH_CONF_OPTS += --with-crypto-library=openssl diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in index 8bedf2ad21c..339df8fddb7 100644 --- a/package/mosquitto/Config.in +++ b/package/mosquitto/Config.in @@ -29,6 +29,15 @@ config BR2_PACKAGE_MOSQUITTO_BROKER help Build and install the mosquitto broker onto target. +config BR2_PACKAGE_MOSQUITTO_BROKER_DYNAMIC_SECURITY_PLUGIN + bool "dynamic security plugin" + depends on BR2_PACKAGE_MOSQUITTO_BROKER + select BR2_PACKAGE_CJSON + select BR2_PACKAGE_OPENSSL + help + Build and install the dynamic security plugin for + mosquitto broker onto target. + comment "mosquitto broker needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 1b06809b9e7..727dd4ff4cb 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -94,6 +94,10 @@ ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER),y) MOSQUITTO_MAKE_DIRS += src apps/mosquitto_ctrl apps/mosquitto_passwd endif +ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER_DYNAMIC_SECURITY_PLUGIN),y) +MOSQUITTO_MAKE_DIRS += plugins/dynamic-security +endif + define MOSQUITTO_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DIRS="$(MOSQUITTO_MAKE_DIRS)" \ $(MOSQUITTO_MAKE_OPTS) diff --git a/package/motion/motion.hash b/package/motion/motion.hash index e8bbfbcbcbc..1d1a005e7a1 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9268df31a5ebeaf8daca4747cdcd01c86e223625b6f971e9bcec98edf35ec06f motion-4.6.0.tar.gz +sha256 657b7d8ee59f42cf06e00da04f0627f3ff42ff5344c9a1da33d16207c4451a03 motion-4.7.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index ff5e2c1403d..fc703492215 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.6.0 +MOTION_VERSION = 4.7.0 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 412d67a328b..0cad06ce584 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 997ffe4125a19de1fd433ed63f128f7d54bc1a5915f3cdb36da6491ef917f217 mtools-4.0.43.tar.lz +sha256 32ca85dfc1674c536143d4e0da60e3134039eb9552e0fecfa110e9c8736093ce mtools-4.0.45.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 96d8e43ea21..7089af339e8 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.43 +MTOOLS_VERSION = 4.0.45 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 04e3c6290a1..4f31eedef94 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v8/nano-8.1.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.2.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 93b3e3e9155ae389fe9ccf9cb7ab380eac29602835ba3077b22f64d0f0cbe8cb nano-8.1.tar.xz +sha256 d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb nano-8.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index db614feb754..a1b94c90d87 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 8 -NANO_VERSION = $(NANO_VERSION_MAJOR).1 +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/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 9ab5d604a84..285484ed2c5 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ -md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz -sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.19/ +md5 4861f0c2450ac7a6094e51090e6fdc75 netatalk-3.1.19.tar.xz +sha1 16900b3b14da9c2f40e1267ecb3e68021cc794b0 netatalk-3.1.19.tar.xz # Locally computed -sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz +sha256 433fa87ac23bc18a9acb0769b4f7f4047eeb14e02e0607ecd3a051c31859164f netatalk-3.1.19.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 53cd53876ad..b6f9c3fa591 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.18 +NETATALK_VERSION = 3.1.19 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config diff --git a/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch b/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch deleted file mode 100644 index 6f39c53128d..00000000000 --- a/package/nethogs/0001-determineVersion-sh-prevent-traversing.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6423bdf05d51efc5441c82248098f99e4c1f59c3 Mon Sep 17 00:00:00 2001 -From: Marcus Hoffmann -Date: Fri, 20 Sep 2024 12:06:26 +0200 -Subject: [PATCH] determineVersion.sh: prevent traversing into outer git repo - for git-describe call - -When building nethogs inside another git repo (as is i.e. done as part -of a buildroot build) the version is picked up from the outer git repo, -which is confusing as well as introducing reproducibility problems when -rebuilding the same nethogs version produces different results if the -outer repository changes. - -Upstream: https://github.com/raboof/nethogs/commit/6423bdf05d51efc5441c82248098f99e4c1f59c3 -Signed-off-by: Marcus Hoffmann ---- - determineVersion.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/determineVersion.sh b/determineVersion.sh -index 7c5f1de..3d80d9d 100755 ---- a/determineVersion.sh -+++ b/determineVersion.sh -@@ -1,3 +1,6 @@ - #!/bin/bash -- --(git describe --tags 2>/dev/null || pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//") | tail -c +2 -+if [ $(git rev-parse --show-toplevel 2>/dev/null) == $(pwd) ]; then -+ git describe --tags 2>/dev/null | tail -c +2 -+else -+ pwd | sed -e "s/.*\\///" | sed -e "s/[^-]*//" | tail -c +2 -+fi diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash index fd1f2362505..b1ef5d70426 100644 --- a/package/nethogs/nethogs.hash +++ b/package/nethogs/nethogs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz +sha256 111ade20cc545e8dfd7ce4e293bd6b31cd1678a989b6a730bd2fa2acc6254818 nethogs-0.8.8.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk index 98c4f5f008c..74387d7397f 100644 --- a/package/nethogs/nethogs.mk +++ b/package/nethogs/nethogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETHOGS_VERSION = 0.8.7 +NETHOGS_VERSION = 0.8.8 NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) NETHOGS_LICENSE = GPL-2.0+ NETHOGS_LICENSE_FILES = COPYING diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index 6c2486e2603..5b11cd0daf1 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.9.1.tar.gz.sig -sha256 ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 nettle-3.9.1.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.10.tar.gz.sig +sha256 b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c nettle-3.10.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 20f755cc986..3f30fd761d7 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETTLE_VERSION = 3.9.1 -NETTLE_SITE = https://ftp.gnu.org/gnu/nettle +NETTLE_VERSION = 3.10 +NETTLE_SITE = $(BR2_GNU_MIRROR)/nettle NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index 59d03fae2a9..902dc599b95 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.11/NetworkManager-openvpn-1.11.0.sha256sum -sha256 2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501 NetworkManager-openvpn-1.11.0.tar.xz +sha256 903fd4c0aebd2aa7ac70c9d8c2bed8df922655d22d764514403566ae89b7e886 NetworkManager-openvpn-1.12.0.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 f39edf32091..b8a4325493e 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.11 +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.12 NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).0 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) diff --git a/package/network-manager/0001-libnm-systemd-core-disable-sd_dhcp6_client_set_duid_uuid.patch b/package/network-manager/0001-libnm-systemd-core-disable-sd_dhcp6_client_set_duid_uuid.patch new file mode 100644 index 00000000000..7c5d4bde786 --- /dev/null +++ b/package/network-manager/0001-libnm-systemd-core-disable-sd_dhcp6_client_set_duid_uuid.patch @@ -0,0 +1,68 @@ +From 118e3117fe48f18cb2175b3cbc95a6ea3ced28b2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj +Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/118e3117fe48f18cb2175b3cbc95a6ea3ced28b2 +Signed-off-by: Fiona Klute (WIWA) +--- + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +index e664a4a7207..28abddfbc5e 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 /* NM_IGNORED */ + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif /* NM_IGNORED */ + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +index 7c20116409e..a6b55d07e0b 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 /* NM_IGNORED */ + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,6 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } ++#endif /* NM_IGNORED */ + + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; +-- +GitLab + diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 952b0cea93c..9fe9ce4e8bf 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.sha256sum -sha256 722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068 NetworkManager-1.46.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.48/NetworkManager-1.48.8.sha256sum +sha256 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 NetworkManager-1.48.10.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 3937982c5fd..8349b6c79bf 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.46 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.48 +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 @@ -144,7 +144,7 @@ NETWORK_MANAGER_CONF_OPTS += \ -Dsystemd_journal=false \ -Dconfig_logging_backend_default=syslog \ -Dsession_tracking=no \ - -Dsuspend_resume=upower \ + -Dsuspend_resume=consolekit \ -Dsystemdsystemunitdir=no endif diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index c5ede1130aa..ef635cd3c3f 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,8 +1,8 @@ # From https://netfilter.org/projects/nftables/downloads.html # Checked pgp signature: -# https://netfilter.org/projects/nftables/files/nftables-1.0.8.tar.xz.sig +# https://netfilter.org/projects/nftables/files/nftables-1.1.0.tar.xz.sig # with key: # https://netfilter.org/files/coreteam-gpg-key-0xD55D978A8A1420E4.txt -sha256 9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50 nftables-1.0.8.tar.xz +sha256 ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24 nftables-1.1.0.tar.xz # Locally computed: sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 9cba2433723..c958f0eb269 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.8 +NFTABLES_VERSION = 1.1.0 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) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 61bda55098f..aaa9e4619ab 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ # From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc -sha256 10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e node-v20.15.1-linux-arm64.tar.xz -sha256 7bc120efdd8018f6915471b963d9b80adf4ed406d6dc9edb4ae944b85f505c4c node-v20.15.1-linux-armv7l.tar.xz -sha256 b33e684802251397ad62ad3f8a1836267ee8b7723f87f669470018ad0035287b node-v20.15.1-linux-ppc64le.tar.xz -sha256 26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f node-v20.15.1-linux-x64.tar.xz -sha256 fdd53a5729d936691a2a1151046fb4897721cb8b0fca2af957823a9b40fe0c34 node-v20.15.1.tar.xz +sha256 6031d04b98f59ff0f7cb98566f65b115ecd893d3b7870821171708cdbaf7ae6e node-v22.11.0-linux-arm64.tar.xz +sha256 9de0fdcfb1cccbe03f72f939e4e6f03867aef3da8223f90606cd93757704dae0 node-v22.11.0-linux-armv7l.tar.xz +sha256 d1d49d7d611b104b6d616e18ac439479d8296aa20e3741432de0e85f4735a81e node-v22.11.0-linux-ppc64le.tar.xz +sha256 83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf610a72 node-v22.11.0-linux-x64.tar.xz +sha256 bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35 node-v22.11.0.tar.xz # Locally calculated -sha256 49cd410e0fe6a8879a40d0764092d1e6114cc85fe41d4efed990d028eec25582 LICENSE +sha256 f0cb1ad806ba5d681f378a8cc2e539fe4b54839290eda3c814ec8994af2b8422 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 104d2cf258c..bf0764136e4 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.15.1 +NODEJS_COMMON_VERSION = 22.11.0 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) diff --git a/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch b/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch new file mode 100644 index 00000000000..ac532e1fb58 --- /dev/null +++ b/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch @@ -0,0 +1,46 @@ +From c265971648f82464a76f797c4c20a09def078be9 Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Thu, 16 May 2024 09:03:24 -0700 +Subject: [PATCH] Don't fail build when set_mempolicy_home_node syscall is + unknown + +Instead just warn at build and return ENOSYS. This fixes build +on architectures like arm without kernel headers installed. + +Fixes #219 + +Upstream: https://github.com/numactl/numactl/commit/87342c3b9a42aadbe1398ca8233d13ab524aa64f +Signed-off-by: Andi Kleen +--- + syscall.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/syscall.c b/syscall.c +index 63b3e53..392f736 100644 +--- a/syscall.c ++++ b/syscall.c +@@ -144,7 +144,7 @@ + #if defined(__x86_64__) || defined(__aarch64__) + #define __NR_set_mempolicy_home_node 450 + #else +-#error "Add syscalls for your architecture or update kernel headers" ++#warning "Add syscalls for your architecture or update kernel headers" + #endif + + #endif +@@ -261,7 +261,12 @@ long WEAK move_pages(int pid, unsigned long count, + + int WEAK set_mempolicy_home_node(void *start, unsigned long len, int home_node, int flags) + { ++#ifndef __NR_set_mempolicy_home_node ++ errno = ENOSYS; ++ return -1; ++#else + return syscall(__NR_set_mempolicy_home_node, start, len, home_node, flags); ++#endif + } + + /* SLES8 glibc doesn't define those */ +-- +2.46.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 deleted file mode 100644 index 54d55656ec2..00000000000 --- a/package/numactl/0001-link-with-latomic-if-needed-again.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/numactl.hash b/package/numactl/numactl.hash index 757001b7509..c48df0ac69d 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1b242f893af977a1d31af6ce9d6b8dafdd2d8ec3dc9207f7c2dc0d3446e7c7c8 numactl-2.0.16.tar.gz +sha256 b4fc0956317680579992d7815bc43d0538960dc73aa1dd8ca7e3806e30bc1274 numactl-2.0.18.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index 157f953c51f..512a5eb96ab 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,14 +4,12 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.16 +NUMACTL_VERSION = 2.0.18 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 = LICENSE.GPL2 LICENSE.LGPL2.1 NUMACTL_INSTALL_STAGING = YES -# We're patching configure.ac -NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" $(eval $(autotools-package)) diff --git a/package/nushell/0001-uucore-add-support-for-sparc64.patch b/package/nushell/0001-uucore-add-support-for-sparc64.patch deleted file mode 100644 index ad7e70a56d6..00000000000 --- a/package/nushell/0001-uucore-add-support-for-sparc64.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9f4330f94cc471d880df7d9089ee1105b27fd321 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 6 Jan 2024 10:26:54 +0100 -Subject: [PATCH] uucore: add support for sparc64 - -Add support for sparc64 in uucore to avoid the following build failure -with nushell: - -error[E0308]: mismatched types - --> /home/autobuild/autobuild/instance-7/output-1/build/nushell-0.85.0/VENDOR/uucore/src/lib/features/fs.rs:121:16 - | -111 | pub fn number_of_links(&self) -> u64 { - | --- expected `u64` because of return type -... -121 | return self.0.st_nlink; - | ^^^^^^^^^^^^^^^ expected `u64`, found `u32` - | -help: you can convert a `u32` to a `u64` - | -121 | return self.0.st_nlink.into(); - | +++++++ - -For more information about this error, try `rustc --explain E0308`. -error: could not compile `uucore` (lib) due to previous error - -Fixes: - - http://autobuild.buildroot.org/results/f9f0287a8e39c65895014ca513ed25071f020add - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/uucore/src/lib/features/fs.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/features/fs.rs -index 20cc9e13d..3b9170bc3 100644 ---- a/VENDOR/uucore/src/lib/features/fs.rs -+++ b/VENDOR/uucore/src/lib/features/fs.rs -@@ -116,6 +116,7 @@ - not(target_os = "freebsd"), - not(target_arch = "aarch64"), - not(target_arch = "riscv64"), -+ not(target_arch = "sparc64"), - target_pointer_width = "64" - ))] - return self.0.st_nlink; -@@ -127,6 +128,7 @@ - target_os = "freebsd", - target_arch = "aarch64", - target_arch = "riscv64", -+ target_arch = "sparc64", - not(target_pointer_width = "64") - ) - ))] --- -2.43.0 - diff --git a/package/nushell/nushell.hash b/package/nushell/nushell.hash index c125a6c652f..83360544550 100644 --- a/package/nushell/nushell.hash +++ b/package/nushell/nushell.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 9175b7e25a93a35c4f2690a63e7c36ac2dc31a9d762f59de01aac8ac1075b02f nushell-0.85.0-cargo2.tar.gz +sha256 592f3b74156be0e65f8ef01fbc2e947480b91407190f93761d7c9531f381bfac nushell-0.96.1-cargo2.tar.gz sha256 2dc1f03f729c21902d869b4d8f8dc528fc730f4c6ad83fc128672bda0ad69196 LICENSE diff --git a/package/nushell/nushell.mk b/package/nushell/nushell.mk index 7b538da4e2a..a05eaa98292 100644 --- a/package/nushell/nushell.mk +++ b/package/nushell/nushell.mk @@ -4,19 +4,12 @@ # ################################################################################ -NUSHELL_VERSION = 0.85.0 +NUSHELL_VERSION = 0.96.1 NUSHELL_SITE = $(call github,nushell,nushell,$(NUSHELL_VERSION)) NUSHELL_LICENSE = MIT NUSHELL_LICENSE_FILES = LICENSE NUSHELL_DEPENDENCIES = host-pkgconf openssl ncurses -# 0001-uucore-add-support-for-sparc64.patch -define NUSHELL_PATCH_CHECKSUM_FILE - $(SED) 's/b0390ae7bca8b31f0db289a5d064bba36d45e4d137674e9df2c6ab6256f926f4/f8ce2ad571e1482f6833cb147eafeb724776e7887ebabf339a5f3e79860583cb/' \ - $(@D)/VENDOR/uucore/.cargo-checksum.json -endef -NUSHELL_POST_PATCH_HOOKS += NUSHELL_PATCH_CHECKSUM_FILE - # Add /usr/bin/nu to /etc/shells as in package/bash/bash.mk define NUSHELL_ADD_NU_TO_SHELLS grep -qsE '^/usr/bin/nu$$' $(TARGET_DIR)/etc/shells \ diff --git a/package/oath-toolkit/Config.in b/package/oath-toolkit/Config.in new file mode 100644 index 00000000000..f2d697a7c9a --- /dev/null +++ b/package/oath-toolkit/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OATH_TOOLKIT + bool "oath-toolkit" + depends on BR2_USE_WCHAR + help + OATH Toolkit provide components to build one-time password + authentication systems. It contains shared C libraries, + command line tools and a PAM module. Supported technologies + include the event-based HOTP algorithm (RFC 4226), the + time-based TOTP algorithm (RFC 6238), and Portable Symmetric + Key Container (PSKC, RFC 6030) to manage secret key + data. OATH stands for Open AuTHentication, which is the + organization that specify the algorithms. + + https://www.nongnu.org/oath-toolkit/ + +if BR2_PACKAGE_OATH_TOOLKIT + +config BR2_PACKAGE_OATH_TOOLKIT_PSKC + bool "enable PSKC" + select BR2_PACKAGE_LIBXML2 + help + Enable the Portable Symmetric Key Container (PSKC) support. + +endif + +comment "oath-toolkit needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR diff --git a/package/oath-toolkit/oath-toolkit.hash b/package/oath-toolkit/oath-toolkit.hash new file mode 100644 index 00000000000..a89dd6bb948 --- /dev/null +++ b/package/oath-toolkit/oath-toolkit.hash @@ -0,0 +1,12 @@ +# After checking pgp signature from: +# https://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-2.6.12.tar.gz.sig +# using key A3CC9C870B9D310ABAD4CF2F51722B08FE4745A2 +# From release announce: +# https://mail.gnu.org/archive/html/oath-toolkit-help/2024-10/msg00002.html +sha1 0bfb6ad29d59628487c9e180c7a43f4ca301e4d1 oath-toolkit-2.6.12.tar.gz +sha256 cafdf739b1ec4b276441c6aedae6411434bbd870071f66154b909cc6e2d9e8ba oath-toolkit-2.6.12.tar.gz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 liboath/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 oathtool/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 pam_oath/COPYING diff --git a/package/oath-toolkit/oath-toolkit.mk b/package/oath-toolkit/oath-toolkit.mk new file mode 100644 index 00000000000..5e8fabb05be --- /dev/null +++ b/package/oath-toolkit/oath-toolkit.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# oath-toolkit +# +################################################################################ + +OATH_TOOLKIT_VERSION = 2.6.12 +OATH_TOOLKIT_SITE = https://download.savannah.nongnu.org/releases/oath-toolkit +OATH_TOOLKIT_LICENSE = GPL-3.0+ (tools), LGPL-2.1+ (libraries) +OATH_TOOLKIT_LICENSE_FILES = \ + COPYING \ + liboath/COPYING \ + oathtool/COPYING \ + pam_oath/COPYING +OATH_TOOLKIT_CPE_ID_VENDOR = nongnu +OATH_TOOLKIT_CPE_ID_PRODUCT = oath_toolkit +OATH_TOOLKIT_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +# Set the pam directory defined in linux-pam (see --enable-securedir +# in LINUX_PAM_CONF_OPTS in package/linux-pam/linux-pam.mk). +OATH_TOOLKIT_CONF_OPTS += \ + --enable-pam \ + --with-pam-dir=/lib/security +OATH_TOOLKIT_DEPENDENCIES += linux-pam +else +OATH_TOOLKIT_CONF_OPTS += --disable-pam +endif + +ifeq ($(BR2_PACKAGE_OATH_TOOLKIT_PSKC),y) +OATH_TOOLKIT_CONF_OPTS += --enable-pskc +OATH_TOOLKIT_DEPENDENCIES += host-libxml2 libxml2 +else +OATH_TOOLKIT_CONF_OPTS += --disable-pskc +endif + +$(eval $(autotools-package)) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 2e2fe0f989e..34d9288c757 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -5,7 +5,7 @@ ################################################################################ OCTAVE_VERSION = 9.2.0 -OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_SITE = $(BR2_GNU_MIRROR)/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ OCTAVE_LICENSE_FILES = COPYING diff --git a/package/open2300/open2300.hash b/package/open2300/open2300.hash index f8b11506942..94be6a47ea0 100644 --- a/package/open2300/open2300.hash +++ b/package/open2300/open2300.hash @@ -1,4 +1,4 @@ -# Localy computed +# Locally computed sha256 ffa7f8d35b16abfbf5e52285cb21f2a7fc6afb901abb40c0c80eef9d23d08aab open2300-f21982e0b1f8321561e5ad1668307fde97700e1b.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/open62541/Config.in b/package/open62541/Config.in index 296be1578d1..a5c07d5043d 100644 --- a/package/open62541/Config.in +++ b/package/open62541/Config.in @@ -88,7 +88,7 @@ config BR2_PACKAGE_OPEN62541_PUBSUB_DELTAFRAMES The PubSub messages differentiate between keyframe (all published values contained) and deltaframe (only changed values contained) messages. Deltaframe messages creation - consumes some additional ressources. + consumes some additional resources. config BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL bool "publish/subscribe information model" diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index be9ee77cc2d..01ea652f920 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 34fbf37e7f8e159b0a187bf8b0663af0187161ba4c5015828590c919645d596a open62541-v1.3.11-git4.tar.gz +sha256 dab44ad50b10cc5f9e9e1f44f0510e0c5f7a8226c6bba821babafc5a79acdc2d open62541-v1.3.12-git4.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 26c3cd5c2e1..92ce3b852bc 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.11 +OPEN62541_VERSION = v1.3.12 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES diff --git a/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch b/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch deleted file mode 100644 index 44883b2c265..00000000000 --- a/package/openblas/0002-fix-position-of-endif-gemm3m-tests-should-not-be-run-in-cross-compiles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48e017de095018c60d83355804a3075658b4970c Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Fri, 5 Apr 2024 22:54:34 +0200 -Subject: [PATCH] fix position of endif - gemm3m tests should not be run in - cross-compiles - -Upstream: https://github.com/OpenMathLib/OpenBLAS/commit/48e017de095018c60d83355804a3075658b4970c -Signed-off-by: Fabrice Fontaine ---- - ctest/Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/ctest/Makefile b/ctest/Makefile -index bbaf96f8ed..6c7cc1ed56 100644 ---- a/ctest/Makefile -+++ b/ctest/Makefile -@@ -203,7 +203,6 @@ ifeq ($(BUILD_COMPLEX16),1) - OPENBLAS_NUM_THREADS=2 ./xzcblat3 < zin3 - endif - endif --endif - - ifeq ($(SUPPORT_GEMM3M),1) - ifeq ($(USE_OPENMP), 1) -@@ -222,7 +221,7 @@ ifeq ($(BUILD_COMPLEX16),1) - endif - endif - endif -- -+endif - - - diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index cd594969080..4439896b14e 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.27 -md5 ef71c66ffeb1ab0f306a37de07d2667f openblas-0.3.27.tar.gz +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.28 +md5 0f54185b6ef804173c01b9a40520a0e8 openblas-0.3.28.tar.gz # Locally calculated -sha256 aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897 openblas-0.3.27.tar.gz +sha256 f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1 openblas-0.3.28.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index a3c7a194cf2..a1f631e6b37 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.27 +OPENBLAS_VERSION = 0.3.28 OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 3f038d63409..184444a53a5 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82 opencl-clhpp-2023.12.14.tar.gz +sha256 22921fd23ca72a21ac5592861d64e7ea53cd8a705fccd73905911f8489519a0b opencl-clhpp-2024.05.08.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 93c25d0d660..2b5d5afa4b8 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2023.12.14 +OPENCL_CLHPP_VERSION = 2024.05.08 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt diff --git a/package/opencsd/opencsd.hash b/package/opencsd/opencsd.hash index 9800d213773..865580968be 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 86ee4248f26d768f60f4f4a09f62acaf63989a6448fe1f65a1539478123d95df opencsd-1.5.3.tar.gz +sha256 1df9b61656ac96bc5cca082d8c32a9f25ed07ef684d7d666911280cf162b7d93 opencsd-1.5.5.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index 42712133a39..9714bb970a4 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.5.3 +OPENCSD_VERSION = 1.5.5 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index fdba9518c78..6015be0eaf1 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 bc910d5d682710e9ff290c33e0780a71edba29d4 OpenIPMI-2.0.34.tar.gz -md5 9d27cc86b95a29251009db96452e7213 OpenIPMI-2.0.34.tar.gz +sha1 a7b8b581a32b649cbf5bc79926f97d59919c5b79 OpenIPMI-2.0.36.tar.gz +md5 e77028dcfb6e91cc256da19723af1a2e OpenIPMI-2.0.36.tar.gz # Locally computed -sha256 93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f OpenIPMI-2.0.34.tar.gz +sha256 a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9 OpenIPMI-2.0.36.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 1c406879e38..63043f677b7 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.34 +OPENIPMI_VERSION = 2.0.36 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 diff --git a/package/openjdk-bin/17.0.9_9/openjdk-bin.hash b/package/openjdk-bin/17.0.12_7/openjdk-bin.hash similarity index 53% rename from package/openjdk-bin/17.0.9_9/openjdk-bin.hash rename to package/openjdk-bin/17.0.12_7/openjdk-bin.hash index 29f39c5d364..4a7c84eb87f 100644 --- a/package/openjdk-bin/17.0.9_9/openjdk-bin.hash +++ b/package/openjdk-bin/17.0.12_7/openjdk-bin.hash @@ -1,6 +1,6 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -sha256 e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz +sha256 9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778 OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz +sha256 8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/21.0.1_12/openjdk-bin.hash b/package/openjdk-bin/21.0.4_7/openjdk-bin.hash similarity index 53% rename from package/openjdk-bin/21.0.1_12/openjdk-bin.hash rename to package/openjdk-bin/21.0.4_7/openjdk-bin.hash index 35be28bb4f1..a73bea1a77a 100644 --- a/package/openjdk-bin/21.0.1_12/openjdk-bin.hash +++ b/package/openjdk-bin/21.0.4_7/openjdk-bin.hash @@ -1,6 +1,6 @@ # From https://github.com/adoptium/temurin21-binaries/releases -sha256 1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1 OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz -sha256 e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9 OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz +sha256 51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9 OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz +sha256 d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79 OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.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 0280151fba1..17056e80b7c 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 21 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_12 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.4_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.9_9 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 949a62e5275..209004a2924 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 9943e3814d3c1a31f1449f09a8b67df54841944f855a1d372be892c5e6b19217 openjdk-21.0.1+12.tar.gz -sha256 836adb5fec5a58ce2f49a0faeaf9e69a3cb89865f4d855c6098f0264843672ad openjdk-17.0.9+9.tar.gz +sha256 b8b37fa6fcc284d91e7458c703ca4c893a1dd5a6e0f6b9e198e7d13cd8efd24d openjdk-21.0.4+7.tar.gz +sha256 ccb7d37c24f9f5808f9d25419d93680570dc600f292e68944032338cb4b2c51e openjdk-17.0.12+7.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index f4e1920e6c8..446e4aa3c26 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_21),y) OPENJDK_VERSION_MAJOR = 21 -OPENJDK_VERSION_MINOR = 0.1+12 +OPENJDK_VERSION_MINOR = 0.4+7 else OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.9+9 +OPENJDK_VERSION_MINOR = 0.12+7 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/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 29261c57ed6..44c11600199 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f9818591685d2eda779b346425061ddde174931e89ba2412118f68b3779e0c19 v9.2.4-package.zip +sha256 30510a365596372cc622f68452610a2150577e8b4416934e396683ad5de013c8 v10.2.1-package.zip sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 682138c4548..1abed9c6b53 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 9.2.4 +OPENLAYERS_VERSION = 10.2.1 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause diff --git a/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch b/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch new file mode 100644 index 00000000000..9bf601370a6 --- /dev/null +++ b/package/opensc/0001-pkcs11-tool-disable-wrap-unwrap-test-until-OpenSC-17.patch @@ -0,0 +1,41 @@ +From 768c9bfcd91206f0d85cd4757fde48e00850a014 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 6 Jan 2025 22:36:10 +0100 +Subject: [PATCH] pkcs11-tool: disable wrap/unwrap test until OpenSC#1796 is + resolved + +Similar to ab74fae4d71d1705b77b9459141987a95dcfc91e ("pkcs11-tool: +disable wrap/unwrap test until OpenSC#1796 is resolved"), but for +0.26, since OpenSC#1796 is still open. + +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/OpenSC/OpenSC/pull/3303 +--- + src/tools/pkcs11-tool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c +index d701d76d6..871a39977 100644 +--- a/src/tools/pkcs11-tool.c ++++ b/src/tools/pkcs11-tool.c +@@ -7681,7 +7681,7 @@ static int test_verify(CK_SESSION_HANDLE sess) + return errors; + } + +-#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 25 ++#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 26 + #else + #ifdef ENABLE_OPENSSL + static int wrap_unwrap(CK_SESSION_HANDLE session, +@@ -7805,7 +7805,7 @@ static int wrap_unwrap(CK_SESSION_HANDLE session, + */ + static int test_unwrap(CK_SESSION_HANDLE sess) + { +-#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 25 ++#if OPENSC_VERSION_MAJOR == 0 && OPENSC_VERSION_MINOR <= 26 + /* temporarily disable test, see https://github.com/OpenSC/OpenSC/issues/1796 */ + return 0; + #else +-- +2.47.1 + diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash index 232222062c7..e12d2d4bfa2 100644 --- a/package/opensc/opensc.hash +++ b/package/opensc/opensc.hash @@ -1,5 +1,5 @@ # Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ -sha256 24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8 opensc-0.24.0.tar.gz +sha256 837baead45e1505260d868871056150ede6e73d35460a470f2595a9e5e75f82b opensc-0.26.0.tar.gz # Computed locally sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 008de9d4c28..11d1507d455 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSC_VERSION = 0.24.0 +OPENSC_VERSION = 0.26.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING diff --git a/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch b/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch new file mode 100644 index 00000000000..85ad5a538c7 --- /dev/null +++ b/package/openssh/0001-build-construct_utmp-when-USE_BTMP-is-set.patch @@ -0,0 +1,35 @@ +From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Wed, 25 Sep 2024 11:13:05 +1000 +Subject: [PATCH] build construct_utmp() when USE_BTMP is set + +Fixes compile error on Void Linux/Musl + +Upstream: https://anongit.mindrot.org/openssh.git/commit/?id=76a618d2842c34c16cd21a4efc7230e2f459008d +Signed-off-by: Fiona Klute (WIWA) +--- + loginrec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/loginrec.c b/loginrec.c +index 45f13dee8b1f..7b1818b86753 100644 +--- a/loginrec.c ++++ b/loginrec.c +@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize) + ** into account. + **/ + +-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) ++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) + + /* build the utmp structure */ + void +@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li, + } + # endif + } +-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */ ++#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */ + + /** + ** utmpx utility functions diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 7e5ccf079de..a5ff385acc0 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -28,7 +28,7 @@ start() { } stop() { - printf "Stopping sshd: " + printf "Stopping %s: " "$DAEMON" start-stop-daemon --stop --pidfile "$PIDFILE" \ --exec "/usr/sbin/$DAEMON" status=$? @@ -50,7 +50,7 @@ restart() { } reload() { - printf "Reloading sshd config: " + printf "Reloading %s config: " "$DAEMON" start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ --exec "/usr/sbin/$DAEMON" status=$? diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 44f9645035c..5758ce4f364 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.8 -sha256 dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 openssh-9.8p1.tar.gz +# From https://www.openssh.com/txt/release-9.9 +sha256 b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 openssh-9.9p1.tar.gz # Locally calculated -sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE +sha256 5bb5b160726ef5756e4f32fe95b35249c294962419650f48d05134b486d27ccb LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 7065c3ae4f8..95c059e03d8 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.8 +OPENSSH_VERSION_MAJOR = 9.9 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 5aa2386d362..77afc9eaf49 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENVPN select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL help OpenVPN is a full-featured SSL VPN solution which can - accomodate a wide range of configurations, including road + accommodate a wide range of configurations, including road warrior access, home/office/campus telecommuting, WiFi security, secure branch office linking, and enterprise-scale remote access solutions with load balancing, failover, and diff --git a/package/opkg-utils/opkg-utils.hash b/package/opkg-utils/opkg-utils.hash index 982dbb5caf3..37834a3a152 100644 --- a/package/opkg-utils/opkg-utils.hash +++ b/package/opkg-utils/opkg-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cbce8a9ad60ee34f27b9195146ff7ecfc37a3f97d2ce6bfc6610f46210f490f8 opkg-utils-0.6.2-git4.tar.gz +sha256 b3299961be768c17185c0516e9757ede4481e94cf81ffc6d9cb0d51206aa58da opkg-utils-0.7.0-git4.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index b077e0dcce0..320d05135d9 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPKG_UTILS_VERSION = 0.6.2 +OPKG_UTILS_VERSION = 0.7.0 OPKG_UTILS_SITE = https://git.yoctoproject.org/git/opkg-utils OPKG_UTILS_SITE_METHOD = git OPKG_UTILS_LICENSE = GPL-2.0+ diff --git a/package/opkg/Config.in b/package/opkg/Config.in index 1f6a39343fd..ccea63cf7f3 100644 --- a/package/opkg/Config.in +++ b/package/opkg/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_OPKG conforms to a subset of debian's policy manual regarding control files. - https://code.google.com/archive/p/opkg/ + https://git.yoctoproject.org/opkg/ if BR2_PACKAGE_OPKG diff --git a/package/opkg/opkg.hash b/package/opkg/opkg.hash index c6ecefba21e..3928a2ce010 100644 --- a/package/opkg/opkg.hash +++ b/package/opkg/opkg.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/opkg/SHA256SUMS -sha256 ac73a90a2549cd04948e563d915912c78e1b8ba0f43af75c5a53fcca474adbd5 opkg-0.6.2.tar.gz +sha256 d973fd0f1568f58f87d6aecd9aa95e3e1f60214a45cee26704bf8fe757c54567 opkg-0.7.0.tar.gz # Locally calculated sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index a550543f3ea..4922d8fc0f8 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -4,13 +4,16 @@ # ################################################################################ -OPKG_VERSION = 0.6.2 +OPKG_VERSION = 0.7.0 OPKG_SITE = https://downloads.yoctoproject.org/releases/opkg OPKG_DEPENDENCIES = host-pkgconf libarchive OPKG_LICENSE = GPL-2.0+ OPKG_LICENSE_FILES = COPYING OPKG_INSTALL_STAGING = YES -OPKG_CONF_OPTS = --enable-sha256 +OPKG_CONF_OPTS = \ + --enable-sha256 \ + --without-acl \ + --without-xattr ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y) OPKG_CONF_OPTS += --enable-gpg diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 439309df951..3b081af6169 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -2,14 +2,12 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" depends on BR2_ARCH_IS_64 depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14, filesystem depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + depends on BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_JSON_FOR_MODERN_CPP @@ -24,11 +22,10 @@ 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 >= 8" depends on BR2_ARCH_IS_64 - 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 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" depends on BR2_ARCH_IS_64 diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index df3302b2c7b..cc0d91f98f8 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b46313813b816f15ce906c04cd4108bbb05362740e0a1a8889055f4e25977d2 osm2pgsql-1.11.0.tar.gz +sha256 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 osm2pgsql-2.0.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 846a4ea2425..7b54e4c0d20 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.11.0 +OSM2PGSQL_VERSION = 2.0.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING @@ -22,19 +22,17 @@ OSM2PGSQL_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LUAJIT),y) OSM2PGSQL_DEPENDENCIES += luajit -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=ON -else ifeq ($(BR2_PACKAGE_LUA),y) -OSM2PGSQL_DEPENDENCIES += lua -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=OFF +OSM2PGSQL_CONF_OPTS += -DWITH_LUAJIT=ON else -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=OFF -DWITH_LUAJIT=OFF +OSM2PGSQL_DEPENDENCIES += lua +OSM2PGSQL_CONF_OPTS += -DWITH_LUAJIT=OFF endif ifeq ($(BR2_PACKAGE_PROJ),y) OSM2PGSQL_DEPENDENCIES += proj -OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=auto +OSM2PGSQL_CONF_OPTS += -DWITH_PROJ=ON else -OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=off +OSM2PGSQL_CONF_OPTS += -DWITH_PROJ=OFF endif $(eval $(cmake-package)) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 30a8fbf0b66..38725ed8c85 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -5,7 +5,7 @@ ################################################################################ # Don't use the github helper, as pcm-tools uses git attributes that are -# replaced when gnerating the archive. +# replaced when generating the archive. # 93fc9193a70e2f1f054be554c48f4a4791be5032 is the hash of the 202110 tag. PCM_TOOLS_VERSION = 93fc9193a70e2f1f054be554c48f4a4791be5032 PCM_TOOLS_SITE = https://github.com/opcm/pcm diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash index f40d1d1e965..496ced9a61c 100644 --- a/package/perftest/perftest.hash +++ b/package/perftest/perftest.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d398cb7a364735485b5ae033b242d7cf0bedcdb5f4d512e54b18c9a3e7a98b87 perftest-24.04.0-0.41.tar.gz +sha256 3e62774a4b098ad91aa13353333ad221cf541d280dc9ba94db50270d4bb5b84a perftest-24.07.0-0.44.tar.gz sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk index 36cb775254c..12d5c1fdba9 100644 --- a/package/perftest/perftest.mk +++ b/package/perftest/perftest.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERFTEST_VERSION = 24.04.0-0.41 +PERFTEST_VERSION = 24.07.0-0.44 PERFTEST_SITE = $(call github,linux-rdma,perftest,$(PERFTEST_VERSION)) PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause PERFTEST_LICENSE_FILES = COPYING diff --git a/package/perl-clone/perl-clone.hash b/package/perl-clone/perl-clone.hash index 7b69b97d065..2cd62648a8d 100644 --- a/package/perl-clone/perl-clone.hash +++ b/package/perl-clone/perl-clone.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 cafa8984a2c2e005e54b27dd1e3f0afe Clone-0.46.tar.gz -sha256 aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b Clone-0.46.tar.gz +md5 62ff032a4df0c4abb74f76adf519361e Clone-0.47.tar.gz +sha256 4c2c0cb9a483efbf970cb1a75b2ca75b0e18cb84bcb5c09624f86e26b09c211d Clone-0.47.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 index 9e04329eabd..a5d18558bc2 100644 --- a/package/perl-clone/perl-clone.mk +++ b/package/perl-clone/perl-clone.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_CLONE_VERSION = 0.46 +PERL_CLONE_VERSION = 0.47 PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz -PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU +PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AT/ATOOMIC PERL_CLONE_LICENSE = Artistic or GPL-1.0+ PERL_CLONE_LICENSE_FILES = README.md PERL_CLONE_DISTNAME = Clone 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 6c1344fb2a3..f8ab405ca03 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 294f545c54a5a4855cb00c5648eb5c2b Crypt-OpenSSL-Random-0.17.tar.gz +sha256 a571b24181baaa76c96704e92acffc6934ff593e380dade274db4e43c140ad51 Crypt-OpenSSL-Random-0.17.tar.gz # computed by scancpan -sha256 fdaba2134145d3e252c5930180b2bcb13b5367ad5a8713d6868f014cd25c496f LICENSE +sha256 076d44a82dfa5a992169d47bc5e2d44ff113a3a84bd9963a6b51c953f8d05099 LICENSE diff --git a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk index e70eb7e927c..b52e836981a 100644 --- a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk +++ b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.15 +PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.17 PERL_CRYPT_OPENSSL_RANDOM_SOURCE = Crypt-OpenSSL-Random-$(PERL_CRYPT_OPENSSL_RANDOM_VERSION).tar.gz PERL_CRYPT_OPENSSL_RANDOM_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = \ diff --git a/package/perl-data-uuid/perl-data-uuid.hash b/package/perl-data-uuid/perl-data-uuid.hash index b2c86296051..1405f1d0b08 100644 --- a/package/perl-data-uuid/perl-data-uuid.hash +++ b/package/perl-data-uuid/perl-data-uuid.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 13468e0fb65a0b5ce27b8628cb2f0109 Data-UUID-1.226.tar.gz -sha256 093d57ffa0d411a94bafafae495697db26f5c9d0277198fe3f7cf2be22996453 Data-UUID-1.226.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 6463f46996e5f00beb57317e49e238b5 Data-UUID-1.227.tar.gz +sha256 95bda7276265f57bc48ffdeddec5ef28cd6f765e3a183757fa5f09f0ce6b98ac Data-UUID-1.227.tar.gz # computed by scancpan sha256 0560c8eea8e1fb8173faa6c2e9b7e9f8728b8ae8250a814709a53c30b778d5fb LICENSE diff --git a/package/perl-data-uuid/perl-data-uuid.mk b/package/perl-data-uuid/perl-data-uuid.mk index 93060964bba..fc272fb4843 100644 --- a/package/perl-data-uuid/perl-data-uuid.mk +++ b/package/perl-data-uuid/perl-data-uuid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_DATA_UUID_VERSION = 1.226 +PERL_DATA_UUID_VERSION = 1.227 PERL_DATA_UUID_SOURCE = Data-UUID-$(PERL_DATA_UUID_VERSION).tar.gz -PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS +PERL_DATA_UUID_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GT/GTERMARS # The license is documented at # https://fedoraproject.org/wiki/Licensing:MIT#HP_Variant as the "HP # Variant" of the MIT license. There is no official SPDX tag for this diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index d055cb33cc1..53f7f6191a1 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 https://cpan.metacpan.org/ -md5 74f127ff4c71fa1aff54dc55818b0c2e Date-Manip-6.94.tar.gz -sha256 0278eb62113618c8977d3d537433d85340c487cbdfd95dd3452e4d7217f48848 Date-Manip-6.94.tar.gz +md5 1dc65dbb042ecab09149a22fbbe9abb4 Date-Manip-6.95.tar.gz +sha256 92383832311f22083f55d03c8dae8f4bcc387cd902624e5ef9ac680f144cbd4c Date-Manip-6.95.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 55d9cff6ef4..dc55bcff2e5 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.94 +PERL_DATE_MANIP_VERSION = 6.95 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-devel-size/perl-devel-size.hash b/package/perl-devel-size/perl-devel-size.hash index c0fbcf29c59..6a5d88af4d3 100644 --- a/package/perl-devel-size/perl-devel-size.hash +++ b/package/perl-devel-size/perl-devel-size.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 0b5335d69402c75d5ab9978027ae2f66 Devel-Size-0.83.tar.gz -sha256 757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3 Devel-Size-0.83.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 4978c07f54a730b16a705e074d7685e3 Devel-Size-0.84.tar.gz +sha256 db2e4d65f688dbf59273b5e82101ac3f1a66f665afb0594dce168b8650a4d0e4 Devel-Size-0.84.tar.gz # computed by scancpan sha256 fca4ebe3a1f329aa33a4d259c0a5b136a15a40b987c60c2dd6f1007bb01a1513 README diff --git a/package/perl-devel-size/perl-devel-size.mk b/package/perl-devel-size/perl-devel-size.mk index 9acc67c9eab..85ee2483d92 100644 --- a/package/perl-devel-size/perl-devel-size.mk +++ b/package/perl-devel-size/perl-devel-size.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DEVEL_SIZE_VERSION = 0.83 +PERL_DEVEL_SIZE_VERSION = 0.84 PERL_DEVEL_SIZE_SOURCE = Devel-Size-$(PERL_DEVEL_SIZE_VERSION).tar.gz PERL_DEVEL_SIZE_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NW/NWCLARK PERL_DEVEL_SIZE_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-digest-hmac/perl-digest-hmac.hash b/package/perl-digest-hmac/perl-digest-hmac.hash index 5e7da14f3fa..4a4b8e5f05e 100644 --- a/package/perl-digest-hmac/perl-digest-hmac.hash +++ b/package/perl-digest-hmac/perl-digest-hmac.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 746a5edffd1485d7500e005730c271c8 Digest-HMAC-1.04.tar.gz -sha256 d6bc8156aa275c44d794b7c18f44cdac4a58140245c959e6b19b2c3838b08ed4 Digest-HMAC-1.04.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 cbeca4ad4c21c241080cd6ee47bdca6e Digest-HMAC-1.05.tar.gz +sha256 215cb59cba610745cfb2d4b3f8ef756d590e57e3ad7986a992e87c4969fcdc7a Digest-HMAC-1.05.tar.gz # computed by scancpan -sha256 cb9ff694d1769f450dd5c400204aa921d2fb3db90fcb21674a39f3725c4255c1 LICENSE +sha256 c10e8c1b7e9e524e361cc87244c74e3abeae5652f246bcc050327f53ba85cba1 LICENSE diff --git a/package/perl-digest-hmac/perl-digest-hmac.mk b/package/perl-digest-hmac/perl-digest-hmac.mk index bc080703de1..0fa4adf778f 100644 --- a/package/perl-digest-hmac/perl-digest-hmac.mk +++ b/package/perl-digest-hmac/perl-digest-hmac.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DIGEST_HMAC_VERSION = 1.04 +PERL_DIGEST_HMAC_VERSION = 1.05 PERL_DIGEST_HMAC_SOURCE = Digest-HMAC-$(PERL_DIGEST_HMAC_VERSION).tar.gz PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AR/ARODLAND PERL_DIGEST_HMAC_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-extutils-config/perl-extutils-config.hash b/package/perl-extutils-config/perl-extutils-config.hash index f4a4b18fc65..92ee0b63af3 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 f455b5743db7b73c80e88133effa3551 ExtUtils-Config-0.010.tar.gz +sha256 82e7e4e90cbe380e152f5de6e3e403746982d502dd30197a123652e46610c66d ExtUtils-Config-0.010.tar.gz # computed by scancpan -sha256 33b39fda54675d4d681764049e27b537cac12213aa6650667abea43662264ddc LICENSE +sha256 bb85b6b9104be3c7b17a4ab7d7dacce239ce640312bc4cd1e78a51780128009e LICENSE diff --git a/package/perl-extutils-config/perl-extutils-config.mk b/package/perl-extutils-config/perl-extutils-config.mk index f46ca3e6fdb..fe41fbcdd53 100644 --- a/package/perl-extutils-config/perl-extutils-config.mk +++ b/package/perl-extutils-config/perl-extutils-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_EXTUTILS_CONFIG_VERSION = 0.008 +PERL_EXTUTILS_CONFIG_VERSION = 0.010 PERL_EXTUTILS_CONFIG_SOURCE = ExtUtils-Config-$(PERL_EXTUTILS_CONFIG_VERSION).tar.gz PERL_EXTUTILS_CONFIG_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_EXTUTILS_CONFIG_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-extutils-helpers/perl-extutils-helpers.hash b/package/perl-extutils-helpers/perl-extutils-helpers.hash index 3f80a96e6dd..15c81df01ef 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 0687f20ac896a7d01219646908ccdf89 ExtUtils-Helpers-0.028.tar.gz +sha256 c8574875cce073e7dc5345a7b06d502e52044d68894f9160203fcaab379514fe ExtUtils-Helpers-0.028.tar.gz # computed by scancpan -sha256 e5530d0ebc8662df3a970644d867faf12760b1a95ca6e2bf1c5f9af410a418e0 LICENSE +sha256 7de2a12de1b294281e50d260e6532d656473ad3e1be6bd4ef76ef7b4c21a898a LICENSE diff --git a/package/perl-extutils-helpers/perl-extutils-helpers.mk b/package/perl-extutils-helpers/perl-extutils-helpers.mk index d3b14d88cec..2ac9ceec08b 100644 --- a/package/perl-extutils-helpers/perl-extutils-helpers.mk +++ b/package/perl-extutils-helpers/perl-extutils-helpers.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_EXTUTILS_HELPERS_VERSION = 0.026 +PERL_EXTUTILS_HELPERS_VERSION = 0.028 PERL_EXTUTILS_HELPERS_SOURCE = ExtUtils-Helpers-$(PERL_EXTUTILS_HELPERS_VERSION).tar.gz PERL_EXTUTILS_HELPERS_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_EXTUTILS_HELPERS_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-extutils-installpaths/perl-extutils-installpaths.hash b/package/perl-extutils-installpaths/perl-extutils-installpaths.hash index 199706044cd..9838345b652 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 34fb12d1b245e44142846c72905beffc ExtUtils-InstallPaths-0.014.tar.gz +sha256 ae65d20cc3c7e14b3cd790915c84510f82dfb37a4c9b88aa74b2e843af417d01 ExtUtils-InstallPaths-0.014.tar.gz # computed by scancpan -sha256 b95d38ac031587625625d92fbd2ee1d5df0d02606057d680e7dcf3598fe629f9 LICENSE +sha256 bddd4809100e5b59fa3b029b2cd303d6384cff751c3898d53827777181a9aabd LICENSE diff --git a/package/perl-extutils-installpaths/perl-extutils-installpaths.mk b/package/perl-extutils-installpaths/perl-extutils-installpaths.mk index e90e130c362..31727194df5 100644 --- a/package/perl-extutils-installpaths/perl-extutils-installpaths.mk +++ b/package/perl-extutils-installpaths/perl-extutils-installpaths.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_EXTUTILS_INSTALLPATHS_VERSION = 0.012 +PERL_EXTUTILS_INSTALLPATHS_VERSION = 0.014 PERL_EXTUTILS_INSTALLPATHS_SOURCE = ExtUtils-InstallPaths-$(PERL_EXTUTILS_INSTALLPATHS_VERSION).tar.gz PERL_EXTUTILS_INSTALLPATHS_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT HOST_PERL_EXTUTILS_INSTALLPATHS_DEPENDENCIES = host-perl-extutils-config diff --git a/package/perl-gdgraph/perl-gdgraph.hash b/package/perl-gdgraph/perl-gdgraph.hash index b2ad4ecc307..1f23762a699 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 4ed2187e4f59c2bfb0392fb407a59d13 GDGraph-1.56.tar.gz +sha256 6f49cc4e59015480db9c9b6b18afd8c50be30886687b69411513d06f38971113 GDGraph-1.56.tar.gz # Hash for license files sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE -sha256 f44630ad9101e40a101d906a07908c975a9b0742273cfb0c00a51d73afb53e7d README +sha256 a343db34e71a251a14209957c89add8fd1bc62c34aa3c3818d1b474635c11754 README diff --git a/package/perl-gdgraph/perl-gdgraph.mk b/package/perl-gdgraph/perl-gdgraph.mk index 286902a66eb..80e1eab35e9 100644 --- a/package/perl-gdgraph/perl-gdgraph.mk +++ b/package/perl-gdgraph/perl-gdgraph.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_GDGRAPH_VERSION = 1.54 +PERL_GDGRAPH_VERSION = 1.56 PERL_GDGRAPH_SOURCE = GDGraph-$(PERL_GDGRAPH_VERSION).tar.gz -PERL_GDGRAPH_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RUZ +PERL_GDGRAPH_SITE = $(BR2_CPAN_MIRROR)/authors/id/B/BP/BPS PERL_GDGRAPH_LICENSE = Artistic or GPL-1.0+ (perl module), GPL-2.0+ (font) PERL_GDGRAPH_LICENSE_FILES = Dustismo.LICENSE README PERL_GDGRAPH_DISTNAME = GDGraph diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index fbdffa03d68..3de461c7ef6 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,5 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -sha256 c0910a5c8f92f8817edd06ccfd224ba1c2ebe8c10f551f032587a1fc83d62ff2 HTML-Parser-3.81.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 17a4c886024bfad1cffcbe6b46cda128 HTML-Parser-3.83.tar.gz +sha256 7278ce9791256132b26a71a5719451844704bb9674b58302c3486df43584f8c0 HTML-Parser-3.83.tar.gz # computed by scancpan -sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE +sha256 cb797b8a92dcb2329dcde194a3032d5d94c172289e9e54ffe8dd1785bc3de2df LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 50efaa273a3..02ce08b5677 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.81 +PERL_HTML_PARSER_VERSION = 3.83 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-http-cookies/perl-http-cookies.hash b/package/perl-http-cookies/perl-http-cookies.hash index 15d9e7a86f7..d5aefaf830d 100644 --- a/package/perl-http-cookies/perl-http-cookies.hash +++ b/package/perl-http-cookies/perl-http-cookies.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 b4d7804231b1dfd10999d42283e0cf06 HTTP-Cookies-6.10.tar.gz -sha256 e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007 HTTP-Cookies-6.10.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 80017e7e56bdc8ba16dea75789748829 HTTP-Cookies-6.11.tar.gz +sha256 8c9a541a4a39f6c0c7e3d0b700b05dfdb830bd490a1b1942a7dedd1b50d9a8c8 HTTP-Cookies-6.11.tar.gz # computed by scancpan -sha256 82902ce20c8ed71d7f4e7a6a5b2b26e43a7e2e90c78098fb49aa49e03ac808e0 LICENSE +sha256 d864d8998d1ce086dc35e5644fbfcf1b46dfd08b0ce8d76d3e32bf86e6953ac3 LICENSE diff --git a/package/perl-http-cookies/perl-http-cookies.mk b/package/perl-http-cookies/perl-http-cookies.mk index 745fd10a7c6..6d87bde2ba0 100644 --- a/package/perl-http-cookies/perl-http-cookies.mk +++ b/package/perl-http-cookies/perl-http-cookies.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_COOKIES_VERSION = 6.10 +PERL_HTTP_COOKIES_VERSION = 6.11 PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index b33e00e33eb..f733a5c91a7 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 https://cpan.metacpan.org/ -md5 86c386bcc85a63c8908e6ae9967b34ee HTTP-Message-6.45.tar.gz -sha256 01cb8406612a3f738842d1e97313ae4d874870d1b8d6d66331f16000943d4cbe HTTP-Message-6.45.tar.gz +md5 01b29ce55d79a774420bc768bb905354 HTTP-Message-7.00.tar.gz +sha256 5afa95eb6ed1c632e81656201a2738e2c1bc6cbfae2f6d82728e2bb0b519c1dc HTTP-Message-7.00.tar.gz # computed by scancpan sha256 553ecefc0ed6d4152809da8516960b9a12352c1c0d7d289ac4ab06d0bd0e67bb LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 7fdba0b29e2..6dfe61edfb9 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.45 +PERL_HTTP_MESSAGE_VERSION = 7.00 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-1.0-Perl or GPL-1.0+ diff --git a/package/perl-json-maybexs/perl-json-maybexs.hash b/package/perl-json-maybexs/perl-json-maybexs.hash index 3b603310f69..872f6cdd8e4 100644 --- a/package/perl-json-maybexs/perl-json-maybexs.hash +++ b/package/perl-json-maybexs/perl-json-maybexs.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 bee9d0cba3f87e05e9613684e4ee2159 JSON-MaybeXS-1.004005.tar.gz -sha256 f5b6bc19f579e66b7299f8748b8ac3e171936dc4e7fcb72a8a257a9bd482a331 JSON-MaybeXS-1.004005.tar.gz +md5 63cf8b82a0dadda0dc445f9c70141383 JSON-MaybeXS-1.004008.tar.gz +sha256 cd3937afa78831f80a2ad5abab6c51b9e82fca4c31e5856ea208d598db5dc867 JSON-MaybeXS-1.004008.tar.gz # computed by scancpan -sha256 de7a14750e81d97e19e111df58a3b51e3f2c8ec2d2dd90f576f54243251972c6 LICENSE +sha256 1505d172444acdfab81b917a3db10543f0b247821932e9c211bb9521467e42dd LICENSE diff --git a/package/perl-json-maybexs/perl-json-maybexs.mk b/package/perl-json-maybexs/perl-json-maybexs.mk index 13c9439ea62..76ab2b28b58 100644 --- a/package/perl-json-maybexs/perl-json-maybexs.mk +++ b/package/perl-json-maybexs/perl-json-maybexs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_JSON_MAYBEXS_VERSION = 1.004005 +PERL_JSON_MAYBEXS_VERSION = 1.004008 PERL_JSON_MAYBEXS_SOURCE = JSON-MaybeXS-$(PERL_JSON_MAYBEXS_VERSION).tar.gz PERL_JSON_MAYBEXS_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_JSON_MAYBEXS_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 8b4b229b50e..5951c34a58d 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 ff7621d0350da3052f24db9a74692672 libwww-perl-6.67.tar.gz -sha256 96eec40a3fd0aa1bd834117be5eb21c438f73094d861a1a7e5774f0b1226b723 libwww-perl-6.67.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 e70e2f41a97b8d97608569d10b75b931 libwww-perl-6.77.tar.gz +sha256 94a907d6b3ea8d966ef43deffd4fa31f5500142b4c00489bfd403860a5f060e4 libwww-perl-6.77.tar.gz # computed by scancpan -sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE +sha256 6186a79a305a0e62c5087f9737b4f66fa5793fa1b396da0126e3c8722c460245 LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 6c4bd29805b..38f68385aa3 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.67 +PERL_LIBWWW_PERL_VERSION = 6.77 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-lwp-protocol-https/perl-lwp-protocol-https.hash b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash index aac0abe3a75..658eb62343f 100644 --- a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash +++ b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 62650d02150a157f486375ca588b6c9d LWP-Protocol-https-6.12.tar.gz -sha256 7dd36d3a4eacfa143a47a2bbbc56ea9413887e2d7376c1d35bbbb2be912b616c LWP-Protocol-https-6.12.tar.gz +md5 65401e3e34be653c9e3b31f798ed5454 LWP-Protocol-https-6.14.tar.gz +sha256 59cdeabf26950d4f1bef70f096b0d77c5b1c5a7b5ad1b66d71b681ba279cbb2a LWP-Protocol-https-6.14.tar.gz # computed by scancpan sha256 e4def55436b2bd99fe2cdbf546a72ad5958327e28831db9b5adb497c6bd580ba LICENSE diff --git a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk index a2048e25a2e..1b4482e166a 100644 --- a/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk +++ b/package/perl-lwp-protocol-https/perl-lwp-protocol-https.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.12 +PERL_LWP_PROTOCOL_HTTPS_VERSION = 6.14 PERL_LWP_PROTOCOL_HTTPS_SOURCE = LWP-Protocol-https-$(PERL_LWP_PROTOCOL_HTTPS_VERSION).tar.gz PERL_LWP_PROTOCOL_HTTPS_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LWP_PROTOCOL_HTTPS_LICENSE = Artistic-1.0-Perl or GPL-1.0+ diff --git a/package/perl-mime-base32/Config.in b/package/perl-mime-base32/Config.in new file mode 100644 index 00000000000..e05b96557aa --- /dev/null +++ b/package/perl-mime-base32/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PERL_MIME_BASE32 + bool "perl-mime-base32" + help + Base32 encoder and decoder. + + https://metacpan.org/release/MIME-Base32 diff --git a/package/perl-mime-base32/perl-mime-base32.hash b/package/perl-mime-base32/perl-mime-base32.hash new file mode 100644 index 00000000000..a01e405bef1 --- /dev/null +++ b/package/perl-mime-base32/perl-mime-base32.hash @@ -0,0 +1,8 @@ +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 0c7735fa09e74c7f2ec93d1890b8c6c0 MIME-Base32-1.303.tar.gz +sha256 ab21fa99130e33a0aff6cdb596f647e5e565d207d634ba2ef06bdbef50424e99 MIME-Base32-1.303.tar.gz + +# computed by scancpan +sha256 08c2ed7589aff3b2076b48b792078d3479c2295559ee7bc4615e93abe0473939 ARTISTIC-1.0 +sha256 3d2fb9b42d1134f39c2e990d66b5e9b77005663fe956db526cc380eb3d9a77d8 GPL-1 +sha256 834c4ebff45be11f35f059b077fdd747dee4b8a747b95049d849fef1c0ccdc62 LICENSE diff --git a/package/perl-mime-base32/perl-mime-base32.mk b/package/perl-mime-base32/perl-mime-base32.mk new file mode 100644 index 00000000000..5c5272fe1b6 --- /dev/null +++ b/package/perl-mime-base32/perl-mime-base32.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-mime-base32 +# +################################################################################ + +PERL_MIME_BASE32_VERSION = 1.303 +PERL_MIME_BASE32_SOURCE = MIME-Base32-$(PERL_MIME_BASE32_VERSION).tar.gz +PERL_MIME_BASE32_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RE/REHSACK +PERL_MIME_BASE32_LICENSE = Artistic or GPL-1.0+ +PERL_MIME_BASE32_LICENSE_FILES = ARTISTIC-1.0 GPL-1 LICENSE +PERL_MIME_BASE32_DISTNAME = MIME-Base32 + +$(eval $(perl-package)) diff --git a/package/perl-mime-tools/perl-mime-tools.hash b/package/perl-mime-tools/perl-mime-tools.hash index f67fe615499..0b3ce379f4d 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 +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 dbc3c9f982498c35d8a103af17c5b5c9 MIME-tools-5.515.tar.gz +sha256 c1ba1dd9f0b2cd82a0e75caedec51e48233f9f01dc29a0971bdff1cb53be9013 MIME-tools-5.515.tar.gz # computed by scancpan sha256 151cd94e37eb05239c5a678c7d1c4d9d5241a7c9c138760b85152bc1947e2b93 COPYING diff --git a/package/perl-mime-tools/perl-mime-tools.mk b/package/perl-mime-tools/perl-mime-tools.mk index 10279d73084..1b526be91da 100644 --- a/package/perl-mime-tools/perl-mime-tools.mk +++ b/package/perl-mime-tools/perl-mime-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MIME_TOOLS_VERSION = 5.509 +PERL_MIME_TOOLS_VERSION = 5.515 PERL_MIME_TOOLS_SOURCE = MIME-tools-$(PERL_MIME_TOOLS_VERSION).tar.gz PERL_MIME_TOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DS/DSKOLL PERL_MIME_TOOLS_LICENSE = Artistic or GPL-1.0+ 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 7b503ff0614..6b467c3ec1d 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 https://cpan.metacpan.org/ -md5 de9814b3c22825837438fc70adad58ac Module-Build-Tiny-0.047.tar.gz -sha256 71260e9421b93c33dd1b3e7d0cf15f759c0ca7c753fa840279ec3be70f8f8c9d Module-Build-Tiny-0.047.tar.gz +md5 15b4434617b61e70315c0838c020a48e Module-Build-Tiny-0.051.tar.gz +sha256 74fdce35e8cd4d787bc2d4fc1d43a291b7bbced4e94dc5fc592bd81ca93a98e9 Module-Build-Tiny-0.051.tar.gz # computed by scancpan sha256 1ce3282467869416f29b0c5f7773d1b80181fb9e08bef64e3829e8c53e19b64e LICENSE diff --git a/package/perl-module-build-tiny/perl-module-build-tiny.mk b/package/perl-module-build-tiny/perl-module-build-tiny.mk index e2e3d83e7c3..ca2fddeeb6f 100644 --- a/package/perl-module-build-tiny/perl-module-build-tiny.mk +++ b/package/perl-module-build-tiny/perl-module-build-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_TINY_VERSION = 0.047 +PERL_MODULE_BUILD_TINY_VERSION = 0.051 PERL_MODULE_BUILD_TINY_SOURCE = Module-Build-Tiny-$(PERL_MODULE_BUILD_TINY_VERSION).tar.gz PERL_MODULE_BUILD_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT HOST_PERL_MODULE_BUILD_TINY_DEPENDENCIES = \ diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index b1ff561f741..0dd34a48360 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 8fba4deae54681d560c275c28803b48c Mojolicious-9.35.tar.gz -sha256 6a4a446ee07fca7c6db72f5d817540d6833009cb8de7cce4c6fb24a15ee7d46b Mojolicious-9.35.tar.gz +md5 0f1eba69cfdb8be36a8c6f0a30d707d1 Mojolicious-9.38.tar.gz +sha256 9a9eb78663ffc4641af7c16a763411e05d9875a27d4f111d4944b690f9a1ef43 Mojolicious-9.38.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 4657d279290..1c0b52fb4ed 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.35 +PERL_MOJOLICIOUS_VERSION = 9.38 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 c9bdd052459..35bb158d123 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 https://cpan.metacpan.org/ -md5 680e2107973ee6f461e3c0ab57066489 Mozilla-CA-20231213.tar.gz -sha256 421a12ba7cef443bd368671cee9c9b46a8b55c2ccf7ac76c42f99e23a06115df Mozilla-CA-20231213.tar.gz +md5 dad624e6dce1d5f87dbb6268395df180 Mozilla-CA-20240924.tar.gz +sha256 c4b1412bbc37dff8cf29af6f92cb47defbe90eebcbc29e407a98638f7a31bcd0 Mozilla-CA-20240924.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 92fb3cec616..ce56649969f 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20231213 +PERL_MOZILLA_CA_VERSION = 20240924 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LW/LWP PERL_MOZILLA_CA_LICENSE = MPL-2.0 diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index f025d36ab4a..9bd87d12c93 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 7c88cae0cac342f3fd43e7d99b29bf2a Net-DNS-1.42.tar.gz -sha256 48dea4d57b25deff5590e18f398a34a52256cb9f0cbf4b7a9ad2ec6fb5182cbe Net-DNS-1.42.tar.gz +md5 7a1c00ef78a6a000bfdf329f24cc5f31 Net-DNS-1.47.tar.gz +sha256 fec3dab10ac82dbac26b1ae2e367909256f420835d96cda7dc1b508e29938f0b Net-DNS-1.47.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 5b6c1ba1d6d..fc8c77dd679 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.42 +PERL_NET_DNS_VERSION = 1.47 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-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 7874846b891..c0f1952c0b3 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 7b2fc4f5edfd29b88d2cc3b96830e7d1 Path-Tiny-0.144.tar.gz -sha256 f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d Path-Tiny-0.144.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 656d3556bb7f30c77d0881d564e200b2 Path-Tiny-0.146.tar.gz +sha256 861ef09bca68254e9ab24337bb6ec9d58593a792e9d68a27ee6bec2150f06741 Path-Tiny-0.146.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 6d784a0d164..5f107842511 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.144 +PERL_PATH_TINY_VERSION = 0.146 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-try-tiny/perl-try-tiny.hash b/package/perl-try-tiny/perl-try-tiny.hash index 7aa88724f0d..fb1acc21fe7 100644 --- a/package/perl-try-tiny/perl-try-tiny.hash +++ b/package/perl-try-tiny/perl-try-tiny.hash @@ -1,6 +1,6 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 993a29ee8a03c9bd9c2f7c53d1082a03 Try-Tiny-0.31.tar.gz -sha256 3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be Try-Tiny-0.31.tar.gz +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 964424fcada4654bede745a7a2fb870b Try-Tiny-0.32.tar.gz +sha256 ef2d6cab0bad18e3ab1c4e6125cc5f695c7e459899f512451c8fa3ef83fa7fc0 Try-Tiny-0.32.tar.gz # computed by scancpan sha256 f1864ede834871a1207fcd19838b6bd5e1ff0a8704f5cc523fc397126041ed0b LICENCE diff --git a/package/perl-try-tiny/perl-try-tiny.mk b/package/perl-try-tiny/perl-try-tiny.mk index cd2421a3cb3..466955ffff5 100644 --- a/package/perl-try-tiny/perl-try-tiny.mk +++ b/package/perl-try-tiny/perl-try-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TRY_TINY_VERSION = 0.31 +PERL_TRY_TINY_VERSION = 0.32 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER PERL_TRY_TINY_LICENSE = MIT diff --git a/package/perl-type-tiny/perl-type-tiny.hash b/package/perl-type-tiny/perl-type-tiny.hash index bca5153a035..5c97fbf9645 100644 --- a/package/perl-type-tiny/perl-type-tiny.hash +++ b/package/perl-type-tiny/perl-type-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 08bb43feabaab97dac7a3e59b5c77ff3 Type-Tiny-2.004000.tar.gz -sha256 697e7f775edfc85f4cf07792d04fd19b09c25285f98f5938e8efc4f74507a128 Type-Tiny-2.004000.tar.gz +md5 afc902c6b56ab6320492cd09c689a940 Type-Tiny-2.006000.tar.gz +sha256 4c685ebbba5145dc02944c305e8e82759811032a55e6da270a751b63b76500ea Type-Tiny-2.006000.tar.gz # computed by scancpan -sha256 1a2929dacaef239beca27a85f7f97b793628dfb22f07fdfb406cb6f3f0d22a6b LICENSE +sha256 80067f577fa565f34f833e302cac68ea1435f3863885540f94071ccd6d5e900d LICENSE diff --git a/package/perl-type-tiny/perl-type-tiny.mk b/package/perl-type-tiny/perl-type-tiny.mk index 31c84a2637c..a4c9cd2672f 100644 --- a/package/perl-type-tiny/perl-type-tiny.mk +++ b/package/perl-type-tiny/perl-type-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_TYPE_TINY_VERSION = 2.004000 +PERL_TYPE_TINY_VERSION = 2.006000 PERL_TYPE_TINY_SOURCE = Type-Tiny-$(PERL_TYPE_TINY_VERSION).tar.gz PERL_TYPE_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_TYPE_TINY_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-uri/Config.in b/package/perl-uri/Config.in index 3f51c517f31..a09f30178d8 100644 --- a/package/perl-uri/Config.in +++ b/package/perl-uri/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_URI bool "perl-uri" + select BR2_PACKAGE_PERL_MIME_BASE32 # runtime help Uniform Resource Identifiers (absolute and relative). diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index c10a829e98d..fb70f0c266b 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from https://cpan.metacpan.org/ -md5 9b45e7635f0968deabe377fc4c99a8b5 URI-5.21.tar.gz -sha256 96265860cd61bde16e8415dcfbf108056de162caa0ac37f81eb695c9d2e0ab77 URI-5.21.tar.gz +md5 34cf48b69c4fbcc40cfebac94af39424 URI-5.29.tar.gz +sha256 a34b9f626c3ff1e20c0d4a23ec5c8b7ae1de1fb674ecefed7e46791388137372 URI-5.29.tar.gz # computed by scancpan sha256 a1730c55839ce3c9182c92e3387ba8f683ad6ab8b4a3257553a20c4db194c2cf LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index aa0c1ed8b5f..d02a729dc2a 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.21 +PERL_URI_VERSION = 5.29 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic-1.0-Perl or GPL-1.0+ diff --git a/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch b/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch deleted file mode 100644 index f0837c2d332..00000000000 --- a/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch +++ /dev/null @@ -1,554 +0,0 @@ -From ba6e2c38aafc23cf114f3ba0d0ff3baead34328b Mon Sep 17 00:00:00 2001 -From: Yves Orton -Date: Tue, 1 Aug 2023 23:12:46 +0200 -Subject: [PATCH] regcomp*.c, regexec.c - fixup regex engine build under - -Uusedl - -The regex engine is built a bit different from most of the perl -codebase. It is compiled as part of the main libperl.so and it is -also compiled (with DEBUGGING enabled) as part of the re extension. -When perl itself is compiled with DEBUGGING enabled then the code -in the re.so extension and the code in libperl.so is the same. - -This all works fine and dandy until you have a static build where the -re.so is linked into libperl.so, which results in duplicate symbols -being defined. These symbols come in two flaviours: "auxiliary" and -"debugging" related symbols. - -We have basically three cases: - -1. USE_DYNAMIC_LOADING is defined. In this case we are doing a dynamic - build and re.so will be separate from libperl.so, so it even if this - is a DEBUGGING enabled build debug and auxiliary functions can be - compiled into *both* re.so and libperl.so. This is basically the - "standard build". - -2. USE_DYNAMIC_LOADING is not defined, and DEBUGGING is not defined - either. In this case auxiliary functions should only be compiled in - libperl.so, and the debug functions should only be compiled into - re.so - -3. USE_DYNAMIC_LOADING is not defined, and DEBUGGING *is* defined. In - this case auxiliary functions AND debug functions should only be - compiled into libperl.so - -It is possible to detect the different build options by looking at the -defines 'USE_DYNAMIC_LOADING', 'PERL_EXT_RE_DEBUG' and -'DEBUGGING_RE_ONLY'. 'USE_DYNAMIC_LOADING' is NOT defined when we are -building a static perl. 'PERL_EXT_RE_DEBUG' is defined only when we are -building re.so, and 'DEBUGGING_RE_ONLY' is defined only when we are -building re.so in a perl that is not itself already a DEBUGGING enabled -perl. The file ext/re/re_top.h responsible for setting up -DEBUGGING_RE_ONLY. - -This patch uses 'PERL_EXT_RE_DEBUG', 'DEBUGGING_RE_ONLY' and -'USE_DYNAMIC_LOADING' to define in regcomp.h two further define flags -'PERL_RE_BUILD_DEBUG' and 'PERL_RE_BUILD_AUX'. - -The 'PERL_RE_BUILD_DEBUG' flag determines if the debugging functions -should be compiled into libperl.so or re.so or both. The -'PERL_RE_BUILD_AUX' flag determines if the auxiliary functions should be -compiled into just libperl.so or into it and re.so. We then use these -flags to guard the different types of functions so that we can build in -all three modes without duplicate symbols. - -Upstream: https://github.com/Perl/perl5/commit/ba6e2c38aafc23cf114f3ba0d0ff3baead34328b -Signed-off-by: Fabrice Fontaine ---- - regcomp.c | 13 +- - regcomp.h | 14 ++- - regcomp_debug.c | 308 +++++++++++++++++++++++----------------------- - regcomp_invlist.c | 3 +- - regexec.c | 3 +- - 5 files changed, 181 insertions(+), 160 deletions(-) - -diff --git a/regcomp.c b/regcomp.c -index d3c135fbfad1..6e35d95d2ac6 100644 ---- a/regcomp.c -+++ b/regcomp.c -@@ -290,6 +290,7 @@ S_edit_distance(const UV* src, - /* END of edit_distance() stuff - * ========================================================= */ - -+#ifdef PERL_RE_BUILD_AUX - /* add a data member to the struct reg_data attached to this regex, it should - * always return a non-zero return. the 's' argument is the type of the items - * being added and the n is the number of items. The length of 's' should match -@@ -340,6 +341,7 @@ Perl_reg_add_data(RExC_state_t* const pRExC_state, const char* const s, const U3 - assert(count>0); - return count; - } -+#endif /* PERL_RE_BUILD_AUX */ - - /*XXX: todo make this not included in a non debugging perl, but appears to be - * used anyway there, in 'use re' */ -@@ -7443,6 +7445,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) - } - - -+#ifdef PERL_RE_BUILD_AUX - void - Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV** invlist_ptr) - { -@@ -7502,6 +7505,7 @@ Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV** invlist_ptr) - } - } - } -+#endif /* PERL_RE_BUILD_AUX */ - - /* Parse POSIX character classes: [[:foo:]], [[=foo=]], [[.foo.]]. - Character classes ([:foo:]) can also be negated ([:^foo:]). -@@ -9095,6 +9099,7 @@ S_dump_regex_sets_structures(pTHX_ RExC_state_t *pRExC_state, - #undef IS_OPERATOR - #undef IS_OPERAND - -+#ifdef PERL_RE_BUILD_AUX - void - Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** invlist) - { -@@ -9182,6 +9187,8 @@ Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** i - } - } - } -+#endif /* PERL_RE_BUILD_AUX */ -+ - - STATIC void - S_output_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV* posix_warnings) -@@ -12105,6 +12112,7 @@ S_optimize_regclass(pTHX_ - - #undef HAS_NONLOCALE_RUNTIME_PROPERTY_DEFINITION - -+#ifdef PERL_RE_BUILD_AUX - void - Perl_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, - regnode* const node, -@@ -12261,6 +12269,7 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, - RExC_rxi->data->data[n] = (void*)rv; - ARG1u_SET(node, n); - } -+#endif /* PERL_RE_BUILD_AUX */ - - SV * - -@@ -12999,6 +13008,8 @@ S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p, - } - #endif - -+ -+#ifdef PERL_RE_BUILD_AUX - SV* - Perl_get_ANYOFM_contents(pTHX_ const regnode * n) { - -@@ -13047,7 +13058,7 @@ Perl_get_ANYOFHbbm_contents(pTHX_ const regnode * n) { - UTF_CONTINUATION_MARK | 0)); - return cp_list; - } -- -+#endif /* PERL_RE_BUILD_AUX */ - - - SV * -diff --git a/regcomp.h b/regcomp.h -index 31c91e6a68e8..017a9f843514 100644 ---- a/regcomp.h -+++ b/regcomp.h -@@ -1554,7 +1554,19 @@ typedef enum { - #define EVAL_OPTIMISTIC_FLAG 128 - #define EVAL_FLAGS_MASK (EVAL_OPTIMISTIC_FLAG-1) - -- -+/* We define PERL_RE_BUILD_DEBUG if we are NOT compiling the re extension and -+ * we are under DEBUGGING, or if we are ARE compiling the re extension -+ * and this is not a DEBUGGING enabled build (identified by -+ * DEBUGGING_RE_ONLY being defined) -+ */ -+#if ( defined(USE_DYNAMIC_LOADING) && defined(DEBUGGING)) || \ -+ ( defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING_RE_ONLY)) || \ -+ (!defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING)) -+#define PERL_RE_BUILD_DEBUG -+#endif -+#if ( defined(USE_DYNAMIC_LOADING) || !defined(PERL_EXT_RE_BUILD) ) -+#define PERL_RE_BUILD_AUX -+#endif - - #endif /* PERL_REGCOMP_H_ */ - -diff --git a/regcomp_debug.c b/regcomp_debug.c -index 93db7a89cf48..96598c49c0bc 100644 ---- a/regcomp_debug.c -+++ b/regcomp_debug.c -@@ -18,8 +18,7 @@ - #include "unicode_constants.h" - #include "regcomp_internal.h" - --#ifdef DEBUGGING -- -+#ifdef PERL_RE_BUILD_DEBUG - int - Perl_re_printf(pTHX_ const char *fmt, ...) - { -@@ -159,13 +158,160 @@ Perl_debug_peep(pTHX_ const char *str, const RExC_state_t *pRExC_state, - }); - } - --#endif /* DEBUGGING */ -+const regnode * -+Perl_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, -+ const regnode *last, const regnode *plast, -+ SV* sv, I32 indent, U32 depth) -+{ -+ const regnode *next; -+ const regnode *optstart= NULL; -+ -+ RXi_GET_DECL(r, ri); -+ DECLARE_AND_GET_RE_DEBUG_FLAGS; -+ -+ PERL_ARGS_ASSERT_DUMPUNTIL; -+ -+#ifdef DEBUG_DUMPUNTIL -+ Perl_re_printf( aTHX_ "--- %d : %d - %d - %d\n", indent, node-start, -+ last ? last-start : 0, plast ? plast-start : 0); -+#endif -+ -+ if (plast && plast < last) -+ last= plast; -+ -+ while (node && (!last || node < last)) { -+ const U8 op = OP(node); -+ -+ if (op == CLOSE || op == SRCLOSE || op == WHILEM) -+ indent--; -+ next = regnext((regnode *)node); -+ const regnode *after = regnode_after((regnode *)node,0); -+ -+ /* Where, what. */ -+ if (op == OPTIMIZED) { -+ if (!optstart && RE_DEBUG_FLAG(RE_DEBUG_COMPILE_OPTIMISE)) -+ optstart = node; -+ else -+ goto after_print; -+ } else -+ CLEAR_OPTSTART; -+ -+ regprop(r, sv, node, NULL, NULL); -+ Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), -+ (int)(2*indent + 1), "", SvPVX_const(sv)); -+ -+ if (op != OPTIMIZED) { -+ if (next == NULL) /* Next ptr. */ -+ Perl_re_printf( aTHX_ " (0)"); -+ else if (REGNODE_TYPE(op) == BRANCH -+ && REGNODE_TYPE(OP(next)) != BRANCH ) -+ Perl_re_printf( aTHX_ " (FAIL)"); -+ else -+ Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); -+ Perl_re_printf( aTHX_ "\n"); -+ } -+ -+ after_print: -+ if (REGNODE_TYPE(op) == BRANCHJ) { -+ assert(next); -+ const regnode *nnode = (OP(next) == LONGJMP -+ ? regnext((regnode *)next) -+ : next); -+ if (last && nnode > last) -+ nnode = last; -+ DUMPUNTIL(after, nnode); -+ } -+ else if (REGNODE_TYPE(op) == BRANCH) { -+ assert(next); -+ DUMPUNTIL(after, next); -+ } -+ else if ( REGNODE_TYPE(op) == TRIE ) { -+ const regnode *this_trie = node; -+ const U32 n = ARG1u(node); -+ const reg_ac_data * const ac = op>=AHOCORASICK ? -+ (reg_ac_data *)ri->data->data[n] : -+ NULL; -+ const reg_trie_data * const trie = -+ (reg_trie_data*)ri->data->data[optrie]; -+#ifdef DEBUGGING -+ AV *const trie_words -+ = MUTABLE_AV(ri->data->data[n + TRIE_WORDS_OFFSET]); -+#endif -+ const regnode *nextbranch= NULL; -+ I32 word_idx; -+ SvPVCLEAR(sv); -+ for (word_idx= 0; word_idx < (I32)trie->wordcount; word_idx++) { -+ SV ** const elem_ptr = av_fetch_simple(trie_words, word_idx, 0); -+ -+ Perl_re_indentf( aTHX_ "%s ", -+ indent+3, -+ elem_ptr -+ ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), -+ SvCUR(*elem_ptr), PL_dump_re_max_len, -+ PL_colors[0], PL_colors[1], -+ (SvUTF8(*elem_ptr) -+ ? PERL_PV_ESCAPE_UNI -+ : 0) -+ | PERL_PV_PRETTY_ELLIPSES -+ | PERL_PV_PRETTY_LTGT -+ ) -+ : "???" -+ ); -+ if (trie->jump) { -+ U16 dist= trie->jump[word_idx+1]; -+ Perl_re_printf( aTHX_ "(%" UVuf ")\n", -+ (UV)((dist ? this_trie + dist : next) - start)); -+ if (dist) { -+ if (!nextbranch) -+ nextbranch= this_trie + trie->jump[0]; -+ DUMPUNTIL(this_trie + dist, nextbranch); -+ } -+ if (nextbranch && REGNODE_TYPE(OP(nextbranch))==BRANCH) -+ nextbranch= regnext((regnode *)nextbranch); -+ } else { -+ Perl_re_printf( aTHX_ "\n"); -+ } -+ } -+ if (last && next > last) -+ node= last; -+ else -+ node= next; -+ } -+ else if ( op == CURLY ) { /* "next" might be very big: optimizer */ -+ DUMPUNTIL(after, after + 1); /* +1 is NOT a REGNODE_AFTER */ -+ } -+ else if (REGNODE_TYPE(op) == CURLY && op != CURLYX) { -+ assert(next); -+ DUMPUNTIL(after, next); -+ } -+ else if ( op == PLUS || op == STAR) { -+ DUMPUNTIL(after, after + 1); /* +1 NOT a REGNODE_AFTER */ -+ } -+ else if (REGNODE_TYPE(op) == EXACT || op == ANYOFHs) { -+ /* Literal string, where present. */ -+ node = (const regnode *)REGNODE_AFTER_varies(node); -+ } -+ else { -+ node = REGNODE_AFTER_opcode(node,op); -+ } -+ if (op == CURLYX || op == OPEN || op == SROPEN) -+ indent++; -+ if (REGNODE_TYPE(op) == END) -+ break; -+ } -+ CLEAR_OPTSTART; -+#ifdef DEBUG_DUMPUNTIL -+ Perl_re_printf( aTHX_ "--- %d\n", (int)indent); -+#endif -+ return node; -+} -+ -+#endif /* PERL_RE_BUILD_DEBUG */ - - /* - - regdump - dump a regexp onto Perl_debug_log in vaguely comprehensible form - */ - #ifdef DEBUGGING -- - static void - S_regdump_intflags(pTHX_ const char *lead, const U32 flags) - { -@@ -907,8 +1053,8 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ - #endif /* DEBUGGING */ - } - --#ifdef DEBUGGING - -+#ifdef DEBUGGING - STATIC void - S_put_code_point(pTHX_ SV *sv, UV c) - { -@@ -1517,154 +1663,4 @@ S_put_charclass_bitmap_innards(pTHX_ SV *sv, - - return did_output_something; - } -- -- --const regnode * --Perl_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, -- const regnode *last, const regnode *plast, -- SV* sv, I32 indent, U32 depth) --{ -- const regnode *next; -- const regnode *optstart= NULL; -- -- RXi_GET_DECL(r, ri); -- DECLARE_AND_GET_RE_DEBUG_FLAGS; -- -- PERL_ARGS_ASSERT_DUMPUNTIL; -- --#ifdef DEBUG_DUMPUNTIL -- Perl_re_printf( aTHX_ "--- %d : %d - %d - %d\n", indent, node-start, -- last ? last-start : 0, plast ? plast-start : 0); --#endif -- -- if (plast && plast < last) -- last= plast; -- -- while (node && (!last || node < last)) { -- const U8 op = OP(node); -- -- if (op == CLOSE || op == SRCLOSE || op == WHILEM) -- indent--; -- next = regnext((regnode *)node); -- const regnode *after = regnode_after((regnode *)node,0); -- -- /* Where, what. */ -- if (op == OPTIMIZED) { -- if (!optstart && RE_DEBUG_FLAG(RE_DEBUG_COMPILE_OPTIMISE)) -- optstart = node; -- else -- goto after_print; -- } else -- CLEAR_OPTSTART; -- -- regprop(r, sv, node, NULL, NULL); -- Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), -- (int)(2*indent + 1), "", SvPVX_const(sv)); -- -- if (op != OPTIMIZED) { -- if (next == NULL) /* Next ptr. */ -- Perl_re_printf( aTHX_ " (0)"); -- else if (REGNODE_TYPE(op) == BRANCH -- && REGNODE_TYPE(OP(next)) != BRANCH ) -- Perl_re_printf( aTHX_ " (FAIL)"); -- else -- Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); -- Perl_re_printf( aTHX_ "\n"); -- } -- -- after_print: -- if (REGNODE_TYPE(op) == BRANCHJ) { -- assert(next); -- const regnode *nnode = (OP(next) == LONGJMP -- ? regnext((regnode *)next) -- : next); -- if (last && nnode > last) -- nnode = last; -- DUMPUNTIL(after, nnode); -- } -- else if (REGNODE_TYPE(op) == BRANCH) { -- assert(next); -- DUMPUNTIL(after, next); -- } -- else if ( REGNODE_TYPE(op) == TRIE ) { -- const regnode *this_trie = node; -- const U32 n = ARG1u(node); -- const reg_ac_data * const ac = op>=AHOCORASICK ? -- (reg_ac_data *)ri->data->data[n] : -- NULL; -- const reg_trie_data * const trie = -- (reg_trie_data*)ri->data->data[optrie]; --#ifdef DEBUGGING -- AV *const trie_words -- = MUTABLE_AV(ri->data->data[n + TRIE_WORDS_OFFSET]); --#endif -- const regnode *nextbranch= NULL; -- I32 word_idx; -- SvPVCLEAR(sv); -- for (word_idx= 0; word_idx < (I32)trie->wordcount; word_idx++) { -- SV ** const elem_ptr = av_fetch_simple(trie_words, word_idx, 0); -- -- Perl_re_indentf( aTHX_ "%s ", -- indent+3, -- elem_ptr -- ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), -- SvCUR(*elem_ptr), PL_dump_re_max_len, -- PL_colors[0], PL_colors[1], -- (SvUTF8(*elem_ptr) -- ? PERL_PV_ESCAPE_UNI -- : 0) -- | PERL_PV_PRETTY_ELLIPSES -- | PERL_PV_PRETTY_LTGT -- ) -- : "???" -- ); -- if (trie->jump) { -- U16 dist= trie->jump[word_idx+1]; -- Perl_re_printf( aTHX_ "(%" UVuf ")\n", -- (UV)((dist ? this_trie + dist : next) - start)); -- if (dist) { -- if (!nextbranch) -- nextbranch= this_trie + trie->jump[0]; -- DUMPUNTIL(this_trie + dist, nextbranch); -- } -- if (nextbranch && REGNODE_TYPE(OP(nextbranch))==BRANCH) -- nextbranch= regnext((regnode *)nextbranch); -- } else { -- Perl_re_printf( aTHX_ "\n"); -- } -- } -- if (last && next > last) -- node= last; -- else -- node= next; -- } -- else if ( op == CURLY ) { /* "next" might be very big: optimizer */ -- DUMPUNTIL(after, after + 1); /* +1 is NOT a REGNODE_AFTER */ -- } -- else if (REGNODE_TYPE(op) == CURLY && op != CURLYX) { -- assert(next); -- DUMPUNTIL(after, next); -- } -- else if ( op == PLUS || op == STAR) { -- DUMPUNTIL(after, after + 1); /* +1 NOT a REGNODE_AFTER */ -- } -- else if (REGNODE_TYPE(op) == EXACT || op == ANYOFHs) { -- /* Literal string, where present. */ -- node = (const regnode *)REGNODE_AFTER_varies(node); -- } -- else { -- node = REGNODE_AFTER_opcode(node,op); -- } -- if (op == CURLYX || op == OPEN || op == SROPEN) -- indent++; -- if (REGNODE_TYPE(op) == END) -- break; -- } -- CLEAR_OPTSTART; --#ifdef DEBUG_DUMPUNTIL -- Perl_re_printf( aTHX_ "--- %d\n", (int)indent); --#endif -- return node; --} -- --#endif /* DEBUGGING */ -+#endif /* DEBUGGING */ -diff --git a/regcomp_invlist.c b/regcomp_invlist.c -index 9ea3f431817d..82f82305846a 100644 ---- a/regcomp_invlist.c -+++ b/regcomp_invlist.c -@@ -18,7 +18,7 @@ - #include "unicode_constants.h" - #include "regcomp_internal.h" - -- -+#ifdef PERL_RE_BUILD_AUX - void - Perl_populate_bitmap_from_invlist(pTHX_ SV * invlist, const UV offset, const U8 * bitmap, const Size_t len) - { -@@ -70,6 +70,7 @@ Perl_populate_invlist_from_bitmap(pTHX_ const U8 * bitmap, const Size_t bitmap_l - } - } - } -+#endif /* PERL_RE_BUILD_AUX */ - - /* This section of code defines the inversion list object and its methods. The - * interfaces are highly subject to change, so as much as possible is static to -diff --git a/regexec.c b/regexec.c -index c404d9aa3d73..de0b7c461918 100644 ---- a/regexec.c -+++ b/regexec.c -@@ -4428,7 +4428,8 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) - */ - #define REPORT_CODE_OFF 29 - #define INDENT_CHARS(depth) ((int)(depth) % 20) --#ifdef DEBUGGING -+ -+#ifdef PERL_RE_BUILD_DEBUG - int - Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) - { diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 91abcdeb92f..aba28440369 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.38.2.tar.xz.{md5,sha1,sha256}.txt -md5 d3957d75042918a23ec0abac4a2b7e0a perl-5.38.2.tar.xz -sha1 af1d5f9e0499f3cfa4736433631aebf7624714da perl-5.38.2.tar.xz -sha256 d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 perl-5.38.2.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.40.0.tar.xz.{md5,sha1,sha256}.txt +md5 cfe14ef0709b9687f9c514042e8e1e82 perl-5.40.0.tar.xz +sha1 4a3af1f62afc611aa1552adc6c7ec389e9723bce perl-5.40.0.tar.xz +sha256 d5325300ad267624cb0b7d512cfdfcd74fa7fe00c455c5b51a6bd53e5e199ef9 perl-5.40.0.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.5.2/perl-cross-1.5.2.hash -sha256 584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90 perl-cross-1.5.2.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.6/perl-cross-1.6.hash +sha256 5abf198ee50ce9e69eb68fede68c87f65241caa744e4203e97490fa59b45ed69 perl-cross-1.6.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 9519aaeeac509b3fa8778155a63545b6086f8313546b93fe9958d1c434d476a8 README +sha256 05fcf86432bd78754c7e325d4be44a5968344c01cc08c004b685172ea508ec23 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 9de0425e87b..dc7c0b8d423 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 38 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2 +PERL_VERSION_MAJOR = 40 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.5.2 +PERL_CROSS_VERSION = 1.6 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz @@ -98,7 +98,9 @@ endef HOST_PERL_CONF_OPTS = \ -des \ -Dprefix="$(HOST_DIR)" \ - -Dcc="$(HOSTCC)" + -Dcc="$(HOSTCC)" \ + -Dccflags="$(HOST_CFLAGS)" \ + -Dldflags="$(HOST_LDFLAGS)" define HOST_PERL_CONFIGURE_CMDS (cd $(@D); $(HOST_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ diff --git a/package/php/0006-Sync-headers-installation.patch b/package/php/0006-Sync-headers-installation.patch new file mode 100644 index 00000000000..da1c6a6e4c4 --- /dev/null +++ b/package/php/0006-Sync-headers-installation.patch @@ -0,0 +1,478 @@ +From e77015d6e5a15d9ec7e30cba73465adc30861355 Mon Sep 17 00:00:00 2001 +From: Peter Kokot +Date: Sun, 28 Jan 2024 19:50:55 +0100 +Subject: [PATCH] Sync headers installation + +This syncs the installed sapi and extension headers on *nix and Windows +systems by installing only what is intended outside of php-src. + +- ext/gd: without gd_arginfo.h and gd_compat.h +- ext/hash: php_hash_joaat.h and php_hash_fnv.h added also on Windows + installation; xxhash/xxhash.h added on both installations as it is + included in php_hash_xxhash.h; Include path for xxhash.h changed to + relative so the php_hash_xxhash.h can be included outside of php-src; + Redundant include flags removed +- ext/iconv: without iconv_arginfo.h +- ext/mysqli: mysqli_mysqlnd.h was missing on Windows +- ext/phar: php_phar.h was missing on Windows +- ext/sodium: php_libsodium.h was missing on *nix +- ext/xml: without xml_arginfo.h +- sapi/cli: cli.h was missing on Windows + +Closes GH-13210 +Closes GH-13213 + +[Thomas: minor backporting tweaks] +Signed-off-by: Thomas Petazzoni +Upstream: https://github.com/php/php-src/commit/52dba99d47563f38d8ed5f84690a3cb2c1785475 +--- + ext/date/config.w32 | 2 +- + ext/dom/config.m4 | 2 +- + ext/filter/config.m4 | 2 +- + ext/gd/config.m4 | 5 ++--- + ext/gd/config.w32 | 2 +- + ext/gmp/config.m4 | 2 +- + ext/hash/config.m4 | 3 +-- + ext/hash/config.w32 | 10 +++------- + ext/hash/php_hash_xxhash.h | 2 +- + ext/iconv/config.m4 | 2 +- + ext/iconv/config.w32 | 2 +- + ext/json/config.w32 | 2 +- + ext/libxml/config.w32 | 2 +- + ext/libxml/config0.m4 | 2 +- + ext/mysqli/config.m4 | 8 ++------ + ext/mysqli/config.w32 | 2 +- + ext/pdo/config.m4 | 2 +- + ext/phar/config.w32 | 1 + + ext/session/config.m4 | 4 ++-- + ext/session/config.w32 | 2 +- + ext/simplexml/config.m4 | 2 +- + ext/simplexml/config.w32 | 2 +- + ext/sockets/config.m4 | 2 +- + ext/sodium/config.m4 | 1 + + ext/sodium/config.w32 | 2 +- + ext/xml/config.m4 | 2 +- + ext/xml/config.w32 | 2 +- + sapi/cli/config.m4 | 2 +- + sapi/cli/config.w32 | 1 + + sapi/embed/config.m4 | 2 +- + 30 files changed, 35 insertions(+), 42 deletions(-) + +diff --git a/ext/date/config.w32 b/ext/date/config.w32 +index cf9e220c558..23af2f7d658 100644 +--- a/ext/date/config.w32 ++++ b/ext/date/config.w32 +@@ -19,5 +19,5 @@ tl_config.WriteLine("#define timelib_strndup estrndup"); + tl_config.WriteLine("#define timelib_free efree"); + tl_config.Close(); + +-PHP_INSTALL_HEADERS("ext/date/", "php_date.h lib/timelib.h lib/timelib_config.h"); ++PHP_INSTALL_HEADERS("ext/date", "php_date.h lib/timelib.h lib/timelib_config.h"); + AC_DEFINE('HAVE_TIMELIB_CONFIG_H', 1, 'Have timelib_config.h') +diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 +index 6a83d10c8e2..27fef334794 100644 +--- a/ext/dom/config.m4 ++++ b/ext/dom/config.m4 +@@ -24,7 +24,7 @@ if test "$PHP_DOM" != "no"; then + namednodemap.c], + $ext_shared) + PHP_SUBST(DOM_SHARED_LIBADD) +- PHP_INSTALL_HEADERS([ext/dom/xml_common.h]) ++ PHP_INSTALL_HEADERS([ext/dom], [xml_common.h]) + PHP_ADD_EXTENSION_DEP(dom, libxml) + ]) + fi +diff --git a/ext/filter/config.m4 b/ext/filter/config.m4 +index 0108a17fb7a..b7934701bb6 100644 +--- a/ext/filter/config.m4 ++++ b/ext/filter/config.m4 +@@ -8,6 +8,6 @@ if test "$PHP_FILTER" != "no"; then + PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_SUBST(FILTER_SHARED_LIBADD) + +- PHP_INSTALL_HEADERS([ext/filter/php_filter.h]) ++ PHP_INSTALL_HEADERS([ext/filter], [php_filter.h]) + PHP_ADD_EXTENSION_DEP(filter, pcre) + fi +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index b31c9b2c0bd..ef55212d1ee 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -238,7 +238,7 @@ dnl Various checks for GD features + PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GD_CFLAGS)) + PHP_ADD_BUILD_DIR($ext_builddir/libgd) + GD_CFLAGS="-Wno-strict-prototypes -I$ext_srcdir/libgd $GD_CFLAGS" +- GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" ++ PHP_INSTALL_HEADERS([ext/gd], [php_gd.h libgd/]) + + PHP_TEST_BUILD(foobar, [], [ + AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) +@@ -253,13 +253,12 @@ dnl Various checks for GD features + PHP_GD_CHECK_VERSION + + PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared) +- GD_HEADER_DIRS="ext/gd/" ++ PHP_INSTALL_HEADERS([ext/gd], [php_gd.h]) + PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ + AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) + ], [ $GD_SHARED_LIBADD ]) + fi + +- PHP_INSTALL_HEADERS([$GD_HEADER_DIRS]) + PHP_SUBST(GD_CFLAGS) + PHP_SUBST(GDLIB_CFLAGS) + PHP_SUBST(GDLIB_LIBS) +diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 +index 09b09df95d3..b779df48e91 100644 +--- a/ext/gd/config.w32 ++++ b/ext/gd/config.w32 +@@ -75,7 +75,7 @@ if (PHP_GD != "no") { + ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); + } + +- PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" ); ++ PHP_INSTALL_HEADERS("ext/gd", "php_gd.h libgd/"); + } else { + WARNING("gd not enabled; libraries and headers not found"); + } +diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4 +index fa55751cf16..657e43b407f 100644 +--- a/ext/gmp/config.m4 ++++ b/ext/gmp/config.m4 +@@ -27,7 +27,7 @@ if test "$PHP_GMP" != "no"; then + PHP_ADD_INCLUDE($PHP_GMP/include) + fi + +- PHP_INSTALL_HEADERS([ext/gmp/php_gmp_int.h]) ++ PHP_INSTALL_HEADERS([ext/gmp], [php_gmp_int.h]) + + PHP_NEW_EXTENSION(gmp, gmp.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_SUBST(GMP_SHARED_LIBADD) +diff --git a/ext/hash/config.m4 b/ext/hash/config.m4 +index 46e66aa9f8c..1e1d2e3f698 100644 +--- a/ext/hash/config.m4 ++++ b/ext/hash/config.m4 +@@ -36,7 +36,6 @@ else + fi + + PHP_ADD_BUILD_DIR(ext/hash/murmur, 1) +-PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/xxhash" + + EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ + hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ +@@ -46,7 +45,7 @@ EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \ + php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ + php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ + php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h php_hash_murmur.h \ +- php_hash_xxhash.h" ++ php_hash_xxhash.h xxhash/xxhash.h" + + PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS) + PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) +diff --git a/ext/hash/config.w32 b/ext/hash/config.w32 +index d38b032efd3..bafbd0b9f8d 100644 +--- a/ext/hash/config.w32 ++++ b/ext/hash/config.w32 +@@ -34,13 +34,9 @@ if (!CHECK_HEADER_ADD_INCLUDE('PMurHash.h', 'CFLAGS_HASH', hash_murmur_dir)) { + } + ADD_SOURCES(hash_murmur_dir, 'PMurHash.c PMurHash128.c', 'hash'); + +-var hash_xxhash_dir = 'ext/hash/xxhash'; +-if (!CHECK_HEADER_ADD_INCLUDE('xxhash.h', 'CFLAGS_HASH', hash_xxhash_dir)) { +- ERROR('Unable to locate xxhash headers'); +-} +- +-PHP_INSTALL_HEADERS('ext/hash/', 'php_hash.h php_hash_md.h php_hash_sha.h ' + ++PHP_INSTALL_HEADERS('ext/hash', 'php_hash.h php_hash_md.h php_hash_sha.h ' + + 'php_hash_ripemd.h php_hash_haval.h php_hash_tiger.h ' + + 'php_hash_gost.h php_hash_snefru.h php_hash_whirlpool.h ' + + 'php_hash_adler32.h php_hash_crc32.h php_hash_sha3.h ' + +- 'php_hash_murmur.h php_hash_xxhash.h'); ++ 'php_hash_murmur.h php_hash_xxhash.h php_hash_fnv.h ' + ++ 'php_hash_joaat.h xxhash/xxhash.h'); +diff --git a/ext/hash/php_hash_xxhash.h b/ext/hash/php_hash_xxhash.h +index a1e8840ce27..ace70deedb0 100644 +--- a/ext/hash/php_hash_xxhash.h ++++ b/ext/hash/php_hash_xxhash.h +@@ -18,7 +18,7 @@ + #define PHP_HASH_XXHASH_H + + #define XXH_INLINE_ALL 1 +-#include "xxhash.h" ++#include "xxhash/xxhash.h" + + typedef struct { + XXH32_state_t s; +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index 3cf400fe962..63221eddb0b 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 +@@ -149,7 +149,7 @@ int main(void) { + + PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) + PHP_SUBST(ICONV_SHARED_LIBADD) +- PHP_INSTALL_HEADERS([ext/iconv/]) ++ PHP_INSTALL_HEADERS([ext/iconv], [php_iconv.h]) + else + AC_MSG_ERROR(Please reinstall the iconv library.) + fi +diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 +index 31423dd121e..0087df54fe5 100644 +--- a/ext/iconv/config.w32 ++++ b/ext/iconv/config.w32 +@@ -17,7 +17,7 @@ if (PHP_ICONV != "no") { + if (!PHP_ICONV_SHARED) { + ADD_DEF_FILE("ext\\iconv\\php_iconv.def"); + } +- PHP_INSTALL_HEADERS("", "ext/iconv"); ++ PHP_INSTALL_HEADERS("ext/iconv", "php_iconv.h"); + } else { + WARNING("iconv support can't be enabled, libraries or headers are missing") + PHP_ICONV = "no"; +diff --git a/ext/json/config.w32 b/ext/json/config.w32 +index 255f2787728..84f77b6f8c9 100644 +--- a/ext/json/config.w32 ++++ b/ext/json/config.w32 +@@ -6,4 +6,4 @@ ADD_SOURCES(configure_module_dirname, "json_encoder.c json_parser.tab.c json_sca + + ADD_MAKEFILE_FRAGMENT(); + +-PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); ++PHP_INSTALL_HEADERS("ext/json", "php_json.h php_json_parser.h php_json_scanner.h"); +diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 +index b11c57bc44a..e890ee4fc4e 100644 +--- a/ext/libxml/config.w32 ++++ b/ext/libxml/config.w32 +@@ -15,7 +15,7 @@ if (PHP_LIBXML == "yes") { + if (!PHP_LIBXML_SHARED) { + ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); + } +- PHP_INSTALL_HEADERS("ext/libxml/", "php_libxml.h"); ++ PHP_INSTALL_HEADERS("ext/libxml", "php_libxml.h"); + } else { + WARNING("libxml support can't be enabled, iconv or libxml are missing") + PHP_LIBXML = "no" +diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4 +index 044a58fa624..7bee0126378 100644 +--- a/ext/libxml/config0.m4 ++++ b/ext/libxml/config0.m4 +@@ -12,6 +12,6 @@ if test "$PHP_LIBXML" != "no"; then + PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [ + AC_DEFINE(HAVE_LIBXML,1,[ ]) + PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) +- PHP_INSTALL_HEADERS([ext/libxml/php_libxml.h]) ++ PHP_INSTALL_HEADERS([ext/libxml], [php_libxml.h]) + ]) + fi +diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 +index ad7fb7f6bfa..ab060ebc4f1 100644 +--- a/ext/mysqli/config.m4 ++++ b/ext/mysqli/config.m4 +@@ -65,10 +65,6 @@ if test "$PHP_MYSQLI" != "no"; then + mysqli_exception.c mysqli_result_iterator.c" + PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_SUBST(MYSQLI_SHARED_LIBADD) +- PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h]) +- +- if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then +- PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) +- PHP_INSTALL_HEADERS([ext/mysqli/mysqli_mysqlnd.h]) +- fi ++ PHP_INSTALL_HEADERS([ext/mysqli], [php_mysqli_structs.h mysqli_mysqlnd.h]) ++ PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) + fi +diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 +index c2c4781dd36..141f993afda 100644 +--- a/ext/mysqli/config.w32 ++++ b/ext/mysqli/config.w32 +@@ -22,6 +22,6 @@ if (PHP_MYSQLI != "no") { + if (PHP_MYSQLI != "no") { + EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); +- PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h"); ++ PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h"); + } + } +diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 +index 9b9a3e36df7..2b182d1e516 100644 +--- a/ext/pdo/config.m4 ++++ b/ext/pdo/config.m4 +@@ -11,7 +11,7 @@ if test "$PHP_PDO" != "no"; then + + PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) + PHP_ADD_EXTENSION_DEP(pdo, spl, true) +- PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h]) ++ PHP_INSTALL_HEADERS([ext/pdo], [php_pdo.h php_pdo_driver.h php_pdo_error.h]) + + dnl so we always include the known-good working hack. + PHP_ADD_MAKEFILE_FRAGMENT +diff --git a/ext/phar/config.w32 b/ext/phar/config.w32 +index c68ba08f2ca..16432165167 100644 +--- a/ext/phar/config.w32 ++++ b/ext/phar/config.w32 +@@ -35,6 +35,7 @@ if (PHP_PHAR != "no") { + } + } + ADD_EXTENSION_DEP('phar', 'spl', true); ++ PHP_INSTALL_HEADERS("ext/phar", "php_phar.h"); + + ADD_MAKEFILE_FRAGMENT(); + } +diff --git a/ext/session/config.m4 b/ext/session/config.m4 +index da31bbde86c..f356102ac46 100644 +--- a/ext/session/config.m4 ++++ b/ext/session/config.m4 +@@ -18,7 +18,7 @@ if test "$PHP_SESSION" != "no"; then + PHP_ADD_EXTENSION_DEP(session, hash, true) + PHP_ADD_EXTENSION_DEP(session, spl) + PHP_SUBST(SESSION_SHARED_LIBADD) +- PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h]) ++ PHP_INSTALL_HEADERS([ext/session], [php_session.h mod_files.h mod_user.h]) + AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) + fi + +@@ -38,6 +38,6 @@ if test "$PHP_MM" != "no"; then + + PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD) + PHP_ADD_INCLUDE($MM_DIR/include) +- PHP_INSTALL_HEADERS([ext/session/mod_mm.h]) ++ PHP_INSTALL_HEADERS([ext/session], [mod_mm.h]) + AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm]) + fi +diff --git a/ext/session/config.w32 b/ext/session/config.w32 +index aff34f3c847..bb3df15ac29 100644 +--- a/ext/session/config.w32 ++++ b/ext/session/config.w32 +@@ -5,5 +5,5 @@ ARG_ENABLE("session", "session support", "yes"); + if (PHP_SESSION == "yes") { + EXTENSION("session", "mod_user_class.c session.c mod_files.c mod_mm.c mod_user.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + AC_DEFINE("HAVE_PHP_SESSION", 1, "Session support"); +- PHP_INSTALL_HEADERS("ext/session/", "mod_mm.h php_session.h mod_files.h mod_user.h"); ++ PHP_INSTALL_HEADERS("ext/session", "mod_mm.h php_session.h mod_files.h mod_user.h"); + } +diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 +index 8b8a6f814a1..734aa080fde 100644 +--- a/ext/simplexml/config.m4 ++++ b/ext/simplexml/config.m4 +@@ -13,7 +13,7 @@ if test "$PHP_SIMPLEXML" != "no"; then + PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [ + AC_DEFINE(HAVE_SIMPLEXML,1,[ ]) + PHP_NEW_EXTENSION(simplexml, simplexml.c, $ext_shared) +- PHP_INSTALL_HEADERS([ext/simplexml/php_simplexml.h ext/simplexml/php_simplexml_exports.h]) ++ PHP_INSTALL_HEADERS([ext/simplexml], [php_simplexml.h php_simplexml_exports.h]) + PHP_SUBST(SIMPLEXML_SHARED_LIBADD) + ]) + PHP_ADD_EXTENSION_DEP(simplexml, libxml) +diff --git a/ext/simplexml/config.w32 b/ext/simplexml/config.w32 +index a6011fedc20..8a1190d5272 100644 +--- a/ext/simplexml/config.w32 ++++ b/ext/simplexml/config.w32 +@@ -21,7 +21,7 @@ if (PHP_SIMPLEXML == "yes") { + MESSAGE("\tSPL support in simplexml disabled"); + } + ADD_FLAG("CFLAGS_SIMPLEXML", "/D PHP_SIMPLEXML_EXPORTS "); +- PHP_INSTALL_HEADERS("ext/simplexml/", "php_simplexml.h php_simplexml_exports.h"); ++ PHP_INSTALL_HEADERS("ext/simplexml", "php_simplexml.h php_simplexml_exports.h"); + } else { + PHP_SIMPLEXML = "no"; + WARNING("simplexml not enabled; libraries and headers not found"); +diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4 +index d0fad902114..0fb11e773f2 100644 +--- a/ext/sockets/config.m4 ++++ b/ext/sockets/config.m4 +@@ -103,5 +103,5 @@ if test "$PHP_SOCKETS" != "no"; then + [sockets.c multicast.c conversions.c sockaddr_conv.c sendrecvmsg.c], + [$ext_shared],, + $PHP_SOCKETS_CFLAGS) +- PHP_INSTALL_HEADERS([ext/sockets/], [php_sockets.h]) ++ PHP_INSTALL_HEADERS([ext/sockets], [php_sockets.h]) + fi +diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4 +index 05d9ebd5a13..a7a9131602e 100644 +--- a/ext/sodium/config.m4 ++++ b/ext/sodium/config.m4 +@@ -15,5 +15,6 @@ if test "$PHP_SODIUM" != "no"; then + SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits" + AX_CHECK_COMPILE_FLAG([-Wno-logical-op], SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op", , [-Werror]) + PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared, , $SODIUM_COMPILER_FLAGS) ++ PHP_INSTALL_HEADERS([ext/sodium], [php_libsodium.h]) + PHP_SUBST(SODIUM_SHARED_LIBADD) + fi +diff --git a/ext/sodium/config.w32 b/ext/sodium/config.w32 +index 2ff8b998d2d..738ef666eb0 100644 +--- a/ext/sodium/config.w32 ++++ b/ext/sodium/config.w32 +@@ -6,7 +6,7 @@ if (PHP_SODIUM != "no") { + if (CHECK_LIB("libsodium.lib", "sodium", PHP_SODIUM) && CHECK_HEADER_ADD_INCLUDE("sodium.h", "CFLAGS_SODIUM")) { + EXTENSION("sodium", "libsodium.c sodium_pwhash.c"); + AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Have the Sodium library'); +- PHP_INSTALL_HEADERS("ext/sodium/", "php_libsodium.h"); ++ PHP_INSTALL_HEADERS("ext/sodium", "php_libsodium.h"); + } else { + WARNING("libsodium not enabled; libraries and headers not found"); + } +diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 +index 208f9e4c160..5c07ce079de 100644 +--- a/ext/xml/config.m4 ++++ b/ext/xml/config.m4 +@@ -32,6 +32,6 @@ if test "$PHP_XML" != "no"; then + + PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_SUBST(XML_SHARED_LIBADD) +- PHP_INSTALL_HEADERS([ext/xml/]) ++ PHP_INSTALL_HEADERS([ext/xml], [expat_compat.h php_xml.h]) + AC_DEFINE(HAVE_XML, 1, [ ]) + fi +diff --git a/ext/xml/config.w32 b/ext/xml/config.w32 +index c0bb3168e88..f4fec691909 100644 +--- a/ext/xml/config.w32 ++++ b/ext/xml/config.w32 +@@ -13,7 +13,7 @@ if (PHP_XML == "yes") { + if (!PHP_XML_SHARED) { + ADD_FLAG("CFLAGS_XML", "/D LIBXML_STATIC "); + } +- PHP_INSTALL_HEADERS("", "ext/xml"); ++ PHP_INSTALL_HEADERS("ext/xml", "expat_compat.h php_xml.h"); + } else { + WARNING("xml support can't be enabled, libraries or headers are missing") + PHP_XML = "no" +diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 +index 1b8e67f0b39..3e58a9aeb74 100644 +--- a/sapi/cli/config.m4 ++++ b/sapi/cli/config.m4 +@@ -56,6 +56,6 @@ if test "$PHP_CLI" != "no"; then + + PHP_OUTPUT(sapi/cli/php.1) + +- PHP_INSTALL_HEADERS([sapi/cli/cli.h]) ++ PHP_INSTALL_HEADERS([sapi/cli], [cli.h]) + fi + AC_MSG_RESULT($PHP_CLI) +diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32 +index 28bb2fd4c6d..2a3475e5de6 100644 +--- a/sapi/cli/config.w32 ++++ b/sapi/cli/config.w32 +@@ -8,6 +8,7 @@ if (PHP_CLI == "yes") { + ADD_FLAG("LIBS_CLI", "ws2_32.lib"); + ADD_FLAG("LIBS_CLI", "shell32.lib"); + ADD_FLAG("LDFLAGS_CLI", "/stack:67108864"); ++ PHP_INSTALL_HEADERS("sapi/cli", "cli.h"); + + if (CHECK_LIB("edit_a.lib;edit.lib", "cli", PHP_CLI) && + CHECK_HEADER_ADD_INCLUDE("editline/readline.h", "CFLAGS_CLI")) { +diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 +index 39d7dcf0a3f..1b44ee94120 100644 +--- a/sapi/embed/config.m4 ++++ b/sapi/embed/config.m4 +@@ -26,7 +26,7 @@ if test "$PHP_EMBED" != "no"; then + if test "$PHP_EMBED_TYPE" != "no"; then + PHP_SUBST(LIBPHP_CFLAGS) + PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) +- PHP_INSTALL_HEADERS([sapi/embed/php_embed.h]) ++ PHP_INSTALL_HEADERS([sapi/embed], [php_embed.h]) + fi + AC_MSG_RESULT([$PHP_EMBED_TYPE]) + else +-- +2.47.1 + diff --git a/package/php/php.hash b/package/php/php.hash index e3a1c6cf2f3..535761f0475 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7 php-8.3.14.tar.xz +sha256 3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f php-8.3.15.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 2f649dc6fb7..ebdd5c2a5a2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.14 +PHP_VERSION = 8.3.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -92,7 +92,7 @@ endif # php has some assembly function that is not present in Thumb mode: # Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode -# so, we desactivate Thumb mode +# so, we deactivate Thumb mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) PHP_CFLAGS += -marm endif @@ -379,5 +379,12 @@ HOST_PHP_DEPENDENCIES = \ host-pcre2 \ host-pkgconf +# PHP can't be AUTORECONFed the standard way unfortunately +HOST_PHP_DEPENDENCIES += host-autoconf host-automake host-libtool +define HOST_PHP_BUILDCONF + cd $(@D) ; $(HOST_MAKE_ENV) ./buildconf --force +endef +HOST_PHP_PRE_CONFIGURE_HOOKS += HOST_PHP_BUILDCONF + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index e4a129f849d..029726685a6 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -3,7 +3,7 @@ # pipewire # ################################################################################ -# reglinux - update + PIPEWIRE_VERSION = 1.2.7 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) @@ -34,7 +34,12 @@ PIPEWIRE_CONF_OPTS += \ -Dsession-managers= \ -Dlegacy-rtkit=false \ -Davb=disabled \ - -Dlibcanberra=disabled + -Droc=disabled \ + -Dlibcanberra=disabled \ + -Dlibmysofa=disabled \ + -Dlibffado=disabled \ + -Dflatpak=disabled \ + -Dsnap=disabled # reglinux PIPEWIRE_CONF_OPTS += --wrap-mode=default @@ -112,27 +117,9 @@ else PIPEWIRE_CONF_OPTS += -Dpipewire-jack=disabled -Djack=disabled endif -# reglinux -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_LIBFREEAPTX),yy) -PIPEWIRE_CONF_OPTS += -Dbluez5-codec-aptx=enabled -PIPEWIRE_DEPENDENCIES += bluez5_utils libfreeaptx -endif - -# reglinux -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_LIBLDAC),yy) -PIPEWIRE_CONF_OPTS += -Dbluez5-codec-ldac=enabled -PIPEWIRE_DEPENDENCIES += bluez5_utils libldac -endif - -# reglinux -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_LIBLC3),yy) -PIPEWIRE_CONF_OPTS += -Dbluez5-codec-lc3=enabled -PIPEWIRE_DEPENDENCIES += bluez5_utils liblc3 -endif - -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC)$(BR2_PACKAGE_LIBGLIB2),yyy) PIPEWIRE_CONF_OPTS += -Dbluez5=enabled -PIPEWIRE_DEPENDENCIES += bluez5_utils sbc +PIPEWIRE_DEPENDENCIES += bluez5_utils sbc libglib2 ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y) PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=enabled PIPEWIRE_DEPENDENCIES += modem-manager @@ -145,8 +132,14 @@ PIPEWIRE_DEPENDENCIES += opus else PIPEWIRE_CONF_OPTS += -Dbluez5-codec-opus=disabled endif +ifeq ($(BR2_PACKAGE_FDK_AAC),y) +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-aac=enabled +PIPEWIRE_DEPENDENCIES += fdk-aac +else +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-aac=disabled +endif else -PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled +PIPEWIRE_CONF_OPTS += -Dbluez5=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) @@ -273,6 +266,13 @@ else PIPEWIRE_CONF_OPTS += -Draop=disabled endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +PIPEWIRE_CONF_OPTS += -Dselinux=enabled +PIPEWIRE_DEPENDENCIES += libselinux +else +PIPEWIRE_CONF_OPTS += -Dselinux=disabled +endif + define PIPEWIRE_USERS pipewire -1 pipewire -1 * - - audio,video PipeWire System Daemon endef diff --git a/package/pixman/0002-pixman-Adjust-arm-assembly-for-binutils-change.patch b/package/pixman/0002-pixman-Adjust-arm-assembly-for-binutils-change.patch new file mode 100644 index 00000000000..2f0fe9f01a2 --- /dev/null +++ b/package/pixman/0002-pixman-Adjust-arm-assembly-for-binutils-change.patch @@ -0,0 +1,108 @@ +From 9c000faabe1730c1ec7dbefe7e290e025adf7b69 Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Fri, 12 Jul 2024 11:11:17 -0400 +Subject: [PATCH] pixman: Adjust arm assembly for binutils change + +A change in the latest version of binutils broke building pixman for arm. + +The binutils change: +https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b + +Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/96 +(cherry picked from commit 865e6ce00bb79a6b925ed4c2c436e1533e4472aa) +Upstream: https://gitlab.freedesktop.org/pixman/pixman/-/commit/865e6ce00bb79a6b925ed4c2c436e1533e4472aa +[Peter: rebase on 0.42.2] +Signed-off-by: Peter Korsgaard +--- + pixman/pixman-arm-simd-asm.S | 44 ++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/pixman/pixman-arm-simd-asm.S b/pixman/pixman-arm-simd-asm.S +index a74a0a8..959a0ba 100644 +--- a/pixman/pixman-arm-simd-asm.S ++++ b/pixman/pixman-arm-simd-asm.S +@@ -818,13 +818,13 @@ generate_composite_function \ + .macro over_white_8888_8888_ca_1pixel_tail + mvn TMP0, WK1 + teq WK1, WK1, asr #32 +- bne 01f +- bcc 03f ++ bne 1f ++ bcc 3f + mov WK3, WK1 +- b 02f +-01: over_white_8888_8888_ca_combine WK1, WK3 +-02: pixst , 4, 3, DST +-03: ++ b 2f ++1: over_white_8888_8888_ca_combine WK1, WK3 ++2: pixst , 4, 3, DST ++3: + .endm + + .macro over_white_8888_8888_ca_2pixels_head +@@ -835,21 +835,21 @@ generate_composite_function \ + pixld , 8, 3, DST + mvn TMP0, WK1 + teq WK1, WK1, asr #32 +- bne 01f ++ bne 1f + movcs WK3, WK1 +- bcs 02f ++ bcs 2f + teq WK2, #0 +- beq 05f +- b 02f +-01: over_white_8888_8888_ca_combine WK1, WK3 +-02: mvn TMP0, WK2 ++ beq 5f ++ b 2f ++1: over_white_8888_8888_ca_combine WK1, WK3 ++2: mvn TMP0, WK2 + teq WK2, WK2, asr #32 +- bne 03f ++ bne 3f + movcs WK4, WK2 +- b 04f +-03: over_white_8888_8888_ca_combine WK2, WK4 +-04: pixst , 8, 3, DST +-05: ++ b 4f ++3: over_white_8888_8888_ca_combine WK2, WK4 ++4: pixst , 8, 3, DST ++5: + .endm + + .macro over_white_8888_8888_ca_process_head cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload +@@ -1065,9 +1065,9 @@ generate_composite_function \ + .if offset != 0 + ldrb ORIG_W, [SRC, #offset] + .endif +- beq 01f ++ beq 1f + teq STRIDE_M, #0xFF +- beq 02f ++ beq 2f + .endif + uxtb16 SCRATCH, d /* rb_dest */ + uxtb16 d, d, ror #8 /* ag_dest */ +@@ -1077,13 +1077,13 @@ generate_composite_function \ + uxtab16 d, d, d, ror #8 + mov SCRATCH, SCRATCH, ror #8 + sel d, SCRATCH, d +- b 02f ++ b 2f + .if offset == 0 + 48: /* Last mov d,#0 of the set - used as part of shortcut for + * source values all 0 */ + .endif +-01: mov d, #0 +-02: ++1: mov d, #0 ++2: + .endm + + .macro in_reverse_8888_8888_tail numbytes, reg1, reg2, reg3, reg4 +-- +2.39.5 + diff --git a/package/pixman/0003-pixman-combine-float.c-fix-inlining-failed-error.patch b/package/pixman/0003-pixman-combine-float.c-fix-inlining-failed-error.patch new file mode 100644 index 00000000000..1c4b153fc5f --- /dev/null +++ b/package/pixman/0003-pixman-combine-float.c-fix-inlining-failed-error.patch @@ -0,0 +1,56 @@ +From 643f098a3922592c82f3ea19668a1596d92a3e7b Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 16 Jul 2024 15:31:16 +0800 +Subject: [PATCH] pixman-combine-float.c: fix inlining failed error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Refer [1], always-inline is not suggested to be used if you have indirect +calls. so replace force_inline with inline to fix error like: +In function ‘combine_inner’, + inlined from ‘combine_soft_light_ca_float’ at ../pixman/pixman-combine-float.c:655:511: +../pixman/pixman-combine-float.c:655:211: error: inlining failed in call to ‘always_inline’ ‘combine_soft_light_c’: function not considered for inlining + +Test with gcc-9 and gcc-14, both works well + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115679 + +Signed-off-by: Changqing Li +Upstream: https://gitlab.freedesktop.org/pixman/pixman/-/commit/643f098a3922592c82f3ea19668a1596d92a3e7b +--- + pixman/pixman-combine-float.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pixman/pixman-combine-float.c b/pixman/pixman-combine-float.c +index e1f8030..230164f 100644 +--- a/pixman/pixman-combine-float.c ++++ b/pixman/pixman-combine-float.c +@@ -261,7 +261,7 @@ get_factor (combine_factor_t factor, float sa, float da) + } + + #define MAKE_PD_COMBINERS(name, a, b) \ +- static float force_inline \ ++ static float \ + pd_combine_ ## name (float sa, float s, float da, float d) \ + { \ + const float fa = get_factor (a, sa, da); \ +@@ -360,13 +360,13 @@ MAKE_PD_COMBINERS (conjoint_xor, ONE_MINUS_DA_OVER_SA, ONE_MINUS_SA_OVER_DA) + */ + + #define MAKE_SEPARABLE_PDF_COMBINERS(name) \ +- static force_inline float \ ++ static float \ + combine_ ## name ## _a (float sa, float s, float da, float d) \ + { \ + return da + sa - da * sa; \ + } \ + \ +- static force_inline float \ ++ static float \ + combine_ ## name ## _c (float sa, float s, float da, float d) \ + { \ + float f = (1 - sa) * d + (1 - da) * s; \ +-- +2.47.1 + diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 41dfcbd0967..47a6353f259 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -206,7 +206,7 @@ endif # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. If the license is unset, it is "unknown" -# so adding unknowns to some unknown is still some other unkown, +# so adding unknowns to some unknown is still some other unknown, # so don't append the blurb in that case. ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed @@ -279,6 +279,7 @@ define $(2)_INSTALL_TARGET_CMDS --root $$(TARGET_DIR)/usr/ \ --bins \ --path ./ \ + --no-track \ --force \ --locked \ -Z target-applies-to-host \ @@ -298,6 +299,7 @@ define $(2)_INSTALL_CMDS --root $$(HOST_DIR) \ --bins \ --path ./ \ + --no-track \ --force \ --locked \ $$($(2)_CARGO_INSTALL_OPTS) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 9ec84d0f453..fe0a7bef383 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -878,7 +878,7 @@ $$(error "Package $(1) defines host variant before target variant!") endif endif -# Globaly remove following conflicting and useless files +# Globally remove following conflicting and useless files $(2)_DROP_FILES_OR_DIRS += /share/info/dir ifeq ($$($(2)_TYPE),host) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 8e27602d411..33cf9bfb1ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -102,7 +102,7 @@ endif # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. If the license is unset, it is "unknown" -# so adding unknowns to some unknown is still some other unkown, +# so adding unknowns to some unknown is still some other unknown, # so don't append the blurb in that case. ifneq ($$($(2)_LICENSE),) $(2)_LICENSE += , vendored dependencies licenses probably not listed diff --git a/package/pkg-kernel-module.mk b/package/pkg-kernel-module.mk index 4f64a73f117..032874c3caa 100644 --- a/package/pkg-kernel-module.mk +++ b/package/pkg-kernel-module.mk @@ -62,6 +62,9 @@ $(2)_MAKE ?= $$(BR2_MAKE) # the root of the package. $(2)_MODULE_SUBDIRS ?= . +$(2)_LINUX_CONFIG_FIXUPS += \ + $$(sep)$$(call KCONFIG_DISABLE_OPT,CONFIG_TRIM_UNUSED_KSYMS) + # Build the kernel module(s) # Force PWD for those packages that want to use it to find their # includes and other support files (Booo!) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index dea4f39ca07..32ace4aac1a 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -200,6 +200,33 @@ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_BUILD_CMD = \ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_INSTALL_CMD = \ $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) +# Target hatch packages +PKG_PYTHON_HATCH_ENV = \ + $(PKG_PYTHON_PEP517_ENV) + +PKG_PYTHON_HATCH_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + +PKG_PYTHON_HATCH_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_HATCH_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_HATCH_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-hatchling + +# Host hatch packages +HOST_PKG_PYTHON_HATCH_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + +HOST_PKG_PYTHON_HATCH_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + +HOST_PKG_PYTHON_HATCH_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ @@ -231,6 +258,33 @@ HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ HOST_PKG_PYTHON_MATURIN_INSTALL_CMD = \ $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) +# Target poetry packages +PKG_PYTHON_POETRY_ENV = \ + $(PKG_PYTHON_PEP517_ENV) + +PKG_PYTHON_POETRY_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + +PKG_PYTHON_POETRY_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_POETRY_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_POETRY_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-poetry-core + +# Host poetry packages +HOST_PKG_PYTHON_POETRY_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + +HOST_PKG_PYTHON_POETRY_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + +HOST_PKG_PYTHON_POETRY_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -257,8 +311,8 @@ endif $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) -ifneq ($$(filter-out setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") +ifneq ($$(filter-out setuptools setuptools-rust pep517 flit flit-bootstrap hatch maturin poetry,$$($(2)_SETUP_TYPE)),) +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'maturin', 'setuptools', 'setuptools-rust', 'pep517', 'flit', 'hatch' or 'poetry'.") endif ifeq ($(4)-$$($(2)_SETUP_TYPE),target-flit-bootstrap) $$(error flit-bootstrap setup type only supported for host packages) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index e8e508e334e..a0dbeac18ea 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -75,7 +75,7 @@ extractor-pkg-dependency = $(EXTRACTOR_PKG_DEPENDENCY$(suffix $(1))) # extractor-system-dependency(filename): returns the name of the tool # needed to extract 'filename', and is meant to be used with -# DL_TOOLS_DEPENDENCIES, in order to check that the necesary tool is +# DL_TOOLS_DEPENDENCIES, in order to check that the necessary tool is # provided by the system Buildroot runs on. # # $(firstword) is used here because the extractor can have arguments, @@ -99,7 +99,7 @@ define yesno-to-bool endef # json-info -- return package or filesystem metadata formatted as an entry -# of a JSON dictionnary +# of a JSON dictionary # $(1): upper-case package or filesystem name define json-info "$($(1)_NAME)": { diff --git a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch index a039d0c1bcc..d25039ade2b 100644 --- a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch +++ b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch @@ -1,4 +1,4 @@ -From 267a57022699453e8d8f517519df25ac6bf6ac4e Mon Sep 17 00:00:00 2001 +From c1f9e60f46f2207f9dd07dd290ad5a2da05ad41d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Dec 2018 11:52:18 +0100 Subject: [PATCH] Only prefix with the sysroot a subset of variables @@ -23,19 +23,19 @@ Signed-off-by: Thomas Petazzoni [Updated to include gobject-introspection paths] Signed-off-by: Adam Duskett --- - libpkgconf/tuple.c | 60 ++++++++++++++++++++++++++++++++-------------- - 1 file changed, 42 insertions(+), 18 deletions(-) + libpkgconf/tuple.c | 65 ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c -index 8523709..7cd2fff 100644 +index 83f6a47..a2aa427 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c -@@ -161,6 +161,21 @@ dequote(const char *value) +@@ -178,6 +178,21 @@ dequote(const char *value) return buf; } +static char * -+pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot); ++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags, bool add_sysroot); + +const char *sysrooted_keys[] = { + "g_ir_scanner", @@ -49,21 +49,19 @@ index 8523709..7cd2fff 100644 + NULL, +}; + - /* - * !doc - * -@@ -181,6 +193,8 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch + static const char * + find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars) + { +@@ -237,14 +252,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch { char *dequote_value; - pkgconf_tuple_t *tuple = calloc(sizeof(pkgconf_tuple_t), 1); + pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t)); + bool add_sysroot = false; + int i; pkgconf_tuple_find_delete(list, key); -@@ -188,9 +202,13 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch - - PKGCONF_TRACE(client, "adding tuple to @%p: %s => %s (parsed? %d)", list, key, dequote_value, parse); + dequote_value = dequote(value); + for (i = 0; sysrooted_keys[i] != NULL; i++) + if (!strcmp(key, sysrooted_keys[i])) @@ -71,77 +69,81 @@ index 8523709..7cd2fff 100644 + tuple->key = strdup(key); if (parse) -- tuple->value = pkgconf_tuple_parse(client, list, dequote_value); -+ tuple->value = pkgconf_tuple_parse_sysroot(client, list, dequote_value, add_sysroot); +- tuple->value = pkgconf_tuple_parse(client, list, dequote_value, flags); ++ tuple->value = pkgconf_tuple_parse_sysroot(client, list, dequote_value, flags, add_sysroot); else tuple->value = strdup(dequote_value); -@@ -234,27 +252,14 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c +@@ -294,22 +315,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c return NULL; } -/* - * !doc - * -- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value) +- * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) - * - * Parse an expression for variable substitution. - * - * :param pkgconf_client_t* client: The pkgconf client object to access. - * :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list). - * :param char* value: The ``key=value`` string to parse. +- * :param uint flags: Any flags to consider while parsing. - * :return: the variable data with any variables substituted - * :rtype: char * - */ -char * --pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value) +-pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) +static char * -+pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot) ++pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags, bool add_sysroot) { char buf[PKGCONF_BUFSIZE]; const char *ptr; - char *bptr = buf; - -- if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) -+ if (add_sysroot && *value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) - bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); +@@ -318,7 +325,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const + if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) && + (!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES))) + { +- if (*value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) ++ if (add_sysroot && *value == '/' && client->sysroot_dir != NULL && strncmp(value, client->sysroot_dir, strlen(client->sysroot_dir))) + bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf); + } - for (ptr = value; *ptr != '\0' && bptr - buf < PKGCONF_BUFSIZE; ptr++) -@@ -294,7 +299,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const - - if (kv != NULL) +@@ -381,7 +388,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const { -- parsekv = pkgconf_tuple_parse(client, vars, kv); -+ parsekv = pkgconf_tuple_parse_sysroot(client, vars, kv, add_sysroot); + size_t nlen; + +- parsekv = pkgconf_tuple_parse(client, vars, kv, flags); ++ parsekv = pkgconf_tuple_parse_sysroot(client, vars, kv, flags, add_sysroot); + nlen = pkgconf_strlcpy(bptr, parsekv, remain); + free(parsekv); - strncpy(bptr, parsekv, PKGCONF_BUFSIZE - (bptr - buf)); - bptr += strlen(parsekv); -@@ -339,6 +344,25 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const +@@ -432,6 +439,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const return strdup(buf); } +/* + * !doc + * -+ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value) ++ * .. c:function:: char *pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) + * + * Parse an expression for variable substitution. + * + * :param pkgconf_client_t* client: The pkgconf client object to access. + * :param pkgconf_list_t* list: The variable list to search for variables (along side the global variable list). + * :param char* value: The ``key=value`` string to parse. ++ * :param uint flags: Any flags to consider while parsing. + * :return: the variable data with any variables substituted + * :rtype: char * + */ +char * -+pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value) ++pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, unsigned int flags) +{ -+ return pkgconf_tuple_parse_sysroot(client, vars, value, true); ++ return pkgconf_tuple_parse_sysroot(client, vars, value, flags, true); +} + /* * !doc * -- -2.19.2 +2.34.1 diff --git a/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch b/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch deleted file mode 100644 index f659a3b07f0..00000000000 --- a/package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4ccef40918a539905a2951bfb81cf8dba4a245c6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 2 Jan 2019 18:15:50 +0100 -Subject: [PATCH] Revert "main: assume --modversion insted of --version if - other flags or module names are provided" - -This reverts commit 12a0eb124cea85586e57f33c91a1e4c73459eef6, as it -causes pkg-config to assume --modversion is used when something as -simple as 'pkg-config --static --version' is used, leading to a -failure instead of the expected behavior: the one of "pkg-config ---version". - -Signed-off-by: Thomas Petazzoni ---- - cli/main.c | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/cli/main.c b/cli/main.c -index b52cc85..c5acc10 100644 ---- a/cli/main.c -+++ b/cli/main.c -@@ -1002,18 +1002,8 @@ main(int argc, char *argv[]) - - if ((want_flags & PKG_VERSION) == PKG_VERSION) - { -- if (argc > 2) -- { -- fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]); -- -- want_flags &= ~PKG_VERSION; -- want_flags |= PKG_MODVERSION; -- } -- else -- { -- version(); -- return EXIT_SUCCESS; -- } -+ version(); -+ return EXIT_SUCCESS; - } - - if ((want_flags & PKG_HELP) == PKG_HELP) --- -2.20.1 - diff --git a/package/pkgconf/pkgconf.hash b/package/pkgconf/pkgconf.hash index f210869c031..6d4b7972d68 100644 --- a/package/pkgconf/pkgconf.hash +++ b/package/pkgconf/pkgconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210 pkgconf-1.6.3.tar.xz +sha256 3a9080ac51d03615e7c1910a0a2a8df08424892b5f13b0628a204d3fcce0ea8b pkgconf-2.3.0.tar.xz sha256 07ee94b50a41ee3fc4e13a9b9c60b26fc28488494c465639f7e5f07a3952ec04 COPYING diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index a8c7b482879..057f43bb980 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -PKGCONF_VERSION = 1.6.3 +PKGCONF_VERSION = 2.3.0 PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index ea45116912b..661c1285e86 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a76ac431ea40a35a83164ce9007909c1c6c12fd1056627f622144e4a705c0a2c policycoreutils-3.6.tar.gz +sha256 58fe4e481edfb4456c114925442e11389df17394925acdba3de211145ce5ea98 policycoreutils-3.7.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 714e2d7ad66..2b53c56e49f 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.6 +POLICYCOREUTILS_VERSION = 3.7 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = LICENSE diff --git a/package/polkit/0001-meson-disable-PIDFD-when-systemd-is-not-available.patch b/package/polkit/0001-meson-disable-PIDFD-when-systemd-is-not-available.patch new file mode 100644 index 00000000000..621b1feef7e --- /dev/null +++ b/package/polkit/0001-meson-disable-PIDFD-when-systemd-is-not-available.patch @@ -0,0 +1,53 @@ +From 51a1c5b5ab616fe0243b40baddb4864199bbe624 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 2 Nov 2024 23:33:16 +0100 +Subject: [PATCH] meson: disable PIDFD when systemd is not available + +Since the Polkit version bump 125, TestPolkitInitd fail due to an +upstream issue related to the new PIDFD support introduced in +Polkit 124 [1]. + +The PIDFD issue only affect OS without systemd. + +Only enable PIDFD support when systemd is available until +upstream fix the issue. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992596 + +[1] https://github.com/polkit-org/polkit/issues/451 + +Upstream: Not applicable + +Signed-off-by: Romain Naour +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 302c189..5c247f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,8 +202,6 @@ if enable_logind + endif + config_data.set('HAVE_LIBSYSTEMD', enable_logind) + +-config_data.set('HAVE_PIDFD_OPEN', cc.get_define('SYS_pidfd_open', prefix: '#include ') != '') +- + # systemd unit / sysuser / tmpfiles.d file installation directories + systemdsystemunitdir = get_option('systemdsystemunitdir') + systemd_dep = dependency('systemd', required : false) +@@ -222,6 +220,10 @@ else + tmpfiles_dir = '/usr/lib/tmpfiles.d' + endif + ++# PIDFD is broken with sysvinit based OS since 124 release ++# https://github.com/polkit-org/polkit/issues/451 ++config_data.set('HAVE_PIDFD_OPEN', systemd_dep.found() and cc.get_define('SYS_pidfd_open', prefix: '#include ') != '') ++ + # User for running polkitd + polkitd_user = get_option('polkitd_user') + config_data.set_quoted('POLKITD_USER', polkitd_user) +-- +2.45.0 + diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 5eadc897538..a3855adecd4 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b69278f6ea0eac406350c45f5720e2fe5e4beaf9f53c16d9902e025965418864 polkit-123.tar.gz +sha256 ea5cd6e6e2afa6bad938ee770bf0c2cd9317910f37956faeba2869adcf3747d1 polkit-125.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index cdbbf8f9b07..234e1cf4151 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLKIT_VERSION = 123 -POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) +POLKIT_VERSION = 125 +POLKIT_SITE = $(call github,polkit-org,polkit,$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VALID = YES @@ -56,8 +56,8 @@ define POLKIT_USERS endef define POLKIT_PERMISSIONS - /etc/polkit-1/rules.d d 700 polkitd root - - - - - - /usr/share/polkit-1/rules.d d 700 polkitd root - - - - - + /etc/polkit-1/rules.d d 750 root polkitd - - - - - + /usr/share/polkit-1/rules.d d 750 root polkitd - - - - - /usr/bin/pkexec f 4755 root root - - - - - /usr/lib/polkit-1/polkit-agent-helper-1 f 4755 root root - - - - - endef diff --git a/package/popperjs/Config.in b/package/popperjs/Config.in deleted file mode 100644 index eae963100e3..00000000000 --- a/package/popperjs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_POPPERJS - bool "popperjs" - help - Popper.js, a JavaScript Tooltip & Popover Positioning Engine. - - https://popper.js.org diff --git a/package/popperjs/popperjs.hash b/package/popperjs/popperjs.hash deleted file mode 100644 index a2388f5b7a3..00000000000 --- a/package/popperjs/popperjs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 83eecef51d10826faca2cd5cabb344e0bef6d4127d7e728db9e4d8308b7b15d1 popperjs-1.16.0.tar.gz -sha256 2961310ed05cd9373a08b8191c071425a7fede0ca5d807ca38fa5f5f61c5b834 LICENSE.md diff --git a/package/popperjs/popperjs.mk b/package/popperjs/popperjs.mk deleted file mode 100644 index c5df302eb22..00000000000 --- a/package/popperjs/popperjs.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# popperjs -# -################################################################################ - -POPPERJS_VERSION = 1.16.0 -POPPERJS_SITE = $(call github,popperjs,popper-core,v$(POPPERJS_VERSION)) -POPPERJS_LICENSE = MIT -POPPERJS_LICENSE_FILES = LICENSE.md - -define POPPERJS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/umd/popper.min.js \ - $(TARGET_DIR)/var/www/popperjs/js/popper.min.js - $(INSTALL) -m 0644 -D $(@D)/dist/umd/popper-utils.min.js \ - $(TARGET_DIR)/var/www/popperjs/js/popper-utils.min.js -endef - -$(eval $(generic-package)) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 7e62e8e1681..9e283f5ac73 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 postgis-3.4.2.tar.gz -sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT +sha256 ca698a22cc2b2b3467ac4e063b43a28413f3004ddd505bdccdd74c56a647f510 postgis-3.5.0.tar.gz +sha256 81749eea887e78402c9b85896cd629b155bc29256927f818f01001f038146391 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 867aa4caea9..a2b121e6f54 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.4.2 +POSTGIS_VERSION = 3.5.0 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) diff --git a/package/pppd/pppd.hash b/package/pppd/pppd.hash index bf226508849..92f036df581 100644 --- a/package/pppd/pppd.hash +++ b/package/pppd/pppd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 535efa0e7c36e9d443b1b52c296d63ab2c1ec9458816ea0e37c701e0a921466d pppd-e1266c76d1ad39f98f11676e34f180f78c5a510c.tar.gz +sha256 c0537067bdff5f0b5d7a2fd1cca13c220f6dadc89183f23739a2cf9df49c68ca pppd-2.5.1.tar.gz sha256 5d588eb3b157d52112afea935c88a7ff9efddc1e2d95a42c25d3b96ad9055008 LICENSE.BSD sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2 diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index d996a391209..4b65cf08d15 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -6,8 +6,8 @@ # The tarball provided at https://download.samba.org/pub/ppp/ does not # include the license files yet so we use the github tarball. -PPPD_VERSION = e1266c76d1ad39f98f11676e34f180f78c5a510c -PPPD_SITE = $(call github,ppp-project,ppp,$(PPPD_VERSION)) +PPPD_VERSION = 2.5.1 +PPPD_SITE = $(call github,ppp-project,ppp,ppp-$(PPPD_VERSION)) PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = LICENSE.BSD LICENSE.GPL-2 PPPD_CPE_ID_VENDOR = point-to-point_protocol_project diff --git a/package/procps-ng/Config.in b/package/procps-ng/Config.in index 4afd01699b8..2b97096f00e 100644 --- a/package/procps-ng/Config.in +++ b/package/procps-ng/Config.in @@ -1,7 +1,13 @@ +comment "procps-ng needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_PROCPS_NG bool "procps-ng" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES help Standard informational utilities and process-handling tools. @@ -11,10 +17,10 @@ config BR2_PACKAGE_PROCPS_NG if BR2_PACKAGE_PROCPS_NG -config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP +config BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP bool "Use original top layout" help Disable modern top layout, return to original top with - detail cpu usage. + detailed cpu usage. endif diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 69d98f96be9..9200b6faa66 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -58,7 +58,7 @@ else PROCPS_NG_CONF_OPTS += --enable-w endif -ifeq ($(BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP),y) +ifeq ($(BR2_PACKAGE_PROCPS_NG_ORIGINAL_TOP),y) PROCPS_NG_CONF_OPTS += --disable-modern-top endif diff --git a/package/proj/proj.hash b/package/proj/proj.hash index 22e6a43bf72..8a1650ade5b 100644 --- a/package/proj/proj.hash +++ b/package/proj/proj.hash @@ -1,5 +1,5 @@ -# Fetched from http://download.osgeo.org/proj/proj-9.3.0.tar.gz.md5 -md5 f1d70cb8873bb4429a03c437c65c41c4 proj-9.3.0.tar.gz +# Fetched from https://download.osgeo.org/proj/proj-9.5.0.tar.gz.md5 +md5 ac46b4e31562890d012ea6b31e579cf6 proj-9.5.0.tar.gz # Locally calculated -sha256 91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d proj-9.3.0.tar.gz +sha256 659af0d558f7c5618c322fde2d3392910806faee8684687959339021fa207d99 proj-9.5.0.tar.gz sha256 6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319 COPYING diff --git a/package/proj/proj.mk b/package/proj/proj.mk index 0e913fa3356..a17a0a1feb7 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROJ_VERSION = 9.3.0 +PROJ_VERSION = 9.5.0 PROJ_SITE = http://download.osgeo.org/proj PROJ_LICENSE = MIT PROJ_LICENSE_FILES = COPYING diff --git a/package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch b/package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch new file mode 100644 index 00000000000..c674ca2ee10 --- /dev/null +++ b/package/protobuf-c/0001-CGenerator-Protect-against-being-invoked-against-edi.patch @@ -0,0 +1,57 @@ +From 2480f4d9d2fa97e5511ed0914ee529a344e969a7 Mon Sep 17 00:00:00 2001 +From: Robert Edmonds +Date: Wed, 20 Mar 2024 22:43:30 -0400 +Subject: [PATCH] CGenerator: Protect against being invoked against "edition" + syntax .proto files + +The Google protobuf project is currently experimenting with a new syntax +for .proto files called "editions". Since protobuf-c is a proto2/proto3 +compiler, after the previous commit reimplementing `FieldSyntax()`, the +protobuf compiler will abort like this if presented with an "editions" +syntax .proto file due to the safety check in `FieldSyntax()`: + + $ protoc --experimental_editions --c_out=. test.proto + protoc-gen-c: ./protoc-c/c_helpers.h:178: int google::protobuf::compiler::c::FieldSyntax(const google::protobuf::FieldDescriptor*): Assertion `syntax == "proto2" || syntax == "proto3"' failed. + --c_out: protoc-gen-c: Plugin killed by signal 6. + +On protobuf 26, our `CodeGenerator` can implement certain methods to +declare that we "support" editions, and then reject any other edition +except proto2 and proto3, which have apparently been retroactively +declared to be "editions". Of course this needs to be wrapped in a +version guard. + +With this protection in place, the protobuf compiler cleanly exits with +a nice error message like this: + + $ protoc --experimental_editions --c_out=. test.proto + WARNING: All log messages before absl::InitializeLog() is called are written to STDERR + E0000 00:00:1710988958.296200 20022 descriptor.cc:4620] Invalid proto descriptor for file "test.proto": + E0000 00:00:1710988958.296239 20022 descriptor.cc:4623] test.proto: Edition 2023 is later than the maximum supported edition PROTO3 + --c_out: protoc-gen-c: Plugin failed with status code 1. + +Signed-off-by: James Hilliard +Upstream: https://github.com/protobuf-c/protobuf-c/pull/711 +--- + protoc-c/c_generator.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h +index b8b44aa..4aeb579 100644 +--- a/protoc-c/c_generator.h ++++ b/protoc-c/c_generator.h +@@ -93,6 +93,12 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator { + const std::string& parameter, + OutputDirectory* output_directory, + std::string* error) const; ++ ++#if GOOGLE_PROTOBUF_VERSION >= 5026000 ++ uint64_t GetSupportedFeatures() const { return CodeGenerator::FEATURE_SUPPORTS_EDITIONS; } ++ Edition GetMinimumEdition() const { return Edition::EDITION_PROTO2; } ++ Edition GetMaximumEdition() const { return Edition::EDITION_PROTO3; } ++#endif + }; + + } // namespace c +-- +2.34.1 + diff --git a/package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch b/package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch new file mode 100644 index 00000000000..e14a9fbc758 --- /dev/null +++ b/package/protobuf-c/0002-Reimplement-FieldSyntax-to-maximize-compatibility-ac.patch @@ -0,0 +1,84 @@ +From ee3d9e5423c93ee6b828fdda8e7fef13a77634eb Mon Sep 17 00:00:00 2001 +From: Robert Edmonds +Date: Wed, 20 Mar 2024 22:25:54 -0400 +Subject: [PATCH] Reimplement FieldSyntax() to maximize compatibility across + protobuf versions + +Recent versions of Google protobuf have broken the interfaces for +determining the syntax version of a .proto file. The current protobuf-c +1.5.0 release does not compile with Google protobuf 26.0 due to the most +recentage breakage. There is a possible workaround involving the Google +protobuf `FileDescriptorLegacy` class, which is documented as: + +// TODO Remove this deprecated API entirely. + +So we probably shouldn't rely on it. + +Instead, this commit obtains the `FileDescriptorProto` corresponding +to the passed in `FieldDescriptor` and interrogates the `syntax` field +directly. This is a single implementation with no version-specific +workarounds. Hopefully this won't break in the next Google protobuf +release. + +I tested the `FieldSyntax()` implementation in this commit across a +number of different Google protobuf releases and found that it worked +(`make && make check`) on all of them: + +- Google protobuf 3.6.1.3 (Ubuntu 20.04) +- Google protobuf 3.12.4 (Ubuntu 22.04) +- Google protobuf 3.21.12 (Debian 12 + Debian unstable) +- Google protobuf 3.25.2 (Debian experimental) +- Google protobuf 26.1-dev + +Signed-off-by: James Hilliard +Upstream: https://github.com/protobuf-c/protobuf-c/pull/711 +--- + protoc-c/c_helpers.h | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/protoc-c/c_helpers.h b/protoc-c/c_helpers.h +index 062d330..be28b60 100644 +--- a/protoc-c/c_helpers.h ++++ b/protoc-c/c_helpers.h +@@ -70,10 +70,6 @@ + #include + #include + +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +-# include +-#endif +- + namespace google { + namespace protobuf { + namespace compiler { +@@ -173,13 +169,21 @@ struct NameIndex + int compare_name_indices_by_name(const void*, const void*); + + // Return the syntax version of the file containing the field. +-// This wrapper is needed to be able to compile against protobuf2. + inline int FieldSyntax(const FieldDescriptor* field) { +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +- return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2; +-#else +- return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2; +-#endif ++ auto proto = FileDescriptorProto(); ++ field->file()->CopyTo(&proto); ++ ++ if (proto.has_syntax()) { ++ auto syntax = proto.syntax(); ++ assert(syntax == "proto2" || syntax == "proto3"); ++ if (syntax == "proto2") { ++ return 2; ++ } else if (syntax == "proto3") { ++ return 3; ++ } ++ } ++ ++ return 2; + } + + // Work around changes in protobuf >= 22.x without breaking compilation against +-- +2.34.1 + diff --git a/package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch b/package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch new file mode 100644 index 00000000000..d7d9cdf845b --- /dev/null +++ b/package/protobuf-c/0003-FileGenerator-GenerateHeader-Set-min_header_version-.patch @@ -0,0 +1,44 @@ +From a6cf1aa386067e26d582cc1d1e327787595c9f13 Mon Sep 17 00:00:00 2001 +From: Robert Edmonds +Date: Wed, 20 Mar 2024 21:48:10 -0400 +Subject: [PATCH] FileGenerator::GenerateHeader(): Set `min_header_version` + unconditionally + +Previously, we were conditionally trying to set `min_header_version` to +the lowest possible value, and relying on a "legacy" Google interface to +determine the file descriptor's syntax version as part of that +determination. + +Instead, simply bump the minimum version to 1003000 (1.3.0). This +release was almost 7 years ago. In practice protobuf-c users should not +be shipping pre-compiled .pb-c.c/.pb-c.h files, anyway. + +Signed-off-by: James Hilliard +Upstream: https://github.com/protobuf-c/protobuf-c/pull/711 +--- + protoc-c/c_file.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc +index ca0ad34..c6d8a24 100644 +--- a/protoc-c/c_file.cc ++++ b/protoc-c/c_file.cc +@@ -117,14 +117,7 @@ FileGenerator::~FileGenerator() {} + void FileGenerator::GenerateHeader(io::Printer* printer) { + std::string filename_identifier = FilenameIdentifier(file_->name()); + +- int min_header_version = 1000000; +-#if GOOGLE_PROTOBUF_VERSION >= 4023000 +- if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) { +-#else +- if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { +-#endif +- min_header_version = 1003000; +- } ++ const int min_header_version = 1003000; + + // Generate top of header. + printer->Print( +-- +2.34.1 + diff --git a/package/pv/pv.hash b/package/pv/pv.hash index ed4cc21d895..6b0ffbc02e0 100644 --- a/package/pv/pv.hash +++ b/package/pv/pv.hash @@ -1,5 +1,7 @@ # Locally calculated after checking pgp signature -sha256 d22948d06be06a5be37336318de540a2215be10ab0163f8cd23a20149647b780 pv-1.8.5.tar.gz +# using key: 4267B4F90F2678A112169BD61D1EF7581B45E9A0 +# from: https://codeberg.org/a-j-wood.gpg +sha256 b38d69d7fc0785eb5eb3c57e8b12a7334f862047bf84b18f414365335399469a pv-1.9.0.tar.gz # Hash for license file sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 docs/COPYING diff --git a/package/pv/pv.mk b/package/pv/pv.mk index f7243da8bec..1266d83a075 100644 --- a/package/pv/pv.mk +++ b/package/pv/pv.mk @@ -4,8 +4,8 @@ # ################################################################################ -PV_VERSION = 1.8.5 -PV_SITE = http://www.ivarch.com/programs/sources +PV_VERSION = 1.9.0 +PV_SITE = https://www.ivarch.com/programs/sources PV_LICENSE = GPL-3.0+ PV_LICENSE_FILES = docs/COPYING PV_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/package/python-aerich/python-aerich.mk b/package/python-aerich/python-aerich.mk index 63343e0b96c..6df3dc4f6e4 100644 --- a/package/python-aerich/python-aerich.mk +++ b/package/python-aerich/python-aerich.mk @@ -7,9 +7,8 @@ PYTHON_AERICH_VERSION = 0.7.2 PYTHON_AERICH_SOURCE = aerich-$(PYTHON_AERICH_VERSION).tar.gz PYTHON_AERICH_SITE = https://files.pythonhosted.org/packages/ca/cd/ae9c60ffc21e2d41e22c62cbf24a60dfad937222d880489703842d179746 -PYTHON_AERICH_SETUP_TYPE = pep517 +PYTHON_AERICH_SETUP_TYPE = poetry PYTHON_AERICH_LICENSE = Apache-2.0 PYTHON_AERICH_LICENSE_FILES = LICENSE -PYTHON_AERICH_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index c9d73cda263..33895b23870 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 baebbc38bc8db31472c438521f7121e3 aiocoap-0.4.7.tar.gz -sha256 90f3bcaffd454f5421d3ad55ddbe3fe10a686d4b9f3c4445d427b130493a96a4 aiocoap-0.4.7.tar.gz +md5 09a0cce4b192d861d2becf216f0769fc aiocoap-0.4.11.tar.gz +sha256 2603b8ec61caedf008b4a153a94f337262bf89f26d1c030f12c492d085e875f7 aiocoap-0.4.11.tar.gz # Locally computed sha256 checksums -sha256 0ad39132b3529369998eb7493b950dc7452b07ba9d8cca7619766b6c6d8270fa doc/LICENSE.rst +sha256 c59b1339031e4495b336555be42b8b488eacfb037a23fadf2d5e2c8abd0e6366 doc/LICENSE.rst +sha256 51d56d9e6f9755df590a329e73ca58663605a182a8e80f0166fff65203a1185a LICENSES/BSD-3-Clause.txt +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSES/MIT.txt diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 73a0d61eba0..a69722232c5 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.7 +PYTHON_AIOCOAP_VERSION = 0.4.11 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/de/14/843232b56c0f09b2ceddae3da37598d9109c4b1d9383b1ab72232018e9e8 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/50/b3/2ea6d3a294ec094da3175aceaa2ad1c2644eab162b48676267e992d4c651 PYTHON_AIOCOAP_SETUP_TYPE = setuptools -PYTHON_AIOCOAP_LICENSE = MIT -PYTHON_AIOCOAP_LICENSE_FILES = doc/LICENSE.rst +PYTHON_AIOCOAP_LICENSE = BSD-3-Clause, MIT +PYTHON_AIOCOAP_LICENSE_FILES = doc/LICENSE.rst LICENSES/BSD-3-Clause.txt LICENSES/MIT.txt $(eval $(python-package)) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index b52140cca56..945dad6a663 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 e8cb2e4dc434e20a3e75acb54d89bdf3 aioconsole-0.7.0.tar.gz -sha256 c702d24406378d37d9873f91e03ce71520bac503d5ab03f81d8b563ff010bd54 aioconsole-0.7.0.tar.gz +md5 f14c575a38cc70c1bd26d83157cd1adf aioconsole-0.8.1.tar.gz +sha256 0535ce743ba468fb21a1ba43c9563032c779534d4ecd923a46dbd350ad91d234 aioconsole-0.8.1.tar.gz # Locally computed sha256 checksums sha256 e1c0ad728983d8a57335e52cf1064f1affd1d454173d8cebd3ed8b4a72b48704 LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index b109d8e358a..646cf3181b7 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.7.0 +PYTHON_AIOCONSOLE_VERSION = 0.8.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/85/da/6a238a72274fa338b2ff20007f026944a6721245fa65d3bd4adeb83be419 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/c7/c9/c57e979eea211b10a63783882a826f257713fa7c0d6c9a6eac851e674fb4 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE diff --git a/package/python-aiodns/python-aiodns.hash b/package/python-aiodns/python-aiodns.hash index bf65691b895..3f4d911db72 100644 --- a/package/python-aiodns/python-aiodns.hash +++ b/package/python-aiodns/python-aiodns.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiodns/json -md5 13fdfc38f30c9498e3e23c6f372e40ba aiodns-3.1.1.tar.gz -sha256 1073eac48185f7a4150cad7f96a5192d6911f12b4fb894de80a088508c9b3a99 aiodns-3.1.1.tar.gz +md5 0bfcd1b040912744badd2771a33a32fc aiodns-3.2.0.tar.gz +sha256 62869b23409349c21b072883ec8998316b234c9a9e36675756e8e317e8768f72 aiodns-3.2.0.tar.gz # Locally computed sha256 checksums sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE diff --git a/package/python-aiodns/python-aiodns.mk b/package/python-aiodns/python-aiodns.mk index f5cbb653345..9c1bea601c8 100644 --- a/package/python-aiodns/python-aiodns.mk +++ b/package/python-aiodns/python-aiodns.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIODNS_VERSION = 3.1.1 +PYTHON_AIODNS_VERSION = 3.2.0 PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz -PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/fa/10/4de99e6e67703d8f6b10ea92a4d2a6c5b96a9c0708b75389a00203387925 +PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/e7/84/41a6a2765abc124563f5380e76b9b24118977729e25a84112f8dfb2b33dc PYTHON_AIODNS_SETUP_TYPE = setuptools PYTHON_AIODNS_LICENSE = MIT PYTHON_AIODNS_LICENSE_FILES = LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 9eae73d3c17..79e4a2cacdd 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -7,9 +7,8 @@ PYTHON_AIOFILES_VERSION = 24.1.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/0b/03/a88171e277e8caa88a4c77808c20ebb04ba74cc4681bf1e9416c862de237 -PYTHON_AIOFILES_SETUP_TYPE = pep517 +PYTHON_AIOFILES_SETUP_TYPE = hatch PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE -PYTHON_AIOFILES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-aiohappyeyeballs/Config.in b/package/python-aiohappyeyeballs/Config.in new file mode 100644 index 00000000000..86a998a7d6c --- /dev/null +++ b/package/python-aiohappyeyeballs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_AIOHAPPYEYEBALLS + bool "python-aiohappyeyeballs" + help + Happy Eyeballs for asyncio. + + https://github.com/aio-libs/aiohappyeyeballs diff --git a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash new file mode 100644 index 00000000000..85938c10843 --- /dev/null +++ b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohappyeyeballs/json +md5 dcc0ba52e3c350f4edc8a8475d1892d6 aiohappyeyeballs-2.4.3.tar.gz +sha256 75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586 aiohappyeyeballs-2.4.3.tar.gz +# Locally computed sha256 checksums +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk new file mode 100644 index 00000000000..2a2c10fb375 --- /dev/null +++ b/package/python-aiohappyeyeballs/python-aiohappyeyeballs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohappyeyeballs +# +################################################################################ + +PYTHON_AIOHAPPYEYEBALLS_VERSION = 2.4.3 +PYTHON_AIOHAPPYEYEBALLS_SOURCE = aiohappyeyeballs-$(PYTHON_AIOHAPPYEYEBALLS_VERSION).tar.gz +PYTHON_AIOHAPPYEYEBALLS_SITE = https://files.pythonhosted.org/packages/bc/69/2f6d5a019bd02e920a3417689a89887b39ad1e350b562f9955693d900c40 +PYTHON_AIOHAPPYEYEBALLS_SETUP_TYPE = poetry +PYTHON_AIOHAPPYEYEBALLS_LICENSE = PSF-2.0 +PYTHON_AIOHAPPYEYEBALLS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash index 0a7b7cc0581..d24e7916b19 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-jinja2/json -md5 8f72451a7da006b4b91ef18ec6f75885 aiohttp-jinja2-1.5.1.tar.gz -sha256 8d149b2a57d91f794b33a394ea5bc66b567f38c74a5a6a9477afc2450f105c01 aiohttp-jinja2-1.5.1.tar.gz +md5 a71dfafdb279d067956f95719b12cb9a aiohttp-jinja2-1.6.tar.gz +sha256 a3a7ff5264e5bca52e8ae547bbfd0761b72495230d438d05b6c0915be619b0e2 aiohttp-jinja2-1.6.tar.gz # Locally computed sha256 checksums sha256 d9d867affaeac220a60381cc544681dcd37c668ed6ea5ddbf9948617f828889a LICENSE diff --git a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk index 17f9a4018a8..efd8c67cffb 100644 --- a/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk +++ b/package/python-aiohttp-jinja2/python-aiohttp-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_JINJA2_VERSION = 1.5.1 +PYTHON_AIOHTTP_JINJA2_VERSION = 1.6 PYTHON_AIOHTTP_JINJA2_SOURCE = aiohttp-jinja2-$(PYTHON_AIOHTTP_JINJA2_VERSION).tar.gz -PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/4e/4c/fadbfcc1269fa79e69fcdb29027840ab022a91471a5aeaa8fd8b27cc5406 +PYTHON_AIOHTTP_JINJA2_SITE = https://files.pythonhosted.org/packages/e6/39/da5a94dd89b1af7241fb7fc99ae4e73505b5f898b540b6aba6dc7afe600e PYTHON_AIOHTTP_JINJA2_SETUP_TYPE = setuptools PYTHON_AIOHTTP_JINJA2_LICENSE = Apache-2.0 PYTHON_AIOHTTP_JINJA2_LICENSE_FILES = 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 deleted file mode 100644 index cf940eaf87a..00000000000 --- a/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/Config.in b/package/python-aiohttp-remotes/Config.in index 7208e373ad8..a5dc89fc9b7 100644 --- a/package/python-aiohttp-remotes/Config.in +++ b/package/python-aiohttp-remotes/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_AIOHTTP_REMOTES bool "python-aiohttp-remotes" select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Control remote side information. diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 51c5cf08b42..11d2b10c7c3 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 c46a71df656e7f1e111684ced68a85d0 aiohttp_remotes-1.2.0.tar.gz -sha256 f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c aiohttp_remotes-1.2.0.tar.gz +md5 7f47c08e21ceb4fd7b9d5072130240d7 aiohttp_remotes-1.3.0.tar.gz +sha256 4f8b95b02ed9126cf8f5f5a8f5e55c1b2d10fc5e7e7d421c172f9c7cd0719092 aiohttp_remotes-1.3.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 e0ec789f416..0c3de29e4f9 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.2.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.3.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/54/05/7c4be6171cc78a13171a4f89e5d308c4a636bdd8ee36101367e99e410ed8 +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/7e/bd/b59c3f8858c3b333b067e2432db95400f1423d7ee6eadfbf4e99a3a30fa3 PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = flit PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index efdac390074..8559df057b0 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 b89bde69f6f3c61a991ff408d2733838 aiohttp-session-2.12.0.tar.gz -sha256 0ccd11a7c77cb9e5a61f4daacdc9170d561112f9cfaf9e9a2d9867c0587d1950 aiohttp-session-2.12.0.tar.gz +md5 ff7a0c880ed7cee24e0a141c201adb8b aiohttp_session-2.12.1.tar.gz +sha256 15e6e0288e9bcccd4b1d0c28aae9c20e19a252b12d0cb682223ca9c83180e899 aiohttp_session-2.12.1.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 55bf0e87f3a..8b8337e68e3 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.12.0 -PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/34/87/8dbc1385c875497d6bc16c9d94e25dbd8ff62599843b73fb4048ba74c867 +PYTHON_AIOHTTP_SESSION_VERSION = 2.12.1 +PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp_session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/c2/c4/d73a7f19b1bd3149ba5bccd22e3ab580c19e4d9fcb83114309e8385ab807 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-sse/python-aiohttp-sse.hash b/package/python-aiohttp-sse/python-aiohttp-sse.hash index 224601450ca..e8382e7f8ea 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.hash +++ b/package/python-aiohttp-sse/python-aiohttp-sse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-sse/json -md5 822cd0c30325e8a711101c1a1ede4058 aiohttp-sse-2.1.0.tar.gz -sha256 dfe8f7271ab4470891fa1bfa1913d6889b3d19015dd3d3a4cab949e66971bbca aiohttp-sse-2.1.0.tar.gz +md5 8c86e737a2f3642941c1d383f42ce6ae aiohttp-sse-2.2.0.tar.gz +sha256 a48dd5774031d3f41a29e159ebdbb93e89c8f37c1e9e83e196296be51885a5c2 aiohttp-sse-2.2.0.tar.gz # Locally computed sha256 checksums sha256 5585eb91ec607b4fdbe97d44a61146a9cc27bb703336628bc3c6a1eaffe60307 LICENSE diff --git a/package/python-aiohttp-sse/python-aiohttp-sse.mk b/package/python-aiohttp-sse/python-aiohttp-sse.mk index 2aef1579f52..bf46c985289 100644 --- a/package/python-aiohttp-sse/python-aiohttp-sse.mk +++ b/package/python-aiohttp-sse/python-aiohttp-sse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SSE_VERSION = 2.1.0 +PYTHON_AIOHTTP_SSE_VERSION = 2.2.0 PYTHON_AIOHTTP_SSE_SOURCE = aiohttp-sse-$(PYTHON_AIOHTTP_SSE_VERSION).tar.gz -PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/2f/3f/cc4f5a3fe6cb50ad5b9d26bb7738c5da1f61645b517d4230df2fc32d89f0 +PYTHON_AIOHTTP_SSE_SITE = https://files.pythonhosted.org/packages/80/df/4ddb30e689695fd91cf41c072e154061120ed166e8baf6c9a0020f27dffc PYTHON_AIOHTTP_SSE_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SSE_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SSE_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 0507106fe76..01a1ed8a3dc 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_AIOHTTP bool "python-aiohttp" select BR2_PACKAGE_PYTHON_AIODNS # runtime + select BR2_PACKAGE_PYTHON_AIOHAPPYEYEBALLS # runtime select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_FROZENLIST # runtime diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 542a46f032b..fd3ca7d72a8 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 f237bcac4ade112b9e7c4b1098197244 aiohttp-3.9.3.tar.gz -sha256 90842933e5d1ff760fae6caca4b2b3edba53ba8f4b71e95dacf2818a2aca06f7 aiohttp-3.9.3.tar.gz +md5 fa0526dab4bf4b755537ae5718a43e25 aiohttp-3.10.10.tar.gz +sha256 0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a aiohttp-3.10.10.tar.gz # Locally computed sha256 checksums sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 315d68cb2ed..17eeae72b39 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.9.3 +PYTHON_AIOHTTP_VERSION = 3.10.10 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/18/93/1f005bbe044471a0444a82cdd7356f5120b9cf94fe2c50c0cdbf28f1258b +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/17/7e/16e57e6cf20eb62481a2f9ce8674328407187950ccc602ad07c685279141 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aiojobs/python-aiojobs.hash b/package/python-aiojobs/python-aiojobs.hash index baaa61b331f..d5721dc6d06 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 d4742018c2188147f1efa41645b5758b aiojobs-1.2.1.tar.gz -sha256 59d6e7ad7829e9d0f73bfceeae28153b541be6b0959a08cc5ceb222717c888ff aiojobs-1.2.1.tar.gz +md5 efad80daa647b6346258f1027da44c8b aiojobs-1.3.0.tar.gz +sha256 03074c884b3dc388b8d798c0de24ec17d72b2799018497fda8062c0431a494b5 aiojobs-1.3.0.tar.gz # Locally computed sha256 checksums sha256 1803dc89455114eefad3b827543343edc2452432fdac29b5edc66c8b66d4cbf3 LICENSE diff --git a/package/python-aiojobs/python-aiojobs.mk b/package/python-aiojobs/python-aiojobs.mk index 9e4a55e13cc..e8ada82305d 100644 --- a/package/python-aiojobs/python-aiojobs.mk +++ b/package/python-aiojobs/python-aiojobs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOJOBS_VERSION = 1.2.1 +PYTHON_AIOJOBS_VERSION = 1.3.0 PYTHON_AIOJOBS_SOURCE = aiojobs-$(PYTHON_AIOJOBS_VERSION).tar.gz -PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/07/ad/e4240f9225022798e0e651ced8f6dc022e88eae4f2df6e1482a8f3c0d54d +PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/c4/0b/d612a769c28bd22bcc52b369a9a10c63eb6e7b5e2e0cfb35e3be7357fe29 PYTHON_AIOJOBS_SETUP_TYPE = setuptools PYTHON_AIOJOBS_LICENSE = Apache-2.0 PYTHON_AIOJOBS_LICENSE_FILES = LICENSE diff --git a/package/python-aiomqtt/Config.in b/package/python-aiomqtt/Config.in new file mode 100644 index 00000000000..d0d31b48ba7 --- /dev/null +++ b/package/python-aiomqtt/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOMQTT + bool "python-aiomqtt" + select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime + help + The idiomatic asyncio MQTT client, wrapped around paho-mqtt. + + https://github.com/empicano/aiomqtt diff --git a/package/python-aiomqtt/python-aiomqtt.hash b/package/python-aiomqtt/python-aiomqtt.hash new file mode 100644 index 00000000000..12ea86d5387 --- /dev/null +++ b/package/python-aiomqtt/python-aiomqtt.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiomqtt/json +md5 e23feb8ad69a1ae3a9701fb1f3c03a3c aiomqtt-2.3.0.tar.gz +sha256 312feebe20bc76dc7c20916663011f3bd37aa6f42f9f687a19a1c58308d80d47 aiomqtt-2.3.0.tar.gz +# Locally computed sha256 checksums +sha256 2cdee9e997c759749069649dfb9060fdb885da82bc50c0dcb4841b1dcab0b032 LICENSE diff --git a/package/python-aiomqtt/python-aiomqtt.mk b/package/python-aiomqtt/python-aiomqtt.mk new file mode 100644 index 00000000000..291547f11f9 --- /dev/null +++ b/package/python-aiomqtt/python-aiomqtt.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-aiomqtt +# +################################################################################ + +PYTHON_AIOMQTT_VERSION = 2.3.0 +PYTHON_AIOMQTT_SOURCE = aiomqtt-$(PYTHON_AIOMQTT_VERSION).tar.gz +PYTHON_AIOMQTT_SITE = https://files.pythonhosted.org/packages/db/c9/168e78bd35b21d9bdbb26178db33a8f265e4a69bb4193e72434e7cb3d1cd +PYTHON_AIOMQTT_SETUP_TYPE = pep517 +PYTHON_AIOMQTT_LICENSE = BSD-3-Clause +PYTHON_AIOMQTT_LICENSE_FILES = LICENSE +PYTHON_AIOMQTT_DEPENDENCIES = host-python-poetry-dynamic-versioning + +$(eval $(python-package)) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index 15584a8a41b..50a670280f6 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 28e4812a1d1d67a2be4370209ece5528 aiorwlock-1.3.0.tar.gz -sha256 83f12d87df4b9728a0b8fda1756585ab0d652b107bab59c6084e1b1ad692ab45 aiorwlock-1.3.0.tar.gz +md5 669ff2887392cfa393205cea23661c2f aiorwlock-1.4.0.tar.gz +sha256 4cea5bec4e9d03533a26919299394822a1422aa519bca9dd09178ec490f8d1cc aiorwlock-1.4.0.tar.gz # Locally computed sha256 checksums sha256 fa99ee9d7727194a9f8994c67d1948dc42e8e00ab809fd4a47acfae119d11403 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index a5e7eeae837..4209ae407c3 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 1.3.0 +PYTHON_AIORWLOCK_VERSION = 1.4.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/fe/7027595f5e635ac1f597f7160a420e1f642a474576efb697001efea16bdc +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/ba/c5/882b4c89d71d6f9c7d0d8dee18d267025e71d4c3241eb3b16ab39105a0d1 PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index 1f752ebc7e6..5f20b18be06 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 29579d34ea694627280b52a3d3116664 alembic-1.13.1.tar.gz -sha256 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595 alembic-1.13.1.tar.gz +md5 a12686c41704218fdb29f140be75cdfd alembic-1.14.0.tar.gz +sha256 b00892b53b3642d0b8dbedba234dbf1924b69be83a9a769d5a624b01094e304b alembic-1.14.0.tar.gz # Locally computed sha256 checksums -sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE +sha256 ce19e7ba2b77ca584b82a6792856e138eb30b311c896b076c09a405ee45fbee9 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 52e30e39ba3..5050765db11 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.13.1 +PYTHON_ALEMBIC_VERSION = 1.14.0 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/7b/24/ddce068e2ac9b5581bd58602edb2a1be1b0752e1ff2963c696ecdbe0470d +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/00/1e/8cb8900ba1b6360431e46fb7a89922916d3a1b017a8908a7c0499cc7e5f6 PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash index ab8b868b970..205130f30bb 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 720b2e1a47a5fdb587ea1b4eabbd23e6 pyalsaaudio-0.10.0.tar.gz -sha256 e21175500a2bd310ae3867e7991639defc1e2a5c92cf1b9f7083296b346738ab pyalsaaudio-0.10.0.tar.gz +md5 8c11664f8787e3d9900d666f15565713 pyalsaaudio-0.11.0.tar.gz +sha256 a78a9dca33524b2c9064b34e21f5ab874272313cf324a9a77592f396a5e0fddc pyalsaaudio-0.11.0.tar.gz # Locally computed sha256 checksums sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk index 0692f4a8e9b..4b3276842e5 100644 --- a/package/python-alsaaudio/python-alsaaudio.mk +++ b/package/python-alsaaudio/python-alsaaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALSAAUDIO_VERSION = 0.10.0 +PYTHON_ALSAAUDIO_VERSION = 0.11.0 PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz -PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/e5/f0/411140b1c2d8eea8531233f39103e7ebda560030493e298be6439ce36936 +PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/21/a6/3d833079b030d449345e35ce0e2874e330d3612135734f07b9ceace25bcf PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools PYTHON_ALSAAUDIO_LICENSE = Python-2.0 PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE diff --git a/package/python-annotated-types/python-annotated-types.mk b/package/python-annotated-types/python-annotated-types.mk index e7a3b7e64bd..b962c1a07df 100644 --- a/package/python-annotated-types/python-annotated-types.mk +++ b/package/python-annotated-types/python-annotated-types.mk @@ -7,9 +7,8 @@ PYTHON_ANNOTATED_TYPES_VERSION = 0.7.0 PYTHON_ANNOTATED_TYPES_SOURCE = annotated_types-$(PYTHON_ANNOTATED_TYPES_VERSION).tar.gz PYTHON_ANNOTATED_TYPES_SITE = https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5 -PYTHON_ANNOTATED_TYPES_SETUP_TYPE = pep517 +PYTHON_ANNOTATED_TYPES_SETUP_TYPE = hatch PYTHON_ANNOTATED_TYPES_LICENSE = MIT PYTHON_ANNOTATED_TYPES_LICENSE_FILES = LICENSE -PYTHON_ANNOTATED_TYPES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash index c1edeca10c8..cfd65ee92f7 100644 --- a/package/python-anyio/python-anyio.hash +++ b/package/python-anyio/python-anyio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/anyio/json -md5 04346dd3631f405d0786ca0f441dace1 anyio-4.4.0.tar.gz -sha256 5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94 anyio-4.4.0.tar.gz +md5 3aae01d9007bd08538158c7a7fa18c39 anyio-4.6.2.post1.tar.gz +sha256 4c8bc31ccdb51c7f7bd251f51c609e038d63e34219b44aa86e47576389880b4c anyio-4.6.2.post1.tar.gz # Locally computed sha256 checksums sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk index 4f9cbb78f79..74c49c2e733 100644 --- a/package/python-anyio/python-anyio.mk +++ b/package/python-anyio/python-anyio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANYIO_VERSION = 4.4.0 +PYTHON_ANYIO_VERSION = 4.6.2.post1 PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz -PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/e6/e3/c4c8d473d6780ef1853d630d581f70d655b4f8d7553c6997958c283039a2 +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/9f/09/45b9b7a6d4e45c6bcb5bf61d19e3ab87df68e0601fa8c5293de3542546cc PYTHON_ANYIO_SETUP_TYPE = setuptools PYTHON_ANYIO_LICENSE = MIT PYTHON_ANYIO_LICENSE_FILES = LICENSE diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index 9c47a2c1a69..ee6c4224332 100644 --- a/package/python-apispec/python-apispec.hash +++ b/package/python-apispec/python-apispec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/apispec/json -md5 1aa13f34a226fca977d72f061360e96e apispec-6.3.1.tar.gz -sha256 b38e4479916d43f2b1e88ce15fc2fae93adf2e8d55cb59ec74ac66a827941483 apispec-6.3.1.tar.gz +md5 0ace01922cd42fc19da5e597df73b631 apispec-6.7.1.tar.gz +sha256 c01b8b6ff40ffedf55b79a67f9dd920e9b2fc3909aae116facf6c8372a08b933 apispec-6.7.1.tar.gz # Locally computed sha256 checksums -sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE +sha256 f345555ff39d6b573342781a6346a5202a8f14bce424fee41f910c6c5379cc7d LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk index aee0e168407..168d3890ce3 100644 --- a/package/python-apispec/python-apispec.mk +++ b/package/python-apispec/python-apispec.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_APISPEC_VERSION = 6.3.1 +PYTHON_APISPEC_VERSION = 6.7.1 PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz -PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/ff/0c/e70aa981d8ebe2e8a500a85c923579ce3363feccd704268e6ff8053875dd -PYTHON_APISPEC_SETUP_TYPE = setuptools +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/96/26/ef0e72400707469058a7536f64d4e00e1a1c07a179acd00fb7e424dc9330 +PYTHON_APISPEC_SETUP_TYPE = flit PYTHON_APISPEC_LICENSE = MIT PYTHON_APISPEC_LICENSE_FILES = LICENSE diff --git a/package/python-argcomplete/Config.in b/package/python-argcomplete/Config.in new file mode 100644 index 00000000000..ba9db643a78 --- /dev/null +++ b/package/python-argcomplete/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ARGCOMPLETE + bool "python-argcomplete" + help + Bash tab completion for argparse. + + https://github.com/kislyuk/argcomplete diff --git a/package/python-argcomplete/python-argcomplete.hash b/package/python-argcomplete/python-argcomplete.hash new file mode 100644 index 00000000000..73ee60f2685 --- /dev/null +++ b/package/python-argcomplete/python-argcomplete.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/argcomplete/json +md5 d41f3c39f4be81d29bb6166e8e57116a argcomplete-3.5.1.tar.gz +sha256 eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4 argcomplete-3.5.1.tar.gz +# Locally computed sha256 checksums +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.rst diff --git a/package/python-argcomplete/python-argcomplete.mk b/package/python-argcomplete/python-argcomplete.mk new file mode 100644 index 00000000000..0118cbb9d6f --- /dev/null +++ b/package/python-argcomplete/python-argcomplete.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-argcomplete +# +################################################################################ + +PYTHON_ARGCOMPLETE_VERSION = 3.5.1 +PYTHON_ARGCOMPLETE_SOURCE = argcomplete-$(PYTHON_ARGCOMPLETE_VERSION).tar.gz +PYTHON_ARGCOMPLETE_SITE = https://files.pythonhosted.org/packages/5f/39/27605e133e7f4bb0c8e48c9a6b87101515e3446003e0442761f6a02ac35e +PYTHON_ARGCOMPLETE_SETUP_TYPE = setuptools +PYTHON_ARGCOMPLETE_LICENSE = Apache-2.0 +PYTHON_ARGCOMPLETE_LICENSE_FILES = LICENSE.rst +PYTHON_ARGCOMPLETE_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index bac9df42d6a..e90b79dce8c 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/argh/json -md5 2659a6353589156e6aa65a99797f8913 argh-0.31.0.tar.gz -sha256 b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0 argh-0.31.0.tar.gz +md5 b3526d2a5126defffdb8075e1c34f0c8 argh-0.31.3.tar.gz +sha256 f30023d8be14ca5ee6b1b3eeab829151d7bbda464ae07dc4dd5347919c5892f9 argh-0.31.3.tar.gz # Locally computed sha256 checksums sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk index 0da3281d495..cdaa7e41399 100644 --- a/package/python-argh/python-argh.mk +++ b/package/python-argh/python-argh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARGH_VERSION = 0.31.0 +PYTHON_ARGH_VERSION = 0.31.3 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/7c/3c/1b7f3fab380c96d61119178040c0183161fe0f182c4da3933bcb3284538f +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/4f/34/bc0b3577a818b4b70c6e318d23fe3c81fc3bb25f978ca8a3965cd8ee3af9 PYTHON_ARGH_SETUP_TYPE = flit PYTHON_ARGH_LICENSE = LGPL-3.0+ PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index 238271f5f78..13559075b29 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -7,11 +7,10 @@ PYTHON_ARGON2_CFFI_VERSION = 23.1.0 PYTHON_ARGON2_CFFI_SOURCE = argon2_cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/31/fa/57ec2c6d16ecd2ba0cf15f3c7d1c3c2e7b5fcb83555ff56d7ab10888ec8f -PYTHON_ARGON2_CFFI_SETUP_TYPE = pep517 +PYTHON_ARGON2_CFFI_SETUP_TYPE = hatch PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE PYTHON_ARGON2_CFFI_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index 7f3bca57c0c..e3157c3e110 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 7cd61836ec3c329f415309f88e92e0e3 asgiref-3.7.2.tar.gz -sha256 9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed asgiref-3.7.2.tar.gz +md5 fb2927e26ea34c97e0a4c89612e80562 asgiref-3.8.1.tar.gz +sha256 c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590 asgiref-3.8.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index abd89624767..0725ad6e385 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.7.2 +PYTHON_ASGIREF_VERSION = 3.8.1 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/12/19/64e38c1c2cbf0da9635b7082bbdf0e89052e93329279f59759c24a10cc96 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-async-timeout/Config.in b/package/python-async-timeout/Config.in index d19f15b3c6c..04dfc81052a 100644 --- a/package/python-async-timeout/Config.in +++ b/package/python-async-timeout/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT bool "python-async-timeout" - select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help asyncio-compatible timeout context manager. diff --git a/package/python-async-timeout/python-async-timeout.hash b/package/python-async-timeout/python-async-timeout.hash index d46489396f0..451c07de5d9 100644 --- a/package/python-async-timeout/python-async-timeout.hash +++ b/package/python-async-timeout/python-async-timeout.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/async-timeout/json -md5 9bf7b764a7310cb063c1c261c21342e4 async-timeout-4.0.3.tar.gz -sha256 4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f async-timeout-4.0.3.tar.gz +md5 566a39011e87cb8044ee75369e69b327 async_timeout-5.0.1.tar.gz +sha256 d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3 async_timeout-5.0.1.tar.gz # Locally computed sha256 checksums sha256 e18d7bb8f513e2c46bb585c94b585bd30720dd3ccb21ddb0786f72d16658f92c LICENSE diff --git a/package/python-async-timeout/python-async-timeout.mk b/package/python-async-timeout/python-async-timeout.mk index 9760b8ae25e..2835368003c 100644 --- a/package/python-async-timeout/python-async-timeout.mk +++ b/package/python-async-timeout/python-async-timeout.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNC_TIMEOUT_VERSION = 4.0.3 -PYTHON_ASYNC_TIMEOUT_SOURCE = async-timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz -PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/87/d6/21b30a550dafea84b1b8eee21b5e23fa16d010ae006011221f33dcd8d7f8 +PYTHON_ASYNC_TIMEOUT_VERSION = 5.0.1 +PYTHON_ASYNC_TIMEOUT_SOURCE = async_timeout-$(PYTHON_ASYNC_TIMEOUT_VERSION).tar.gz +PYTHON_ASYNC_TIMEOUT_SITE = https://files.pythonhosted.org/packages/a5/ae/136395dfbfe00dfc94da3f3e136d0b13f394cba8f4841120e34226265780 PYTHON_ASYNC_TIMEOUT_LICENSE = Apache-2.0 PYTHON_ASYNC_TIMEOUT_LICENSE_FILES = LICENSE PYTHON_ASYNC_TIMEOUT_SETUP_TYPE = setuptools diff --git a/package/python-asyncssh/python-asyncssh.hash b/package/python-asyncssh/python-asyncssh.hash index f74cbe9c836..d3c2f642bd3 100644 --- a/package/python-asyncssh/python-asyncssh.hash +++ b/package/python-asyncssh/python-asyncssh.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/asyncssh/json -md5 3b22a39fa9d638b277c9441187b73c5c asyncssh-2.14.2.tar.gz -sha256 e956bf8988d07a06ba3305f6604e261f4ca014c4a232f0873f1c7692fbe3cfc2 asyncssh-2.14.2.tar.gz +md5 9c61e713b1630f62aa1a690744573e1b asyncssh-2.18.0.tar.gz +sha256 1a322161c01f60b9719dc8f39f80db71e61f3f5e04abbc3420ce503126d87123 asyncssh-2.18.0.tar.gz # Locally computed sha256 checksums sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 LICENSE sha256 68c286b0cf4507bec8922103efe861adb0bd3218003b1ec1b25e2e64bdd76bd3 COPYRIGHT diff --git a/package/python-asyncssh/python-asyncssh.mk b/package/python-asyncssh/python-asyncssh.mk index 1f6b9d79a25..60a559f0b95 100644 --- a/package/python-asyncssh/python-asyncssh.mk +++ b/package/python-asyncssh/python-asyncssh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNCSSH_VERSION = 2.14.2 +PYTHON_ASYNCSSH_VERSION = 2.18.0 PYTHON_ASYNCSSH_SOURCE = asyncssh-$(PYTHON_ASYNCSSH_VERSION).tar.gz -PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/6c/f9/849f158fe50cdb0b1bf75009861865c9a30c3b5a0d62ad43bb5e00b10feb +PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/25/69/8ea398f5aa6ae8fa7d007feb262d83aa9304e4a6a1accf7a104b37fef97e PYTHON_ASYNCSSH_SETUP_TYPE = setuptools PYTHON_ASYNCSSH_LICENSE = EPL-2.0 or GPL-2.0+ PYTHON_ASYNCSSH_LICENSE_FILES = LICENSE COPYRIGHT diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index d8c6d147d58..5cd15dbed75 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 60588a146fb413a997c7519d77198a5e attrs-23.2.0.tar.gz -sha256 935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 attrs-23.2.0.tar.gz +md5 031a41b703d7fc47ec204d0369b68dcd attrs-24.2.0.tar.gz +sha256 5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 attrs-24.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index fb1729e62fa..c0725cf8478 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,19 +4,17 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 23.2.0 +PYTHON_ATTRS_VERSION = 24.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d -PYTHON_ATTRS_SETUP_TYPE = pep517 +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/fc/0f/aafca9af9315aee06a89ffde799a10a582fe8de76c563ee80bbcdc08b3fb +PYTHON_ATTRS_SETUP_TYPE = hatch PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE PYTHON_ATTRS_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs HOST_PYTHON_ATTRS_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs diff --git a/package/python-augeas/0001-Use-CFFI-in-out-of-line-API-mode-49.patch b/package/python-augeas/0001-Use-CFFI-in-out-of-line-API-mode-49.patch deleted file mode 100644 index da9093d7232..00000000000 --- a/package/python-augeas/0001-Use-CFFI-in-out-of-line-API-mode-49.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 9de73fefbe83c74840a93c039258845c49271b9b Mon Sep 17 00:00:00 2001 -From: Jeffery To -Date: Sun, 8 Nov 2020 21:51:09 +0800 -Subject: [PATCH] Use CFFI in out-of-line API mode (#49) - -Currently, ffi.py is called during setup to generate augeas.py; this -file would normally be used for out-of-line ABI mode. ffi.py is also -imported at run-time, instead of the generated augeas.py, and used in -in-line ABI mode. - -This changes usage of CFFI to out-of-line API mode (CFFI's "main mode of -usage"): ffi.py is called during setup to generate _augeas.abi3.so (a C -extension module); this generated module is imported at run-time. - -With this change, the headers/development files for augeas (i.e. -libaugeas-dev on Debian, augeas-devel on Fedora, etc.) and the C -compiler are required for build/setup. (These were not necessary -previously.) - -Closes https://github.com/hercules-team/python-augeas/issues/48. - -Upstream: commit 712c2028568df7760bc98d95577e35709078bfea -Signed-off-by: Thomas Petazzoni ---- - augeas/__init__.py | 2 +- - augeas/ffi.py | 27 ++++++++++++++++++++++----- - setup.py | 1 + - 3 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/augeas/__init__.py b/augeas/__init__.py -index 9bd97bf..1c0f580 100644 ---- a/augeas/__init__.py -+++ b/augeas/__init__.py -@@ -32,7 +32,7 @@ format and the transformation into a tree. - - from sys import version_info as _pyver - --from augeas.ffi import ffi, lib -+from _augeas import ffi, lib - - __author__ = "Nathaniel McCallum " - __credits__ = """Jeff Schroeder -diff --git a/augeas/ffi.py b/augeas/ffi.py -index a24daf5..1931764 100644 ---- a/augeas/ffi.py -+++ b/augeas/ffi.py -@@ -1,9 +1,28 @@ -+import os -+import subprocess -+ - from cffi import FFI - -+def get_include_dirs(): -+ XML2_CONFIG = os.environ.get('XML2_CONFIG', 'xml2-config') -+ PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config') -+ try: -+ stdout = subprocess.check_output([XML2_CONFIG, '--cflags']) -+ except (OSError, subprocess.CalledProcessError): -+ try: -+ stdout = subprocess.check_output([PKG_CONFIG, '--cflags', 'libxml-2.0']) -+ except (OSError, subprocess.CalledProcessError): -+ stdout = b'' -+ cflags = stdout.decode('utf-8').split() -+ return [cflag[2:] for cflag in cflags if cflag.startswith('-I')] -+ - ffi = FFI() --ffi.set_source("augeas", -- None, -- libraries=['augeas']) -+ffi.set_source("_augeas", -+ """ -+ #include -+ """, -+ libraries=['augeas'], -+ include_dirs=get_include_dirs()) - - ffi.cdef(""" - typedef struct augeas augeas; -@@ -44,7 +63,5 @@ const char *aug_error_details(augeas *aug); - void free(void *); - """) - --lib = ffi.dlopen("augeas") -- - if __name__ == "__main__": - ffi.compile(verbose=True) -diff --git a/setup.py b/setup.py -index 7d55877..17f9516 100755 ---- a/setup.py -+++ b/setup.py -@@ -22,6 +22,7 @@ setup(name=name, - setup_requires=["cffi>=1.0.0"], - cffi_modules=["augeas/ffi.py:ffi"], - install_requires=["cffi>=1.0.0"], -+ zip_safe=False, - url="http://augeas.net/", - classifiers=[ - "Programming Language :: Python :: 2.7", --- -2.31.1 - diff --git a/package/python-augeas/python-augeas.hash b/package/python-augeas/python-augeas.hash index f4f42098759..d56eaef6a08 100644 --- a/package/python-augeas/python-augeas.hash +++ b/package/python-augeas/python-augeas.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a1d2cdaf2ad4c091ed5ec7976c52d16e14ecfbf40b1bdcaced2465255fb0f87 python-augeas-1.1.0.tar.gz +sha256 ee2c1e74cad61124097c5f540f063fa2dd3b8cd3159f1706f11167814c9bfcd5 python-augeas-1.2.0.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/python-augeas/python-augeas.mk b/package/python-augeas/python-augeas.mk index 7adaa84f493..6d2a08a0904 100644 --- a/package/python-augeas/python-augeas.mk +++ b/package/python-augeas/python-augeas.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_AUGEAS_VERSION = 1.1.0 +PYTHON_AUGEAS_VERSION = 1.2.0 PYTHON_AUGEAS_SITE = $(call github,hercules-team,python-augeas,v$(PYTHON_AUGEAS_VERSION)) PYTHON_AUGEAS_SETUP_TYPE = setuptools PYTHON_AUGEAS_LICENSE = LGPL-2.1+ diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 11448fef3ac..4b9e7c1be56 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 f29d3cebec06c81a87823a2776ffcc5c autobahn-23.6.2.tar.gz -sha256 ec9421c52a2103364d1ef0468036e6019ee84f71721e86b36fe19ad6966c1181 autobahn-23.6.2.tar.gz +md5 cedc5252be771288b19c237cd54a63e9 autobahn-24.4.2.tar.gz +sha256 a2d71ef1b0cf780b6d11f8b205fd2c7749765e65795f2ea7d823796642ee92c9 autobahn-24.4.2.tar.gz # Locally computed sha256 checksums -sha256 ab1dd7a42dbdae302346c5a4571f2149691cc1ec06836232bf4923527e3fe41c LICENSE +sha256 49c90822821c78934079a4bfed0a880790a868bc6dba90ea8fe8274e0f985ada LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 703f1065156..458739f7f4e 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 23.6.2 +PYTHON_AUTOBAHN_VERSION = 24.4.2 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/92/ee/c3320c326919394ff597592549ff5d29d2f7bf12be9ddaa9017caff1a170 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/38/f2/8dffb3b709383ba5b47628b0cc4e43e8d12d59eecbddb62cfccac2e7cf6a PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar diff --git a/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch b/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch new file mode 100644 index 00000000000..9e00269cb0e --- /dev/null +++ b/package/python-autocommand/0001-Remove-license-declaration-and-rely-instead-on-Trove.patch @@ -0,0 +1,29 @@ +From 4e54dc74f2d6f735cb187343f01c44693ea86f59 Mon Sep 17 00:00:00 2001 +From: "Jason R. Coombs" +Date: Thu, 4 Apr 2024 17:23:20 -0400 +Subject: [PATCH] Remove license declaration and rely instead on Trove + classifiers and LICENSE being included. + +Closes #32. + +Upstream: https://github.com/Lucretiel/autocommand/pull/33 +Signed-off-by: Thomas Petazzoni +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 41f86a1..d154562 100644 +--- a/setup.py ++++ b/setup.py +@@ -13,7 +13,6 @@ setup( + ], + package_dir={'': 'src'}, + platforms='any', +- license='LGPLv3', + author='Nathan West', + url='https://github.com/Lucretiel/autocommand', + description='A library to create a command-line program from a function', +-- +2.47.0 + diff --git a/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch b/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch deleted file mode 100644 index 2be7ec6cdab..00000000000 --- a/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/Config.in b/package/python-automat/Config.in index ee02d22b5b9..7d3186f1cab 100644 --- a/package/python-automat/Config.in +++ b/package/python-automat/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_PYTHON_AUTOMAT bool "python-automat" - select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Self-service finite-state machines for the programmer on the go. diff --git a/package/python-automat/python-automat.hash b/package/python-automat/python-automat.hash index cfb16ac6645..4edc9f3f09c 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 b8064994239aabb172748f984489ce75 Automat-22.10.0.tar.gz -sha256 e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e Automat-22.10.0.tar.gz +md5 c023f8848366053a76f99cffba3ea34e automat-24.8.1.tar.gz +sha256 b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88 automat-24.8.1.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 101197b15b5..85bc890fc5e 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 22.10.0 -PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/7a/7b/9c3d26d8a0416eefbc0428f168241b32657ca260fb7ef507596ff5c2f6c4 +PYTHON_AUTOMAT_VERSION = 24.8.1 +PYTHON_AUTOMAT_SOURCE = automat-$(PYTHON_AUTOMAT_VERSION).tar.gz +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/8d/2d/ede4ad7fc34ab4482389fa3369d304f2fa22e50770af706678f6a332fa82 PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index e57b6a722b6..35566923983 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.11.3/py/avro-1.11.3.tar.gz.sha512 -sha512 c2066b4dd8b55b0534fb5bb8fc5a81abcef76ab46458b666c98732811f632c34062c1a0cefaf370aa0843c1cad5bd822f9a6ef0ad88cda5177519a3d3c73072d avro-1.11.3.tar.gz - -# License files +# md5, sha256 from https://pypi.org/pypi/avro/json +md5 03dbb66d68ad18a332a4f4bce0700ca9 avro-1.12.0.tar.gz +sha256 cad9c53b23ceed699c7af6bddced42e2c572fd6b408c257a7d4fc4e8cf2e2d6b avro-1.12.0.tar.gz +# Locally computed sha256 checksums sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index 4e9db9fefc6..e1cbea89712 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -5,10 +5,9 @@ ################################################################################ # When updating the version, please also update avro-c -PYTHON_AVRO_VERSION = 1.11.3 -PYTHON_AVRO_SITE = \ - https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_VERSION = 1.12.0 PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz +PYTHON_AVRO_SITE = https://files.pythonhosted.org/packages/e6/73/48668732bbc8ae1e79b237f84e761204c8dd266c5e16e7601000aba471d3 PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools diff --git a/package/python-babel/Config.in b/package/python-babel/Config.in index 1a22b83f2cf..4f66404a5fb 100644 --- a/package/python-babel/Config.in +++ b/package/python-babel/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BABEL bool "python-babel" - select BR2_PACKAGE_PYTHON_PYTZ # runtime help A collection of tools for internationalizing Python applications. diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index ab4e0225648..cb41750386c 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 3bec3f4c842144c15d839bdde41a44d4 Babel-2.14.0.tar.gz -sha256 6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363 Babel-2.14.0.tar.gz +md5 1dbf17974d7ccc9950757ed3c9618db0 babel-2.16.0.tar.gz +sha256 d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316 babel-2.16.0.tar.gz # Locally computed sha256 checksums -sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE +sha256 3f9142a40859dfcb33f45c16ad872b500d683cc4a20b17091478b404e900520f LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index eb39b9aef7c..dd10abbfa33 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,13 +4,12 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.14.0 -PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/e2/80/cfbe44a9085d112e983282ee7ca4c00429bc4d1ce86ee5f4e60259ddff7f +PYTHON_BABEL_VERSION = 2.16.0 +PYTHON_BABEL_SOURCE = babel-$(PYTHON_BABEL_VERSION).tar.gz +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/2a/74/f1bc80f23eeba13393b7222b11d95ca3af2c1e28edca18af487137eefed9 PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE -HOST_PYTHON_BABEL_DEPENDENCIES = host-python-pytz # purge locale data (if enabled), keep special en_US_POSIX data which # is used by default by the python-babel code diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index f3e05174296..6855047de6c 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 630f29d9eccca3aea0521eaeff7e4aab43611f1bbf4f8afcdf590aeee9fc8187 python-bcrypt-4.1.3-cargo2.tar.gz +sha256 2385fd07301cf6d01befc1245d9310a97790492be76e388dd7c0d8de0409806f python-bcrypt-4.2.0-cargo2.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 3d1aeab2884..0654ea47307 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 4.1.3 +PYTHON_BCRYPT_VERSION = 4.2.0 PYTHON_BCRYPT_SOURCE_PYPI = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/ca/e9/0b36987abbcd8c9210c7b86673d88ff0a481b4610630710fb80ba5661356 +PYTHON_BCRYPT_SITE_PYPI = https://files.pythonhosted.org/packages/e4/7e/d95e7d96d4828e965891af92e43b52a4cd3395dc1c1ef4ee62748d0471d0 PYTHON_BCRYPT_SITE = $(PYTHON_BCRYPT_SITE_PYPI)/$(PYTHON_BCRYPT_SOURCE_PYPI)?buildroot-path=filename PYTHON_BCRYPT_SETUP_TYPE = setuptools-rust PYTHON_BCRYPT_LICENSE = Apache-2.0 diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index bb02807cdb5..ba54f68c83c 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -7,9 +7,8 @@ PYTHON_BEAUTIFULSOUP4_VERSION = 4.12.3 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/b3/ca/824b1195773ce6166d388573fc106ce56d4a805bd7427b624e063596ec58 -PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = pep517 +PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = hatch PYTHON_BEAUTIFULSOUP4_LICENSE = MIT PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = LICENSE -PYTHON_BEAUTIFULSOUP4_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-beniget/python-beniget.hash b/package/python-beniget/python-beniget.hash index cd4fa7b8735..20f5d4ca6c7 100644 --- a/package/python-beniget/python-beniget.hash +++ b/package/python-beniget/python-beniget.hash @@ -1,5 +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 +md5 f49610696dd4682006f63e6cf4b7ddc8 beniget-0.4.2.post1.tar.gz +sha256 a0258537e65e7e14ec33a86802f865a667f949bb6c73646d55e42f7c45a052ae beniget-0.4.2.post1.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 index 9970546b142..53c5d70b5a6 100644 --- a/package/python-beniget/python-beniget.mk +++ b/package/python-beniget/python-beniget.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BENIGET_VERSION = 0.4.1 +PYTHON_BENIGET_VERSION = 0.4.2.post1 PYTHON_BENIGET_SOURCE = beniget-$(PYTHON_BENIGET_VERSION).tar.gz -PYTHON_BENIGET_SITE = https://files.pythonhosted.org/packages/14/e7/50cbac38f77eca8efd39516be6651fdb9f3c4c0fab8cf2cf05f612578737 +PYTHON_BENIGET_SITE = https://files.pythonhosted.org/packages/2e/27/5bb01af8f2860d431b98d0721b96ff2cea979106cae3f2d093ec74f6400c PYTHON_BENIGET_SETUP_TYPE = setuptools PYTHON_BENIGET_LICENSE = BSD-3-Clause PYTHON_BENIGET_LICENSE_FILES = LICENSE diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in index 8548fd43ba6..927fb6d2d6a 100644 --- a/package/python-betterproto/Config.in +++ b/package/python-betterproto/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_BETTERPROTO bool "python-betterproto" select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help A better Protobuf / gRPC generator & library. diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash index 8d23d2ae567..2eed9a490d2 100644 --- a/package/python-betterproto/python-betterproto.hash +++ b/package/python-betterproto/python-betterproto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/betterproto/json -md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz -sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +md5 de9a12d1943dfa266dc3cf489cd3c6fa betterproto-2.0.0b7.tar.gz +sha256 1b1458ca5278d519bcd62556a4c236f998a91d503f0f71c67b0b954747052af2 betterproto-2.0.0b7.tar.gz # Locally computed sha256 checksums sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk index 37f72f8166f..0fc43e86a28 100644 --- a/package/python-betterproto/python-betterproto.mk +++ b/package/python-betterproto/python-betterproto.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_VERSION = 2.0.0b7 PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz -PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 -PYTHON_BETTERPROTO_SETUP_TYPE = pep517 +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/4e/94/930a1368fbed92adc897a9a1fae282e3f9d608547dbf805034ca549f381a +PYTHON_BETTERPROTO_SETUP_TYPE = poetry PYTHON_BETTERPROTO_LICENSE = MIT PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md -PYTHON_BETTERPROTO_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-bidict/python-bidict.hash b/package/python-bidict/python-bidict.hash index bcb9ea3f34e..5fe425c3aa2 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 67dd74f41341e7ff437d69e00a6fd514 bidict-0.22.1.tar.gz -sha256 1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d bidict-0.22.1.tar.gz +md5 561cd7fd5c3036bbfa2c5185531e7b19 bidict-0.23.1.tar.gz +sha256 03069d763bc387bbd20e7d49914e75fc4132a41937fa3405417e1a5a2d006d71 bidict-0.23.1.tar.gz # Locally computed sha256 checksums -sha256 be0487398bba08e7772b4077b637787b94973b53c44b3cbdd6c7dab10ed15035 LICENSE +sha256 f3f53adcecaa48d73a66e238fa5ba906cb41876783b45d28a1346b3142eebd9a LICENSE diff --git a/package/python-bidict/python-bidict.mk b/package/python-bidict/python-bidict.mk index ae3a1ee024c..9181195d23e 100644 --- a/package/python-bidict/python-bidict.mk +++ b/package/python-bidict/python-bidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BIDICT_VERSION = 0.22.1 +PYTHON_BIDICT_VERSION = 0.23.1 PYTHON_BIDICT_SOURCE = bidict-$(PYTHON_BIDICT_VERSION).tar.gz -PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8 +PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/9a/6e/026678aa5a830e07cd9498a05d3e7e650a4f56a42f267a53d22bcda1bdc9 PYTHON_BIDICT_SETUP_TYPE = setuptools PYTHON_BIDICT_LICENSE = MPL-2.0 PYTHON_BIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash index d91a28af20f..1a75424e02b 100644 --- a/package/python-bitarray/python-bitarray.hash +++ b/package/python-bitarray/python-bitarray.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitarray/json -md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz -sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +md5 2a23854c5c9c777625996456c9c88883 bitarray-3.0.0.tar.gz +sha256 a2083dc20f0d828a7cdf7a16b20dae56aab0f43dc4f347a3b3039f6577992b03 bitarray-3.0.0.tar.gz # Locally computed sha256 checksums sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk index f86320c1122..5f47976a412 100644 --- a/package/python-bitarray/python-bitarray.mk +++ b/package/python-bitarray/python-bitarray.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_VERSION = 3.0.0 PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz -PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/85/62/dcfac53d22ef7e904ed10a8e710a36391d2d6753c34c869b51bfc5e4ad54 PYTHON_BITARRAY_SETUP_TYPE = setuptools PYTHON_BITARRAY_LICENSE = Python-2.0 PYTHON_BITARRAY_LICENSE_FILES = LICENSE diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index 1889983f473..e1b66c76b0c 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 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz -sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz +md5 5edecacd8fa0356601f7035977d0749e bitstring-4.2.3.tar.gz +sha256 e0c447af3fda0d114f77b88c2d199f02f97ee7e957e6d719f40f41cf15fbb897 bitstring-4.2.3.tar.gz # Locally computed sha256 checksums sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index 983491303dd..fcb40365d4c 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 4.1.4 +PYTHON_BITSTRING_VERSION = 4.2.3 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/d8/d0/d6f57409bb50f54fe2894ec5a50b5c04cb41aa814c3bdb8a7eeb4a0f7697 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 691450f86b4..6c68c5b0563 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - 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 8462e19d39b..2213ec2f70c 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 5e27e052efc45b64da1a1f017610c561 bleak-0.21.1.tar.gz -sha256 ec4a1a2772fb315b992cbaa1153070c7e26968a52b0e2727035f443a1af5c18f bleak-0.21.1.tar.gz +md5 261eb442ba16707ed00a21265cd337fc bleak-0.22.3.tar.gz +sha256 3149c3c19657e457727aa53d9d6aeb89658495822cd240afd8aeca4dd09c045c bleak-0.22.3.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 716b6327edf..f47440388e4 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.21.1 +PYTHON_BLEAK_VERSION = 0.22.3 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 -PYTHON_BLEAK_SETUP_TYPE = pep517 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/fb/96/15750b50c0018338e2cce30de939130971ebfdf4f9d6d56c960f5657daad +PYTHON_BLEAK_SETUP_TYPE = poetry PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE -PYTHON_BLEAK_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-blinker/python-blinker.hash b/package/python-blinker/python-blinker.hash index e0c1d600ebe..7039c1a3bcf 100644 --- a/package/python-blinker/python-blinker.hash +++ b/package/python-blinker/python-blinker.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/blinker/json -md5 0306b831281e9918ffb0ac6e3e18b47f blinker-1.7.0.tar.gz -sha256 e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 blinker-1.7.0.tar.gz +md5 1ffce54aca3d568ab18ee921d479274f blinker-1.9.0.tar.gz +sha256 b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf blinker-1.9.0.tar.gz # Locally computed sha256 checksums -sha256 9eb73a1f38597a4aa17025d2ae1be3839624c795e985d4f0e9769ce29faca467 LICENSE.rst +sha256 9eb73a1f38597a4aa17025d2ae1be3839624c795e985d4f0e9769ce29faca467 LICENSE.txt diff --git a/package/python-blinker/python-blinker.mk b/package/python-blinker/python-blinker.mk index 234126a5005..a5949e117bc 100644 --- a/package/python-blinker/python-blinker.mk +++ b/package/python-blinker/python-blinker.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BLINKER_VERSION = 1.7.0 +PYTHON_BLINKER_VERSION = 1.9.0 PYTHON_BLINKER_SOURCE = blinker-$(PYTHON_BLINKER_VERSION).tar.gz -PYTHON_BLINKER_SITE = https://files.pythonhosted.org/packages/a1/13/6df5fc090ff4e5d246baf1f45fe9e5623aa8565757dfa5bd243f6a545f9e -PYTHON_BLINKER_SETUP_TYPE = setuptools +PYTHON_BLINKER_SITE = https://files.pythonhosted.org/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce +PYTHON_BLINKER_SETUP_TYPE = flit PYTHON_BLINKER_LICENSE = MIT -PYTHON_BLINKER_LICENSE_FILES = LICENSE.rst +PYTHON_BLINKER_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python-bluezero/python-bluezero.hash b/package/python-bluezero/python-bluezero.hash index e9ccb9133e1..150a3842239 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 5c256c89c3973cfd20f340f095525af2 bluezero-0.8.0.tar.gz -sha256 9bd6706ff6b941c3bedd5b64e0447051120ae8eeac458fb65f56cc6730e1e598 bluezero-0.8.0.tar.gz +md5 8bace06486618fceca632aedc2733027 bluezero-0.9.0.tar.gz +sha256 2512935e094e3afd21ca9d4cb1b9aaa88a524e9538ae81305b2086f09f0eee17 bluezero-0.9.0.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 8e078f10733..81e7363fc7e 100644 --- a/package/python-bluezero/python-bluezero.mk +++ b/package/python-bluezero/python-bluezero.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.8.0 +PYTHON_BLUEZERO_VERSION = 0.9.0 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/67/e1/15fc417b9828d38aa8e09ba06df61d6889740fe45867510a781df9a8ba35 +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/7b/9c/bfb3e1f92dd39bf3de8fc483a102bfae763fbf156177b77ed96b8a38bbb1 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 02440a2960e..c274da55403 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 7cc00aa828c5d3a5c09e3af284e6d23e boto3-1.34.14.tar.gz -sha256 5c1bb487c68120aae236354d81b8a1a55d0aa3395d30748a01825ef90891921e boto3-1.34.14.tar.gz +md5 ec76b10d3c22a3ff81420a3d443c3492 boto3-1.35.57.tar.gz +sha256 db58348849a5af061f0f5ec9c3b699da5221ca83354059fdccb798e3ddb6b62a boto3-1.35.57.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 52bb5bc3b17..d0984f9f241 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.34.14 +PYTHON_BOTO3_VERSION = 1.35.57 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/5f/b6/1e45c3a145304c3feaf48959c6a46efe9a256eec4d417a445b0d9827d20c +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/c5/73/fb880ce301129a7116ff47b1aab1ca7427c7d63a163676701abc168309eb 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 47fb30f960e..1076a748b27 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 6c8ba4112df2c114c71522330deb0f9a botocore-1.34.14.tar.gz -sha256 041bed0852649cab7e4dcd4d87f9d1cc084467fb846e5b60015e014761d96414 botocore-1.34.14.tar.gz +md5 d317006e6032155bfd46a949cddbac72 botocore-1.35.57.tar.gz +sha256 d96306558085baf0bcb3b022d7a8c39c93494f031edb376694d2b2dcd0e81327 botocore-1.35.57.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 485e9731354..d8d410aea59 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.34.14 +PYTHON_BOTOCORE_VERSION = 1.35.57 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/35/6d/a5aaf38f980060d17905398301033e9eb45c2552bf281fa7fd4c8e23ebdd +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/61/17/65b0a3bb507b19a7a1c6cc7c63e374906891798986f0ba2b6ad174ece86a PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 48a576aaecf..3ea1f71ca63 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 7d79d6131ecd524530f4e919bc60f444 bottle-0.12.25.tar.gz -sha256 e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021 bottle-0.12.25.tar.gz +md5 3564bf7c5e348d6dee6dd13a89dd9330 bottle-0.13.2.tar.gz +sha256 e53803b9d298c7d343d00ba7d27b0059415f04b9f6f40b8d58b5bf914ba9d348 bottle-0.13.2.tar.gz # Locally computed sha256 checksums -sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE +sha256 af150257b1f7cce92b6207854f2e8f90ea9ae52d7cac758d13a47bd12e2a2443 LICENSE diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index b35f726f959..d6469b11d00 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.25 +PYTHON_BOTTLE_VERSION = 0.13.2 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/fd/04/1c09ab851a52fe6bc063fd0df758504edede5cc741bd2e807bf434a09215 +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/1b/fb/97839b95c2a2ea1ca91877a846988f90f4ca16ee42c0bb79e079171c0c06 PYTHON_BOTTLE_LICENSE = MIT PYTHON_BOTTLE_LICENSE_FILES = LICENSE PYTHON_BOTTLE_CPE_ID_VENDOR = bottlepy diff --git a/package/python-bsdiff4/python-bsdiff4.hash b/package/python-bsdiff4/python-bsdiff4.hash index 5f7585af6ac..4b09dd132be 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 ebc06d059f3c4ed4c4a5b952f55ae239 bsdiff4-1.2.4.tar.gz -sha256 1d7129a8121860731e8cce2901d3183e14aec70244f64e8f74563275dc388067 bsdiff4-1.2.4.tar.gz +md5 6fae66687d99305e2bf15887c9f80cf9 bsdiff4-1.2.5.tar.gz +sha256 cdd83f820ecb8f1ef67a4e5f0b152c61d327caf7abf35aa9a763413915b21368 bsdiff4-1.2.5.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 71d212fb280..2b48bdb6467 100644 --- a/package/python-bsdiff4/python-bsdiff4.mk +++ b/package/python-bsdiff4/python-bsdiff4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BSDIFF4_VERSION = 1.2.4 +PYTHON_BSDIFF4_VERSION = 1.2.5 PYTHON_BSDIFF4_SOURCE = bsdiff4-$(PYTHON_BSDIFF4_VERSION).tar.gz -PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/58/b2/ccf01309dda2c08e0600027bc0f5a99534c91f2f8728b5009fc363df6c2c +PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/43/49/262497fc308aa998d7431130cb8526b16aa43f2cca500d0182fb68689d99 PYTHON_BSDIFF4_LICENSE = BSD-2-Clause, BSD-Protection (core.c) PYTHON_BSDIFF4_LICENSE_FILES = LICENSE PYTHON_BSDIFF4_CPE_ID_VENDOR = pypi diff --git a/package/python-cached-property/python-cached-property.hash b/package/python-cached-property/python-cached-property.hash index 835e9e02006..edd01e25ddd 100644 --- a/package/python-cached-property/python-cached-property.hash +++ b/package/python-cached-property/python-cached-property.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cached-property/json -md5 3451c63f8733ea0756ca1dd2b0c04bb8 cached-property-1.5.2.tar.gz -sha256 9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130 cached-property-1.5.2.tar.gz +md5 a97302dfc447d087676996a84e22cab6 cached_property-2.0.1.tar.gz +sha256 484d617105e3ee0e4f1f58725e72a8ef9e93deee462222dbd51cd91230897641 cached_property-2.0.1.tar.gz # Locally computed sha256 checksums sha256 ba4756c8039b25b66e3c456cc5bf635aa528cf459b97ee1499d06684ccd89b9a LICENSE diff --git a/package/python-cached-property/python-cached-property.mk b/package/python-cached-property/python-cached-property.mk index 9e1b3f8aff7..eb5c68b1731 100644 --- a/package/python-cached-property/python-cached-property.mk +++ b/package/python-cached-property/python-cached-property.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CACHED_PROPERTY_VERSION = 1.5.2 -PYTHON_CACHED_PROPERTY_SOURCE = cached-property-$(PYTHON_CACHED_PROPERTY_VERSION).tar.gz -PYTHON_CACHED_PROPERTY_SITE = https://files.pythonhosted.org/packages/61/2c/d21c1c23c2895c091fa7a91a54b6872098fea913526932d21902088a7c41 +PYTHON_CACHED_PROPERTY_VERSION = 2.0.1 +PYTHON_CACHED_PROPERTY_SOURCE = cached_property-$(PYTHON_CACHED_PROPERTY_VERSION).tar.gz +PYTHON_CACHED_PROPERTY_SITE = https://files.pythonhosted.org/packages/76/4b/3d870836119dbe9a5e3c9a61af8cc1a8b69d75aea564572e385882d5aefb PYTHON_CACHED_PROPERTY_SETUP_TYPE = setuptools PYTHON_CACHED_PROPERTY_LICENSE = BSD-3-Clause PYTHON_CACHED_PROPERTY_LICENSE_FILES = LICENSE diff --git a/package/python-cachetools/python-cachetools.hash b/package/python-cachetools/python-cachetools.hash index 7b6b9391911..fb16cb492b2 100644 --- a/package/python-cachetools/python-cachetools.hash +++ b/package/python-cachetools/python-cachetools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cachetools/json -md5 5317c13b69c4021e925a2fbbc199bcc9 cachetools-5.3.2.tar.gz -sha256 086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 cachetools-5.3.2.tar.gz +md5 d589387a314eed031e97348a73b8cf91 cachetools-5.5.0.tar.gz +sha256 2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a cachetools-5.5.0.tar.gz # Locally computed sha256 checksums -sha256 76260c1370a7d41d5fac71a27d781f3add5d7249adfbbfa930846d2d9e47dbd5 LICENSE +sha256 2f4d2ff05f05c5da3879f40292b7600332d775dc7ed320d43dd42f3cd7d92c9b LICENSE diff --git a/package/python-cachetools/python-cachetools.mk b/package/python-cachetools/python-cachetools.mk index c841e0761ff..38a2313d59c 100644 --- a/package/python-cachetools/python-cachetools.mk +++ b/package/python-cachetools/python-cachetools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CACHETOOLS_VERSION = 5.3.2 +PYTHON_CACHETOOLS_VERSION = 5.5.0 PYTHON_CACHETOOLS_SOURCE = cachetools-$(PYTHON_CACHETOOLS_VERSION).tar.gz -PYTHON_CACHETOOLS_SITE = https://files.pythonhosted.org/packages/10/21/1b6880557742c49d5b0c4dcf0cf544b441509246cdd71182e0847ac859d5 +PYTHON_CACHETOOLS_SITE = https://files.pythonhosted.org/packages/c3/38/a0f315319737ecf45b4319a8cd1f3a908e29d9277b46942263292115eee7 PYTHON_CACHETOOLS_SETUP_TYPE = setuptools PYTHON_CACHETOOLS_LICENSE = MIT PYTHON_CACHETOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 61955a2b00b..34ba35bad2e 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -11,3 +11,13 @@ config BR2_PACKAGE_PYTHON_CAN Python. https://github.com/hardbyte/python-can + +if BR2_PACKAGE_PYTHON_CAN + +config BR2_PACKAGE_PYTHON_CAN_VIEWER + bool "python-can-viewer" + select BR2_PACKAGE_PYTHON3_CURSES # runtime + help + Also install the viewer tool (requires ncurses). + +endif diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 4e706519bec..479935b2f01 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-can/json -md5 a84ace55fdeca8efd50986deacfba584 python-can-4.3.1.tar.gz -sha256 008bea1c12e31586e1aa76971126b831bf01056a900e91862a11360e011ab933 python-can-4.3.1.tar.gz +md5 20133a1b73b58c976bba6b0af8581f32 python_can-4.4.2.tar.gz +sha256 1c46c0935f39f7a9c3e76b03249af0580689ebf7a1844195e92f87257f009df5 python_can-4.4.2.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index c7100e3ddae..bc67be4f8c6 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,10 +4,18 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.3.1 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/02/fc/d5fd33ee93f17a4eb0dcd75aebf522396e3f511bf474058e99e86ae4e33f +PYTHON_CAN_VERSION = 4.4.2 +PYTHON_CAN_SOURCE = python_can-$(PYTHON_CAN_VERSION).tar.gz +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/a3/17/57c38abbf00993ac5ec306de0c00271685d1372ef3d907b107eb63ab13a8 PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt +ifneq ($(BR2_PACKAGE_PYTHON_CAN_VIEWER),y) +define PYTHON_CAN_REMOVE_VIEWER + rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/can/viewer.py +endef +PYTHON_CAN_POST_INSTALL_TARGET_HOOKS += PYTHON_CAN_REMOVE_VIEWER +endif + $(eval $(python-package)) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index fc3668bc6cb..8a38dc16a3c 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/canopen/json -md5 2a757a6996f896d2e6afbf2bcf598df2 canopen-2.2.0.tar.gz -sha256 5f18651b9df6e4769b9882e969f934ae773ef24a45aabc3334b586982048d08c canopen-2.2.0.tar.gz +md5 808c04aa0394210be9eeb46fb6e3bf96 canopen-2.3.0.tar.gz +sha256 792084a93c138d5b2a406ddd2d4eb5ce208f03bd8fda60f81ad2bb8d56c6b827 canopen-2.3.0.tar.gz # Locally computed sha256 checksums sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index 09ec595ec69..e9747dcdf24 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 2.2.0 +PYTHON_CANOPEN_VERSION = 2.3.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/49/55/67e555f6f4ea51d6d966e998a77881c1bd726c6e8cc602fd04852772ce87 +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1a/b3/733e5f98c995d7f3e82853bc5ee2f0677df6203d51d8a4387af188322523 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 42ed828d535..8c30bced204 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 b44037904de5b0f833020bfe01f741ca cbor2-5.5.1.tar.gz -sha256 f9e192f461a9f8f6082df28c035b006d153904213dc8640bed8a72d72bbc9475 cbor2-5.5.1.tar.gz +md5 0804f5be872bcdbed12fb1314615b461 cbor2-5.6.5.tar.gz +sha256 b682820677ee1dbba45f7da11898d2720f92e06be36acec290867d5ebf3d7e09 cbor2-5.6.5.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 423670047e8..9e410376fbf 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.5.1 +PYTHON_CBOR2_VERSION = 5.6.5 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d6/37/a0a75c2cae532ecb155d05edc1fbbe54fa3957e86f875a38542f87e1379c +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/e4/aa/ba55b47d51d27911981a18743b4d3cebfabccbb0598c09801b734cec4184 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 0bb4a4fbc4c..6f8e0241b56 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 d138c6217784e19cda28770b003ab23b certifi-2024.6.2.tar.gz -sha256 3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516 certifi-2024.6.2.tar.gz +md5 f842fc7a8ef562539e07873475eed593 certifi-2024.8.30.tar.gz +sha256 bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9 certifi-2024.8.30.tar.gz # Locally computed sha256 checksums sha256 e93716da6b9c0d5a4a1df60fe695b370f0695603d21f6f83f053e42cfc10caf7 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 1c5d4d262d6..7cdd65941af 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2024.6.2 +PYTHON_CERTIFI_VERSION = 2024.8.30 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/07/b3/e02f4f397c81077ffc52a538e0aec464016f1860c472ed33bd2a1d220cc5 +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/b0/ee/9b19140fe824b367c04c5e1b369942dd754c4c5462d5674002f75c4dedc1 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 0573d6ec066..2847d38b554 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 0bcaed453da3004d0bea103038345c1e cffi-1.16.0.tar.gz -sha256 bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 cffi-1.16.0.tar.gz +md5 4336ca58b2df0cc3b163884d5fa2e5e2 cffi-1.17.1.tar.gz +sha256 1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 cffi-1.17.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 1f83db079b0..152009e8caa 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.16.0 +PYTHON_CFFI_VERSION = 1.17.1 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/68/ce/95b0bae7968c65473e1298efb042e10cafc7bafc14d9e4f154008241c91d +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d 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 943712b3fd3..6b62d0d6a2a 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 a184dded3478e618735a42174c334565 channels_redis-4.1.0.tar.gz -sha256 6bd4f75f4ab4a7db17cee495593ace886d7e914c66f8214a1f247ff6659c073a channels_redis-4.1.0.tar.gz +md5 e43a397dd3049f382a9c8b91d0f62c79 channels_redis-4.2.0.tar.gz +sha256 01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd channels_redis-4.2.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels-redis/python-channels-redis.mk b/package/python-channels-redis/python-channels-redis.mk index 9186f07f170..7ca065ce0e1 100644 --- a/package/python-channels-redis/python-channels-redis.mk +++ b/package/python-channels-redis/python-channels-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_REDIS_VERSION = 4.1.0 +PYTHON_CHANNELS_REDIS_VERSION = 4.2.0 PYTHON_CHANNELS_REDIS_SOURCE = channels_redis-$(PYTHON_CHANNELS_REDIS_VERSION).tar.gz -PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/5b/3b/941efa8e337c3537475926fbf86e8cfe38a919e0f60bb9538b1cff364b8d +PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/fd/c8/d8e4d369a4cbce5dc86e84a559993001d471327f1ef57c13ffc82bdc9efa 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 ea643f15897..8f0a529460c 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 b145f0623bf1bad8ceb534c306ad2f2a channels-4.0.0.tar.gz -sha256 0ce53507a7da7b148eaa454526e0e05f7da5e5d1c23440e4886cf146981d8420 channels-4.0.0.tar.gz +md5 bfbc466f2e0a06a8834a4be10856ce8c channels-4.1.0.tar.gz +sha256 e0ed375719f5c1851861f05ed4ce78b0166f9245ca0ecd836cb77d4bb531489d channels-4.1.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels/python-channels.mk b/package/python-channels/python-channels.mk index 40f17cb1142..0e00e7ea4e6 100644 --- a/package/python-channels/python-channels.mk +++ b/package/python-channels/python-channels.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_VERSION = 4.0.0 +PYTHON_CHANNELS_VERSION = 4.1.0 PYTHON_CHANNELS_SOURCE = channels-$(PYTHON_CHANNELS_VERSION).tar.gz -PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/8e/cb/6fedd9df5972b893a04c8e5d7748873d6480a813e74b0797945bee1f4282 +PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/7d/73/da9e496657b242308d68cf79c937be125fcca4af61a620d98adfdde66fab PYTHON_CHANNELS_SETUP_TYPE = setuptools PYTHON_CHANNELS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_LICENSE_FILES = LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index 8ef0e3fed04..ebed9d19d7a 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 0a4019908d9e50ff13138e8a794d9e2b charset-normalizer-3.3.2.tar.gz -sha256 f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 charset-normalizer-3.3.2.tar.gz +md5 8e0d0f33219087c2cd2d01b1d6ff11b6 charset_normalizer-3.4.0.tar.gz +sha256 223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e charset_normalizer-3.4.0.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 914b96eb69a..ee04bf8968a 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 = 3.3.2 -PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8 +PYTHON_CHARSET_NORMALIZER_VERSION = 3.4.0 +PYTHON_CHARSET_NORMALIZER_SOURCE = charset_normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE diff --git a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch deleted file mode 100644 index 837f2804d2c..00000000000 --- a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001 -From: Serhii Abarovskyi -Date: Tue, 9 May 2023 18:33:54 +0300 -Subject: [PATCH] Use setuptools-scm v7+ for building the dists - -Since version 7, setuptools-scm has native support for git archive, -so the setuptools-scm-git-archive project is obsolete -and this patch removes it from the build dependencies. -Close #515 - -Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 -Signed-off-by: Fabrice Fontaine ---- - .git_archival.txt | 3 +++ - pyproject.toml | 3 +-- - requirements/dist-build-constraints.in | 3 +-- - requirements/dist-build-constraints.txt | 16 +++++++--------- - setup.cfg | 3 +-- - 5 files changed, 13 insertions(+), 15 deletions(-) - -diff --git a/.git_archival.txt b/.git_archival.txt -index 95cb3eea4e..3994ec0a83 100644 ---- a/.git_archival.txt -+++ b/.git_archival.txt -@@ -1 +1,4 @@ -+node: $Format:%H$ -+node-date: $Format:%cI$ -+describe-name: $Format:%(describe:tags=true)$ - ref-names: $Format:%D$ -diff --git a/pyproject.toml b/pyproject.toml -index b1e5f60a80..88df57dcc1 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -6,8 +6,7 @@ requires = [ - "setuptools>=34.4", - - # Plugins -- "setuptools_scm[toml]>=3.5", -- "setuptools_scm_git_archive>=1.1", -+ "setuptools-scm >= 7.0.0", - ] - build-backend = "setuptools.build_meta" - -diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in -index 26b57228a9..a37baef1a9 100644 ---- a/requirements/dist-build-constraints.in -+++ b/requirements/dist-build-constraints.in -@@ -5,8 +5,7 @@ - setuptools >= 34.4 - - # Plugins --setuptools_scm[toml] >= 3.5 --setuptools_scm_git_archive >= 1.1 -+setuptools-scm[toml] >= 7.0.0 - - # Dynamic (coming from setuptools' PEP 517 build backend) - wheel -diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt -index 525f2be30f..8bd4343ff6 100644 ---- a/requirements/dist-build-constraints.txt -+++ b/requirements/dist-build-constraints.txt -@@ -1,18 +1,16 @@ - # --# This file is autogenerated by pip-compile with python 3.10 --# To update, run: -+# This file is autogenerated by pip-compile with Python 3.10 -+# by the following command: - # - # pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in - # --packaging==21.3 -+packaging==23.1 - # via setuptools-scm --pyparsing==3.0.6 -- # via packaging --setuptools-scm==6.3.2 -+setuptools-scm==7.1.0 - # via -r requirements/dist-build-constraints.in --setuptools-scm-git-archive==1.1 -- # via -r requirements/dist-build-constraints.in --tomli==2.0.0 -+tomli==2.0.1 -+ # via setuptools-scm -+typing-extensions==4.6.3 - # via setuptools-scm - wheel==0.37.1 - # via -r requirements/dist-build-constraints.in -diff --git a/setup.cfg b/setup.cfg -index 1f2b08f4c3..900c7b4feb 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -64,8 +64,7 @@ include_package_data = True - packages = find: - include_package_data = True - setup_requires = -- setuptools_scm>=1.15.0 -- setuptools_scm_git_archive>=1.0 -+ setuptools_scm >= 7.0.0 - install_requires = - importlib_metadata; python_version < '3.8' - more_itertools >= 2.6 diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index d103eb6f963..2d63dd96514 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 be96fa052c54892240f916fbb06cc571 cheroot-10.0.0.tar.gz -sha256 59c4a1877fef9969b3c3c080caaaf377e2780919437853fc0d32a9df40b311f0 cheroot-10.0.0.tar.gz +md5 0fce2608fcb31c16c81945c73e283724 cheroot-10.0.1.tar.gz +sha256 e0b82f797658d26b8613ec8eb563c3b08e6bd6a7921e9d5089bd1175ad1b1740 cheroot-10.0.1.tar.gz # Locally computed sha256 checksums sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 19aa7ae1938..3d39eac7a0c 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 10.0.0 +PYTHON_CHEROOT_VERSION = 10.0.1 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/08/7c/95c154177b16077de0fec1b821b0d8b3df2b59c5c7b3575a9c1bf52a437e +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/63/e2/f85981a51281bd30525bf664309332faa7c81782bb49e331af603421dbd1 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools diff --git a/package/python-cherrypy/Config.in b/package/python-cherrypy/Config.in index fd67872873e..24e244f3b38 100644 --- a/package/python-cherrypy/Config.in +++ b/package/python-cherrypy/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CHERRYPY bool "python-cherrypy" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jaraco-collections -> python-jaraco-text -> python-inflect -> python-pydantic -> python-pydantic-core select BR2_PACKAGE_PYTHON_CHEROOT # runtime select BR2_PACKAGE_PYTHON_JARACO_COLLECTIONS # runtime select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime diff --git a/package/python-cherrypy/python-cherrypy.hash b/package/python-cherrypy/python-cherrypy.hash index 92697e5f06e..73df447a447 100644 --- a/package/python-cherrypy/python-cherrypy.hash +++ b/package/python-cherrypy/python-cherrypy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cherrypy/json -md5 014dbd400aeda9d2b098ed01c95b4a30 CherryPy-18.9.0.tar.gz -sha256 6b06c191ce71a86461f30572a1ab57ffc09f43143ba8e42c103c7b3347220eb1 CherryPy-18.9.0.tar.gz +md5 3f7cf1b729467945218bf553f7232da8 cherrypy-18.10.0.tar.gz +sha256 6c70e78ee11300e8b21c0767c542ae6b102a49cac5cfd4e3e313d7bb907c5891 cherrypy-18.10.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 244491a040b..1f995ed1dfa 100644 --- a/package/python-cherrypy/python-cherrypy.mk +++ b/package/python-cherrypy/python-cherrypy.mk @@ -4,14 +4,12 @@ # ################################################################################ -PYTHON_CHERRYPY_VERSION = 18.9.0 -PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/bd/5f/e265a49883bfcfb7f2c3d3d9e96197cfe8136783e96c5ce20e201550aaa0 +PYTHON_CHERRYPY_VERSION = 18.10.0 +PYTHON_CHERRYPY_SOURCE = cherrypy-$(PYTHON_CHERRYPY_VERSION).tar.gz +PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/93/e8/2f7ef142d1962d08a8885c4c9942212abecad6a80ccdd1620fd1f5c993fd PYTHON_CHERRYPY_LICENSE = BSD-3-Clause PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md PYTHON_CHERRYPY_SETUP_TYPE = setuptools -PYTHON_CHERRYPY_DEPENDENCIES = \ - host-python-setuptools-scm \ - host-python-setuptools-scm-git-archive +PYTHON_CHERRYPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-colorama/python-colorama.mk b/package/python-colorama/python-colorama.mk index d633e006024..e87c60afb9f 100644 --- a/package/python-colorama/python-colorama.mk +++ b/package/python-colorama/python-colorama.mk @@ -7,9 +7,8 @@ PYTHON_COLORAMA_VERSION = 0.4.6 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4 -PYTHON_COLORAMA_SETUP_TYPE = pep517 +PYTHON_COLORAMA_SETUP_TYPE = hatch 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 9df94b19ba1..464ec553219 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 805e982037ba071d3d42c3d53cf73fd8 colorlog-6.8.0.tar.gz -sha256 fbb6fdf9d5685f2517f388fb29bb27d54e8654dd31f58bc2a3b217e967a95ca6 colorlog-6.8.0.tar.gz +md5 eded3e4cf270c1d1fabc170826f4d735 colorlog-6.9.0.tar.gz +sha256 bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2 colorlog-6.9.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 f96318ce5aa..c23e1c720fa 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 6.8.0 +PYTHON_COLORLOG_VERSION = 6.9.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/1f/b0/e4e3850d43f5429f9e53404056d705117fbb8a4d9e755425e762a9f68317 +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/d3/7a/359f4d5df2353f26172b3cc39ea32daa39af8de522205f512f458923e677 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE diff --git a/package/python-configobj/Config.in b/package/python-configobj/Config.in index 365aa17fcbc..cb9d9147450 100644 --- a/package/python-configobj/Config.in +++ b/package/python-configobj/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_CONFIGOBJ bool "python-configobj" - select BR2_PACKAGE_PYTHON_SIX # runtime help Config file reading, writing and validation. diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash index 682dc987f14..b173f0cdd7d 100644 --- a/package/python-configobj/python-configobj.hash +++ b/package/python-configobj/python-configobj.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/configobj/json -md5 8dda7b31bb3aea87ecfe3b7a87812b17 configobj-5.0.8.tar.gz -sha256 6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97 configobj-5.0.8.tar.gz +md5 496b60edcd943a900ddc0cb04132e81c configobj-5.0.9.tar.gz +sha256 03c881bbf23aa07bccf1b837005975993c4ab4427ba57f959afdd9d1a2386848 configobj-5.0.9.tar.gz # Locally computed sha256 checksums -sha256 0d95e648469a711f5ec1e59e6d4492150ec65d968c1ea6c6d96154a92879997a LICENSE +sha256 fd227649f1956788444397bf0899e977140a5bc662d86826657bc2aad833fe2a LICENSE diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk index fe1776f79f9..963bbcb2b84 100644 --- a/package/python-configobj/python-configobj.mk +++ b/package/python-configobj/python-configobj.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONFIGOBJ_VERSION = 5.0.8 +PYTHON_CONFIGOBJ_VERSION = 5.0.9 PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://files.pythonhosted.org/packages/cb/87/17d4c6d634c044ab08b11c0cd2a8a136d103713d438f8792d7be2c5148fb +PYTHON_CONFIGOBJ_SITE = https://files.pythonhosted.org/packages/f5/c4/c7f9e41bc2e5f8eeae4a08a01c91b2aea3dfab40a3e14b25e87e7db8d501 PYTHON_CONFIGOBJ_SETUP_TYPE = setuptools PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause PYTHON_CONFIGOBJ_LICENSE_FILES = LICENSE diff --git a/package/python-contourpy/python-contourpy.hash b/package/python-contourpy/python-contourpy.hash index 8f23d107aea..8902607ec84 100644 --- a/package/python-contourpy/python-contourpy.hash +++ b/package/python-contourpy/python-contourpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/contourpy/json -md5 cae5b781ade023c01bc1a8a53312f2ac contourpy-1.1.0.tar.gz -sha256 e53046c3863828d21d531cc3b53786e6580eb1ba02477e8681009b6aa0870b21 contourpy-1.1.0.tar.gz +md5 81447a2ceaf933b28db04d02086a22ed contourpy-1.3.0.tar.gz +sha256 7ffa0db17717a8ffb127efd0c95a4362d996b892c2904db72428d5b52e1938a4 contourpy-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 c2522156ba7d4dfbbec266dfea98bf76a69bc41edb18cad323177fad6b19b35f LICENSE +sha256 c7d0a153bffaa104044463ebc633793d451722efd3138b5ffd2527b40f1505a2 LICENSE diff --git a/package/python-contourpy/python-contourpy.mk b/package/python-contourpy/python-contourpy.mk index f305793cb28..3804fce8c3b 100644 --- a/package/python-contourpy/python-contourpy.mk +++ b/package/python-contourpy/python-contourpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONTOURPY_VERSION = 1.1.0 +PYTHON_CONTOURPY_VERSION = 1.3.0 PYTHON_CONTOURPY_SOURCE = contourpy-$(PYTHON_CONTOURPY_VERSION).tar.gz -PYTHON_CONTOURPY_SITE = https://files.pythonhosted.org/packages/a7/3b/632c003e1dfbc82d32c0466762f2d2cf139d26032626dc65944e38d0e5b9 +PYTHON_CONTOURPY_SITE = https://files.pythonhosted.org/packages/f5/f6/31a8f28b4a2a4fa0e01085e542f3081ab0588eff8e589d39d775172c9792 PYTHON_CONTOURPY_LICENSE = BSD-3-Clause PYTHON_CONTOURPY_LICENSE_FILES = LICENSE PYTHON_CONTOURPY_DEPENDENCIES = python-pybind host-python-meson-python diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index 10ba469d5a8..141d0758512 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 1675bdeeb821441b8b4c35e0a7ba861c python-crontab-3.0.0.tar.gz -sha256 79fb7465039ddfd4fb93d072d6ee0d45c1ac8bf1597f0686ea14fd4361dba379 python-crontab-3.0.0.tar.gz +md5 7ff9f13749104faa73f353a0d4ae9087 python_crontab-3.2.0.tar.gz +sha256 40067d1dd39ade3460b2ad8557c7651514cd3851deffff61c5c60e1227c5c36b python_crontab-3.2.0.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 21a9edef9b8..7946f56829f 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 3.0.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/fb/6f/14adf2570e83c90f3f5af1af5225a70f914ba9e7ab9d08e675c5f6887102 +PYTHON_CRONTAB_VERSION = 3.2.0 +PYTHON_CRONTAB_SOURCE = python_crontab-$(PYTHON_CRONTAB_VERSION).tar.gz +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/e2/f0/25775565c133d4e29eeb607bf9ddba0075f3af36041a1844dd207881047f PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 213aa24fa83..51b408823f9 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime help cryptography is a package designed to expose cryptographic diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 5fbf69a208f..61d9ca598ee 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,6 @@ # Locally calculated after vendoring -sha256 b55c6c011ba4bb803de0b557f40f1765bab9f63240e93516daaf75c3c68e6618 python-cryptography-39.0.2-cargo2.tar.gz +sha256 72c5686ee70cf37075e2fdea332066e4e2351fab8beaa4a22268983f092bca4e python-cryptography-43.0.3-cargo2.tar.gz # Locally computed sha256 checksums -sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE +sha256 3e0c7c091a948b82533ba98fd7cbb40432d6f1a9acbf85f5922d2f99a93ae6bb LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 1cbccd0d5cf..7feb4076cd0 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,18 +4,26 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 +PYTHON_CRYPTOGRAPHY_VERSION = 43.0.3 PYTHON_CRYPTOGRAPHY_SOURCE_PYPI = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 +PYTHON_CRYPTOGRAPHY_SITE_PYPI = https://files.pythonhosted.org/packages/0d/05/07b55d1fa21ac18c3a8c79f764e2514e6f6a9698f1be44994f5adf0d29db PYTHON_CRYPTOGRAPHY_SITE = $(PYTHON_CRYPTOGRAPHY_SITE_PYPI)/$(PYTHON_CRYPTOGRAPHY_SOURCE_PYPI)?buildroot-path=filename -PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools-rust +PYTHON_CRYPTOGRAPHY_SETUP_TYPE = maturin PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography PYTHON_CRYPTOGRAPHY_CARGO_MANIFEST_PATH = src/rust/Cargo.toml -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl -HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi host-openssl +PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools \ + openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-cffi \ + host-python-setuptools \ + host-openssl +PYTHON_CRYPTOGRAPHY_BUILD_OPTS = --skip-dependency-check +HOST_PYTHON_CRYPTOGRAPHY_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index d93135a9894..66c87904b41 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 11707e5da7c40bd98e5b4998489f10e0 cssutils-2.9.0.tar.gz -sha256 89477b3d17d790e97b9fb4def708767061055795aae6f7c82ae32e967c9be4cd cssutils-2.9.0.tar.gz +md5 c8c21e635454d9ca73b21892def35f55 cssutils-2.11.1.tar.gz +sha256 0563a76513b6af6eebbe788c3bf3d01c920e46b3f90c8416738c5cfc773ff8e2 cssutils-2.11.1.tar.gz # Locally computed sha256 checksums -sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER +sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a LICENSE diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index be5be30eee2..0fc706780c7 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 2.9.0 +PYTHON_CSSUTILS_VERSION = 2.11.1 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/b4/65/a054545c81eb87af898d664043578b8444ea3ded656db3da8f9d9fa21334 +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/33/9f/329d26121fe165be44b1dfff21aa0dc348f04633931f1d20ed6cf448a236 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ -PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER +PYTHON_CSSUTILS_LICENSE_FILES = LICENSE PYTHON_CSSUTILS_SETUP_TYPE = setuptools PYTHON_CSSUTILS_DEPENDENCIES = host-python-setuptools-scm diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 42c063014e4..cd320eaa2a1 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 d9a1e8416f2278857a189347858ed9d0 Cython-0.29.37.tar.gz -sha256 f813d4a6dd94adee5d4ff266191d1d95bf6d4164a4facc535422c021b2504cfb Cython-0.29.37.tar.gz +md5 388b85b7c23f501320d19d991b169f5d cython-3.0.11.tar.gz +sha256 7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff cython-3.0.11.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 024c8c1e506..51086bedab5 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.37 -PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/2a/97/8cc3fe7c6de4796921236a64d00ca8a95565772e57f0d3caae68d880b592 +PYTHON_CYTHON_VERSION = 3.0.11 +PYTHON_CYTHON_SOURCE = cython-$(PYTHON_CYTHON_VERSION).tar.gz +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/84/4d/b720d6000f4ca77f030bd70f12550820f0766b568e43f11af7f7ad9061aa PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch deleted file mode 100644 index 70cdb4f19db..00000000000 --- a/package/python-daphne/0001-remove-pytest-runner-requirement.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f9d881cc55c89f51240f93308713216cfec793eb Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sat, 3 Aug 2019 14:23:19 -0400 -Subject: [PATCH] remove pytest-runner requirement - -Setup does not actually require pytest-runner. As such, remove it. - -Signed-off-by: Adam Duskett ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 64e94f1..4e3abb0 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,7 +23,6 @@ setup( - include_package_data=True, - 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", "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 90d053bff6e..194b73a0e44 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 f0dcc0618459ad7d25508704f9505b56 daphne-4.0.0.tar.gz -sha256 cce9afc8f49a4f15d4270b8cfb0e0fe811b770a5cc795474e97e4da287497666 daphne-4.0.0.tar.gz +md5 6a00ce30210105fcd0f756d4dc5505f9 daphne-4.1.2.tar.gz +sha256 fcbcace38eb86624ae247c7ffdc8ac12f155d7d19eafac4247381896d6f33761 daphne-4.1.2.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 c08088278e9..097a1958217 100644 --- a/package/python-daphne/python-daphne.mk +++ b/package/python-daphne/python-daphne.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_DAPHNE_VERSION = 4.0.0 +PYTHON_DAPHNE_VERSION = 4.1.2 PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz -PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/d7/77/57b19d5caabf8537879aa4cf3a017b99d0b727f2521ffca7fd9140573509 +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/1a/c1/aedf180beb12395835cba791ce7239b8880009d9d37564d72b7590cde605 PYTHON_DAPHNE_SETUP_TYPE = setuptools # https://github.com/django/daphne/blob/master/LICENSE PYTHON_DAPHNE_LICENSE = BSD-3-Clause PYTHON_DAPHNE_LICENSE_FILES = LICENSE +PYTHON_DAPHNE_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash index 08d2675443e..4234fc0501a 100644 --- a/package/python-dbus-fast/python-dbus-fast.hash +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-fast/json -md5 791ce3b0c04099959161a18ae983bf25 dbus_fast-2.12.0.tar.gz -sha256 849478e11d251fa4ebb99ce5bfee332cb6383c63ef0bc97bae23cef4e0badf9c dbus_fast-2.12.0.tar.gz +md5 3d7ef3e3ae2691d45dcf3d07511eca4f dbus_fast-2.24.3.tar.gz +sha256 9042a1b565ecac4f8e04df79376de1d1d31e4c82eddb6e71e8b8d82d0c94dd3d dbus_fast-2.24.3.tar.gz # Locally computed sha256 checksums sha256 c37e9c75110e01d1f0c5360dc7d7776a30ac5f70d2440db214423e4b7a77a6af LICENSE diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index 1456ce5e4c6..60d0b7e9afb 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_DBUS_FAST_VERSION = 2.12.0 +PYTHON_DBUS_FAST_VERSION = 2.24.3 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/f5/8c/220fcbe4337b842d730d5752f207fc8efd3a02405c71c329e61218e947b8 -PYTHON_DBUS_FAST_SETUP_TYPE = pep517 +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/0a/37/a27e7f2dc6a18b5dcee70ffb08013a33770c2154a51fb5e2c04a7f4169fa +PYTHON_DBUS_FAST_SETUP_TYPE = poetry PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 PYTHON_DBUS_FAST_DEPENDENCIES = \ host-python-cython \ - host-python-poetry-core \ host-python-setuptools $(eval $(python-package)) diff --git a/package/python-distlib/python-distlib.hash b/package/python-distlib/python-distlib.hash index 1a14e6ba779..6cf37158658 100644 --- a/package/python-distlib/python-distlib.hash +++ b/package/python-distlib/python-distlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/distlib/json -md5 c4df5794463d3710bae3d162bf953ba6 distlib-0.3.8.tar.gz -sha256 1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 distlib-0.3.8.tar.gz +md5 958df85785458fa326a07af4f9c1c328 distlib-0.3.9.tar.gz +sha256 a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403 distlib-0.3.9.tar.gz # Locally computed sha256 checksums sha256 808e10c8a6ab8deb149ff9b3fb19f447a808094606d712a9ca57fead3552599d LICENSE.txt diff --git a/package/python-distlib/python-distlib.mk b/package/python-distlib/python-distlib.mk index 2eba3ae64f9..e95c28c5185 100644 --- a/package/python-distlib/python-distlib.mk +++ b/package/python-distlib/python-distlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTLIB_VERSION = 0.3.8 +PYTHON_DISTLIB_VERSION = 0.3.9 PYTHON_DISTLIB_SOURCE = distlib-$(PYTHON_DISTLIB_VERSION).tar.gz -PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/c4/91/e2df406fb4efacdf46871c25cde65d3c6ee5e173b7e5a4547a47bae91920 +PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/0d/dd/1bec4c5ddb504ca60fc29472f3d27e8d4da1257a854e1d96742f15c1d02d PYTHON_DISTLIB_SETUP_TYPE = setuptools PYTHON_DISTLIB_LICENSE = PSF-2.0 PYTHON_DISTLIB_LICENSE_FILES = LICENSE.txt diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 413745e1330..53c4ceead35 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 8669004de8eb7f1a558400f9103c0001 Django-5.0.9.tar.gz -sha256 6333870d342329b60174da3a60dbd302e533f3b0bb0971516750e974a99b5a39 Django-5.0.9.tar.gz +md5 03ec3e0f2d6cbcb9eb11c629ca1c538b Django-5.1.4.tar.gz +sha256 de450c09e91879fa5a307f696e57c851955c910a438a35e6b4c895e86bedc82a Django-5.1.4.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 8232a900263..4facc6b6c49 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,14 +4,15 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.9 +PYTHON_DJANGO_VERSION = 5.1.4 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/fa/7b/176ce335cba42342b8f20efbdd5eb27067a0b34ee2203e051b34bedca0d9 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/d3/e8/536555596dbb79f6e77418aeb40bdc1758c26725aba31919ba449e6d5e6a PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject PYTHON_DJANGO_CPE_ID_PRODUCT = django PYTHON_DJANGO_SETUP_TYPE = setuptools +PYTHON_DJANGO_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) diff --git a/package/python-dnspython/python-dnspython.hash b/package/python-dnspython/python-dnspython.hash index 77ffb5dedcd..4ed5a042700 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 fac4e1580e5e9dfee722cb97bc073722 dnspython-2.4.2.tar.gz -sha256 8dcfae8c7460a2f84b4072e26f1c9f4101ca20c071649cb7c34e8b6a93d58984 dnspython-2.4.2.tar.gz +md5 7a8f6f15038a116598744517931420d0 dnspython-2.7.0.tar.gz +sha256 ce9c432eda0dc91cf618a5cedf1a4e142651196bbcd2c80e89ed5a907e5cfaf1 dnspython-2.7.0.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 f0df7331433..2d3622110cf 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -4,14 +4,12 @@ # ################################################################################ -PYTHON_DNSPYTHON_VERSION = 2.4.2 +PYTHON_DNSPYTHON_VERSION = 2.7.0 PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz -PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/65/2d/372a20e52a87b2ba0160997575809806111a72e18aa92738daccceb8d2b9 +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/b5/4a/263763cb2ba3816dd94b08ad3a33d5fdae34ecb856678773cc40a3605829 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE -PYTHON_DNSPYTHON_SETUP_TYPE = pep517 -PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core -HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core +PYTHON_DNSPYTHON_SETUP_TYPE = hatch $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index 55ba405f7c4..582d9ee1d01 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -7,11 +7,11 @@ PYTHON_DOCKER_VERSION = 7.1.0 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/91/9b/4a2ea29aeba62471211598dac5d96825bb49348fa07e906ea930394a83ce -PYTHON_DOCKER_SETUP_TYPE = pep517 +PYTHON_DOCKER_SETUP_TYPE = hatch 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-hatchling host-python-hatch-vcs +PYTHON_DOCKER_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index 2386cc2891d..f79d418efa4 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/docutils/json -md5 93bcfe0065cf1d0b6a0bcabeca7a2335 docutils-0.20.1.tar.gz -sha256 f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b docutils-0.20.1.tar.gz +md5 c4064e1e0e3cd142951fd2b95b830874 docutils-0.21.2.tar.gz +sha256 3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f docutils-0.21.2.tar.gz # Locally computed sha256 checksums -sha256 a0d7ee761e8d757c0b904518514f98233fd94f2398da3703130d15142ca47a77 COPYING.txt +sha256 534edf7641abde69fc500f228c09751812c0589815eef0c082bc6ba317d646ac COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 2b496f0d468..1f1e043c153 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.20.1 +PYTHON_DOCUTILS_VERSION = 0.21.2 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/1f/53/a5da4f2c5739cf66290fac1431ee52aff6851c7c8ffd8264f13affd7bcdd -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/ae/ed/aefcc8cd0ba62a0560c3c18c33925362d46c6075480bfa4df87b28e169a9 +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, ZPL-2.1, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = setuptools +PYTHON_DOCUTILS_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-dotenv/Config.in b/package/python-dotenv/Config.in new file mode 100644 index 00000000000..f9b42bd28ed --- /dev/null +++ b/package/python-dotenv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_DOTENV + bool "python-dotenv" + help + Read key-value pairs from a .env file and set them as + environment variables. + + https://github.com/theskumar/python-dotenv diff --git a/package/python-dotenv/python-dotenv.hash b/package/python-dotenv/python-dotenv.hash new file mode 100644 index 00000000000..710922fba3a --- /dev/null +++ b/package/python-dotenv/python-dotenv.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-dotenv/json +md5 68abb78e05460ce558ca255de550e1ea python-dotenv-1.0.1.tar.gz +sha256 e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca python-dotenv-1.0.1.tar.gz +# Locally computed sha256 checksums +sha256 80619b7049f08c81683ad0e01f08f257a840652dd71ee83146d36658c7d2c2b9 LICENSE diff --git a/package/python-dotenv/python-dotenv.mk b/package/python-dotenv/python-dotenv.mk new file mode 100644 index 00000000000..324eea239e7 --- /dev/null +++ b/package/python-dotenv/python-dotenv.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-dotenv +# +################################################################################ + +PYTHON_DOTENV_VERSION = 1.0.1 +PYTHON_DOTENV_SITE = https://files.pythonhosted.org/packages/bc/57/e84d88dfe0aec03b7a2d4327012c1627ab5f03652216c63d49846d7a6c58 +PYTHON_DOTENV_SETUP_TYPE = setuptools +PYTHON_DOTENV_LICENSE = BSD-3-Clause +PYTHON_DOTENV_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index 3e1dd22133d..b53830f4cbb 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 cc4be8cfc01804cc31a123b56f68aeb1 dtschema-2023.11.tar.gz -sha256 cf9a449ea743c0a955cf6034ef246668fa5ea177684977c61fef7604af5f273b dtschema-2023.11.tar.gz +md5 e4ecd1925af81376865ce0169dc1146a dtschema-2024.11.tar.gz +sha256 bb7dd36ff9406ec89607b893cfc5e1ffa7ead76fd5c48df77eafc9b4d4196047 dtschema-2024.11.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index e1dd5009fda..13ccc16e956 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2023.11 +PYTHON_DTSCHEMA_VERSION = 2024.11 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/5a/94/7890ef663fba1cca84cf0ab64c7f68685343c921ab883f0356cd9978b605 +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/b7/e2/260c0429118b1555ddc2d0d465b7ab36e76ab2454a3d1a916ef06dffccca PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt diff --git a/package/python-dunamai/python-dunamai.hash b/package/python-dunamai/python-dunamai.hash new file mode 100644 index 00000000000..a2a92b86995 --- /dev/null +++ b/package/python-dunamai/python-dunamai.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dunamai/json +md5 1b3ca932416961ea6953dbbc21e6d42c dunamai-1.22.0.tar.gz +sha256 375a0b21309336f0d8b6bbaea3e038c36f462318c68795166e31f9873fdad676 dunamai-1.22.0.tar.gz +# Locally computed sha256 checksums +sha256 cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8 LICENSE diff --git a/package/python-dunamai/python-dunamai.mk b/package/python-dunamai/python-dunamai.mk new file mode 100644 index 00000000000..bd6c71fd6aa --- /dev/null +++ b/package/python-dunamai/python-dunamai.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-dunamai +# +################################################################################ + +PYTHON_DUNAMAI_VERSION = 1.22.0 +PYTHON_DUNAMAI_SOURCE = dunamai-$(PYTHON_DUNAMAI_VERSION).tar.gz +PYTHON_DUNAMAI_SITE = https://files.pythonhosted.org/packages/a0/fe/aee602f08765de4dd753d2e5d6cbd480857182e345f161f7a19ad1979e4d +PYTHON_DUNAMAI_SETUP_TYPE = poetry +PYTHON_DUNAMAI_LICENSE = MIT +PYTHON_DUNAMAI_LICENSE_FILES = LICENSE +HOST_PYTHON_DUNAMAI_DEPENDENCIES = host-python-packaging + +$(eval $(host-python-package)) diff --git a/package/python-ecdsa/python-ecdsa.hash b/package/python-ecdsa/python-ecdsa.hash index 382cccd47c6..c523553657a 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 cbca26ec29cc50e32e8b070aa2ec0786 ecdsa-0.18.0.tar.gz -sha256 190348041559e21b22a1d65cee485282ca11a6f81d503fddb84d5017e9ed1e49 ecdsa-0.18.0.tar.gz +md5 3c9234e8b57eea26d88093f18d2aa358 ecdsa-0.19.0.tar.gz +sha256 60eaad1199659900dd0af521ed462b793bbdf867432b3948e87416ae4caf6bf8 ecdsa-0.19.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 321e87e0a3a..8fa2c431bcf 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ECDSA_VERSION = 0.18.0 +PYTHON_ECDSA_VERSION = 0.19.0 PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/ff/7b/ba6547a76c468a0d22de93e89ae60d9561ec911f59532907e72b0d8bc0f1 +PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/5e/d0/ec8ac1de7accdcf18cfe468653ef00afd2f609faf67c423efbd02491051b PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE diff --git a/package/python-email-validator/python-email-validator.hash b/package/python-email-validator/python-email-validator.hash index 4342f8d91bc..f7a7ed8a339 100644 --- a/package/python-email-validator/python-email-validator.hash +++ b/package/python-email-validator/python-email-validator.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/email-validator/json -md5 a836759afeb7efdc5d493fbdf8a1bae6 email_validator-2.1.1.tar.gz -sha256 200a70680ba08904be6d1eef729205cc0d687634399a5924d842533efb824b84 email_validator-2.1.1.tar.gz +md5 593073eca56ac1e947d47b9b314f2f11 email_validator-2.2.0.tar.gz +sha256 cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7 email_validator-2.2.0.tar.gz # Locally computed sha256 checksums sha256 672179752e109134a3fb2bdd0780b29fdb7a03974f0f586a13aead5129562d4c LICENSE diff --git a/package/python-email-validator/python-email-validator.mk b/package/python-email-validator/python-email-validator.mk index 8d82eb092f7..35881c13a34 100644 --- a/package/python-email-validator/python-email-validator.mk +++ b/package/python-email-validator/python-email-validator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EMAIL_VALIDATOR_VERSION = 2.1.1 +PYTHON_EMAIL_VALIDATOR_VERSION = 2.2.0 PYTHON_EMAIL_VALIDATOR_SOURCE = email_validator-$(PYTHON_EMAIL_VALIDATOR_VERSION).tar.gz -PYTHON_EMAIL_VALIDATOR_SITE = https://files.pythonhosted.org/packages/63/82/2914bff80ebee8c027802a664ad4b4caad502cd594e358f76aff395b5e56 +PYTHON_EMAIL_VALIDATOR_SITE = https://files.pythonhosted.org/packages/48/ce/13508a1ec3f8bb981ae4ca79ea40384becc868bfae97fd1c942bb3a001b1 PYTHON_EMAIL_VALIDATOR_SETUP_TYPE = setuptools PYTHON_EMAIL_VALIDATOR_LICENSE = Unlicense PYTHON_EMAIL_VALIDATOR_LICENSE_FILES = LICENSE diff --git a/package/python-engineio/Config.in b/package/python-engineio/Config.in index b42b609e0d3..9b9849ac483 100644 --- a/package/python-engineio/Config.in +++ b/package/python-engineio/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_ENGINEIO bool "python-engineio" + select BR2_PACKAGE_PYTHON_SIMPLE_WEBSOCKET # runtime select BR2_PACKAGE_PYTHON3_ZLIB help Engine.IO server. diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index c1b02350bc2..ecf4d2898e2 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 619e7fce0257a8219187f50aa94844a3 python-engineio-4.8.2.tar.gz -sha256 f8609e3afdda318fdc336b4ba2de8dd397bb8f9b8a1b43e56c27330e32c2e34c python-engineio-4.8.2.tar.gz +md5 3e45a23dd8df2d611681cb6970c1fd27 python_engineio-4.10.1.tar.gz +sha256 166cea8dd7429638c5c4e3a4895beae95196e860bc6f29ed0b9fe753d1ef2072 python_engineio-4.10.1.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 67092402b49..49d5e298fe2 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.8.2 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/e2/24/4a69dd119d10e31c4439f910a2a0f71b540b9f835ab60efa1f0f7bcae0c7 +PYTHON_ENGINEIO_VERSION = 4.10.1 +PYTHON_ENGINEIO_SOURCE = python_engineio-$(PYTHON_ENGINEIO_VERSION).tar.gz +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/9e/d2/b985b0affc5944620e1f812969322f40204f75297c5087fc4cdd44f1a14e PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 4099957971e..5095454aa1f 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ESPTOOL bool "python-esptool" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_ARGCOMPLETE # runtime select BR2_PACKAGE_PYTHON_BITSTRING # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 490b4e7e9c1..6eab7909013 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 e7f2012cf31cd23f60049b179fb3b53a esptool-4.7.0.tar.gz -sha256 01454e69e1ef3601215db83ff2cb1fc79ece67d24b0e5d43d451b410447c4893 esptool-4.7.0.tar.gz +md5 c7d41d4c89ffa0fa0a9d490439358b27 esptool-4.8.1.tar.gz +sha256 dc4ef26b659e1a8dcb019147c0ea6d94980b34de99fbe09121c7941c8b254531 esptool-4.8.1.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 648748237dc..a4922c1e5b4 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.7.0 +PYTHON_ESPTOOL_VERSION = 4.8.1 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879dee053874a4f955ed1e9ad97275485f51cb4bc2cb4e9b24479 +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/5c/6b/3ce9bb7f36bdef3d6ae71646a1d3b7d59826a478f3ed8a783a93a2f8f537 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE diff --git a/package/python-evdev/python-evdev.hash b/package/python-evdev/python-evdev.hash index 9a6d0d07beb..afa74c792bd 100644 --- a/package/python-evdev/python-evdev.hash +++ b/package/python-evdev/python-evdev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/evdev/json -md5 905b12ef6136b518ddf418d8d5b053e4 evdev-1.6.1.tar.gz -sha256 299db8628cc73b237fc1cc57d3c2948faa0756e2a58b6194b5bf81dc2081f1e3 evdev-1.6.1.tar.gz +md5 c20a623d2d05fd87c1f46d736ee9c3cc evdev-1.7.1.tar.gz +sha256 0c72c370bda29d857e188d931019c32651a9c1ea977c08c8d939b1ced1637fde evdev-1.7.1.tar.gz # Locally computed sha256 checksums sha256 55fd76d7b3f90d312f161d318631b93c58a0e69d662d07c4f5aca2c6c9ecc85e LICENSE diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index b509b43e8a3..269b290dcaa 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EVDEV_VERSION = 1.6.1 +PYTHON_EVDEV_VERSION = 1.7.1 PYTHON_EVDEV_SOURCE = evdev-$(PYTHON_EVDEV_VERSION).tar.gz -PYTHON_EVDEV_SITE = https://files.pythonhosted.org/packages/05/50/629b011a7f61cb2fca754ea8631575784bf8605a1ec4d6970a010bc54e2b +PYTHON_EVDEV_SITE = https://files.pythonhosted.org/packages/12/bb/f622a8a5e64d46ca83020a761877c0ead19140903c9aaf1431f3c531fdf6 PYTHON_EVDEV_SETUP_TYPE = setuptools PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash index e21418aae98..8f02628485e 100644 --- a/package/python-executing/python-executing.hash +++ b/package/python-executing/python-executing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/executing/json -md5 91da12f933267a5fe085033db2a3b84d executing-2.0.1.tar.gz -sha256 35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147 executing-2.0.1.tar.gz +md5 e64dd9916bb0a6c89f88295f4867c1b6 executing-2.1.0.tar.gz +sha256 8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab executing-2.1.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 index 071e8679417..d13da22be31 100644 --- a/package/python-executing/python-executing.mk +++ b/package/python-executing/python-executing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_EXECUTING_VERSION = 2.0.1 +PYTHON_EXECUTING_VERSION = 2.1.0 PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz -PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/08/41/85d2d28466fca93737592b7f3cc456d1cfd6bcd401beceeba17e8e792b50 +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8c/e3/7d45f492c2c4a0e8e0fad57d081a7c8a0286cdd86372b070cca1ec0caa1e PYTHON_EXECUTING_SETUP_TYPE = setuptools PYTHON_EXECUTING_LICENSE = MIT PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt diff --git a/package/python-expandvars/python-expandvars.mk b/package/python-expandvars/python-expandvars.mk index 5c9a7249b30..0a72601b5a3 100644 --- a/package/python-expandvars/python-expandvars.mk +++ b/package/python-expandvars/python-expandvars.mk @@ -7,9 +7,8 @@ PYTHON_EXPANDVARS_VERSION = 0.12.0 PYTHON_EXPANDVARS_SOURCE = expandvars-$(PYTHON_EXPANDVARS_VERSION).tar.gz PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/2b/a5/46d1f58edcae1d632fafdfee313e378240e002ae45d26502bac938bd8751 -PYTHON_EXPANDVARS_SETUP_TYPE = pep517 +PYTHON_EXPANDVARS_SETUP_TYPE = hatch PYTHON_EXPANDVARS_LICENSE = MIT PYTHON_EXPANDVARS_LICENSE_FILES = LICENSE -HOST_PYTHON_EXPANDVARS_DEPENDENCIES = host-python-hatchling $(eval $(host-python-package)) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 2d54d278377..8b2fdb0f478 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 22a5c32f3d9dd96d498febe8e16ddffe falcon-3.1.3.tar.gz -sha256 23335dbccd44f29e85ec55f2f35d5a0bc12bd7a509f641ab81f5c64b65626263 falcon-3.1.3.tar.gz +md5 779e94857aed44e78536a9d36268e76c falcon-4.0.2.tar.gz +sha256 58f4b9c9da4c9b1e2c9f396ad7ef897701b3c7c7c87227f0bd1aee40c7fbc525 falcon-4.0.2.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 6c96bf16ebf..f5ab76655f5 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.1.3 +PYTHON_FALCON_VERSION = 4.0.2 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/3b/30/a7bc770025b6a7a36d0508e3d735dca239df7c27b862856e54d661f24632 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/37/4f/d317952294dee1982cd930c8ee2b8b7fbf04140473882801061b3346c713 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 2be006a97d8..6c7451ebd02 100644 --- a/package/python-fastapi/python-fastapi.hash +++ b/package/python-fastapi/python-fastapi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastapi/json -md5 32df7b178fb59e180d34729be33d5024 fastapi-0.111.0.tar.gz -sha256 b9db9dd147c91cb8b769f7183535773d8741dd46f9dc6676cd82eab510228cd7 fastapi-0.111.0.tar.gz +md5 feecf6d0db305d63ee9e6fcb77c81673 fastapi-0.115.4.tar.gz +sha256 db653475586b091cb8b2fec2ac54a680ac6a158e07406e1abae31679e8826349 fastapi-0.115.4.tar.gz # Locally computed sha256 checksums sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index 262b166907b..95eb565b236 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.111.0 +PYTHON_FASTAPI_VERSION = 0.115.4 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/0e/1f/f4a99e92c583780787e04b05aa9d8a8db9ec76d091d81545948a006f5b44 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/a9/db/5781f19bd30745885e0737ff3fdd4e63e7bc691710f9da691128bb0dc73b PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE diff --git a/package/python-fastui/python-fastui.hash b/package/python-fastui/python-fastui.hash index 50f49824e03..37e7f0216bb 100644 --- a/package/python-fastui/python-fastui.hash +++ b/package/python-fastui/python-fastui.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fastui/json -md5 c8e7d060c0ad3a7ad1237dac3555b83e fastui-0.5.2.tar.gz -sha256 854a7a7fce4c08efd9caff1a331d222007b3708b133d996528e3f40996c96091 fastui-0.5.2.tar.gz +md5 bfc873f6ec7ab9cd406822793168ee7e fastui-0.7.0.tar.gz +sha256 08ec1b8437653fc37caaf3dae46566a43dbda3f190c62c43f8f3d063261dd1e8 fastui-0.7.0.tar.gz # Locally computed sha256 checksums sha256 1c39900853b2c98a5c98e1acc10e54ef06ba2693cdf85e8b28e3ede658888d79 LICENSE diff --git a/package/python-fastui/python-fastui.mk b/package/python-fastui/python-fastui.mk index e143c9978c7..898bc26eb9a 100644 --- a/package/python-fastui/python-fastui.mk +++ b/package/python-fastui/python-fastui.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_FASTUI_VERSION = 0.5.2 +PYTHON_FASTUI_VERSION = 0.7.0 PYTHON_FASTUI_SOURCE = fastui-$(PYTHON_FASTUI_VERSION).tar.gz -PYTHON_FASTUI_SITE = https://files.pythonhosted.org/packages/64/11/515c9b5cb6e885f4ba8c325f75b95a754d99b8296bdc9f134dc90a79019f -PYTHON_FASTUI_SETUP_TYPE = pep517 +PYTHON_FASTUI_SITE = https://files.pythonhosted.org/packages/87/97/3f001410200256026ff98a4588ec8cb4f3b48bc74a28325e32bfb3b08ffd +PYTHON_FASTUI_SETUP_TYPE = hatch PYTHON_FASTUI_LICENSE = MIT PYTHON_FASTUI_LICENSE_FILES = LICENSE -PYTHON_FASTUI_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index 3013cb6789e..c81d016f8e2 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 368d00d1946b89c910d4bf1da68b5a66 filelock-3.13.1.tar.gz -sha256 521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e filelock-3.13.1.tar.gz +md5 4c66a5abfc4004cbb0cc30d22e472031 filelock-3.16.1.tar.gz +sha256 c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435 filelock-3.16.1.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 a32517b1ad1..f26030a9e4e 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.13.1 +PYTHON_FILELOCK_VERSION = 3.16.1 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/70/70/41905c80dcfe71b22fb06827b8eae65781783d4a14194bce79d16a013263 -PYTHON_FILELOCK_SETUP_TYPE = pep517 +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/9d/db/3ef5bb276dae18d6ec2124224403d1d67bccdbefc17af4cc8f553e341ab1 +PYTHON_FILELOCK_SETUP_TYPE = hatch PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE -PYTHON_FILELOCK_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs +PYTHON_FILELOCK_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-fire/Config.in b/package/python-fire/Config.in index 9c816b0fd0e..0d5787044c6 100644 --- a/package/python-fire/Config.in +++ b/package/python-fire/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_FIRE bool "python-fire" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TERMCOLOR # runtime help A library for automatically generating command line diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index ce44bef96e2..375b5c8c037 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 8b24d579bd2a1b344b4f9670fa49ebc8 fire-0.5.0.tar.gz -sha256 a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 fire-0.5.0.tar.gz +md5 4f2da2e8111c45e60b8806529949fda0 fire-0.7.0.tar.gz +sha256 961550f07936eaf65ad1dc8360f2b2bf8408fad46abbfa4d2a3794f8d2a95cdf fire-0.7.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 7a6c31e8a45..43187073216 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.5.0 +PYTHON_FIRE_VERSION = 0.7.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/94/ed/3b9a10605163f48517931083aee8364d4d6d3bb1aa9b75eb0a4a5e9fbfc1 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/6b/b6/82c7e601d6d3c3278c40b7bd35e17e82aa227f050aa9f66cb7b7fce29471 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.mk b/package/python-flask-babel/python-flask-babel.mk index 3970a14db1c..33444c71e08 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -8,8 +8,7 @@ PYTHON_FLASK_BABEL_VERSION = 4.0.0 PYTHON_FLASK_BABEL_SOURCE = flask_babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/58/1a/4c65e3b90bda699a637bfb7fb96818b0a9bbff7636ea91aade67f6020a31 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause -PYTHON_FLASK_BABEL_SETUP_TYPE = pep517 +PYTHON_FLASK_BABEL_SETUP_TYPE = poetry PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE -PYTHON_FLASK_BABEL_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-flask-cors/python-flask-cors.hash b/package/python-flask-cors/python-flask-cors.hash index ced7d9dceac..41c232df361 100644 --- a/package/python-flask-cors/python-flask-cors.hash +++ b/package/python-flask-cors/python-flask-cors.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-cors/json -md5 0ccfa375e744200243d85719b38cdbc6 Flask-Cors-4.0.0.tar.gz -sha256 f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0 Flask-Cors-4.0.0.tar.gz +md5 a6e8202cc008ef6f70ce75a7ae7f8d9d flask_cors-5.0.0.tar.gz +sha256 5aadb4b950c4e93745034594d9f3ea6591f734bb3662e16e255ffbf5e89c88ef flask_cors-5.0.0.tar.gz # Locally computed sha256 checksums sha256 6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d LICENSE diff --git a/package/python-flask-cors/python-flask-cors.mk b/package/python-flask-cors/python-flask-cors.mk index bfcaf63c641..1119648370d 100644 --- a/package/python-flask-cors/python-flask-cors.mk +++ b/package/python-flask-cors/python-flask-cors.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_CORS_VERSION = 4.0.0 -PYTHON_FLASK_CORS_SOURCE = Flask-Cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz -PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/c8/b0/bd7130837a921497520f62023c7ba754e441dcedf959a43e6d1fd86e5451 +PYTHON_FLASK_CORS_VERSION = 5.0.0 +PYTHON_FLASK_CORS_SOURCE = flask_cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz +PYTHON_FLASK_CORS_SITE = https://files.pythonhosted.org/packages/4f/d0/d9e52b154e603b0faccc0b7c2ad36a764d8755ef4036acbf1582a67fb86b PYTHON_FLASK_CORS_SETUP_TYPE = setuptools PYTHON_FLASK_CORS_LICENSE = MIT PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash index d5c0e465959..ad1564caabd 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash @@ -1,6 +1,6 @@ # 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 +md5 29ca67027f53912cb146d9305ea3e810 Flask-JSONRPC-3.0.1.tar.gz +sha256 110295be39c6d6a110063630c050e3f8a4f79c50281898b3f1cb8a18fb3cb84a Flask-JSONRPC-3.0.1.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 c816749085c..2a60d73d427 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_JSONRPC_VERSION = 2.2.2 +PYTHON_FLASK_JSONRPC_VERSION = 3.0.1 PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz -PYTHON_FLASK_JSONRPC_SITE = https://files.pythonhosted.org/packages/a5/7b/8cbd53084a1efb58a1105905a38b0cbefcd3ae13ef2c90c07eedf0fdb6dc +PYTHON_FLASK_JSONRPC_SITE = https://files.pythonhosted.org/packages/7e/9d/637a0620802e4c496bd5d48e3766c3a4fd6a03f815f9bcb183bc7a17a5bb PYTHON_FLASK_JSONRPC_LICENSE = BSD-3-Clause PYTHON_FLASK_JSONRPC_LICENSE_FILES = LICENSE COPYING PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index b468c48fd85..685464c7e45 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-smorest/json -md5 b10a7a0bdee4505dec3cc7652560bc9e flask-smorest-0.42.3.tar.gz -sha256 736ef072bd5522de750a5a9d9f1bfb6d750d05c66e1b3702bc7a20e4277af9bf flask-smorest-0.42.3.tar.gz +md5 98b3b197fcfb944954d768f6d84416ee flask_smorest-0.45.0.tar.gz +sha256 1490291a59e572be5c02e0a769589584180eceba65bc1949456760856b3e990b flask_smorest-0.45.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 c8a48548bbb732a0bbd6a0dc2c556cfa1e6e5fe35d888cdf6a1974d69e0e312a LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk index 6eb1abc6fad..323d1ec1911 100644 --- a/package/python-flask-smorest/python-flask-smorest.mk +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_FLASK_SMOREST_VERSION = 0.42.3 -PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz -PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/25/91/da55ec1288e821069ab61b6db4acfa171fa268c426523bb4f3a8a91210db -PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools +PYTHON_FLASK_SMOREST_VERSION = 0.45.0 +PYTHON_FLASK_SMOREST_SOURCE = flask_smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/29/cc/ad32be9d2a2148000c4c845d234f12cee10d6ec9cc3724fe7a3ff9e93f99 +PYTHON_FLASK_SMOREST_SETUP_TYPE = flit PYTHON_FLASK_SMOREST_LICENSE = MIT PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE diff --git a/package/python-flask-wtf/python-flask-wtf.hash b/package/python-flask-wtf/python-flask-wtf.hash index f4267579550..082db8a7d8e 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 cbdd73ec30c7b3b887dc12026fd4954c flask_wtf-1.2.1.tar.gz -sha256 8bb269eb9bb46b87e7c8233d7e7debdf1f8b74bf90cc1789988c29b37a97b695 flask_wtf-1.2.1.tar.gz +md5 4582b41cf00556f226e0256404310cfa flask_wtf-1.2.2.tar.gz +sha256 79d2ee1e436cf570bccb7d916533fa18757a2f18c290accffab1b9a0b684666b flask_wtf-1.2.2.tar.gz # Locally computed sha256 checksums 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 bb32d55e255..787029639bb 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_FLASK_WTF_VERSION = 1.2.1 +PYTHON_FLASK_WTF_VERSION = 1.2.2 PYTHON_FLASK_WTF_SOURCE = flask_wtf-$(PYTHON_FLASK_WTF_VERSION).tar.gz -PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9b/ef/b6ec35e02f479f6e76e02ede14594c9cfa5e6dcbab6ea0e82fa413993a2a +PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/80/9b/f1cd6e41bbf874f3436368f2c7ee3216c1e82d666ff90d1d800e20eb1317 PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst -PYTHON_FLASK_WTF_SETUP_TYPE = pep517 -PYTHON_FLASK_WTF_DEPENDENCIES = host-python-hatchling +PYTHON_FLASK_WTF_SETUP_TYPE = hatch $(eval $(python-package)) diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 3b5afc48e79..415e2068b02 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/flask/json -md5 4848c9d5305197822b5b00c8e9a6d9aa flask-3.0.0.tar.gz -sha256 cfadcdb638b609361d29ec22360d6070a77d7463dcb3ab08d2c2f2f168845f58 flask-3.0.0.tar.gz +md5 4658b022a07f6d8df51ef24c717fe162 flask-3.0.3.tar.gz +sha256 ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842 flask-3.0.3.tar.gz # Locally computed sha256 checksums -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst -sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.txt +sha256 1e07e9c25f2618a040560b70e63f42259eab24e558d0f3532e6163d751cb4eea docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index 1372d915c13..a4a19efba02 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 3.0.0 +PYTHON_FLASK_VERSION = 3.0.3 PYTHON_FLASK_SOURCE = flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/d8/09/c1a7354d3925a3c6c8cfdebf4245bae67d633ffda1ba415add06ffc839c5 +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/41/e1/d104c83026f8d35dfd2c261df7d64738341067526406b40190bc063e829a PYTHON_FLASK_SETUP_TYPE = flit PYTHON_FLASK_LICENSE = BSD-3-Clause -PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst +PYTHON_FLASK_LICENSE_FILES = LICENSE.txt docs/license.rst PYTHON_FLASK_CPE_ID_VENDOR = palletsprojects PYTHON_FLASK_CPE_ID_PRODUCT = flask diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 4d4907f5dc4..f8e71bf3985 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flit_core/json -md5 3bc52f1952b9a78361114147da63c35b flit_core-3.9.0.tar.gz -sha256 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba flit_core-3.9.0.tar.gz -# Locally computed +md5 a3381dd58e23e9826c5199b1f70318b0 flit_core-3.10.1.tar.gz +sha256 66e5b87874a0d6e39691f0e22f09306736b633548670ad3c09ec9db03c5662f7 flit_core-3.10.1.tar.gz +# Locally computed sha256 checksums sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index 34e58d03ca2..bfa80af3e3b 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLIT_CORE_VERSION = 3.9.0 +PYTHON_FLIT_CORE_VERSION = 3.10.1 PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz -PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80 +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/d5/ae/09427bea9227a33ec834ed5461432752fd5d02b14f93dd68406c91684622 PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 74766564107..3c691fbd898 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 767059d1d373ade070d38295feaa3f92 fonttools-4.47.0.tar.gz -sha256 ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf fonttools-4.47.0.tar.gz +md5 ed2b78a3c9b7982608ee605f1fd952b0 fonttools-4.54.1.tar.gz +sha256 957f669d4922f92c171ba01bef7f29410668db09f6c02111e22b2bce446f3285 fonttools-4.54.1.tar.gz # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index e2472aa1846..ebb7f143024 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.47.0 +PYTHON_FONTTOOLS_VERSION = 4.54.1 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).tar.gz -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/dd/e5/9adc30ebca9009d5ad36c7e74462ee5fc51985ca9a845fd26f9f5c99b3df +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/11/1d/70b58e342e129f9c0ce030029fb4b2b0670084bbbfe1121d008f6a1e361c 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 40a87d2ec04..b9e91cf4c34 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 e64b421e8e571623695cd414515f0081 frozenlist-1.4.1.tar.gz -sha256 c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b frozenlist-1.4.1.tar.gz +md5 0882f528872840df39091fb5085e258a frozenlist-1.5.0.tar.gz +sha256 81d5af29e61b9c8348e876d442253723928dce6433e0e76cd925cd83f1b4b817 frozenlist-1.5.0.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 11dcee9da4f..d6ced4b1765 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.4.1 +PYTHON_FROZENLIST_VERSION = 1.5.0 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/8f/ed/0f4cec13a93c02c47ec32d81d11c0c1efbadf4a471e3f3ce7cad366cbbd3 PYTHON_FROZENLIST_SETUP_TYPE = pep517 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 d3103389312..8839d80c91a 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,4 +1,5 @@ -# reglinux -sha256 a1c78af957e53190e6ad726560824af5dec9435a5f2a357caa602975c61f7d62 v1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 028bd8af5a7dd853fd12c8bf627236a9 future-1.0.0.tar.gz +sha256 bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05 future-1.0.0.tar.gz # Locally computed sha256 checksums -sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt +sha256 beba04103c3a9fff928b59c77d5fbeb03a3e4bd0d7ac3d1e1f8994a21e30ee3b LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 49e22eb0ac7..698863a13d2 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -3,10 +3,10 @@ # python-future # ################################################################################ -# reglinux - bump -PYTHON_FUTURE_VERSION = v1.0.0 -PYTHON_FUTURE_SOURCE = $(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://github.com/PythonCharmers/python-future/archive/refs/tags + +PYTHON_FUTURE_VERSION = 1.0.0 +PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/a7/b2/4140c69c6a66432916b26158687e821ba631a4c9273c474343badf84d3ba 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 index 9ce52969386..4071a079191 100644 --- a/package/python-gast/python-gast.hash +++ b/package/python-gast/python-gast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/gast/json -md5 907c689e3fdbc7a48cc010e665195baa gast-0.5.4.tar.gz -sha256 9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97 gast-0.5.4.tar.gz +md5 4a088eca6fd6bae16bc2fd2ff828de51 gast-0.6.0.tar.gz +sha256 88fc5300d32c7ac6ca7b515310862f71e6fdf2c029bbec7c66c0f5dd47b6b1fb gast-0.6.0.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 index 0db1dbe93eb..771d7a4be48 100644 --- a/package/python-gast/python-gast.mk +++ b/package/python-gast/python-gast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GAST_VERSION = 0.5.4 +PYTHON_GAST_VERSION = 0.6.0 PYTHON_GAST_SOURCE = gast-$(PYTHON_GAST_VERSION).tar.gz -PYTHON_GAST_SITE = https://files.pythonhosted.org/packages/e4/41/f26f62ebef1a80148e20951a6e9ef4d0ebbe2090124bc143da26e12a934c +PYTHON_GAST_SITE = https://files.pythonhosted.org/packages/3c/14/c566f5ca00c115db7725263408ff952b8ae6d6a4e792ef9c84e77d9af7a1 PYTHON_GAST_SETUP_TYPE = setuptools PYTHON_GAST_LICENSE = BSD-3-Clause PYTHON_GAST_LICENSE_FILES = LICENSE diff --git a/package/python-git/python-git.hash b/package/python-git/python-git.hash index a9798717960..44b91662dd5 100644 --- a/package/python-git/python-git.hash +++ b/package/python-git/python-git.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/gitpython/json -md5 db4f2a27c8abc4a7e25504e3aeab4a84 GitPython-3.1.40.tar.gz -sha256 22b126e9ffb671fdd0c129796343a02bf67bf2994b35449ffc9321aa755e18a4 GitPython-3.1.40.tar.gz +md5 350a6dd0d1d560e0af82733592e8dbb3 GitPython-3.1.43.tar.gz +sha256 35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c GitPython-3.1.43.tar.gz # Locally computed sha256 checksums sha256 86fc94c321a9afbc11514713511bafded225f25100dcc0f7350e82bc231b8beb LICENSE diff --git a/package/python-git/python-git.mk b/package/python-git/python-git.mk index 91d6b07ab19..9975af91984 100644 --- a/package/python-git/python-git.mk +++ b/package/python-git/python-git.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GIT_VERSION = 3.1.40 +PYTHON_GIT_VERSION = 3.1.43 PYTHON_GIT_SOURCE = GitPython-$(PYTHON_GIT_VERSION).tar.gz -PYTHON_GIT_SITE = https://files.pythonhosted.org/packages/0d/b2/37265877ae607a2cbf9a471f4581dbf5ed13a501b90cb4c773f9ccfff3ea +PYTHON_GIT_SITE = https://files.pythonhosted.org/packages/b6/a1/106fd9fa2dd989b6fb36e5893961f82992cf676381707253e0bf93eb1662 PYTHON_GIT_LICENSE = BSD-3-Clause PYTHON_GIT_LICENSE_FILES = LICENSE PYTHON_GIT_SETUP_TYPE = setuptools diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index 4a194ad41e2..5d722a1b958 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 b263ea268692cfe687d29d52daab4770 python-gnupg-0.5.2.tar.gz -sha256 01d8013931c9fa3f45824bbea7054c03d6e11f258a72e7e086e168dbcb91854c python-gnupg-0.5.2.tar.gz +md5 48c77a551bed992d19f7a99e3c6fb9d6 python-gnupg-0.5.3.tar.gz +sha256 290d8ddb9cd63df96cfe9284b9b265f19fd6e145e5582dc58fd7271f026d0a47 python-gnupg-0.5.3.tar.gz # Locally computed sha256 checksums sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index ddf2287f9b7..00c1b9edde4 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.5.2 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/5d/4425390ad81d22b330a1b0df204c4d39fb3cb7c39e081d51e9f7426ce716 +PYTHON_GNUPG_VERSION = 0.5.3 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/85/61/2df3cd6f49dbb2d4a6a567cac1d803e3a50d86207e196d0f9e67a48664f7 PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python diff --git a/package/python-google-api-core/Config.in b/package/python-google-api-core/Config.in index 689923a2f48..5ddc8b3b226 100644 --- a/package/python-google-api-core/Config.in +++ b/package/python-google-api-core/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_PYTHON_GOOGLE_API_CORE bool "python-google-api-core" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # python-proto-plus select BR2_PACKAGE_PYTHON_GOOGLE_AUTH # runtime select BR2_PACKAGE_PYTHON_GOOGLEAPIS_COMMON_PROTOS # runtime + select BR2_PACKAGE_PYTHON_PROTO_PLUS # runtime select BR2_PACKAGE_PYTHON_PROTOBUF # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime help diff --git a/package/python-google-api-core/python-google-api-core.hash b/package/python-google-api-core/python-google-api-core.hash index 5a1cd7f1cb9..397ce7cb40b 100644 --- a/package/python-google-api-core/python-google-api-core.hash +++ b/package/python-google-api-core/python-google-api-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-api-core/json -md5 58a4ce34a405e514cdb5295c80834cfd google-api-core-2.15.0.tar.gz -sha256 abc978a72658f14a2df1e5e12532effe40f94f868f6e23d95133bd6abcca35ca google-api-core-2.15.0.tar.gz +md5 b69067b81abd55aa7eecc22858ea326c google_api_core-2.22.0.tar.gz +sha256 26f8d76b96477db42b55fd02a33aae4a42ec8b86b98b94969b7333a2c828bf35 google_api_core-2.22.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-google-api-core/python-google-api-core.mk b/package/python-google-api-core/python-google-api-core.mk index 84042d8d7ac..b48d934e73e 100644 --- a/package/python-google-api-core/python-google-api-core.mk +++ b/package/python-google-api-core/python-google-api-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_API_CORE_VERSION = 2.15.0 -PYTHON_GOOGLE_API_CORE_SOURCE = google-api-core-$(PYTHON_GOOGLE_API_CORE_VERSION).tar.gz -PYTHON_GOOGLE_API_CORE_SITE = https://files.pythonhosted.org/packages/2c/e4/56b14d35057a23cab9067dd8fb841407d05d32b5d6c7a3c66c1360e8a7c0 +PYTHON_GOOGLE_API_CORE_VERSION = 2.22.0 +PYTHON_GOOGLE_API_CORE_SOURCE = google_api_core-$(PYTHON_GOOGLE_API_CORE_VERSION).tar.gz +PYTHON_GOOGLE_API_CORE_SITE = https://files.pythonhosted.org/packages/00/c2/425f97c2087affbd452a05d3faa08d97de333f2ca554733e1becab55ee4e PYTHON_GOOGLE_API_CORE_SETUP_TYPE = setuptools PYTHON_GOOGLE_API_CORE_LICENSE = Apache-2.0 PYTHON_GOOGLE_API_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-google-auth/python-google-auth.hash b/package/python-google-auth/python-google-auth.hash index 9c201391f47..ef0ceaeb60c 100644 --- a/package/python-google-auth/python-google-auth.hash +++ b/package/python-google-auth/python-google-auth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-auth/json -md5 718e1a2c55baf3b019e9a42524812113 google-auth-2.26.1.tar.gz -sha256 54385acca5c0fbdda510cd8585ba6f3fcb06eeecf8a6ecca39d3ee148b092590 google-auth-2.26.1.tar.gz +md5 8dba1c171af4d945fb479ab27a0aac38 google_auth-2.36.0.tar.gz +sha256 545e9618f2df0bcbb7dcbc45a546485b1212624716975a1ea5ae8149ce769ab1 google_auth-2.36.0.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-google-auth/python-google-auth.mk b/package/python-google-auth/python-google-auth.mk index 02c8c1164f8..f2ccc2e3de6 100644 --- a/package/python-google-auth/python-google-auth.mk +++ b/package/python-google-auth/python-google-auth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_AUTH_VERSION = 2.26.1 -PYTHON_GOOGLE_AUTH_SOURCE = google-auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz -PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/bc/c0/b5119831db4888e703b2adaa912709931181678ae3a50ca08d51a3904765 +PYTHON_GOOGLE_AUTH_VERSION = 2.36.0 +PYTHON_GOOGLE_AUTH_SOURCE = google_auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz +PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/6a/71/4c5387d8a3e46e3526a8190ae396659484377a73b33030614dd3b28e7ded PYTHON_GOOGLE_AUTH_SETUP_TYPE = setuptools PYTHON_GOOGLE_AUTH_LICENSE = Apache-2.0 PYTHON_GOOGLE_AUTH_LICENSE_FILES = LICENSE diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.hash b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash index 1169e945e98..408f07994de 100644 --- a/package/python-googleapis-common-protos/python-googleapis-common-protos.hash +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/googleapis-common-protos/json -md5 148bfe9b5a92663c5ff0a6700453ebad googleapis-common-protos-1.62.0.tar.gz -sha256 83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277 googleapis-common-protos-1.62.0.tar.gz +md5 cdb94d19ca05b4f16da10bbf39da2347 googleapis_common_protos-1.65.0.tar.gz +sha256 334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0 googleapis_common_protos-1.65.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.mk b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk index ca943a1cd37..3f43f1516e5 100644 --- a/package/python-googleapis-common-protos/python-googleapis-common-protos.mk +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION = 1.62.0 -PYTHON_GOOGLEAPIS_COMMON_PROTOS_SOURCE = googleapis-common-protos-$(PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION).tar.gz -PYTHON_GOOGLEAPIS_COMMON_PROTOS_SITE = https://files.pythonhosted.org/packages/4a/5f/eb12d721b45d20a977289d674e179995a0ddab1684d2c61b29a63d43a5f1 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION = 1.65.0 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SOURCE = googleapis_common_protos-$(PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION).tar.gz +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SITE = https://files.pythonhosted.org/packages/53/3b/1599ceafa875ffb951480c8c74f4b77646a6b80e80970698f2aa93c216ce PYTHON_GOOGLEAPIS_COMMON_PROTOS_SETUP_TYPE = setuptools PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE = Apache-2.0 PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE_FILES = LICENSE diff --git a/package/python-gpiozero/Config.in b/package/python-gpiozero/Config.in index 16f512c516f..1944769f7e7 100644 --- a/package/python-gpiozero/Config.in +++ b/package/python-gpiozero/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_PYTHON_GPIOZERO bool "python-gpiozero" depends on BR2_arm || BR2_aarch64 # REG select BR2_PACKAGE_PYTHON_COLORZERO # runtime - select BR2_PACKAGE_PYTHON_RPI_GPIO # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help A simple interface to GPIO devices with Raspberry Pi. diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 61e7f053466..7ed4ff13a38 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 170495b0af3b63ca40ca637dd6e5c6ef greenlet-3.0.3.tar.gz -sha256 43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 greenlet-3.0.3.tar.gz +md5 13a71396abdf249280fa25d258acf435 greenlet-3.1.1.tar.gz +sha256 4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 greenlet-3.1.1.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 1af104519ba..5575ddaff5d 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 3.0.3 +PYTHON_GREENLET_VERSION = 3.1.1 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/17/14/3bddb1298b9a6786539ac609ba4b7c9c0842e12aa73aaa4d8d73ec8f8185 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/2f/ff/df5fede753cc10f6a5be0931204ea30c35fa2f2ea7a35b25bdaf4fe40e46 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in index 1cdd0d3f67f..0b6da0a9c18 100644 --- a/package/python-grpc-requests/Config.in +++ b/package/python-grpc-requests/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS bool "python-grpc-requests" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # python-google-api-core, python-protobuf depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio depends on BR2_INSTALL_LIBSTDCPP # python-grpcio @@ -7,12 +8,14 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime select BR2_PACKAGE_PYTHON_GRPCIO # runtime select BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION # runtime + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime help grpc for Humans. grpc reflection support client. https://github.com/wesky93/grpc_requests comment "python-grpcio-requests needs a toolchain w/ C++" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpc-requests/python-grpc-requests.hash b/package/python-grpc-requests/python-grpc-requests.hash index c816a65b50f..aeb5336a4c8 100644 --- a/package/python-grpc-requests/python-grpc-requests.hash +++ b/package/python-grpc-requests/python-grpc-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpc-requests/json -md5 39f0d7ef45ab3620d8b63c2408af35b0 grpc_requests-0.1.13.tar.gz -sha256 30a00493b206156b94be21f641edcbef5ea69fb43daf503390da661123520521 grpc_requests-0.1.13.tar.gz +md5 6d63bed1f4a80fc3e59191ce69903d31 grpc_requests-0.1.20.tar.gz +sha256 a76744d781c5a7bf3abde8dc778d24c4e17deb39d173d85096ff3caee3d15250 grpc_requests-0.1.20.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-grpc-requests/python-grpc-requests.mk b/package/python-grpc-requests/python-grpc-requests.mk index 9ffd73d4248..7fecdf5a3cf 100644 --- a/package/python-grpc-requests/python-grpc-requests.mk +++ b/package/python-grpc-requests/python-grpc-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPC_REQUESTS_VERSION = 0.1.13 +PYTHON_GRPC_REQUESTS_VERSION = 0.1.20 PYTHON_GRPC_REQUESTS_SOURCE = grpc_requests-$(PYTHON_GRPC_REQUESTS_VERSION).tar.gz -PYTHON_GRPC_REQUESTS_SITE = https://files.pythonhosted.org/packages/46/51/8981bce4ca61bce1c7b7a12dd04f6cbd35c4ea874842b06283f6bbc9a0e8 +PYTHON_GRPC_REQUESTS_SITE = https://files.pythonhosted.org/packages/92/84/f5a3874a6e10448d8c198253d2c79f7b34a23fb4a96b78a648dc468913a6 PYTHON_GRPC_REQUESTS_SETUP_TYPE = setuptools PYTHON_GRPC_REQUESTS_LICENSE = Apache-2.0 PYTHON_GRPC_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.hash b/package/python-grpcio-reflection/python-grpcio-reflection.hash index d17087d4bb8..a64fbeae54c 100644 --- a/package/python-grpcio-reflection/python-grpcio-reflection.hash +++ b/package/python-grpcio-reflection/python-grpcio-reflection.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpcio-reflection/json -md5 f93b042f8092cf1818f249518668a78a grpcio-reflection-1.60.0.tar.gz -sha256 3f6c0c73ba8f20d1420c5e72fc4dd0389fac346ed8fb32a28e6e1967b44fff35 grpcio-reflection-1.60.0.tar.gz +md5 e9a0f06f8886b5f95da4e599b0960ef5 grpcio_reflection-1.67.1.tar.gz +sha256 507d9785a72032816e9bb5add4a660c655813a6bc1537b957822c652c88bf458 grpcio_reflection-1.67.1.tar.gz # Locally computed sha256 checksums sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.mk b/package/python-grpcio-reflection/python-grpcio-reflection.mk index b3d2fdffa84..4e8c3e8dc38 100644 --- a/package/python-grpcio-reflection/python-grpcio-reflection.mk +++ b/package/python-grpcio-reflection/python-grpcio-reflection.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPCIO_REFLECTION_VERSION = 1.60.0 -PYTHON_GRPCIO_REFLECTION_SOURCE = grpcio-reflection-$(PYTHON_GRPCIO_REFLECTION_VERSION).tar.gz -PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/33/3a/e257225b8fd9f05d2af3e363459f0d074ca684438667892ea3215e2162ca +PYTHON_GRPCIO_REFLECTION_VERSION = 1.67.1 +PYTHON_GRPCIO_REFLECTION_SOURCE = grpcio_reflection-$(PYTHON_GRPCIO_REFLECTION_VERSION).tar.gz +PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/17/61/618d56bd1f7069dea5fee8fa6efb5e6548b6edb52000ef1a7b242c0c1b04 PYTHON_GRPCIO_REFLECTION_SETUP_TYPE = setuptools PYTHON_GRPCIO_REFLECTION_LICENSE = Apache-2.0 PYTHON_GRPCIO_REFLECTION_LICENSE_FILES = LICENSE diff --git a/package/python-grpcio/python-grpcio.hash b/package/python-grpcio/python-grpcio.hash index 39366f576eb..5784e4758c9 100644 --- a/package/python-grpcio/python-grpcio.hash +++ b/package/python-grpcio/python-grpcio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/grpcio/json -md5 480bfb7435426de392a883e6516aae79 grpcio-1.60.0.tar.gz -sha256 2199165a1affb666aa24adf0c97436686d0a61bc5fc113c037701fb7c7fceb96 grpcio-1.60.0.tar.gz +md5 f1e17b3bf215880d87fb8d853bd5dc4c grpcio-1.67.1.tar.gz +sha256 3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732 grpcio-1.67.1.tar.gz # Locally computed sha256 checksums sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio/python-grpcio.mk b/package/python-grpcio/python-grpcio.mk index 3d264de4afc..ed854b50987 100644 --- a/package/python-grpcio/python-grpcio.mk +++ b/package/python-grpcio/python-grpcio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GRPCIO_VERSION = 1.60.0 +PYTHON_GRPCIO_VERSION = 1.67.1 PYTHON_GRPCIO_SOURCE = grpcio-$(PYTHON_GRPCIO_VERSION).tar.gz -PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/61/38/c615b5c2be690fb31871f294cc08a96e598b085b8d07c5967a5018e0b90c +PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/20/53/d9282a66a5db45981499190b77790570617a604a38f3d103d0400974aeb5 PYTHON_GRPCIO_SETUP_TYPE = setuptools PYTHON_GRPCIO_LICENSE = Apache-2.0 PYTHON_GRPCIO_LICENSE_FILES = LICENSE diff --git a/package/python-gunicorn/python-gunicorn.hash b/package/python-gunicorn/python-gunicorn.hash index bd4dc1b3ca6..5639697c515 100644 --- a/package/python-gunicorn/python-gunicorn.hash +++ b/package/python-gunicorn/python-gunicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/gunicorn/json -md5 cb41319d6929842c5af7003d48c513a2 gunicorn-21.2.0.tar.gz -sha256 88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033 gunicorn-21.2.0.tar.gz +md5 18b666db62a890579170639961c5b064 gunicorn-23.0.0.tar.gz +sha256 f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec gunicorn-23.0.0.tar.gz # Locally computed sha256 checksums -sha256 fc71b8f2ce774a47090c106ac5d1145359f5c0e25a0d9ab42acacd230f596936 LICENSE +sha256 6646cdbba2e99e3421dd18c22173579a1fde347e831dae6adee80eefe331e951 LICENSE diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index effa93e5ef6..8e3b87fd515 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GUNICORN_VERSION = 21.2.0 +PYTHON_GUNICORN_VERSION = 23.0.0 PYTHON_GUNICORN_SOURCE = gunicorn-$(PYTHON_GUNICORN_VERSION).tar.gz -PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/06/89/acd9879fa6a5309b4bf16a5a8855f1e58f26d38e0c18ede9b3a70996b021 +PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/34/72/9614c465dc206155d93eff0ca20d42e1e35afc533971379482de953521a4 PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk index 2a268923881..08578649654 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk @@ -9,7 +9,6 @@ PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_F PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f 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 +PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = hatch $(eval $(host-python-package)) diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index 46e59f8aa0e..f63d8b26feb 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -9,9 +9,7 @@ PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/f5/c9/54bb4fa27b4e4a014ef3bb17710cdf692b3aa2cbc7953da885f1bf7e06ea PYTHON_HATCH_VCS_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 +PYTHON_HATCH_VCS_SETUP_TYPE = hatch +HOST_PYTHON_HATCH_VCS_DEPENDENCIES = host-python-setuptools-scm $(eval $(host-python-package)) diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index ad33295ad7c..d4d98d85df1 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 8823961dc3ba19a6e63ab6329b3b852f hiredis-2.3.2.tar.gz -sha256 733e2456b68f3f126ddaf2cd500a33b25146c3676b97ea843665717bda0c5d43 hiredis-2.3.2.tar.gz +md5 c0b7f7def9f945e8a900a4275df2d3af hiredis-3.0.0.tar.gz +sha256 fed8581ae26345dea1f1e0d1a96e05041a727a45e7d8d459164583e23c6ac441 hiredis-3.0.0.tar.gz # Locally computed sha256 checksums sha256 3256b5b77e98aa34ff31a4d2c2c10f7f177b0f3058753a6044430a168987353b LICENSE sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index d86fb109dc4..59e036c8450 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 2.3.2 +PYTHON_HIREDIS_VERSION = 3.0.0 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/fe/2d/a5ae61da1157644f7e52e088fa158ac6f5d09775112d14b1c9b9a5156bf1 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/8b/80/740fb0dfa7a42416ce8376490f41dcdb1e5deed9c3739dfe4200fad865a9 PYTHON_HIREDIS_SETUP_TYPE = setuptools PYTHON_HIREDIS_LICENSE = MIT, BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = LICENSE vendor/hiredis/COPYING diff --git a/package/python-httpcore/python-httpcore.hash b/package/python-httpcore/python-httpcore.hash index e773374c050..68c0450f943 100644 --- a/package/python-httpcore/python-httpcore.hash +++ b/package/python-httpcore/python-httpcore.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpcore/json -md5 17916ce84db1c0705af60a61bbec9061 httpcore-1.0.5.tar.gz -sha256 34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 httpcore-1.0.5.tar.gz +md5 458f9b56367cf547425bf2347bffd784 httpcore-1.0.6.tar.gz +sha256 73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f httpcore-1.0.6.tar.gz # Locally computed sha256 checksums sha256 fdcb59154c74cbaba16a11242f7740bea9f23d6feb5547917d8c5f94a80392a5 LICENSE.md diff --git a/package/python-httpcore/python-httpcore.mk b/package/python-httpcore/python-httpcore.mk index ae29d8dc8af..a4324338848 100644 --- a/package/python-httpcore/python-httpcore.mk +++ b/package/python-httpcore/python-httpcore.mk @@ -4,14 +4,12 @@ # ################################################################################ -PYTHON_HTTPCORE_VERSION = 1.0.5 +PYTHON_HTTPCORE_VERSION = 1.0.6 PYTHON_HTTPCORE_SOURCE = httpcore-$(PYTHON_HTTPCORE_VERSION).tar.gz -PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/17/b0/5e8b8674f8d203335a62fdfcfa0d11ebe09e23613c3391033cbba35f7926 -PYTHON_HTTPCORE_SETUP_TYPE = pep517 +PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/b6/44/ed0fa6a17845fb033bd885c03e842f08c1b9406c86a2e60ac1ae1b9206a6 +PYTHON_HTTPCORE_SETUP_TYPE = hatch PYTHON_HTTPCORE_LICENSE = BSD-3-Clause PYTHON_HTTPCORE_LICENSE_FILES = LICENSE.md -PYTHON_HTTPCORE_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-fancy-pypi-readme +PYTHON_HTTPCORE_DEPENDENCIES = host-python-hatch-fancy-pypi-readme $(eval $(python-package)) diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash index 381439f464e..3ffd491c9e4 100644 --- a/package/python-httpx/python-httpx.hash +++ b/package/python-httpx/python-httpx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpx/json -md5 d6035d561136590900678ec6c78698cb httpx-0.27.0.tar.gz -sha256 a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5 httpx-0.27.0.tar.gz +md5 f29763f29da610b185d2ca33937c572f httpx-0.27.2.tar.gz +sha256 f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2 httpx-0.27.2.tar.gz # Locally computed sha256 checksums sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index edba2dbb04a..21bbd48a58e 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -4,16 +4,14 @@ # ################################################################################ -PYTHON_HTTPX_VERSION = 0.27.0 +PYTHON_HTTPX_VERSION = 0.27.2 PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz -PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/5c/2d/3da5bdf4408b8b2800061c339f240c1802f2e82d55e50bd39c5a881f47f0 -PYTHON_HTTPX_SETUP_TYPE = pep517 +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/78/82/08f8c936781f67d9e6b9eeb8a0c8b4e406136ea4c3d1f89a5db71d42e0e6 +PYTHON_HTTPX_SETUP_TYPE = hatch PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md PYTHON_HTTPX_CPE_ID_VENDOR = encode PYTHON_HTTPX_CPE_ID_PRODUCT = httpx -PYTHON_HTTPX_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-fancy-pypi-readme +PYTHON_HTTPX_DEPENDENCIES = host-python-hatch-fancy-pypi-readme $(eval $(python-package)) diff --git a/package/python-humanize/python-humanize.hash b/package/python-humanize/python-humanize.hash index 871bb9bfa57..ea30ca5c22b 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 5e90552713107f756788ecdd8fbe341d humanize-4.4.0.tar.gz -sha256 efb2584565cc86b7ea87a977a15066de34cdedaf341b11c851cfcfd2b964779c humanize-4.4.0.tar.gz +md5 c37298e6bc6604b54aeb0e158c7c0512 humanize-4.11.0.tar.gz +sha256 e66f36020a2d5a974c504bd2555cf770621dbdbb6d82f94a6857c0b1ea2608be humanize-4.11.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 6155954b821..4915da2cef5 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_HUMANIZE_VERSION = 4.4.0 +PYTHON_HUMANIZE_VERSION = 4.11.0 PYTHON_HUMANIZE_SOURCE = humanize-$(PYTHON_HUMANIZE_VERSION).tar.gz -PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8c8361496b085edcab2ddcd85410735a2b6fdd044247fc5b75 -PYTHON_HUMANIZE_SETUP_TYPE = setuptools +PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/6a/40/64a912b9330786df25e58127194d4a5a7441f818b400b155e748a270f924 +PYTHON_HUMANIZE_SETUP_TYPE = hatch PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE -PYTHON_HUMANIZE_DEPENDENCIES = host-python-setuptools-scm +PYTHON_HUMANIZE_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 7b22841d885..fbf571f8068 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 31cc572cb7a6519159c927c998c64c79 idna-3.7.tar.gz -sha256 028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc idna-3.7.tar.gz +md5 28448b00665099117b6daa9887812cc4 idna-3.10.tar.gz +sha256 12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 idna-3.10.tar.gz # Locally computed sha256 checksums sha256 a59f0b0ef3635874109a4461ca44ff7a70d50696e814767bfaf721d4c9b0db0f LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index b3c012ed0d3..c7b7f6ad001 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.7 +PYTHON_IDNA_VERSION = 3.10 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/21/ed/f86a79a07470cb07819390452f178b3bef1d375f2ec021ecfc709fc7cf07 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = flit diff --git a/package/python-immutabledict/Config.in b/package/python-immutabledict/Config.in new file mode 100644 index 00000000000..51b180bf29b --- /dev/null +++ b/package/python-immutabledict/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_IMMUTABLEDICT + bool "python-immutabledict" + help + Immutable wrapper around dictionaries (a fork of + frozendict). + + https://github.com/corenting/immutabledict diff --git a/package/python-immutabledict/python-immutabledict.hash b/package/python-immutabledict/python-immutabledict.hash new file mode 100644 index 00000000000..8232bc6e0ea --- /dev/null +++ b/package/python-immutabledict/python-immutabledict.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/immutabledict/json +md5 6796be00860cc5cf45ae839b9ed2de52 immutabledict-4.2.0.tar.gz +sha256 e003fd81aad2377a5a758bf7e1086cf3b70b63e9a5cc2f46bce8d0a2b4727c5f immutabledict-4.2.0.tar.gz +# Locally computed sha256 checksums +sha256 347f918d37d4e0556a0695d34b9fb87fa9bbe808d54949851789c6c1fc91c61f LICENSE diff --git a/package/python-immutabledict/python-immutabledict.mk b/package/python-immutabledict/python-immutabledict.mk new file mode 100644 index 00000000000..99089f0d6a3 --- /dev/null +++ b/package/python-immutabledict/python-immutabledict.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-immutabledict +# +################################################################################ + +PYTHON_IMMUTABLEDICT_VERSION = 4.2.0 +PYTHON_IMMUTABLEDICT_SOURCE = immutabledict-$(PYTHON_IMMUTABLEDICT_VERSION).tar.gz +PYTHON_IMMUTABLEDICT_SITE = https://files.pythonhosted.org/packages/55/f4/710c84db4d77767176342913ac6b25f43aaed6d0a0bdb9168a8d2936d9c7 +PYTHON_IMMUTABLEDICT_SETUP_TYPE = poetry +PYTHON_IMMUTABLEDICT_LICENSE = MIT +PYTHON_IMMUTABLEDICT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-incremental/python-incremental.hash b/package/python-incremental/python-incremental.hash index 456e8ca16d1..7707495a0a3 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 9fffa2490ca649550c79a78e85ef2eef incremental-22.10.0.tar.gz -sha256 912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 incremental-22.10.0.tar.gz +md5 d946fb1a369c77693b4dab8ac9b13596 incremental-24.7.2.tar.gz +sha256 fb4f1d47ee60efe87d4f6f0ebb5f70b9760db2b2574c59c8e8912be4ebd464c9 incremental-24.7.2.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 4b032d26490..9a1432ebd21 100644 --- a/package/python-incremental/python-incremental.mk +++ b/package/python-incremental/python-incremental.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INCREMENTAL_VERSION = 22.10.0 +PYTHON_INCREMENTAL_VERSION = 24.7.2 PYTHON_INCREMENTAL_SOURCE = incremental-$(PYTHON_INCREMENTAL_VERSION).tar.gz -PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/86/42/9e87f04fa2cd40e3016f27a4b4572290e95899c6dce317e2cdb580f3ff09 +PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/27/87/156b374ff6578062965afe30cc57627d35234369b3336cf244b240c8d8e6 PYTHON_INCREMENTAL_SETUP_TYPE = setuptools PYTHON_INCREMENTAL_LICENSE = MIT PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE diff --git a/package/python-inflect/Config.in b/package/python-inflect/Config.in index daf6bd4a323..c2773aae451 100644 --- a/package/python-inflect/Config.in +++ b/package/python-inflect/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_PYTHON_INFLECT bool "python-inflect" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_PYDANTIC # runtime - select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime + select BR2_PACKAGE_PYTHON_TYPEGUARD # runtime help Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words. diff --git a/package/python-inflect/python-inflect.hash b/package/python-inflect/python-inflect.hash index 3faa4cc5a53..8b373b8a7e6 100644 --- a/package/python-inflect/python-inflect.hash +++ b/package/python-inflect/python-inflect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/inflect/json -md5 61c670cf5c4d09314f6a4d3b99d3b98d inflect-7.0.0.tar.gz -sha256 63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e inflect-7.0.0.tar.gz +md5 7201084aafe65ed5925a8f055f9281a7 inflect-7.4.0.tar.gz +sha256 904baa17cc2cb74827a6c27b95692e95670dadc72b208b3e8c1c05aeed47026b inflect-7.4.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-inflect/python-inflect.mk b/package/python-inflect/python-inflect.mk index cef4c066273..926f2c43efb 100644 --- a/package/python-inflect/python-inflect.mk +++ b/package/python-inflect/python-inflect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLECT_VERSION = 7.0.0 +PYTHON_INFLECT_VERSION = 7.4.0 PYTHON_INFLECT_SOURCE = inflect-$(PYTHON_INFLECT_VERSION).tar.gz -PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/9f/90/1d0a889847fdce963ebe9684de24a749e4fad627bf595e9f0d32730f85a8 +PYTHON_INFLECT_SITE = https://files.pythonhosted.org/packages/e1/dc/02614acece4d578e709c606594c989cfd9f15cf6401444e5603e60df9b26 PYTHON_INFLECT_SETUP_TYPE = setuptools PYTHON_INFLECT_LICENSE = MIT PYTHON_INFLECT_LICENSE_FILES = LICENSE diff --git a/package/python-influxdb/python-influxdb.hash b/package/python-influxdb/python-influxdb.hash index e86bd8c2ca3..b8aa5f97379 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 e5888a7023e9a49d8a372538b625f908 influxdb-5.3.1.tar.gz -sha256 46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a influxdb-5.3.1.tar.gz +md5 6e1b7c63785720c72b901e2a8c1aca96 influxdb-5.3.2.tar.gz +sha256 58c647f6043712dd86e9aee12eb4ccfbbb5415467bc9910a48aa8c74c1108970 influxdb-5.3.2.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 d77cb89d2de..47bc0e7d20a 100644 --- a/package/python-influxdb/python-influxdb.mk +++ b/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.3.1 +PYTHON_INFLUXDB_VERSION = 5.3.2 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/86/4f/a9c524576677c1694b149e09d4fd6342e4a1d9a5f409e437168a14d6d150 +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/12/d4/4c1bd3a8f85403fad3137a7e44f7882b0366586b7c27d12713493516f1c7 PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 99e946f0ab5..7c6cd149077 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -7,9 +7,9 @@ PYTHON_INICONFIG_VERSION = 2.0.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 -PYTHON_INICONFIG_SETUP_TYPE = pep517 +PYTHON_INICONFIG_SETUP_TYPE = hatch PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE -PYTHON_INICONFIG_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs +PYTHON_INICONFIG_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 87cc3969b07..8ab55169103 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,11 +1,9 @@ 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 select BR2_PACKAGE_PYTHON_MATPLOTLIB_INLINE # runtime - select BR2_PACKAGE_PYTHON_PICKLESHARE # runtime select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 33f70885b35..ca2b0ea16c0 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 eee726e4cef5fd680110a899b4e5e2cb ipython-8.20.0.tar.gz -sha256 2f21bd3fc1d51550c89ee3944ae04bbc7bc79e129ea0937da6e6c68bfdbf117a ipython-8.20.0.tar.gz +md5 728e73b95f7a3078fcbce50e64396bc3 ipython-8.29.0.tar.gz +sha256 40b60e15b22591450eef73e40a027cf77bd652e757523eebc5bd7c7c498290eb ipython-8.29.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 d3c2c05a055..7e7806b12d2 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.20.0 +PYTHON_IPYTHON_VERSION = 8.29.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c5/d1/187474d64bdefcb6804c1a3a1597d9e94f287e71c06f50f7784d56833fb7 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/85/e0/a3f36dde97e12121106807d80485423ae4c5b27ce60d40d4ab0bab18a9db PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index 080daa4693f..3676e9e93ec 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -7,9 +7,8 @@ PYTHON_ISO8601_VERSION = 2.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15 -PYTHON_ISO8601_SETUP_TYPE = pep517 +PYTHON_ISO8601_SETUP_TYPE = poetry PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE -PYTHON_ISO8601_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-iterable-io/Config.in b/package/python-iterable-io/Config.in new file mode 100644 index 00000000000..e85159eb2f2 --- /dev/null +++ b/package/python-iterable-io/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ITERABLE_IO + bool "python-iterable-io" + help + Adapt generators and other iterables to a file-like + interface. + + https://github.com/pR0Ps/iterable-io diff --git a/package/python-iterable-io/python-iterable-io.hash b/package/python-iterable-io/python-iterable-io.hash new file mode 100644 index 00000000000..aae6ad547e4 --- /dev/null +++ b/package/python-iterable-io/python-iterable-io.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/iterable-io/json +md5 d6027af37f8e15edd346bdff6d5c5e3c iterable-io-1.0.0.tar.gz +sha256 fb9e1b739587a9ba0d5c60a3e1eb71246761583bc9f18b3c35bb112b44b18c3c iterable-io-1.0.0.tar.gz +# Locally computed sha256 checksums +sha256 5de72116ec3738168bbaea5bd3405d161246ac542456470dc074f23d336252c0 README.md diff --git a/package/python-iterable-io/python-iterable-io.mk b/package/python-iterable-io/python-iterable-io.mk new file mode 100644 index 00000000000..e59c7d64559 --- /dev/null +++ b/package/python-iterable-io/python-iterable-io.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-iterable-io +# +################################################################################ + +PYTHON_ITERABLE_IO_VERSION = 1.0.0 +PYTHON_ITERABLE_IO_SOURCE = iterable-io-$(PYTHON_ITERABLE_IO_VERSION).tar.gz +PYTHON_ITERABLE_IO_SITE = https://files.pythonhosted.org/packages/40/be/27d59b5c1d74ecbd26c1142f84b61d6cb04f0d0337697149645f34406b2d +PYTHON_ITERABLE_IO_SETUP_TYPE = setuptools +PYTHON_ITERABLE_IO_LICENSE = LGPL-3.0 +PYTHON_ITERABLE_IO_LICENSE_FILES = README.md + +$(eval $(python-package)) diff --git a/package/python-janus/Config.in b/package/python-janus/Config.in index 924c1fa97d5..1b23653f76a 100644 --- a/package/python-janus/Config.in +++ b/package/python-janus/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JANUS bool "python-janus" - select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Mixed sync-async queue to interoperate between asyncio tasks and classic threads. diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 7f7ce35caa5..9cdf8fdde7d 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 2d8c0b884c14f18fc5223858eb16461e janus-1.0.0.tar.gz -sha256 df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612 janus-1.0.0.tar.gz +md5 0e3053f8b41e447e3cabed4075ac9116 janus-1.1.0.tar.gz +sha256 0634df8b2b31f8afda4311abcf7fea912686fef717d13769eeaa01ae08d2b84c janus-1.1.0.tar.gz # Locally computed sha256 checksums sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index 43df87870d9..a6cbfc86db0 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 1.0.0 +PYTHON_JANUS_VERSION = 1.1.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/b8/a8/facab7275d7d3d2032f375843fe46fad1cfa604a108b5a238638d4615bdc +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/45/50/112a19f28a11b545c4c95de29c50a06fa9381a2432eaabbf9316bbd4e046 PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.hash b/package/python-jaraco-classes/python-jaraco-classes.hash index 701aa07b830..370ec5e2f65 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 26ae65ab8cda78455ddab0b05fe0a553 jaraco.classes-3.3.0.tar.gz -sha256 c063dd08e89217cee02c8d5e5ec560f2c8ce6cdc2fcdc2e68f7b2e5547ed3621 jaraco.classes-3.3.0.tar.gz +md5 994fb3f2ce9bb538ca6e8abf6ebbdf9c jaraco.classes-3.4.0.tar.gz +sha256 47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd jaraco.classes-3.4.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk index 45950556b08..0ba39721bba 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 = 3.3.0 +PYTHON_JARACO_CLASSES_VERSION = 3.4.0 PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz -PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/8b/de/d0a466824ce8b53c474bb29344e6d6113023eb2c3793d1c58c0908588bfa +PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/06/c0/ed4a27bc5571b99e3cff68f8a9fa5b56ff7df1c2251cc715a652ddd26402 PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools diff --git a/package/python-jaraco-collections/Config.in b/package/python-jaraco-collections/Config.in index a6fa721d4d5..6cb1024b88d 100644 --- a/package/python-jaraco-collections/Config.in +++ b/package/python-jaraco-collections/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_JARACO_COLLECTIONS bool "python-jaraco-collections" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-jaraco-text -> python-inflect -> python-pydantic -> python-pydantic-core select BR2_PACKAGE_PYTHON_JARACO_TEXT # runtime help Collection objects similar to those in stdlib by jaraco. diff --git a/package/python-jaraco-collections/python-jaraco-collections.hash b/package/python-jaraco-collections/python-jaraco-collections.hash index 0308d48641c..d3d6742f0b1 100644 --- a/package/python-jaraco-collections/python-jaraco-collections.hash +++ b/package/python-jaraco-collections/python-jaraco-collections.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.collections/json -md5 2b12f44216432f1ce2ead377fd7a2b93 jaraco.collections-5.0.0.tar.gz -sha256 1680e8d09f295f625c7ba926880175a26fdbe7092b4c76d198e30476b21cfe68 jaraco.collections-5.0.0.tar.gz +md5 33a136eb3dd4c36090270ea2d4d43e7c jaraco_collections-5.1.0.tar.gz +sha256 0e4829409d39ad18a40aa6754fee2767f4d9730c4ba66dc9df89f1d2756994c2 jaraco_collections-5.1.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-collections/python-jaraco-collections.mk b/package/python-jaraco-collections/python-jaraco-collections.mk index 1400e286ee1..3414799f443 100644 --- a/package/python-jaraco-collections/python-jaraco-collections.mk +++ b/package/python-jaraco-collections/python-jaraco-collections.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_COLLECTIONS_VERSION = 5.0.0 -PYTHON_JARACO_COLLECTIONS_SOURCE = jaraco.collections-$(PYTHON_JARACO_COLLECTIONS_VERSION).tar.gz -PYTHON_JARACO_COLLECTIONS_SITE = https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8 +PYTHON_JARACO_COLLECTIONS_VERSION = 5.1.0 +PYTHON_JARACO_COLLECTIONS_SOURCE = jaraco_collections-$(PYTHON_JARACO_COLLECTIONS_VERSION).tar.gz +PYTHON_JARACO_COLLECTIONS_SITE = https://files.pythonhosted.org/packages/8c/ed/3f0ef2bcf765b5a3d58ecad8d825874a3af1e792fa89f89ad79f090a4ccc PYTHON_JARACO_COLLECTIONS_SETUP_TYPE = setuptools PYTHON_JARACO_COLLECTIONS_LICENSE = MIT PYTHON_JARACO_COLLECTIONS_LICENSE_FILES = LICENSE diff --git a/package/python-jaraco-context/python-jaraco-context.hash b/package/python-jaraco-context/python-jaraco-context.hash index f8daa913642..a6b32260b24 100644 --- a/package/python-jaraco-context/python-jaraco-context.hash +++ b/package/python-jaraco-context/python-jaraco-context.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.context/json -md5 b40aeeda6a07dd283f2a407f622cda5b jaraco.context-4.3.0.tar.gz -sha256 4dad2404540b936a20acedec53355bdaea223acb88fd329fa6de9261c941566e jaraco.context-4.3.0.tar.gz +md5 bb22ef027077b1fa8528ef1d9840b838 jaraco_context-6.0.1.tar.gz +sha256 9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3 jaraco_context-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-context/python-jaraco-context.mk b/package/python-jaraco-context/python-jaraco-context.mk index 668855c98a2..d33521afdd0 100644 --- a/package/python-jaraco-context/python-jaraco-context.mk +++ b/package/python-jaraco-context/python-jaraco-context.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_CONTEXT_VERSION = 4.3.0 -PYTHON_JARACO_CONTEXT_SOURCE = jaraco.context-$(PYTHON_JARACO_CONTEXT_VERSION).tar.gz -PYTHON_JARACO_CONTEXT_SITE = https://files.pythonhosted.org/packages/7c/b4/fa71f82b83ebeed95fe45ce587d6cba85b7c09ef3d9f61602f92f45e90db +PYTHON_JARACO_CONTEXT_VERSION = 6.0.1 +PYTHON_JARACO_CONTEXT_SOURCE = jaraco_context-$(PYTHON_JARACO_CONTEXT_VERSION).tar.gz +PYTHON_JARACO_CONTEXT_SITE = https://files.pythonhosted.org/packages/df/ad/f3777b81bf0b6e7bc7514a1656d3e637b2e8e15fab2ce3235730b3e7a4e6 PYTHON_JARACO_CONTEXT_SETUP_TYPE = setuptools PYTHON_JARACO_CONTEXT_LICENSE = MIT PYTHON_JARACO_CONTEXT_LICENSE_FILES = LICENSE diff --git a/package/python-jaraco-functools/python-jaraco-functools.hash b/package/python-jaraco-functools/python-jaraco-functools.hash index 97db6b75fb0..69edc2384be 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 6683d6f56930d4f0b34157b083813cf3 jaraco.functools-4.0.0.tar.gz -sha256 c279cb24c93d694ef7270f970d499cab4d3813f4e08273f95398651a634f0925 jaraco.functools-4.0.0.tar.gz +md5 b8a8d165da986efa1966abd91c45348e jaraco_functools-4.1.0.tar.gz +sha256 70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d jaraco_functools-4.1.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-functools/python-jaraco-functools.mk b/package/python-jaraco-functools/python-jaraco-functools.mk index 5637b756290..e72a062fa88 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 = 4.0.0 -PYTHON_JARACO_FUNCTOOLS_SOURCE = jaraco.functools-$(PYTHON_JARACO_FUNCTOOLS_VERSION).tar.gz -PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/57/7c/fe770e264913f9a49ddb9387cca2757b8d7d26f06735c1bfbb018912afce +PYTHON_JARACO_FUNCTOOLS_VERSION = 4.1.0 +PYTHON_JARACO_FUNCTOOLS_SOURCE = jaraco_functools-$(PYTHON_JARACO_FUNCTOOLS_VERSION).tar.gz +PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/ab/23/9894b3df5d0a6eb44611c36aec777823fc2e07740dabbd0b810e19594013 PYTHON_JARACO_FUNCTOOLS_LICENSE = MIT PYTHON_JARACO_FUNCTOOLS_LICENSE_FILES = LICENSE PYTHON_JARACO_FUNCTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-jaraco-text/Config.in b/package/python-jaraco-text/Config.in index 5044ea32332..44000ccb187 100644 --- a/package/python-jaraco-text/Config.in +++ b/package/python-jaraco-text/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_JARACO_TEXT bool "python-jaraco-text" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-inflect -> python-pydantic -> python-pydantic-core select BR2_PACKAGE_PYTHON_AUTOCOMMAND # runtime - select BR2_PACKAGE_PYTHON_INFLECT # runtime select BR2_PACKAGE_PYTHON_JARACO_CONTEXT # runtime select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime select BR2_PACKAGE_PYTHON_MORE_ITERTOOLS # runtime diff --git a/package/python-jaraco-text/python-jaraco-text.hash b/package/python-jaraco-text/python-jaraco-text.hash index 704e75d6be7..1e79bf746ae 100644 --- a/package/python-jaraco-text/python-jaraco-text.hash +++ b/package/python-jaraco-text/python-jaraco-text.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.text/json -md5 9f63a5cdd56061ebd84d8175d1df3b70 jaraco.text-3.12.0.tar.gz -sha256 389e25c8d4b32e9715bf530596fab0f5cd3aa47296e43969392e18a541af592c jaraco.text-3.12.0.tar.gz +md5 3c519c7a49d6448e6dc2073d466afd39 jaraco_text-4.0.0.tar.gz +sha256 5b71fecea69ab6f939d4c906c04fee1eda76500d1641117df6ec45b865f10db0 jaraco_text-4.0.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-jaraco-text/python-jaraco-text.mk b/package/python-jaraco-text/python-jaraco-text.mk index 06b028d65f5..2d612196a6b 100644 --- a/package/python-jaraco-text/python-jaraco-text.mk +++ b/package/python-jaraco-text/python-jaraco-text.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_TEXT_VERSION = 3.12.0 -PYTHON_JARACO_TEXT_SOURCE = jaraco.text-$(PYTHON_JARACO_TEXT_VERSION).tar.gz -PYTHON_JARACO_TEXT_SITE = https://files.pythonhosted.org/packages/53/30/52edc6c9997d48b0d9fbedb6a29edab2b397968f637b76aae299a9128c34 +PYTHON_JARACO_TEXT_VERSION = 4.0.0 +PYTHON_JARACO_TEXT_SOURCE = jaraco_text-$(PYTHON_JARACO_TEXT_VERSION).tar.gz +PYTHON_JARACO_TEXT_SITE = https://files.pythonhosted.org/packages/4f/00/1b4dbbc5c6dcb87a4278cc229b2b560484bf231bba7922686c5139e5f934 PYTHON_JARACO_TEXT_SETUP_TYPE = setuptools PYTHON_JARACO_TEXT_LICENSE = MIT PYTHON_JARACO_TEXT_LICENSE_FILES = LICENSE diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash index 6bcb886a47a..75d64da7bfb 100644 --- a/package/python-jc/python-jc.hash +++ b/package/python-jc/python-jc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jc/json -md5 e042a82acf978e5dc16dd1ac9371e97a jc-1.25.2.tar.gz -sha256 97ada193495f79550f06fe0cbfb119ff470bcca57c1cc593a5cdb0008720e0b3 jc-1.25.2.tar.gz +md5 7e9454e01eafa7c8c6e415fddc7d2638 jc-1.25.3.tar.gz +sha256 fa3140ceda6cba1210d1362f363cd79a0514741e8a1dd6167db2b2e2d5f24f7b jc-1.25.3.tar.gz # Locally computed sha256 checksums sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk index c57c9e8acc0..202884f3dca 100644 --- a/package/python-jc/python-jc.mk +++ b/package/python-jc/python-jc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JC_VERSION = 1.25.2 +PYTHON_JC_VERSION = 1.25.3 PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz -PYTHON_JC_SITE = https://files.pythonhosted.org/packages/39/2e/c0d557b2ee673e2e0aef24a01e732aa232f6b1e180f339058f674f391ab8 +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/a5/82/bfb1ec7d9667bc2f922254bc62e12fd460a5de3b711518f5089df0a17180 PYTHON_JC_SETUP_TYPE = setuptools PYTHON_JC_LICENSE = MIT, BSD-3-Clause (bundled pbPlist) PYTHON_JC_LICENSE_FILES = LICENSE.md diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash index aa919681ace..f68e57cd5a8 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema-specifications/json -md5 de730f6937d1e3660a2d835c4f93f31b jsonschema_specifications-2023.12.1.tar.gz -sha256 48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc jsonschema_specifications-2023.12.1.tar.gz +md5 e8f726a5b9647031d9ee8b922cf9b56f jsonschema_specifications-2024.10.1.tar.gz +sha256 0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272 jsonschema_specifications-2024.10.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 653c839bb45..4637c14f04e 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -4,19 +4,15 @@ # ################################################################################ -PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2023.12.1 +PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2024.10.1 PYTHON_JSONSCHEMA_SPECIFICATIONS_SOURCE = jsonschema_specifications-$(PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION).tar.gz -PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/f8/b9/cc0cc592e7c195fb8a650c1d5990b10175cf13b4c97465c72ec841de9e4b -PYTHON_JSONSCHEMA_SPECIFICATIONS_SETUP_TYPE = pep517 +PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/10/db/58f950c996c793472e336ff3655b13fbcf1e3b359dcf52dcf3ed3b52c352 +PYTHON_JSONSCHEMA_SPECIFICATIONS_SETUP_TYPE = hatch PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE = MIT PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE_FILES = COPYING -PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-vcs +PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = host-python-hatch-vcs -HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = host-python-hatch-vcs # This is a runtime dependency, but we don't have the concept of # runtime dependencies for host packages. diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index 645a6657fe7..79d64f4846c 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 e758f0f6a8f3f59d754e7e35ea9f0792 jsonschema-4.20.0.tar.gz -sha256 4f614fd46d8d61258610998997743ec5492a648b33cf478c1ddc23ed4598a5fa jsonschema-4.20.0.tar.gz +md5 a2cb5fee4da011118708ab275b34f30b jsonschema-4.23.0.tar.gz +sha256 d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4 jsonschema-4.23.0.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 9e8b6e18b87..9f99628b5dd 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,19 +4,17 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.20.0 +PYTHON_JSONSCHEMA_VERSION = 4.23.0 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/a8/74/77bf12d3dd32b764692a71d4200f03429c41eee2e8a9225d344d91c03aff -PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/38/2e/03362ee4034a4c917f697890ccd4aec0800ccf9ded7f511971c75451deec +PYTHON_JSONSCHEMA_SETUP_TYPE = hatch PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE PYTHON_JSONSCHEMA_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs diff --git a/package/python-keyring/Config.in b/package/python-keyring/Config.in index 6c03317f617..55295ab7abd 100644 --- a/package/python-keyring/Config.in +++ b/package/python-keyring/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PYTHON_KEYRING depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ENTRYPOINTS # runtime select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime + select BR2_PACKAGE_PYTHON_JARACO_CONTEXT # runtime + select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime select BR2_PACKAGE_PYTHON_JEEPNEY # runtime select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime help diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 50ac3df3427..ddbe52fb353 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 ed5df85d33c36bb268a79d4472a13312 keyring-24.2.0.tar.gz -sha256 ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509 keyring-24.2.0.tar.gz +md5 abbca9e5a78bdb506d3ba0bfa3fe3642 keyring-25.5.0.tar.gz +sha256 4c753b3ec91717fe713c4edd522d625889d8973a349b0e582622f49766de58e6 keyring-25.5.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 87b51a89602..1972f5f6de8 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 24.2.0 +PYTHON_KEYRING_VERSION = 25.5.0 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/14/c5/7a2a66489c66ee29562300ddc5be63636f70b4025a74df71466e62d929b1 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/f6/24/64447b13df6a0e2797b586dad715766d756c932ce8ace7f67bd384d76ae0 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.hash b/package/python-kiwisolver/python-kiwisolver.hash index 900027a88b1..c4ae255377e 100644 --- a/package/python-kiwisolver/python-kiwisolver.hash +++ b/package/python-kiwisolver/python-kiwisolver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/kiwisolver/json -md5 20dea6992699d6be8a563995d7fe0309 kiwisolver-1.4.5.tar.gz -sha256 e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec kiwisolver-1.4.5.tar.gz +md5 3e1406c57a4fdce3804096f57a9b4855 kiwisolver-1.4.7.tar.gz +sha256 9893ff81bd7107f7b685d3017cc6583daadb4fc26e4a888350df530e41980a60 kiwisolver-1.4.7.tar.gz # Locally computed sha256 checksums -sha256 26da8d49744796f2601fb5fe9e5d8b9e8102064ca60a8dc1825b6177cb05450c LICENSE +sha256 238e69906d7e507a94832b9831131862c4176d58c002b388e2e99db5d83677d2 LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.mk b/package/python-kiwisolver/python-kiwisolver.mk index 04a0779b37d..4220e1c8904 100644 --- a/package/python-kiwisolver/python-kiwisolver.mk +++ b/package/python-kiwisolver/python-kiwisolver.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KIWISOLVER_VERSION = 1.4.5 +PYTHON_KIWISOLVER_VERSION = 1.4.7 PYTHON_KIWISOLVER_SOURCE = kiwisolver-$(PYTHON_KIWISOLVER_VERSION).tar.gz -PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/b9/2d/226779e405724344fc678fcc025b812587617ea1a48b9442628b688e85ea +PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/85/4d/2255e1c76304cbd60b48cee302b66d1dde4468dc5b1160e4b7cb43778f2a PYTHON_KIWISOLVER_LICENSE = BSD-3-Clause PYTHON_KIWISOLVER_LICENSE_FILES = LICENSE PYTHON_KIWISOLVER_SETUP_TYPE = setuptools diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash index 9ea778c8da5..35ee842a4ae 100644 --- a/package/python-lark/python-lark.hash +++ b/package/python-lark/python-lark.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lark/json -md5 124c36ea3b68783f06cea5fe6ee8a6f2 lark-1.1.8.tar.gz -sha256 7ef424db57f59c1ffd6f0d4c2b705119927f566b68c0fe1942dddcc0e44391a5 lark-1.1.8.tar.gz +md5 99760ed81904c56b2db2b7ab7723063e lark-1.2.2.tar.gz +sha256 ca807d0162cd16cef15a8feecb862d7319e7a09bdb13aef927968e45040fed80 lark-1.2.2.tar.gz # Locally computed sha256 checksums -sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 LICENSE +sha256 2eee60f52d4e11357bf89e72b034d050e285e47fda1361e5662fb322ee27d771 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk index 9cb30abb651..1a85b49bd3f 100644 --- a/package/python-lark/python-lark.mk +++ b/package/python-lark/python-lark.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LARK_VERSION = 1.1.8 +PYTHON_LARK_VERSION = 1.2.2 PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz -PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/12/1c/b466b58dacac15ffefce9bcb5128e18948a143849610a7d5300f31920be0 +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/af/60/bc7622aefb2aee1c0b4ba23c1446d3e30225c8770b38d7aedbfb65ca9d5a PYTHON_LARK_SETUP_TYPE = setuptools PYTHON_LARK_LICENSE = MIT PYTHON_LARK_LICENSE_FILES = LICENSE diff --git a/package/python-legacy-cgi/Config.in b/package/python-legacy-cgi/Config.in new file mode 100644 index 00000000000..f21706ed965 --- /dev/null +++ b/package/python-legacy-cgi/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LEGACY_CGI + bool "python-legacy-cgi" + help + Fork of the standard library cgi and cgitb modules, being + deprecated in PEP-594. + + https://github.com/jackrosenthal/legacy-cgi diff --git a/package/python-legacy-cgi/python-legacy-cgi.hash b/package/python-legacy-cgi/python-legacy-cgi.hash new file mode 100644 index 00000000000..063483a1e85 --- /dev/null +++ b/package/python-legacy-cgi/python-legacy-cgi.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/legacy-cgi/json +md5 82a61ea4905ec03f07cf24c586623fa7 legacy_cgi-2.6.1.tar.gz +sha256 f2ada99c747c3d72a473a6aaff6259a61f226b06fe9f3106e495ab83fd8f7a42 legacy_cgi-2.6.1.tar.gz +# Locally computed sha256 checksums +sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE diff --git a/package/python-legacy-cgi/python-legacy-cgi.mk b/package/python-legacy-cgi/python-legacy-cgi.mk new file mode 100644 index 00000000000..8e6e3e7bd4d --- /dev/null +++ b/package/python-legacy-cgi/python-legacy-cgi.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-legacy-cgi +# +################################################################################ + +PYTHON_LEGACY_CGI_VERSION = 2.6.1 +PYTHON_LEGACY_CGI_SOURCE = legacy_cgi-$(PYTHON_LEGACY_CGI_VERSION).tar.gz +PYTHON_LEGACY_CGI_SITE = https://files.pythonhosted.org/packages/48/96/ff14ad0f759f2297a2e61db9c5384d248a6b38c6c1d4452c07d7419676a2 +PYTHON_LEGACY_CGI_SETUP_TYPE = poetry +PYTHON_LEGACY_CGI_LICENSE = PSF-2.0 +PYTHON_LEGACY_CGI_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-libconf/Config.in b/package/python-libconf/Config.in new file mode 100644 index 00000000000..f5cecec8c6b --- /dev/null +++ b/package/python-libconf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LIBCONF + bool "python-libconf" + help + libconf is a pure-Python reader/writer for configuration files + in libconfig format, which is often used in C/C++ projects. + + https://github.com/ChrisAichinger/python-libconf/ diff --git a/package/python-libconf/python-libconf.mk b/package/python-libconf/python-libconf.mk index b349e3e60ec..65bdee86199 100644 --- a/package/python-libconf/python-libconf.mk +++ b/package/python-libconf/python-libconf.mk @@ -10,4 +10,5 @@ PYTHON_LIBCONF_SETUP_TYPE = setuptools PYTHON_LIBCONF_LICENSE = MIT PYTHON_LIBCONF_LICENSE_FILES = LICENSE +$(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-lmdb/Config.in b/package/python-lmdb/Config.in index baf9bce5ac5..b63af96ec47 100644 --- a/package/python-lmdb/Config.in +++ b/package/python-lmdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_LMDB bool "python-lmdb" - select BR2_PACKAGE_PYTHON_CFFI # runtime help Universal Python binding for the LMDB 'Lightning' Database. diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index ad176d5d215..064c76fb586 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 d216e0220c625aa72de2acc158e81a0e lmdb-1.4.1.tar.gz -sha256 1f4c76af24e907593487c904ef5eba1993beb38ed385af82adb25a858f2d658d lmdb-1.4.1.tar.gz +md5 bdd78148e8374cb0001af06cc64bfefb lmdb-1.5.1.tar.gz +sha256 717c255827d331e02f7242b44051aa06466c90f6d732ecb07b31edfb1e06c67a lmdb-1.5.1.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 7906d388aee..7105fd14644 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,14 +4,13 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.4.1 +PYTHON_LMDB_VERSION = 1.5.1 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/de/13/dd9b0c1924f0becc93e0bacd123a4e7a347966e3e74753ace3b1e85acc39 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/67/2c/0cc9375341121ca1f4b31a2137f955dc24550e095d733c9b42ea94113ba1 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools -PYTHON_LMDB_DEPENDENCIES = host-python-cffi $(eval $(python-package)) diff --git a/package/python-logbook/python-logbook.hash b/package/python-logbook/python-logbook.hash index 8761945de6b..361ea9921e2 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 cbb7e5fb2d6325f42a323b0000127393 Logbook-1.7.0.post0.tar.gz -sha256 a5e8016701ca3beea6a390b0ba1541037f663543ca508ccd36cfdc841639cdd7 Logbook-1.7.0.post0.tar.gz +md5 d15918a5745349eefab327661454527d logbook-1.8.0.tar.gz +sha256 487fa41539787bfa21a51fabd7f3ae8ae7f9e6679bb3e241d0f5f18a2fc37e9c logbook-1.8.0.tar.gz # Locally computed sha256 checksums sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE diff --git a/package/python-logbook/python-logbook.mk b/package/python-logbook/python-logbook.mk index e47e78d26e9..f6ccc1aac6c 100644 --- a/package/python-logbook/python-logbook.mk +++ b/package/python-logbook/python-logbook.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LOGBOOK_VERSION = 1.7.0.post0 -PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz -PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/cc/98/c1d93c1d7593f58515333a6217aa4ae647d9ee9c1aa2dfdf77b28b7bb7c7 +PYTHON_LOGBOOK_VERSION = 1.8.0 +PYTHON_LOGBOOK_SOURCE = logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz +PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/c3/a2/fafcc4ce7bad34093150e14f9ed179aa53e3e60a5c46e840547bdae26674 PYTHON_LOGBOOK_SETUP_TYPE = setuptools PYTHON_LOGBOOK_LICENSE = BSD-3-Clause PYTHON_LOGBOOK_LICENSE_FILES = LICENSE diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 3eb427a80d2..059238ffab5 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # From https://pypi.org/project/lxml/ -sha256 bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87 lxml-5.2.2.tar.gz +sha256 4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f lxml-5.3.0.tar.gz # Locally computed sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 2a26c132a7f..8604b5783a0 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 5.2.2 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/63/f7/ffbb6d2eb67b80a45b8a0834baa5557a14a5ffce0979439e7cd7f0c4055b +PYTHON_LXML_VERSION = 5.3.0 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e7/6b/20c3a4b24751377aaa6307eb230b66701024012c29dd374999cc92983269 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. @@ -29,12 +29,12 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ --skip-dependency-check \ - -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + -C--build-option=--with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ --skip-dependency-check \ - -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ - -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config + -C--build-option=--with-xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--with-xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash index 782837081ef..98307af0cf0 100644 --- a/package/python-m2crypto/python-m2crypto.hash +++ b/package/python-m2crypto/python-m2crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/m2crypto/json -md5 280c20072afbe7010cf9e9620ea25c7b M2Crypto-0.40.1.tar.gz -sha256 bbfd113ec55708c05816252a4f09e4237df4f3bbfc8171cbbc33057d257bbb30 M2Crypto-0.40.1.tar.gz +md5 75c50150857eb60e4f447b04d13ff507 m2crypto-0.43.0.tar.gz +sha256 6c2c1c7bb0e8aa768f7ca803da7dbc2666d4003b26bd7adf70233afc59d8cf33 m2crypto-0.43.0.tar.gz # Locally computed sha256 checksums sha256 4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0 LICENCE diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 6c07f42d06a..b5142c9bb2c 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -4,17 +4,15 @@ # ################################################################################ -PYTHON_M2CRYPTO_VERSION = 0.40.1 -PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz -PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/9e/a3/9433817493ea250db67a05de3361cb0a1d58531847d50406f2f28455e68c +PYTHON_M2CRYPTO_VERSION = 0.43.0 +PYTHON_M2CRYPTO_SOURCE = m2crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz +PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/ff/1b/4771f0ecfdd9df6752ae5d0cf040545bb3cfe8a504af87e05c9ac4a6a499 PYTHON_M2CRYPTO_SETUP_TYPE = setuptools PYTHON_M2CRYPTO_LICENSE = MIT PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = \ - -C--build-option=build_ext \ - -C--build-option=--openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_ENV = OPENSSL_PATH="$(STAGING_DIR)/usr" $(eval $(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 deleted file mode 100644 index 8afe7c95465..00000000000 --- a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch +++ /dev/null @@ -1,39 +0,0 @@ -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/0002-Update-versioneer-to-0.29.patch b/package/python-magic-wormhole-mailbox-server/0002-Update-versioneer-to-0.29.patch deleted file mode 100644 index 3152f1aae79..00000000000 --- a/package/python-magic-wormhole-mailbox-server/0002-Update-versioneer-to-0.29.patch +++ /dev/null @@ -1,2194 +0,0 @@ -From 76b422b7f53dbc41195a184d966230106f6ddc7d Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 24 Oct 2023 09:50:41 +0200 -Subject: [PATCH] Update versioneer to 0.29 - -Fixes builds against Python 3.12.0 - -Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/40 - -Signed-off-by: Adam Duskett ---- - versioneer.py | 1350 ++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 931 insertions(+), 419 deletions(-) - -diff --git a/versioneer.py b/versioneer.py -index 64fea1c..de97d90 100644 ---- a/versioneer.py -+++ b/versioneer.py -@@ -1,5 +1,4 @@ -- --# Version: 0.18 -+# Version: 0.29 - - """The Versioneer - like a rocketeer, but for versions. - -@@ -7,18 +6,14 @@ The Versioneer - ============== - - * like a rocketeer, but for versions! --* https://github.com/warner/python-versioneer -+* https://github.com/python-versioneer/python-versioneer - * Brian Warner --* License: Public Domain --* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy --* [![Latest Version] --(https://pypip.in/version/versioneer/badge.svg?style=flat) --](https://pypi.python.org/pypi/versioneer/) --* [![Build Status] --(https://travis-ci.org/warner/python-versioneer.png?branch=master) --](https://travis-ci.org/warner/python-versioneer) -- --This is a tool for managing a recorded version number in distutils-based -+* License: Public Domain (Unlicense) -+* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3 -+* [![Latest Version][pypi-image]][pypi-url] -+* [![Build Status][travis-image]][travis-url] -+ -+This is a tool for managing a recorded version number in setuptools-based - python projects. The goal is to remove the tedious and error-prone "update - the embedded version string" step from your release process. Making a new - release should be as easy as recording a new tag in your version-control -@@ -27,9 +22,38 @@ system, and maybe making new tarballs. - - ## Quick Install - --* `pip install versioneer` to somewhere to your $PATH --* add a `[versioneer]` section to your setup.cfg (see below) --* run `versioneer install` in your source tree, commit the results -+Versioneer provides two installation modes. The "classic" vendored mode installs -+a copy of versioneer into your repository. The experimental build-time dependency mode -+is intended to allow you to skip this step and simplify the process of upgrading. -+ -+### Vendored mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+ * Note that you will need to add `tomli; python_version < "3.11"` to your -+ build-time dependencies if you use `pyproject.toml` -+* run `versioneer install --vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` -+ -+### Build-time dependency mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+* add `versioneer` (with `[toml]` extra, if configuring in `pyproject.toml`) -+ to the `requires` key of the `build-system` table in `pyproject.toml`: -+ ```toml -+ [build-system] -+ requires = ["setuptools", "versioneer[toml]"] -+ build-backend = "setuptools.build_meta" -+ ``` -+* run `versioneer install --no-vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` - - ## Version Identifiers - -@@ -61,7 +85,7 @@ version 1.3). Many VCS systems can report a description that captures this, - for example `git describe --tags --dirty --always` reports things like - "0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the - 0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has --uncommitted changes. -+uncommitted changes). - - The version identifier is used for multiple purposes: - -@@ -166,7 +190,7 @@ which may help identify what went wrong). - - Some situations are known to cause problems for Versioneer. This details the - most significant ones. More can be found on Github --[issues page](https://github.com/warner/python-versioneer/issues). -+[issues page](https://github.com/python-versioneer/python-versioneer/issues). - - ### Subprojects - -@@ -180,7 +204,7 @@ two common reasons why `setup.py` might not be in the root: - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). - * Source trees whose main purpose is to contain a C library, but which also -- provide bindings to Python (and perhaps other langauges) in subdirectories. -+ provide bindings to Python (and perhaps other languages) in subdirectories. - - Versioneer will look for `.git` in parent directories, and most operations - should get the right version string. However `pip` and `setuptools` have bugs -@@ -194,9 +218,9 @@ work too. - Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in - some later version. - --[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -+[Bug #38](https://github.com/python-versioneer/python-versioneer/issues/38) is tracking - this issue. The discussion in --[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -+[PR #61](https://github.com/python-versioneer/python-versioneer/pull/61) describes the - issue from the Versioneer side in more detail. - [pip PR#3176](https://github.com/pypa/pip/pull/3176) and - [pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -@@ -224,31 +248,20 @@ regenerated while a different version is checked out. Many setup.py commands - cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into - a different virtualenv), so this can be surprising. - --[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -+[Bug #83](https://github.com/python-versioneer/python-versioneer/issues/83) describes - this one, but upgrading to a newer version of setuptools should probably - resolve it. - --### Unicode version strings -- --While Versioneer works (and is continually tested) with both Python 2 and --Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. --Newer releases probably generate unicode version strings on py2. It's not --clear that this is wrong, but it may be surprising for applications when then --write these strings to a network connection or include them in bytes-oriented --APIs like cryptographic checksums. -- --[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates --this question. -- - - ## Updating Versioneer - - To upgrade your project to a new release of Versioneer, do the following: - - * install the new Versioneer (`pip install -U versioneer` or equivalent) --* edit `setup.cfg`, if necessary, to include any new configuration settings -- indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. --* re-run `versioneer install` in your source tree, to replace -+* edit `setup.cfg` and `pyproject.toml`, if necessary, -+ to include any new configuration settings indicated by the release notes. -+ See [UPGRADING](./UPGRADING.md) for details. -+* re-run `versioneer install --[no-]vendor` in your source tree, to replace - `SRC/_version.py` - * commit any changed files - -@@ -265,35 +278,70 @@ installation by editing setup.py . Alternatively, it might go the other - direction and include code from all supported VCS systems, reducing the - number of intermediate scripts. - -+## Similar projects -+ -+* [setuptools_scm](https://github.com/pypa/setuptools_scm/) - a non-vendored build-time -+ dependency -+* [minver](https://github.com/jbweston/miniver) - a lightweight reimplementation of -+ versioneer -+* [versioningit](https://github.com/jwodder/versioningit) - a PEP 518-based setuptools -+ plugin - - ## License - - To make Versioneer easier to embed, all its code is dedicated to the public - domain. The `_version.py` that it creates is also in the public domain. --Specifically, both are released under the Creative Commons "Public Domain --Dedication" license (CC0-1.0), as described in --https://creativecommons.org/publicdomain/zero/1.0/ . -+Specifically, both are released under the "Unlicense", as described in -+https://unlicense.org/. -+ -+[pypi-image]: https://img.shields.io/pypi/v/versioneer.svg -+[pypi-url]: https://pypi.python.org/pypi/versioneer/ -+[travis-image]: -+https://img.shields.io/travis/com/python-versioneer/python-versioneer.svg -+[travis-url]: https://travis-ci.com/github/python-versioneer/python-versioneer - - """ -+# pylint:disable=invalid-name,import-outside-toplevel,missing-function-docstring -+# pylint:disable=missing-class-docstring,too-many-branches,too-many-statements -+# pylint:disable=raise-missing-from,too-many-lines,too-many-locals,import-error -+# pylint:disable=too-few-public-methods,redefined-outer-name,consider-using-with -+# pylint:disable=attribute-defined-outside-init,too-many-arguments - --from __future__ import print_function --try: -- import configparser --except ImportError: -- import ConfigParser as configparser -+import configparser - import errno - import json - import os - import re - import subprocess - import sys -+from pathlib import Path -+from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Union -+from typing import NoReturn -+import functools -+ -+have_tomllib = True -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ try: -+ import tomli as tomllib -+ except ImportError: -+ have_tomllib = False - - - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ versionfile_source: str -+ versionfile_build: Optional[str] -+ parentdir_prefix: Optional[str] -+ verbose: Optional[bool] -+ - --def get_root(): -+def get_root() -> str: - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the -@@ -301,18 +349,30 @@ def get_root(): - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -- err = ("Versioneer was unable to run the project root directory. " -- "Versioneer requires setup.py to be executed from " -- "its immediate directory (like 'python setup.py COMMAND'), " -- "or in a way that lets it use sys.argv[0] to find the root " -- "(like 'python path/to/setup.py COMMAND').") -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): -+ err = ( -+ "Versioneer was unable to run the project root directory. " -+ "Versioneer requires setup.py to be executed from " -+ "its immediate directory (like 'python setup.py COMMAND'), " -+ "or in a way that lets it use sys.argv[0] to find the root " -+ "(like 'python path/to/setup.py COMMAND')." -+ ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools -@@ -321,43 +381,64 @@ def get_root(): - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. -- me = os.path.realpath(os.path.abspath(__file__)) -- me_dir = os.path.normcase(os.path.splitext(me)[0]) -+ my_path = os.path.realpath(os.path.abspath(__file__)) -+ me_dir = os.path.normcase(os.path.splitext(my_path)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) -- if me_dir != vsr_dir: -- print("Warning: build in %s is using versioneer.py from %s" -- % (os.path.dirname(me), versioneer_py)) -+ if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals(): -+ print( -+ "Warning: build in %s is using versioneer.py from %s" -+ % (os.path.dirname(my_path), versioneer_py) -+ ) - except NameError: - pass - return root - - --def get_config_from_root(root): -+def get_config_from_root(root: str) -> VersioneerConfig: - """Read the project setup.cfg file to determine Versioneer config.""" -- # This might raise EnvironmentError (if setup.cfg is missing), or -+ # This might raise OSError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . -- setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -- with open(setup_cfg, "r") as f: -- parser.readfp(f) -- VCS = parser.get("versioneer", "VCS") # mandatory -- -- def get(parser, name): -- if parser.has_option("versioneer", name): -- return parser.get("versioneer", name) -- return None -+ root_pth = Path(root) -+ pyproject_toml = root_pth / "pyproject.toml" -+ setup_cfg = root_pth / "setup.cfg" -+ section: Union[Dict[str, Any], configparser.SectionProxy, None] = None -+ if pyproject_toml.exists() and have_tomllib: -+ try: -+ with open(pyproject_toml, "rb") as fobj: -+ pp = tomllib.load(fobj) -+ section = pp["tool"]["versioneer"] -+ except (tomllib.TOMLDecodeError, KeyError) as e: -+ print(f"Failed to load config from {pyproject_toml}: {e}") -+ print("Try to load it from setup.cfg") -+ if not section: -+ parser = configparser.ConfigParser() -+ with open(setup_cfg) as cfg_file: -+ parser.read_file(cfg_file) -+ parser.get("versioneer", "VCS") # raise error if missing -+ -+ section = parser["versioneer"] -+ -+ # `cast`` really shouldn't be used, but its simplest for the -+ # common VersioneerConfig users at the moment. We verify against -+ # `None` values elsewhere where it matters -+ - cfg = VersioneerConfig() -- cfg.VCS = VCS -- cfg.style = get(parser, "style") or "" -- cfg.versionfile_source = get(parser, "versionfile_source") -- cfg.versionfile_build = get(parser, "versionfile_build") -- cfg.tag_prefix = get(parser, "tag_prefix") -- if cfg.tag_prefix in ("''", '""'): -+ cfg.VCS = section["VCS"] -+ cfg.style = section.get("style", "") -+ cfg.versionfile_source = cast(str, section.get("versionfile_source")) -+ cfg.versionfile_build = section.get("versionfile_build") -+ cfg.tag_prefix = cast(str, section.get("tag_prefix")) -+ if cfg.tag_prefix in ("''", '""', None): - cfg.tag_prefix = "" -- cfg.parentdir_prefix = get(parser, "parentdir_prefix") -- cfg.verbose = get(parser, "verbose") -+ cfg.parentdir_prefix = section.get("parentdir_prefix") -+ if isinstance(section, configparser.SectionProxy): -+ # Make sure configparser translates to bool -+ cfg.verbose = section.getboolean("verbose") -+ else: -+ cfg.verbose = section.get("verbose") -+ - return cfg - - -@@ -366,37 +447,54 @@ class NotThisMethod(Exception): - - - # these dictionaries contain VCS-specific tools --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" -- if vcs not in HANDLERS: -- HANDLERS[vcs] = {} -- HANDLERS[vcs][method] = f -+ HANDLERS.setdefault(vcs, {})[method] = f - return f -+ - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen( -+ [command] + args, -+ cwd=cwd, -+ env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr else None), -+ **popen_kwargs, -+ ) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -407,26 +505,27 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --LONG_VERSION_PY['git'] = ''' -+LONG_VERSION_PY[ -+ "git" -+] = r''' - # This file helps to compute a version number in source trees obtained from - # git-archive tarball (such as those provided by githubs download-from-tag - # feature). Distribution tarballs (built by setup.py sdist) and build - # directories (produced by setup.py build) will contain a much shorter file - # that just contains the computed version number. - --# This file is released into the public domain. Generated by --# versioneer-0.18 (https://github.com/warner/python-versioneer) -+# This file is released into the public domain. -+# Generated by versioneer-0.29 -+# https://github.com/python-versioneer/python-versioneer - - """Git implementation of _version.py.""" - -@@ -435,9 +534,11 @@ import os - import re - import subprocess - import sys -+from typing import Any, Callable, Dict, List, Optional, Tuple -+import functools - - --def get_keywords(): -+def get_keywords() -> Dict[str, str]: - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must -@@ -453,8 +554,15 @@ def get_keywords(): - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ parentdir_prefix: str -+ versionfile_source: str -+ verbose: bool -+ - --def get_config(): -+def get_config() -> VersioneerConfig: - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py -@@ -472,13 +580,13 @@ class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} -@@ -487,22 +595,35 @@ def register_vcs_handler(vcs, method): # decorator - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen([command] + args, cwd=cwd, env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr -+ else None), **popen_kwargs) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -513,18 +634,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -533,15 +656,14 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% -@@ -550,41 +672,48 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -597,11 +726,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d -@@ -610,7 +739,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: -@@ -619,6 +748,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r'\d', r): -+ continue - if verbose: - print("picking %%s" %% r) - return {"version": r, -@@ -634,7 +768,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, -+ root: str, -+ verbose: bool, -+ runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -645,8 +784,15 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, -+ hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) -@@ -654,24 +800,57 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%%s*" %% tag_prefix], -- cwd=root) -+ describe_out, rc = runner(GITS, [ -+ "describe", "--tags", "--dirty", "--always", "--long", -+ "--match", f"{tag_prefix}[[:digit:]]*" -+ ], cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], -+ cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -688,7 +867,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -+ # unparsable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces -@@ -713,26 +892,27 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -757,23 +937,71 @@ def render_pep440(pieces): - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%%d.g%%s" %% (pieces["distance"], -+ pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%%d" %% pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%%d.dev%%d" %% (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%%d" %% (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%%d" %% pieces["distance"] -+ rendered = "0.post0.dev%%d" %% pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -800,12 +1028,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -822,7 +1079,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -842,7 +1099,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -862,7 +1119,7 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", -@@ -876,10 +1133,14 @@ def render(pieces, style): - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -894,7 +1155,7 @@ def render(pieces, style): - "date": pieces.get("date")} - - --def get_versions(): -+def get_versions() -> Dict[str, Any]: - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some -@@ -915,7 +1176,7 @@ def get_versions(): - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. -- for i in cfg.versionfile_source.split('/'): -+ for _ in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, -@@ -942,41 +1203,48 @@ def get_versions(): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -989,11 +1257,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d -@@ -1002,7 +1270,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r"\d", r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: -@@ -1010,23 +1278,37 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): -- r = ref[len(tag_prefix):] -+ r = ref[len(tag_prefix) :] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r"\d", r): -+ continue - if verbose: - print("picking %s" % r) -- return {"version": r, -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": None, -- "date": date} -+ return { -+ "version": r, -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": None, -+ "date": date, -+ } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") -- return {"version": "0+unknown", -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": "no suitable tags", "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": "no suitable tags", -+ "date": None, -+ } - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, root: str, verbose: bool, runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -1037,8 +1319,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) -@@ -1046,24 +1334,65 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%s*" % tag_prefix], -- cwd=root) -+ describe_out, rc = runner( -+ GITS, -+ [ -+ "describe", -+ "--tags", -+ "--dirty", -+ "--always", -+ "--long", -+ "--match", -+ f"{tag_prefix}[[:digit:]]*", -+ ], -+ cwd=root, -+ ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -1072,17 +1401,16 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: -- git_describe = git_describe[:git_describe.rindex("-dirty")] -+ git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX -- mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) -+ mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -- pieces["error"] = ("unable to parse git-describe output: '%s'" -- % describe_out) -+ # unparsable. Maybe git-describe is misbehaving? -+ pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out - return pieces - - # tag -@@ -1091,10 +1419,12 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) -- pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" -- % (full_tag, tag_prefix)) -+ pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( -+ full_tag, -+ tag_prefix, -+ ) - return pieces -- pieces["closest-tag"] = full_tag[len(tag_prefix):] -+ pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) -@@ -1105,19 +1435,20 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def do_vcs_install(manifest_in, versionfile_source, ipy): -+def do_vcs_install(versionfile_source: str, ipy: Optional[str]) -> None: - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py -@@ -1126,36 +1457,40 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] -- files = [manifest_in, versionfile_source] -+ files = [versionfile_source] - if ipy: - files.append(ipy) -- try: -- me = __file__ -- if me.endswith(".pyc") or me.endswith(".pyo"): -- me = os.path.splitext(me)[0] + ".py" -- versioneer_file = os.path.relpath(me) -- except NameError: -- versioneer_file = "versioneer.py" -- files.append(versioneer_file) -+ if "VERSIONEER_PEP518" not in globals(): -+ try: -+ my_path = __file__ -+ if my_path.endswith((".pyc", ".pyo")): -+ my_path = os.path.splitext(my_path)[0] + ".py" -+ versioneer_file = os.path.relpath(my_path) -+ except NameError: -+ versioneer_file = "versioneer.py" -+ files.append(versioneer_file) - present = False - try: -- f = open(".gitattributes", "r") -- for line in f.readlines(): -- if line.strip().startswith(versionfile_source): -- if "export-subst" in line.strip().split()[1:]: -- present = True -- f.close() -- except EnvironmentError: -+ with open(".gitattributes", "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith(versionfile_source): -+ if "export-subst" in line.strip().split()[1:]: -+ present = True -+ break -+ except OSError: - pass - if not present: -- f = open(".gitattributes", "a+") -- f.write("%s export-subst\n" % versionfile_source) -- f.close() -+ with open(".gitattributes", "a+") as fobj: -+ fobj.write(f"{versionfile_source} export-subst\n") - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -1164,24 +1499,29 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): -- return {"version": dirname[len(parentdir_prefix):], -- "full-revisionid": None, -- "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ return { -+ "version": dirname[len(parentdir_prefix) :], -+ "full-revisionid": None, -+ "dirty": False, -+ "error": None, -+ "date": None, -+ } -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: -- print("Tried directories %s but none started with prefix %s" % -- (str(rootdirs), parentdir_prefix)) -+ print( -+ "Tried directories %s but none started with prefix %s" -+ % (str(rootdirs), parentdir_prefix) -+ ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - - SHORT_VERSION_PY = """ --# This file was generated by 'versioneer.py' (0.18) from -+# This file was generated by 'versioneer.py' (0.29) from - # revision-control system data, or from the parent directory name of an - # unpacked source archive. Distribution tarballs contain a pre-generated copy - # of this file. -@@ -1198,42 +1538,42 @@ def get_versions(): - """ - - --def versions_from_file(filename): -+def versions_from_file(filename: str) -> Dict[str, Any]: - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() -- except EnvironmentError: -+ except OSError: - raise NotThisMethod("unable to read _version.py") -- mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: -- mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - --def write_to_version_file(filename, versions): -+def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None: - """Write the given version number to the given _version.py file.""" -- os.unlink(filename) -- contents = json.dumps(versions, sort_keys=True, -- indent=1, separators=(",", ": ")) -+ contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -1251,30 +1591,76 @@ def render_pep440(pieces): - rendered += ".dirty" - else: - # exception #1 -- rendered = "0+untagged.%d.g%s" % (pieces["distance"], -- pieces["short"]) -+ rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%d" % pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%d" % (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%d" % pieces["distance"] -+ rendered = "0.post0.dev%d" % pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -1301,12 +1687,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -1323,7 +1738,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -1343,7 +1758,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -1363,24 +1778,30 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: -- return {"version": "unknown", -- "full-revisionid": pieces.get("long"), -- "dirty": None, -- "error": pieces["error"], -- "date": None} -+ return { -+ "version": "unknown", -+ "full-revisionid": pieces.get("long"), -+ "dirty": None, -+ "error": pieces["error"], -+ "date": None, -+ } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -1390,16 +1811,20 @@ def render(pieces, style): - else: - raise ValueError("unknown style '%s'" % style) - -- return {"version": rendered, "full-revisionid": pieces["long"], -- "dirty": pieces["dirty"], "error": None, -- "date": pieces.get("date")} -+ return { -+ "version": rendered, -+ "full-revisionid": pieces["long"], -+ "dirty": pieces["dirty"], -+ "error": None, -+ "date": pieces.get("date"), -+ } - - - class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - --def get_versions(verbose=False): -+def get_versions(verbose: bool = False) -> Dict[str, Any]: - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. -@@ -1414,9 +1839,10 @@ def get_versions(verbose=False): - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS -- verbose = verbose or cfg.verbose -- assert cfg.versionfile_source is not None, \ -- "please set versioneer.versionfile_source" -+ verbose = verbose or bool(cfg.verbose) # `bool()` used to avoid `None` -+ assert ( -+ cfg.versionfile_source is not None -+ ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) -@@ -1470,18 +1896,26 @@ def get_versions(verbose=False): - if verbose: - print("unable to compute version") - -- return {"version": "0+unknown", "full-revisionid": None, -- "dirty": None, "error": "unable to compute version", -- "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": None, -+ "dirty": None, -+ "error": "unable to compute version", -+ "date": None, -+ } - - --def get_version(): -+def get_version() -> str: - """Get the short version string for this project.""" - return get_versions()["version"] - - --def get_cmdclass(): -- """Get the custom setuptools/distutils subclasses used by Versioneer.""" -+def get_cmdclass(cmdclass: Optional[Dict[str, Any]] = None): -+ """Get the custom setuptools subclasses used by Versioneer. -+ -+ If the package uses a different cmdclass (e.g. one from numpy), it -+ should be provide as an argument. -+ """ - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and -@@ -1495,25 +1929,25 @@ def get_cmdclass(): - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. -- # Also see https://github.com/warner/python-versioneer/issues/52 -+ # Also see https://github.com/python-versioneer/python-versioneer/issues/52 - -- cmds = {} -+ cmds = {} if cmdclass is None else cmdclass.copy() - -- # we add "version" to both distutils and setuptools -- from distutils.core import Command -+ # we add "version" to setuptools -+ from setuptools import Command - - class cmd_version(Command): - description = "report generated version string" -- user_options = [] -- boolean_options = [] -+ user_options: List[Tuple[str, str, str]] = [] -+ boolean_options: List[str] = [] - -- def initialize_options(self): -+ def initialize_options(self) -> None: - pass - -- def finalize_options(self): -+ def finalize_options(self) -> None: - pass - -- def run(self): -+ def run(self) -> None: - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) -@@ -1521,9 +1955,10 @@ def get_cmdclass(): - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) -+ - cmds["version"] = cmd_version - -- # we override "build_py" in both distutils and setuptools -+ # we override "build_py" in setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py -@@ -1538,29 +1973,71 @@ def get_cmdclass(): - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - -+ # pip install -e . and setuptool/editable_wheel will invoke build_py -+ # but the build_py command is not expected to copy any files. -+ - # we override different "build_py" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.build_py import build_py as _build_py -+ if "build_py" in cmds: -+ _build_py: Any = cmds["build_py"] - else: -- from distutils.command.build_py import build_py as _build_py -+ from setuptools.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) -+ if getattr(self, "editable_mode", False): -+ # During editable installs `.py` and data files are -+ # not copied to build_lib -+ return - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: -- target_versionfile = os.path.join(self.build_lib, -- cfg.versionfile_build) -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) -+ - cmds["build_py"] = cmd_build_py - -+ if "build_ext" in cmds: -+ _build_ext: Any = cmds["build_ext"] -+ else: -+ from setuptools.command.build_ext import build_ext as _build_ext -+ -+ class cmd_build_ext(_build_ext): -+ def run(self) -> None: -+ root = get_root() -+ cfg = get_config_from_root(root) -+ versions = get_versions() -+ _build_ext.run(self) -+ if self.inplace: -+ # build_ext --inplace will only build extensions in -+ # build/lib<..> dir with no _version.py to write to. -+ # As in place builds will already have a _version.py -+ # in the module dir, we do not need to write one. -+ return -+ # now locate _version.py in the new build/ directory and replace -+ # it with an updated value -+ if not cfg.versionfile_build: -+ return -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) -+ if not os.path.exists(target_versionfile): -+ print( -+ f"Warning: {target_versionfile} does not exist, skipping " -+ "version update. This can happen if you are running build_ext " -+ "without first running build_py." -+ ) -+ return -+ print("UPDATING %s" % target_versionfile) -+ write_to_version_file(target_versionfile, versions) -+ -+ cmds["build_ext"] = cmd_build_ext -+ - if "cx_Freeze" in sys.modules: # cx_freeze enabled? -- from cx_Freeze.dist import build_exe as _build_exe -+ from cx_Freeze.dist import build_exe as _build_exe # type: ignore -+ - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ -@@ -1569,7 +2046,7 @@ def get_cmdclass(): - # ... - - class cmd_build_exe(_build_exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1581,24 +2058,28 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - -- if 'py2exe' in sys.modules: # py2exe enabled? -+ if "py2exe" in sys.modules: # py2exe enabled? - try: -- from py2exe.distutils_buildexe import py2exe as _py2exe # py3 -+ from py2exe.setuptools_buildexe import py2exe as _py2exe # type: ignore - except ImportError: -- from py2exe.build_exe import py2exe as _py2exe # py2 -+ from py2exe.distutils_buildexe import py2exe as _py2exe # type: ignore - - class cmd_py2exe(_py2exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1610,23 +2091,67 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["py2exe"] = cmd_py2exe - -+ # sdist farms its file list building out to egg_info -+ if "egg_info" in cmds: -+ _egg_info: Any = cmds["egg_info"] -+ else: -+ from setuptools.command.egg_info import egg_info as _egg_info -+ -+ class cmd_egg_info(_egg_info): -+ def find_sources(self) -> None: -+ # egg_info.find_sources builds the manifest list and writes it -+ # in one shot -+ super().find_sources() -+ -+ # Modify the filelist and normalize it -+ root = get_root() -+ cfg = get_config_from_root(root) -+ self.filelist.append("versioneer.py") -+ if cfg.versionfile_source: -+ # There are rare cases where versionfile_source might not be -+ # included by default, so we must be explicit -+ self.filelist.append(cfg.versionfile_source) -+ self.filelist.sort() -+ self.filelist.remove_duplicates() -+ -+ # The write method is hidden in the manifest_maker instance that -+ # generated the filelist and was thrown away -+ # We will instead replicate their final normalization (to unicode, -+ # and POSIX-style paths) -+ from setuptools import unicode_utils -+ -+ normalized = [ -+ unicode_utils.filesys_decode(f).replace(os.sep, "/") -+ for f in self.filelist.files -+ ] -+ -+ manifest_filename = os.path.join(self.egg_info, "SOURCES.txt") -+ with open(manifest_filename, "w") as fobj: -+ fobj.write("\n".join(normalized)) -+ -+ cmds["egg_info"] = cmd_egg_info -+ - # we override different "sdist" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.sdist import sdist as _sdist -+ if "sdist" in cmds: -+ _sdist: Any = cmds["sdist"] - else: -- from distutils.command.sdist import sdist as _sdist -+ from setuptools.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): -- def run(self): -+ def run(self) -> None: - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old -@@ -1634,7 +2159,7 @@ def get_cmdclass(): - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - -- def make_release_tree(self, base_dir, files): -+ def make_release_tree(self, base_dir: str, files: List[str]) -> None: - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) -@@ -1643,8 +2168,10 @@ def get_cmdclass(): - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) -- write_to_version_file(target_versionfile, -- self._versioneer_generated_versions) -+ write_to_version_file( -+ target_versionfile, self._versioneer_generated_versions -+ ) -+ - cmds["sdist"] = cmd_sdist - - return cmds -@@ -1687,23 +2214,26 @@ SAMPLE_CONFIG = """ - - """ - --INIT_PY_SNIPPET = """ -+OLD_SNIPPET = """ - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - """ - -+INIT_PY_SNIPPET = """ -+from . import {0} -+__version__ = {0}.get_versions()['version'] -+""" -+ - --def do_setup(): -- """Main VCS-independent setup function for installing Versioneer.""" -+def do_setup() -> int: -+ """Do main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) -- except (EnvironmentError, configparser.NoSectionError, -- configparser.NoOptionError) as e: -- if isinstance(e, (EnvironmentError, configparser.NoSectionError)): -- print("Adding sample versioneer config to setup.cfg", -- file=sys.stderr) -+ except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: -+ if isinstance(e, (OSError, configparser.NoSectionError)): -+ print("Adding sample versioneer config to setup.cfg", file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) -@@ -1712,71 +2242,49 @@ def do_setup(): - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -- -- ipy = os.path.join(os.path.dirname(cfg.versionfile_source), -- "__init__.py") -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ -+ ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") -+ maybe_ipy: Optional[str] = ipy - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() -- except EnvironmentError: -+ except OSError: - old = "" -- if INIT_PY_SNIPPET not in old: -+ module = os.path.splitext(os.path.basename(cfg.versionfile_source))[0] -+ snippet = INIT_PY_SNIPPET.format(module) -+ if OLD_SNIPPET in old: -+ print(" replacing boilerplate in %s" % ipy) -+ with open(ipy, "w") as f: -+ f.write(old.replace(OLD_SNIPPET, snippet)) -+ elif snippet not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: -- f.write(INIT_PY_SNIPPET) -+ f.write(snippet) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) -- ipy = None -- -- # Make sure both the top-level "versioneer.py" and versionfile_source -- # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so -- # they'll be copied into source distributions. Pip won't be able to -- # install the package without this. -- manifest_in = os.path.join(root, "MANIFEST.in") -- simple_includes = set() -- try: -- with open(manifest_in, "r") as f: -- for line in f: -- if line.startswith("include "): -- for include in line.split()[1:]: -- simple_includes.add(include) -- except EnvironmentError: -- pass -- # That doesn't cover everything MANIFEST.in can do -- # (http://docs.python.org/2/distutils/sourcedist.html#commands), so -- # it might give some false negatives. Appending redundant 'include' -- # lines is safe, though. -- if "versioneer.py" not in simple_includes: -- print(" appending 'versioneer.py' to MANIFEST.in") -- with open(manifest_in, "a") as f: -- f.write("include versioneer.py\n") -- else: -- print(" 'versioneer.py' already in MANIFEST.in") -- if cfg.versionfile_source not in simple_includes: -- print(" appending versionfile_source ('%s') to MANIFEST.in" % -- cfg.versionfile_source) -- with open(manifest_in, "a") as f: -- f.write("include %s\n" % cfg.versionfile_source) -- else: -- print(" versionfile_source already in MANIFEST.in") -+ maybe_ipy = None - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. -- do_vcs_install(manifest_in, cfg.versionfile_source, ipy) -+ do_vcs_install(cfg.versionfile_source, maybe_ipy) - return 0 - - --def scan_setup_py(): -+def scan_setup_py() -> int: - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False -@@ -1813,10 +2321,14 @@ def scan_setup_py(): - return errors - - -+def setup_command() -> NoReturn: -+ """Set up Versioneer and exit with appropriate error code.""" -+ errors = do_setup() -+ errors += scan_setup_py() -+ sys.exit(1 if errors else 0) -+ -+ - if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": -- errors = do_setup() -- errors += scan_setup_py() -- if errors: -- sys.exit(1) -+ setup_command() --- -2.41.0 - diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index a0721e866f5..1b0402ebb40 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER 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_SETUPTOOLS # runtime, pkg_resources select BR2_PACKAGE_PYTHON_TWISTED # runtime help This package is the main server that Magic-Wormhole clients diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash index c7147126419..5512537c62e 100644 --- a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json -md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz -sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.1.tar.gz +md5 8e45d8943628d9c618e8801b8005725e magic-wormhole-mailbox-server-0.5.0.tar.gz +sha256 1f194edf88c6df746ba980c6a8c837c1e1d90f3afb3c7b0e501fce752aabceda magic-wormhole-mailbox-server-0.5.0.tar.gz # Locally computed sha256 checksums sha256 4a9cc2415c52cef591b6822eee68fed36d7e6d80284b09638cff61d762d99060 LICENSE diff --git a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk index a3394c7dcd6..04cd65e3e55 100644 --- a/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.1 +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.5.0 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_SITE = https://files.pythonhosted.org/packages/1f/0b/0b6fda78c8a90d6c600da614c5a1962a4f24275e76d2e1bf763ee8df0b70 PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE diff --git a/package/python-magic-wormhole-transit-relay/0001-Update-versioneer-to-0.29.patch b/package/python-magic-wormhole-transit-relay/0001-Update-versioneer-to-0.29.patch deleted file mode 100644 index 51cecd138a0..00000000000 --- a/package/python-magic-wormhole-transit-relay/0001-Update-versioneer-to-0.29.patch +++ /dev/null @@ -1,2194 +0,0 @@ -From f00f54ecbd9bea970795da4f1f6091828a011bcd Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 24 Oct 2023 09:52:45 +0200 -Subject: [PATCH] Update versioneer to 0.29 - -Fixes builds against Python 3.12.0 - -Upstream: https://github.com/magic-wormhole/magic-wormhole-transit-relay/pull/34 - -Signed-off-by: Adam Duskett ---- - versioneer.py | 1350 ++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 931 insertions(+), 419 deletions(-) - -diff --git a/versioneer.py b/versioneer.py -index 64fea1c..de97d90 100644 ---- a/versioneer.py -+++ b/versioneer.py -@@ -1,5 +1,4 @@ -- --# Version: 0.18 -+# Version: 0.29 - - """The Versioneer - like a rocketeer, but for versions. - -@@ -7,18 +6,14 @@ The Versioneer - ============== - - * like a rocketeer, but for versions! --* https://github.com/warner/python-versioneer -+* https://github.com/python-versioneer/python-versioneer - * Brian Warner --* License: Public Domain --* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy --* [![Latest Version] --(https://pypip.in/version/versioneer/badge.svg?style=flat) --](https://pypi.python.org/pypi/versioneer/) --* [![Build Status] --(https://travis-ci.org/warner/python-versioneer.png?branch=master) --](https://travis-ci.org/warner/python-versioneer) -- --This is a tool for managing a recorded version number in distutils-based -+* License: Public Domain (Unlicense) -+* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3 -+* [![Latest Version][pypi-image]][pypi-url] -+* [![Build Status][travis-image]][travis-url] -+ -+This is a tool for managing a recorded version number in setuptools-based - python projects. The goal is to remove the tedious and error-prone "update - the embedded version string" step from your release process. Making a new - release should be as easy as recording a new tag in your version-control -@@ -27,9 +22,38 @@ system, and maybe making new tarballs. - - ## Quick Install - --* `pip install versioneer` to somewhere to your $PATH --* add a `[versioneer]` section to your setup.cfg (see below) --* run `versioneer install` in your source tree, commit the results -+Versioneer provides two installation modes. The "classic" vendored mode installs -+a copy of versioneer into your repository. The experimental build-time dependency mode -+is intended to allow you to skip this step and simplify the process of upgrading. -+ -+### Vendored mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+ * Note that you will need to add `tomli; python_version < "3.11"` to your -+ build-time dependencies if you use `pyproject.toml` -+* run `versioneer install --vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` -+ -+### Build-time dependency mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+* add `versioneer` (with `[toml]` extra, if configuring in `pyproject.toml`) -+ to the `requires` key of the `build-system` table in `pyproject.toml`: -+ ```toml -+ [build-system] -+ requires = ["setuptools", "versioneer[toml]"] -+ build-backend = "setuptools.build_meta" -+ ``` -+* run `versioneer install --no-vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` - - ## Version Identifiers - -@@ -61,7 +85,7 @@ version 1.3). Many VCS systems can report a description that captures this, - for example `git describe --tags --dirty --always` reports things like - "0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the - 0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has --uncommitted changes. -+uncommitted changes). - - The version identifier is used for multiple purposes: - -@@ -166,7 +190,7 @@ which may help identify what went wrong). - - Some situations are known to cause problems for Versioneer. This details the - most significant ones. More can be found on Github --[issues page](https://github.com/warner/python-versioneer/issues). -+[issues page](https://github.com/python-versioneer/python-versioneer/issues). - - ### Subprojects - -@@ -180,7 +204,7 @@ two common reasons why `setup.py` might not be in the root: - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). - * Source trees whose main purpose is to contain a C library, but which also -- provide bindings to Python (and perhaps other langauges) in subdirectories. -+ provide bindings to Python (and perhaps other languages) in subdirectories. - - Versioneer will look for `.git` in parent directories, and most operations - should get the right version string. However `pip` and `setuptools` have bugs -@@ -194,9 +218,9 @@ work too. - Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in - some later version. - --[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -+[Bug #38](https://github.com/python-versioneer/python-versioneer/issues/38) is tracking - this issue. The discussion in --[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -+[PR #61](https://github.com/python-versioneer/python-versioneer/pull/61) describes the - issue from the Versioneer side in more detail. - [pip PR#3176](https://github.com/pypa/pip/pull/3176) and - [pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -@@ -224,31 +248,20 @@ regenerated while a different version is checked out. Many setup.py commands - cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into - a different virtualenv), so this can be surprising. - --[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -+[Bug #83](https://github.com/python-versioneer/python-versioneer/issues/83) describes - this one, but upgrading to a newer version of setuptools should probably - resolve it. - --### Unicode version strings -- --While Versioneer works (and is continually tested) with both Python 2 and --Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. --Newer releases probably generate unicode version strings on py2. It's not --clear that this is wrong, but it may be surprising for applications when then --write these strings to a network connection or include them in bytes-oriented --APIs like cryptographic checksums. -- --[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates --this question. -- - - ## Updating Versioneer - - To upgrade your project to a new release of Versioneer, do the following: - - * install the new Versioneer (`pip install -U versioneer` or equivalent) --* edit `setup.cfg`, if necessary, to include any new configuration settings -- indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. --* re-run `versioneer install` in your source tree, to replace -+* edit `setup.cfg` and `pyproject.toml`, if necessary, -+ to include any new configuration settings indicated by the release notes. -+ See [UPGRADING](./UPGRADING.md) for details. -+* re-run `versioneer install --[no-]vendor` in your source tree, to replace - `SRC/_version.py` - * commit any changed files - -@@ -265,35 +278,70 @@ installation by editing setup.py . Alternatively, it might go the other - direction and include code from all supported VCS systems, reducing the - number of intermediate scripts. - -+## Similar projects -+ -+* [setuptools_scm](https://github.com/pypa/setuptools_scm/) - a non-vendored build-time -+ dependency -+* [minver](https://github.com/jbweston/miniver) - a lightweight reimplementation of -+ versioneer -+* [versioningit](https://github.com/jwodder/versioningit) - a PEP 518-based setuptools -+ plugin - - ## License - - To make Versioneer easier to embed, all its code is dedicated to the public - domain. The `_version.py` that it creates is also in the public domain. --Specifically, both are released under the Creative Commons "Public Domain --Dedication" license (CC0-1.0), as described in --https://creativecommons.org/publicdomain/zero/1.0/ . -+Specifically, both are released under the "Unlicense", as described in -+https://unlicense.org/. -+ -+[pypi-image]: https://img.shields.io/pypi/v/versioneer.svg -+[pypi-url]: https://pypi.python.org/pypi/versioneer/ -+[travis-image]: -+https://img.shields.io/travis/com/python-versioneer/python-versioneer.svg -+[travis-url]: https://travis-ci.com/github/python-versioneer/python-versioneer - - """ -+# pylint:disable=invalid-name,import-outside-toplevel,missing-function-docstring -+# pylint:disable=missing-class-docstring,too-many-branches,too-many-statements -+# pylint:disable=raise-missing-from,too-many-lines,too-many-locals,import-error -+# pylint:disable=too-few-public-methods,redefined-outer-name,consider-using-with -+# pylint:disable=attribute-defined-outside-init,too-many-arguments - --from __future__ import print_function --try: -- import configparser --except ImportError: -- import ConfigParser as configparser -+import configparser - import errno - import json - import os - import re - import subprocess - import sys -+from pathlib import Path -+from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Union -+from typing import NoReturn -+import functools -+ -+have_tomllib = True -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ try: -+ import tomli as tomllib -+ except ImportError: -+ have_tomllib = False - - - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ versionfile_source: str -+ versionfile_build: Optional[str] -+ parentdir_prefix: Optional[str] -+ verbose: Optional[bool] -+ - --def get_root(): -+def get_root() -> str: - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the -@@ -301,18 +349,30 @@ def get_root(): - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -- err = ("Versioneer was unable to run the project root directory. " -- "Versioneer requires setup.py to be executed from " -- "its immediate directory (like 'python setup.py COMMAND'), " -- "or in a way that lets it use sys.argv[0] to find the root " -- "(like 'python path/to/setup.py COMMAND').") -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): -+ err = ( -+ "Versioneer was unable to run the project root directory. " -+ "Versioneer requires setup.py to be executed from " -+ "its immediate directory (like 'python setup.py COMMAND'), " -+ "or in a way that lets it use sys.argv[0] to find the root " -+ "(like 'python path/to/setup.py COMMAND')." -+ ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools -@@ -321,43 +381,64 @@ def get_root(): - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. -- me = os.path.realpath(os.path.abspath(__file__)) -- me_dir = os.path.normcase(os.path.splitext(me)[0]) -+ my_path = os.path.realpath(os.path.abspath(__file__)) -+ me_dir = os.path.normcase(os.path.splitext(my_path)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) -- if me_dir != vsr_dir: -- print("Warning: build in %s is using versioneer.py from %s" -- % (os.path.dirname(me), versioneer_py)) -+ if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals(): -+ print( -+ "Warning: build in %s is using versioneer.py from %s" -+ % (os.path.dirname(my_path), versioneer_py) -+ ) - except NameError: - pass - return root - - --def get_config_from_root(root): -+def get_config_from_root(root: str) -> VersioneerConfig: - """Read the project setup.cfg file to determine Versioneer config.""" -- # This might raise EnvironmentError (if setup.cfg is missing), or -+ # This might raise OSError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . -- setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -- with open(setup_cfg, "r") as f: -- parser.readfp(f) -- VCS = parser.get("versioneer", "VCS") # mandatory -- -- def get(parser, name): -- if parser.has_option("versioneer", name): -- return parser.get("versioneer", name) -- return None -+ root_pth = Path(root) -+ pyproject_toml = root_pth / "pyproject.toml" -+ setup_cfg = root_pth / "setup.cfg" -+ section: Union[Dict[str, Any], configparser.SectionProxy, None] = None -+ if pyproject_toml.exists() and have_tomllib: -+ try: -+ with open(pyproject_toml, "rb") as fobj: -+ pp = tomllib.load(fobj) -+ section = pp["tool"]["versioneer"] -+ except (tomllib.TOMLDecodeError, KeyError) as e: -+ print(f"Failed to load config from {pyproject_toml}: {e}") -+ print("Try to load it from setup.cfg") -+ if not section: -+ parser = configparser.ConfigParser() -+ with open(setup_cfg) as cfg_file: -+ parser.read_file(cfg_file) -+ parser.get("versioneer", "VCS") # raise error if missing -+ -+ section = parser["versioneer"] -+ -+ # `cast`` really shouldn't be used, but its simplest for the -+ # common VersioneerConfig users at the moment. We verify against -+ # `None` values elsewhere where it matters -+ - cfg = VersioneerConfig() -- cfg.VCS = VCS -- cfg.style = get(parser, "style") or "" -- cfg.versionfile_source = get(parser, "versionfile_source") -- cfg.versionfile_build = get(parser, "versionfile_build") -- cfg.tag_prefix = get(parser, "tag_prefix") -- if cfg.tag_prefix in ("''", '""'): -+ cfg.VCS = section["VCS"] -+ cfg.style = section.get("style", "") -+ cfg.versionfile_source = cast(str, section.get("versionfile_source")) -+ cfg.versionfile_build = section.get("versionfile_build") -+ cfg.tag_prefix = cast(str, section.get("tag_prefix")) -+ if cfg.tag_prefix in ("''", '""', None): - cfg.tag_prefix = "" -- cfg.parentdir_prefix = get(parser, "parentdir_prefix") -- cfg.verbose = get(parser, "verbose") -+ cfg.parentdir_prefix = section.get("parentdir_prefix") -+ if isinstance(section, configparser.SectionProxy): -+ # Make sure configparser translates to bool -+ cfg.verbose = section.getboolean("verbose") -+ else: -+ cfg.verbose = section.get("verbose") -+ - return cfg - - -@@ -366,37 +447,54 @@ class NotThisMethod(Exception): - - - # these dictionaries contain VCS-specific tools --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" -- if vcs not in HANDLERS: -- HANDLERS[vcs] = {} -- HANDLERS[vcs][method] = f -+ HANDLERS.setdefault(vcs, {})[method] = f - return f -+ - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen( -+ [command] + args, -+ cwd=cwd, -+ env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr else None), -+ **popen_kwargs, -+ ) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -407,26 +505,27 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --LONG_VERSION_PY['git'] = ''' -+LONG_VERSION_PY[ -+ "git" -+] = r''' - # This file helps to compute a version number in source trees obtained from - # git-archive tarball (such as those provided by githubs download-from-tag - # feature). Distribution tarballs (built by setup.py sdist) and build - # directories (produced by setup.py build) will contain a much shorter file - # that just contains the computed version number. - --# This file is released into the public domain. Generated by --# versioneer-0.18 (https://github.com/warner/python-versioneer) -+# This file is released into the public domain. -+# Generated by versioneer-0.29 -+# https://github.com/python-versioneer/python-versioneer - - """Git implementation of _version.py.""" - -@@ -435,9 +534,11 @@ import os - import re - import subprocess - import sys -+from typing import Any, Callable, Dict, List, Optional, Tuple -+import functools - - --def get_keywords(): -+def get_keywords() -> Dict[str, str]: - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must -@@ -453,8 +554,15 @@ def get_keywords(): - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ parentdir_prefix: str -+ versionfile_source: str -+ verbose: bool -+ - --def get_config(): -+def get_config() -> VersioneerConfig: - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py -@@ -472,13 +580,13 @@ class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} -@@ -487,22 +595,35 @@ def register_vcs_handler(vcs, method): # decorator - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen([command] + args, cwd=cwd, env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr -+ else None), **popen_kwargs) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -513,18 +634,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -533,15 +656,14 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% -@@ -550,41 +672,48 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -597,11 +726,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d -@@ -610,7 +739,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: -@@ -619,6 +748,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r'\d', r): -+ continue - if verbose: - print("picking %%s" %% r) - return {"version": r, -@@ -634,7 +768,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, -+ root: str, -+ verbose: bool, -+ runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -645,8 +784,15 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, -+ hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) -@@ -654,24 +800,57 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%%s*" %% tag_prefix], -- cwd=root) -+ describe_out, rc = runner(GITS, [ -+ "describe", "--tags", "--dirty", "--always", "--long", -+ "--match", f"{tag_prefix}[[:digit:]]*" -+ ], cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], -+ cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -688,7 +867,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -+ # unparsable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces -@@ -713,26 +892,27 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -757,23 +937,71 @@ def render_pep440(pieces): - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%%d.g%%s" %% (pieces["distance"], -+ pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%%d" %% pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%%d.dev%%d" %% (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%%d" %% (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%%d" %% pieces["distance"] -+ rendered = "0.post0.dev%%d" %% pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -800,12 +1028,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -822,7 +1079,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -842,7 +1099,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -862,7 +1119,7 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", -@@ -876,10 +1133,14 @@ def render(pieces, style): - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -894,7 +1155,7 @@ def render(pieces, style): - "date": pieces.get("date")} - - --def get_versions(): -+def get_versions() -> Dict[str, Any]: - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some -@@ -915,7 +1176,7 @@ def get_versions(): - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. -- for i in cfg.versionfile_source.split('/'): -+ for _ in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, -@@ -942,41 +1203,48 @@ def get_versions(): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -989,11 +1257,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d -@@ -1002,7 +1270,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r"\d", r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: -@@ -1010,23 +1278,37 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): -- r = ref[len(tag_prefix):] -+ r = ref[len(tag_prefix) :] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r"\d", r): -+ continue - if verbose: - print("picking %s" % r) -- return {"version": r, -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": None, -- "date": date} -+ return { -+ "version": r, -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": None, -+ "date": date, -+ } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") -- return {"version": "0+unknown", -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": "no suitable tags", "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": "no suitable tags", -+ "date": None, -+ } - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, root: str, verbose: bool, runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -1037,8 +1319,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) -@@ -1046,24 +1334,65 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%s*" % tag_prefix], -- cwd=root) -+ describe_out, rc = runner( -+ GITS, -+ [ -+ "describe", -+ "--tags", -+ "--dirty", -+ "--always", -+ "--long", -+ "--match", -+ f"{tag_prefix}[[:digit:]]*", -+ ], -+ cwd=root, -+ ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -1072,17 +1401,16 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: -- git_describe = git_describe[:git_describe.rindex("-dirty")] -+ git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX -- mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) -+ mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -- pieces["error"] = ("unable to parse git-describe output: '%s'" -- % describe_out) -+ # unparsable. Maybe git-describe is misbehaving? -+ pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out - return pieces - - # tag -@@ -1091,10 +1419,12 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) -- pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" -- % (full_tag, tag_prefix)) -+ pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( -+ full_tag, -+ tag_prefix, -+ ) - return pieces -- pieces["closest-tag"] = full_tag[len(tag_prefix):] -+ pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) -@@ -1105,19 +1435,20 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def do_vcs_install(manifest_in, versionfile_source, ipy): -+def do_vcs_install(versionfile_source: str, ipy: Optional[str]) -> None: - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py -@@ -1126,36 +1457,40 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] -- files = [manifest_in, versionfile_source] -+ files = [versionfile_source] - if ipy: - files.append(ipy) -- try: -- me = __file__ -- if me.endswith(".pyc") or me.endswith(".pyo"): -- me = os.path.splitext(me)[0] + ".py" -- versioneer_file = os.path.relpath(me) -- except NameError: -- versioneer_file = "versioneer.py" -- files.append(versioneer_file) -+ if "VERSIONEER_PEP518" not in globals(): -+ try: -+ my_path = __file__ -+ if my_path.endswith((".pyc", ".pyo")): -+ my_path = os.path.splitext(my_path)[0] + ".py" -+ versioneer_file = os.path.relpath(my_path) -+ except NameError: -+ versioneer_file = "versioneer.py" -+ files.append(versioneer_file) - present = False - try: -- f = open(".gitattributes", "r") -- for line in f.readlines(): -- if line.strip().startswith(versionfile_source): -- if "export-subst" in line.strip().split()[1:]: -- present = True -- f.close() -- except EnvironmentError: -+ with open(".gitattributes", "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith(versionfile_source): -+ if "export-subst" in line.strip().split()[1:]: -+ present = True -+ break -+ except OSError: - pass - if not present: -- f = open(".gitattributes", "a+") -- f.write("%s export-subst\n" % versionfile_source) -- f.close() -+ with open(".gitattributes", "a+") as fobj: -+ fobj.write(f"{versionfile_source} export-subst\n") - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -1164,24 +1499,29 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): -- return {"version": dirname[len(parentdir_prefix):], -- "full-revisionid": None, -- "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ return { -+ "version": dirname[len(parentdir_prefix) :], -+ "full-revisionid": None, -+ "dirty": False, -+ "error": None, -+ "date": None, -+ } -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: -- print("Tried directories %s but none started with prefix %s" % -- (str(rootdirs), parentdir_prefix)) -+ print( -+ "Tried directories %s but none started with prefix %s" -+ % (str(rootdirs), parentdir_prefix) -+ ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - - SHORT_VERSION_PY = """ --# This file was generated by 'versioneer.py' (0.18) from -+# This file was generated by 'versioneer.py' (0.29) from - # revision-control system data, or from the parent directory name of an - # unpacked source archive. Distribution tarballs contain a pre-generated copy - # of this file. -@@ -1198,42 +1538,42 @@ def get_versions(): - """ - - --def versions_from_file(filename): -+def versions_from_file(filename: str) -> Dict[str, Any]: - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() -- except EnvironmentError: -+ except OSError: - raise NotThisMethod("unable to read _version.py") -- mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: -- mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - --def write_to_version_file(filename, versions): -+def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None: - """Write the given version number to the given _version.py file.""" -- os.unlink(filename) -- contents = json.dumps(versions, sort_keys=True, -- indent=1, separators=(",", ": ")) -+ contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -1251,30 +1591,76 @@ def render_pep440(pieces): - rendered += ".dirty" - else: - # exception #1 -- rendered = "0+untagged.%d.g%s" % (pieces["distance"], -- pieces["short"]) -+ rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%d" % pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%d" % (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%d" % pieces["distance"] -+ rendered = "0.post0.dev%d" % pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -1301,12 +1687,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -1323,7 +1738,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -1343,7 +1758,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -1363,24 +1778,30 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: -- return {"version": "unknown", -- "full-revisionid": pieces.get("long"), -- "dirty": None, -- "error": pieces["error"], -- "date": None} -+ return { -+ "version": "unknown", -+ "full-revisionid": pieces.get("long"), -+ "dirty": None, -+ "error": pieces["error"], -+ "date": None, -+ } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -1390,16 +1811,20 @@ def render(pieces, style): - else: - raise ValueError("unknown style '%s'" % style) - -- return {"version": rendered, "full-revisionid": pieces["long"], -- "dirty": pieces["dirty"], "error": None, -- "date": pieces.get("date")} -+ return { -+ "version": rendered, -+ "full-revisionid": pieces["long"], -+ "dirty": pieces["dirty"], -+ "error": None, -+ "date": pieces.get("date"), -+ } - - - class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - --def get_versions(verbose=False): -+def get_versions(verbose: bool = False) -> Dict[str, Any]: - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. -@@ -1414,9 +1839,10 @@ def get_versions(verbose=False): - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS -- verbose = verbose or cfg.verbose -- assert cfg.versionfile_source is not None, \ -- "please set versioneer.versionfile_source" -+ verbose = verbose or bool(cfg.verbose) # `bool()` used to avoid `None` -+ assert ( -+ cfg.versionfile_source is not None -+ ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) -@@ -1470,18 +1896,26 @@ def get_versions(verbose=False): - if verbose: - print("unable to compute version") - -- return {"version": "0+unknown", "full-revisionid": None, -- "dirty": None, "error": "unable to compute version", -- "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": None, -+ "dirty": None, -+ "error": "unable to compute version", -+ "date": None, -+ } - - --def get_version(): -+def get_version() -> str: - """Get the short version string for this project.""" - return get_versions()["version"] - - --def get_cmdclass(): -- """Get the custom setuptools/distutils subclasses used by Versioneer.""" -+def get_cmdclass(cmdclass: Optional[Dict[str, Any]] = None): -+ """Get the custom setuptools subclasses used by Versioneer. -+ -+ If the package uses a different cmdclass (e.g. one from numpy), it -+ should be provide as an argument. -+ """ - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and -@@ -1495,25 +1929,25 @@ def get_cmdclass(): - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. -- # Also see https://github.com/warner/python-versioneer/issues/52 -+ # Also see https://github.com/python-versioneer/python-versioneer/issues/52 - -- cmds = {} -+ cmds = {} if cmdclass is None else cmdclass.copy() - -- # we add "version" to both distutils and setuptools -- from distutils.core import Command -+ # we add "version" to setuptools -+ from setuptools import Command - - class cmd_version(Command): - description = "report generated version string" -- user_options = [] -- boolean_options = [] -+ user_options: List[Tuple[str, str, str]] = [] -+ boolean_options: List[str] = [] - -- def initialize_options(self): -+ def initialize_options(self) -> None: - pass - -- def finalize_options(self): -+ def finalize_options(self) -> None: - pass - -- def run(self): -+ def run(self) -> None: - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) -@@ -1521,9 +1955,10 @@ def get_cmdclass(): - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) -+ - cmds["version"] = cmd_version - -- # we override "build_py" in both distutils and setuptools -+ # we override "build_py" in setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py -@@ -1538,29 +1973,71 @@ def get_cmdclass(): - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - -+ # pip install -e . and setuptool/editable_wheel will invoke build_py -+ # but the build_py command is not expected to copy any files. -+ - # we override different "build_py" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.build_py import build_py as _build_py -+ if "build_py" in cmds: -+ _build_py: Any = cmds["build_py"] - else: -- from distutils.command.build_py import build_py as _build_py -+ from setuptools.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) -+ if getattr(self, "editable_mode", False): -+ # During editable installs `.py` and data files are -+ # not copied to build_lib -+ return - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: -- target_versionfile = os.path.join(self.build_lib, -- cfg.versionfile_build) -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) -+ - cmds["build_py"] = cmd_build_py - -+ if "build_ext" in cmds: -+ _build_ext: Any = cmds["build_ext"] -+ else: -+ from setuptools.command.build_ext import build_ext as _build_ext -+ -+ class cmd_build_ext(_build_ext): -+ def run(self) -> None: -+ root = get_root() -+ cfg = get_config_from_root(root) -+ versions = get_versions() -+ _build_ext.run(self) -+ if self.inplace: -+ # build_ext --inplace will only build extensions in -+ # build/lib<..> dir with no _version.py to write to. -+ # As in place builds will already have a _version.py -+ # in the module dir, we do not need to write one. -+ return -+ # now locate _version.py in the new build/ directory and replace -+ # it with an updated value -+ if not cfg.versionfile_build: -+ return -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) -+ if not os.path.exists(target_versionfile): -+ print( -+ f"Warning: {target_versionfile} does not exist, skipping " -+ "version update. This can happen if you are running build_ext " -+ "without first running build_py." -+ ) -+ return -+ print("UPDATING %s" % target_versionfile) -+ write_to_version_file(target_versionfile, versions) -+ -+ cmds["build_ext"] = cmd_build_ext -+ - if "cx_Freeze" in sys.modules: # cx_freeze enabled? -- from cx_Freeze.dist import build_exe as _build_exe -+ from cx_Freeze.dist import build_exe as _build_exe # type: ignore -+ - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ -@@ -1569,7 +2046,7 @@ def get_cmdclass(): - # ... - - class cmd_build_exe(_build_exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1581,24 +2058,28 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - -- if 'py2exe' in sys.modules: # py2exe enabled? -+ if "py2exe" in sys.modules: # py2exe enabled? - try: -- from py2exe.distutils_buildexe import py2exe as _py2exe # py3 -+ from py2exe.setuptools_buildexe import py2exe as _py2exe # type: ignore - except ImportError: -- from py2exe.build_exe import py2exe as _py2exe # py2 -+ from py2exe.distutils_buildexe import py2exe as _py2exe # type: ignore - - class cmd_py2exe(_py2exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1610,23 +2091,67 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["py2exe"] = cmd_py2exe - -+ # sdist farms its file list building out to egg_info -+ if "egg_info" in cmds: -+ _egg_info: Any = cmds["egg_info"] -+ else: -+ from setuptools.command.egg_info import egg_info as _egg_info -+ -+ class cmd_egg_info(_egg_info): -+ def find_sources(self) -> None: -+ # egg_info.find_sources builds the manifest list and writes it -+ # in one shot -+ super().find_sources() -+ -+ # Modify the filelist and normalize it -+ root = get_root() -+ cfg = get_config_from_root(root) -+ self.filelist.append("versioneer.py") -+ if cfg.versionfile_source: -+ # There are rare cases where versionfile_source might not be -+ # included by default, so we must be explicit -+ self.filelist.append(cfg.versionfile_source) -+ self.filelist.sort() -+ self.filelist.remove_duplicates() -+ -+ # The write method is hidden in the manifest_maker instance that -+ # generated the filelist and was thrown away -+ # We will instead replicate their final normalization (to unicode, -+ # and POSIX-style paths) -+ from setuptools import unicode_utils -+ -+ normalized = [ -+ unicode_utils.filesys_decode(f).replace(os.sep, "/") -+ for f in self.filelist.files -+ ] -+ -+ manifest_filename = os.path.join(self.egg_info, "SOURCES.txt") -+ with open(manifest_filename, "w") as fobj: -+ fobj.write("\n".join(normalized)) -+ -+ cmds["egg_info"] = cmd_egg_info -+ - # we override different "sdist" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.sdist import sdist as _sdist -+ if "sdist" in cmds: -+ _sdist: Any = cmds["sdist"] - else: -- from distutils.command.sdist import sdist as _sdist -+ from setuptools.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): -- def run(self): -+ def run(self) -> None: - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old -@@ -1634,7 +2159,7 @@ def get_cmdclass(): - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - -- def make_release_tree(self, base_dir, files): -+ def make_release_tree(self, base_dir: str, files: List[str]) -> None: - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) -@@ -1643,8 +2168,10 @@ def get_cmdclass(): - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) -- write_to_version_file(target_versionfile, -- self._versioneer_generated_versions) -+ write_to_version_file( -+ target_versionfile, self._versioneer_generated_versions -+ ) -+ - cmds["sdist"] = cmd_sdist - - return cmds -@@ -1687,23 +2214,26 @@ SAMPLE_CONFIG = """ - - """ - --INIT_PY_SNIPPET = """ -+OLD_SNIPPET = """ - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - """ - -+INIT_PY_SNIPPET = """ -+from . import {0} -+__version__ = {0}.get_versions()['version'] -+""" -+ - --def do_setup(): -- """Main VCS-independent setup function for installing Versioneer.""" -+def do_setup() -> int: -+ """Do main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) -- except (EnvironmentError, configparser.NoSectionError, -- configparser.NoOptionError) as e: -- if isinstance(e, (EnvironmentError, configparser.NoSectionError)): -- print("Adding sample versioneer config to setup.cfg", -- file=sys.stderr) -+ except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: -+ if isinstance(e, (OSError, configparser.NoSectionError)): -+ print("Adding sample versioneer config to setup.cfg", file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) -@@ -1712,71 +2242,49 @@ def do_setup(): - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -- -- ipy = os.path.join(os.path.dirname(cfg.versionfile_source), -- "__init__.py") -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ -+ ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") -+ maybe_ipy: Optional[str] = ipy - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() -- except EnvironmentError: -+ except OSError: - old = "" -- if INIT_PY_SNIPPET not in old: -+ module = os.path.splitext(os.path.basename(cfg.versionfile_source))[0] -+ snippet = INIT_PY_SNIPPET.format(module) -+ if OLD_SNIPPET in old: -+ print(" replacing boilerplate in %s" % ipy) -+ with open(ipy, "w") as f: -+ f.write(old.replace(OLD_SNIPPET, snippet)) -+ elif snippet not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: -- f.write(INIT_PY_SNIPPET) -+ f.write(snippet) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) -- ipy = None -- -- # Make sure both the top-level "versioneer.py" and versionfile_source -- # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so -- # they'll be copied into source distributions. Pip won't be able to -- # install the package without this. -- manifest_in = os.path.join(root, "MANIFEST.in") -- simple_includes = set() -- try: -- with open(manifest_in, "r") as f: -- for line in f: -- if line.startswith("include "): -- for include in line.split()[1:]: -- simple_includes.add(include) -- except EnvironmentError: -- pass -- # That doesn't cover everything MANIFEST.in can do -- # (http://docs.python.org/2/distutils/sourcedist.html#commands), so -- # it might give some false negatives. Appending redundant 'include' -- # lines is safe, though. -- if "versioneer.py" not in simple_includes: -- print(" appending 'versioneer.py' to MANIFEST.in") -- with open(manifest_in, "a") as f: -- f.write("include versioneer.py\n") -- else: -- print(" 'versioneer.py' already in MANIFEST.in") -- if cfg.versionfile_source not in simple_includes: -- print(" appending versionfile_source ('%s') to MANIFEST.in" % -- cfg.versionfile_source) -- with open(manifest_in, "a") as f: -- f.write("include %s\n" % cfg.versionfile_source) -- else: -- print(" versionfile_source already in MANIFEST.in") -+ maybe_ipy = None - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. -- do_vcs_install(manifest_in, cfg.versionfile_source, ipy) -+ do_vcs_install(cfg.versionfile_source, maybe_ipy) - return 0 - - --def scan_setup_py(): -+def scan_setup_py() -> int: - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False -@@ -1813,10 +2321,14 @@ def scan_setup_py(): - return errors - - -+def setup_command() -> NoReturn: -+ """Set up Versioneer and exit with appropriate error code.""" -+ errors = do_setup() -+ errors += scan_setup_py() -+ sys.exit(1 if errors else 0) -+ -+ - if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": -- errors = do_setup() -- errors += scan_setup_py() -- if errors: -- sys.exit(1) -+ setup_command() --- -2.41.0 - diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in index 1a743c10fea..4cbb840a822 100644 --- a/package/python-magic-wormhole-transit-relay/Config.in +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY bool "python-magic-wormhole-transit-relay" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime help Transit Relay server for Magic-Wormhole. 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 index f131477a403..3f038728bee 100644 --- 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 @@ -1,5 +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 +md5 73be034b4a57e9d190cfb658cbaa5fbf magic-wormhole-transit-relay-0.4.0.tar.gz +sha256 912d835da21b11266c77111dc9b5e5800263fc0b98f0a179962267df41819e8c magic-wormhole-transit-relay-0.4.0.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 index e4ffe6e7a60..03a2d416db0 100644 --- 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 @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.4.0 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_SITE = https://files.pythonhosted.org/packages/d0/87/cb71073e53ea7e1b6f892c52e4114caea81b887a7d34e665b15dc81d669e PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE diff --git a/package/python-magic-wormhole/0001-Update-versioneer-to-0.29.patch b/package/python-magic-wormhole/0001-Update-versioneer-to-0.29.patch deleted file mode 100644 index 54b5fe8b1d9..00000000000 --- a/package/python-magic-wormhole/0001-Update-versioneer-to-0.29.patch +++ /dev/null @@ -1,2185 +0,0 @@ -From b283ce50c6f32387d0f474c935ed6015585b986c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 24 Oct 2023 09:54:40 +0200 -Subject: [PATCH] Update versioneer to 0.29 - -Fixes builds against Python 3.12.0 - -Upstream: https://github.com/magic-wormhole/magic-wormhole/pull/505 - -Signed-off-by: Adam Duskett ---- - versioneer.py | 1348 ++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 930 insertions(+), 418 deletions(-) - -diff --git a/versioneer.py b/versioneer.py -index ebe628e..de97d90 100644 ---- a/versioneer.py -+++ b/versioneer.py -@@ -1,5 +1,4 @@ -- --# Version: 0.18 -+# Version: 0.29 - - """The Versioneer - like a rocketeer, but for versions. - -@@ -7,18 +6,14 @@ The Versioneer - ============== - - * like a rocketeer, but for versions! --* https://github.com/warner/python-versioneer -+* https://github.com/python-versioneer/python-versioneer - * Brian Warner --* License: Public Domain --* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy --* [![Latest Version] --(https://pypip.in/version/versioneer/badge.svg?style=flat) --](https://pypi.python.org/pypi/versioneer/) --* [![Build Status] --(https://travis-ci.org/warner/python-versioneer.png?branch=master) --](https://travis-ci.org/warner/python-versioneer) -- --This is a tool for managing a recorded version number in distutils-based -+* License: Public Domain (Unlicense) -+* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3 -+* [![Latest Version][pypi-image]][pypi-url] -+* [![Build Status][travis-image]][travis-url] -+ -+This is a tool for managing a recorded version number in setuptools-based - python projects. The goal is to remove the tedious and error-prone "update - the embedded version string" step from your release process. Making a new - release should be as easy as recording a new tag in your version-control -@@ -27,9 +22,38 @@ system, and maybe making new tarballs. - - ## Quick Install - --* `pip install versioneer` to somewhere to your $PATH --* add a `[versioneer]` section to your setup.cfg (see below) --* run `versioneer install` in your source tree, commit the results -+Versioneer provides two installation modes. The "classic" vendored mode installs -+a copy of versioneer into your repository. The experimental build-time dependency mode -+is intended to allow you to skip this step and simplify the process of upgrading. -+ -+### Vendored mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+ * Note that you will need to add `tomli; python_version < "3.11"` to your -+ build-time dependencies if you use `pyproject.toml` -+* run `versioneer install --vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` -+ -+### Build-time dependency mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+* add `versioneer` (with `[toml]` extra, if configuring in `pyproject.toml`) -+ to the `requires` key of the `build-system` table in `pyproject.toml`: -+ ```toml -+ [build-system] -+ requires = ["setuptools", "versioneer[toml]"] -+ build-backend = "setuptools.build_meta" -+ ``` -+* run `versioneer install --no-vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` - - ## Version Identifiers - -@@ -61,7 +85,7 @@ version 1.3). Many VCS systems can report a description that captures this, - for example `git describe --tags --dirty --always` reports things like - "0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the - 0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has --uncommitted changes. -+uncommitted changes). - - The version identifier is used for multiple purposes: - -@@ -166,7 +190,7 @@ which may help identify what went wrong). - - Some situations are known to cause problems for Versioneer. This details the - most significant ones. More can be found on Github --[issues page](https://github.com/warner/python-versioneer/issues). -+[issues page](https://github.com/python-versioneer/python-versioneer/issues). - - ### Subprojects - -@@ -194,9 +218,9 @@ work too. - Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in - some later version. - --[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -+[Bug #38](https://github.com/python-versioneer/python-versioneer/issues/38) is tracking - this issue. The discussion in --[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -+[PR #61](https://github.com/python-versioneer/python-versioneer/pull/61) describes the - issue from the Versioneer side in more detail. - [pip PR#3176](https://github.com/pypa/pip/pull/3176) and - [pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -@@ -224,31 +248,20 @@ regenerated while a different version is checked out. Many setup.py commands - cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into - a different virtualenv), so this can be surprising. - --[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -+[Bug #83](https://github.com/python-versioneer/python-versioneer/issues/83) describes - this one, but upgrading to a newer version of setuptools should probably - resolve it. - --### Unicode version strings -- --While Versioneer works (and is continually tested) with both Python 2 and --Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. --Newer releases probably generate unicode version strings on py2. It's not --clear that this is wrong, but it may be surprising for applications when then --write these strings to a network connection or include them in bytes-oriented --APIs like cryptographic checksums. -- --[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates --this question. -- - - ## Updating Versioneer - - To upgrade your project to a new release of Versioneer, do the following: - - * install the new Versioneer (`pip install -U versioneer` or equivalent) --* edit `setup.cfg`, if necessary, to include any new configuration settings -- indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. --* re-run `versioneer install` in your source tree, to replace -+* edit `setup.cfg` and `pyproject.toml`, if necessary, -+ to include any new configuration settings indicated by the release notes. -+ See [UPGRADING](./UPGRADING.md) for details. -+* re-run `versioneer install --[no-]vendor` in your source tree, to replace - `SRC/_version.py` - * commit any changed files - -@@ -265,35 +278,70 @@ installation by editing setup.py . Alternatively, it might go the other - direction and include code from all supported VCS systems, reducing the - number of intermediate scripts. - -+## Similar projects -+ -+* [setuptools_scm](https://github.com/pypa/setuptools_scm/) - a non-vendored build-time -+ dependency -+* [minver](https://github.com/jbweston/miniver) - a lightweight reimplementation of -+ versioneer -+* [versioningit](https://github.com/jwodder/versioningit) - a PEP 518-based setuptools -+ plugin - - ## License - - To make Versioneer easier to embed, all its code is dedicated to the public - domain. The `_version.py` that it creates is also in the public domain. --Specifically, both are released under the Creative Commons "Public Domain --Dedication" license (CC0-1.0), as described in --https://creativecommons.org/publicdomain/zero/1.0/ . -+Specifically, both are released under the "Unlicense", as described in -+https://unlicense.org/. -+ -+[pypi-image]: https://img.shields.io/pypi/v/versioneer.svg -+[pypi-url]: https://pypi.python.org/pypi/versioneer/ -+[travis-image]: -+https://img.shields.io/travis/com/python-versioneer/python-versioneer.svg -+[travis-url]: https://travis-ci.com/github/python-versioneer/python-versioneer - - """ -+# pylint:disable=invalid-name,import-outside-toplevel,missing-function-docstring -+# pylint:disable=missing-class-docstring,too-many-branches,too-many-statements -+# pylint:disable=raise-missing-from,too-many-lines,too-many-locals,import-error -+# pylint:disable=too-few-public-methods,redefined-outer-name,consider-using-with -+# pylint:disable=attribute-defined-outside-init,too-many-arguments - --from __future__ import print_function --try: -- import configparser --except ImportError: -- import ConfigParser as configparser -+import configparser - import errno - import json - import os - import re - import subprocess - import sys -+from pathlib import Path -+from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Union -+from typing import NoReturn -+import functools -+ -+have_tomllib = True -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ try: -+ import tomli as tomllib -+ except ImportError: -+ have_tomllib = False - - - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ versionfile_source: str -+ versionfile_build: Optional[str] -+ parentdir_prefix: Optional[str] -+ verbose: Optional[bool] -+ - --def get_root(): -+def get_root() -> str: - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the -@@ -301,18 +349,30 @@ def get_root(): - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -- err = ("Versioneer was unable to run the project root directory. " -- "Versioneer requires setup.py to be executed from " -- "its immediate directory (like 'python setup.py COMMAND'), " -- "or in a way that lets it use sys.argv[0] to find the root " -- "(like 'python path/to/setup.py COMMAND').") -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): -+ err = ( -+ "Versioneer was unable to run the project root directory. " -+ "Versioneer requires setup.py to be executed from " -+ "its immediate directory (like 'python setup.py COMMAND'), " -+ "or in a way that lets it use sys.argv[0] to find the root " -+ "(like 'python path/to/setup.py COMMAND')." -+ ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools -@@ -321,43 +381,64 @@ def get_root(): - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. -- me = os.path.realpath(os.path.abspath(__file__)) -- me_dir = os.path.normcase(os.path.splitext(me)[0]) -+ my_path = os.path.realpath(os.path.abspath(__file__)) -+ me_dir = os.path.normcase(os.path.splitext(my_path)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) -- if me_dir != vsr_dir: -- print("Warning: build in %s is using versioneer.py from %s" -- % (os.path.dirname(me), versioneer_py)) -+ if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals(): -+ print( -+ "Warning: build in %s is using versioneer.py from %s" -+ % (os.path.dirname(my_path), versioneer_py) -+ ) - except NameError: - pass - return root - - --def get_config_from_root(root): -+def get_config_from_root(root: str) -> VersioneerConfig: - """Read the project setup.cfg file to determine Versioneer config.""" -- # This might raise EnvironmentError (if setup.cfg is missing), or -+ # This might raise OSError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . -- setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -- with open(setup_cfg, "r") as f: -- parser.readfp(f) -- VCS = parser.get("versioneer", "VCS") # mandatory -- -- def get(parser, name): -- if parser.has_option("versioneer", name): -- return parser.get("versioneer", name) -- return None -+ root_pth = Path(root) -+ pyproject_toml = root_pth / "pyproject.toml" -+ setup_cfg = root_pth / "setup.cfg" -+ section: Union[Dict[str, Any], configparser.SectionProxy, None] = None -+ if pyproject_toml.exists() and have_tomllib: -+ try: -+ with open(pyproject_toml, "rb") as fobj: -+ pp = tomllib.load(fobj) -+ section = pp["tool"]["versioneer"] -+ except (tomllib.TOMLDecodeError, KeyError) as e: -+ print(f"Failed to load config from {pyproject_toml}: {e}") -+ print("Try to load it from setup.cfg") -+ if not section: -+ parser = configparser.ConfigParser() -+ with open(setup_cfg) as cfg_file: -+ parser.read_file(cfg_file) -+ parser.get("versioneer", "VCS") # raise error if missing -+ -+ section = parser["versioneer"] -+ -+ # `cast`` really shouldn't be used, but its simplest for the -+ # common VersioneerConfig users at the moment. We verify against -+ # `None` values elsewhere where it matters -+ - cfg = VersioneerConfig() -- cfg.VCS = VCS -- cfg.style = get(parser, "style") or "" -- cfg.versionfile_source = get(parser, "versionfile_source") -- cfg.versionfile_build = get(parser, "versionfile_build") -- cfg.tag_prefix = get(parser, "tag_prefix") -- if cfg.tag_prefix in ("''", '""'): -+ cfg.VCS = section["VCS"] -+ cfg.style = section.get("style", "") -+ cfg.versionfile_source = cast(str, section.get("versionfile_source")) -+ cfg.versionfile_build = section.get("versionfile_build") -+ cfg.tag_prefix = cast(str, section.get("tag_prefix")) -+ if cfg.tag_prefix in ("''", '""', None): - cfg.tag_prefix = "" -- cfg.parentdir_prefix = get(parser, "parentdir_prefix") -- cfg.verbose = get(parser, "verbose") -+ cfg.parentdir_prefix = section.get("parentdir_prefix") -+ if isinstance(section, configparser.SectionProxy): -+ # Make sure configparser translates to bool -+ cfg.verbose = section.getboolean("verbose") -+ else: -+ cfg.verbose = section.get("verbose") -+ - return cfg - - -@@ -366,37 +447,54 @@ class NotThisMethod(Exception): - - - # these dictionaries contain VCS-specific tools --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" -- if vcs not in HANDLERS: -- HANDLERS[vcs] = {} -- HANDLERS[vcs][method] = f -+ HANDLERS.setdefault(vcs, {})[method] = f - return f -+ - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen( -+ [command] + args, -+ cwd=cwd, -+ env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr else None), -+ **popen_kwargs, -+ ) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -407,26 +505,27 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --LONG_VERSION_PY['git'] = ''' -+LONG_VERSION_PY[ -+ "git" -+] = r''' - # This file helps to compute a version number in source trees obtained from - # git-archive tarball (such as those provided by githubs download-from-tag - # feature). Distribution tarballs (built by setup.py sdist) and build - # directories (produced by setup.py build) will contain a much shorter file - # that just contains the computed version number. - --# This file is released into the public domain. Generated by --# versioneer-0.18 (https://github.com/warner/python-versioneer) -+# This file is released into the public domain. -+# Generated by versioneer-0.29 -+# https://github.com/python-versioneer/python-versioneer - - """Git implementation of _version.py.""" - -@@ -435,9 +534,11 @@ import os - import re - import subprocess - import sys -+from typing import Any, Callable, Dict, List, Optional, Tuple -+import functools - - --def get_keywords(): -+def get_keywords() -> Dict[str, str]: - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must -@@ -453,8 +554,15 @@ def get_keywords(): - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ parentdir_prefix: str -+ versionfile_source: str -+ verbose: bool -+ - --def get_config(): -+def get_config() -> VersioneerConfig: - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py -@@ -472,13 +580,13 @@ class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} -@@ -487,22 +595,35 @@ def register_vcs_handler(vcs, method): # decorator - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen([command] + args, cwd=cwd, env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr -+ else None), **popen_kwargs) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -513,18 +634,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -533,15 +656,14 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% -@@ -550,41 +672,48 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -597,11 +726,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d -@@ -610,7 +739,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: -@@ -619,6 +748,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r'\d', r): -+ continue - if verbose: - print("picking %%s" %% r) - return {"version": r, -@@ -634,7 +768,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, -+ root: str, -+ verbose: bool, -+ runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -645,8 +784,15 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, -+ hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) -@@ -654,24 +800,57 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%%s*" %% tag_prefix], -- cwd=root) -+ describe_out, rc = runner(GITS, [ -+ "describe", "--tags", "--dirty", "--always", "--long", -+ "--match", f"{tag_prefix}[[:digit:]]*" -+ ], cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], -+ cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -688,7 +867,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -+ # unparsable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces -@@ -713,26 +892,27 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -757,23 +937,71 @@ def render_pep440(pieces): - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%%d.g%%s" %% (pieces["distance"], -+ pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%%d" %% pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%%d.dev%%d" %% (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%%d" %% (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%%d" %% pieces["distance"] -+ rendered = "0.post0.dev%%d" %% pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -800,12 +1028,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -822,7 +1079,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -842,7 +1099,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -862,7 +1119,7 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", -@@ -876,10 +1133,14 @@ def render(pieces, style): - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -894,7 +1155,7 @@ def render(pieces, style): - "date": pieces.get("date")} - - --def get_versions(): -+def get_versions() -> Dict[str, Any]: - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some -@@ -915,7 +1176,7 @@ def get_versions(): - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. -- for i in cfg.versionfile_source.split('/'): -+ for _ in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, -@@ -942,41 +1203,48 @@ def get_versions(): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -989,11 +1257,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d -@@ -1002,7 +1270,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r"\d", r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: -@@ -1010,23 +1278,37 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): -- r = ref[len(tag_prefix):] -+ r = ref[len(tag_prefix) :] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r"\d", r): -+ continue - if verbose: - print("picking %s" % r) -- return {"version": r, -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": None, -- "date": date} -+ return { -+ "version": r, -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": None, -+ "date": date, -+ } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") -- return {"version": "0+unknown", -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": "no suitable tags", "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": "no suitable tags", -+ "date": None, -+ } - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, root: str, verbose: bool, runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -1037,8 +1319,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) -@@ -1046,24 +1334,65 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%s*" % tag_prefix], -- cwd=root) -+ describe_out, rc = runner( -+ GITS, -+ [ -+ "describe", -+ "--tags", -+ "--dirty", -+ "--always", -+ "--long", -+ "--match", -+ f"{tag_prefix}[[:digit:]]*", -+ ], -+ cwd=root, -+ ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -1072,17 +1401,16 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: -- git_describe = git_describe[:git_describe.rindex("-dirty")] -+ git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX -- mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) -+ mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -- pieces["error"] = ("unable to parse git-describe output: '%s'" -- % describe_out) -+ # unparsable. Maybe git-describe is misbehaving? -+ pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out - return pieces - - # tag -@@ -1091,10 +1419,12 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) -- pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" -- % (full_tag, tag_prefix)) -+ pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( -+ full_tag, -+ tag_prefix, -+ ) - return pieces -- pieces["closest-tag"] = full_tag[len(tag_prefix):] -+ pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) -@@ -1105,19 +1435,20 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def do_vcs_install(manifest_in, versionfile_source, ipy): -+def do_vcs_install(versionfile_source: str, ipy: Optional[str]) -> None: - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py -@@ -1126,36 +1457,40 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] -- files = [manifest_in, versionfile_source] -+ files = [versionfile_source] - if ipy: - files.append(ipy) -- try: -- me = __file__ -- if me.endswith(".pyc") or me.endswith(".pyo"): -- me = os.path.splitext(me)[0] + ".py" -- versioneer_file = os.path.relpath(me) -- except NameError: -- versioneer_file = "versioneer.py" -- files.append(versioneer_file) -+ if "VERSIONEER_PEP518" not in globals(): -+ try: -+ my_path = __file__ -+ if my_path.endswith((".pyc", ".pyo")): -+ my_path = os.path.splitext(my_path)[0] + ".py" -+ versioneer_file = os.path.relpath(my_path) -+ except NameError: -+ versioneer_file = "versioneer.py" -+ files.append(versioneer_file) - present = False - try: -- f = open(".gitattributes", "r") -- for line in f.readlines(): -- if line.strip().startswith(versionfile_source): -- if "export-subst" in line.strip().split()[1:]: -- present = True -- f.close() -- except EnvironmentError: -+ with open(".gitattributes", "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith(versionfile_source): -+ if "export-subst" in line.strip().split()[1:]: -+ present = True -+ break -+ except OSError: - pass - if not present: -- f = open(".gitattributes", "a+") -- f.write("%s export-subst\n" % versionfile_source) -- f.close() -+ with open(".gitattributes", "a+") as fobj: -+ fobj.write(f"{versionfile_source} export-subst\n") - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -1164,24 +1499,29 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): -- return {"version": dirname[len(parentdir_prefix):], -- "full-revisionid": None, -- "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ return { -+ "version": dirname[len(parentdir_prefix) :], -+ "full-revisionid": None, -+ "dirty": False, -+ "error": None, -+ "date": None, -+ } -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: -- print("Tried directories %s but none started with prefix %s" % -- (str(rootdirs), parentdir_prefix)) -+ print( -+ "Tried directories %s but none started with prefix %s" -+ % (str(rootdirs), parentdir_prefix) -+ ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - - SHORT_VERSION_PY = """ --# This file was generated by 'versioneer.py' (0.18) from -+# This file was generated by 'versioneer.py' (0.29) from - # revision-control system data, or from the parent directory name of an - # unpacked source archive. Distribution tarballs contain a pre-generated copy - # of this file. -@@ -1198,42 +1538,42 @@ def get_versions(): - """ - - --def versions_from_file(filename): -+def versions_from_file(filename: str) -> Dict[str, Any]: - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() -- except EnvironmentError: -+ except OSError: - raise NotThisMethod("unable to read _version.py") -- mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: -- mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - --def write_to_version_file(filename, versions): -+def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None: - """Write the given version number to the given _version.py file.""" -- os.unlink(filename) -- contents = json.dumps(versions, sort_keys=True, -- indent=1, separators=(",", ": ")) -+ contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -1251,30 +1591,76 @@ def render_pep440(pieces): - rendered += ".dirty" - else: - # exception #1 -- rendered = "0+untagged.%d.g%s" % (pieces["distance"], -- pieces["short"]) -+ rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%d" % pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%d" % (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%d" % pieces["distance"] -+ rendered = "0.post0.dev%d" % pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -1301,12 +1687,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -1323,7 +1738,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -1343,7 +1758,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -1363,24 +1778,30 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: -- return {"version": "unknown", -- "full-revisionid": pieces.get("long"), -- "dirty": None, -- "error": pieces["error"], -- "date": None} -+ return { -+ "version": "unknown", -+ "full-revisionid": pieces.get("long"), -+ "dirty": None, -+ "error": pieces["error"], -+ "date": None, -+ } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -1390,16 +1811,20 @@ def render(pieces, style): - else: - raise ValueError("unknown style '%s'" % style) - -- return {"version": rendered, "full-revisionid": pieces["long"], -- "dirty": pieces["dirty"], "error": None, -- "date": pieces.get("date")} -+ return { -+ "version": rendered, -+ "full-revisionid": pieces["long"], -+ "dirty": pieces["dirty"], -+ "error": None, -+ "date": pieces.get("date"), -+ } - - - class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - --def get_versions(verbose=False): -+def get_versions(verbose: bool = False) -> Dict[str, Any]: - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. -@@ -1414,9 +1839,10 @@ def get_versions(verbose=False): - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS -- verbose = verbose or cfg.verbose -- assert cfg.versionfile_source is not None, \ -- "please set versioneer.versionfile_source" -+ verbose = verbose or bool(cfg.verbose) # `bool()` used to avoid `None` -+ assert ( -+ cfg.versionfile_source is not None -+ ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) -@@ -1470,18 +1896,26 @@ def get_versions(verbose=False): - if verbose: - print("unable to compute version") - -- return {"version": "0+unknown", "full-revisionid": None, -- "dirty": None, "error": "unable to compute version", -- "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": None, -+ "dirty": None, -+ "error": "unable to compute version", -+ "date": None, -+ } - - --def get_version(): -+def get_version() -> str: - """Get the short version string for this project.""" - return get_versions()["version"] - - --def get_cmdclass(): -- """Get the custom setuptools/distutils subclasses used by Versioneer.""" -+def get_cmdclass(cmdclass: Optional[Dict[str, Any]] = None): -+ """Get the custom setuptools subclasses used by Versioneer. -+ -+ If the package uses a different cmdclass (e.g. one from numpy), it -+ should be provide as an argument. -+ """ - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and -@@ -1495,25 +1929,25 @@ def get_cmdclass(): - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. -- # Also see https://github.com/warner/python-versioneer/issues/52 -+ # Also see https://github.com/python-versioneer/python-versioneer/issues/52 - -- cmds = {} -+ cmds = {} if cmdclass is None else cmdclass.copy() - -- # we add "version" to both distutils and setuptools -- from distutils.core import Command -+ # we add "version" to setuptools -+ from setuptools import Command - - class cmd_version(Command): - description = "report generated version string" -- user_options = [] -- boolean_options = [] -+ user_options: List[Tuple[str, str, str]] = [] -+ boolean_options: List[str] = [] - -- def initialize_options(self): -+ def initialize_options(self) -> None: - pass - -- def finalize_options(self): -+ def finalize_options(self) -> None: - pass - -- def run(self): -+ def run(self) -> None: - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) -@@ -1521,9 +1955,10 @@ def get_cmdclass(): - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) -+ - cmds["version"] = cmd_version - -- # we override "build_py" in both distutils and setuptools -+ # we override "build_py" in setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py -@@ -1538,29 +1973,71 @@ def get_cmdclass(): - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - -+ # pip install -e . and setuptool/editable_wheel will invoke build_py -+ # but the build_py command is not expected to copy any files. -+ - # we override different "build_py" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.build_py import build_py as _build_py -+ if "build_py" in cmds: -+ _build_py: Any = cmds["build_py"] - else: -- from distutils.command.build_py import build_py as _build_py -+ from setuptools.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) -+ if getattr(self, "editable_mode", False): -+ # During editable installs `.py` and data files are -+ # not copied to build_lib -+ return - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: -- target_versionfile = os.path.join(self.build_lib, -- cfg.versionfile_build) -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) -+ - cmds["build_py"] = cmd_build_py - -+ if "build_ext" in cmds: -+ _build_ext: Any = cmds["build_ext"] -+ else: -+ from setuptools.command.build_ext import build_ext as _build_ext -+ -+ class cmd_build_ext(_build_ext): -+ def run(self) -> None: -+ root = get_root() -+ cfg = get_config_from_root(root) -+ versions = get_versions() -+ _build_ext.run(self) -+ if self.inplace: -+ # build_ext --inplace will only build extensions in -+ # build/lib<..> dir with no _version.py to write to. -+ # As in place builds will already have a _version.py -+ # in the module dir, we do not need to write one. -+ return -+ # now locate _version.py in the new build/ directory and replace -+ # it with an updated value -+ if not cfg.versionfile_build: -+ return -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) -+ if not os.path.exists(target_versionfile): -+ print( -+ f"Warning: {target_versionfile} does not exist, skipping " -+ "version update. This can happen if you are running build_ext " -+ "without first running build_py." -+ ) -+ return -+ print("UPDATING %s" % target_versionfile) -+ write_to_version_file(target_versionfile, versions) -+ -+ cmds["build_ext"] = cmd_build_ext -+ - if "cx_Freeze" in sys.modules: # cx_freeze enabled? -- from cx_Freeze.dist import build_exe as _build_exe -+ from cx_Freeze.dist import build_exe as _build_exe # type: ignore -+ - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ -@@ -1569,7 +2046,7 @@ def get_cmdclass(): - # ... - - class cmd_build_exe(_build_exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1581,24 +2058,28 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - -- if 'py2exe' in sys.modules: # py2exe enabled? -+ if "py2exe" in sys.modules: # py2exe enabled? - try: -- from py2exe.distutils_buildexe import py2exe as _py2exe # py3 -+ from py2exe.setuptools_buildexe import py2exe as _py2exe # type: ignore - except ImportError: -- from py2exe.build_exe import py2exe as _py2exe # py2 -+ from py2exe.distutils_buildexe import py2exe as _py2exe # type: ignore - - class cmd_py2exe(_py2exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1610,23 +2091,67 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["py2exe"] = cmd_py2exe - -+ # sdist farms its file list building out to egg_info -+ if "egg_info" in cmds: -+ _egg_info: Any = cmds["egg_info"] -+ else: -+ from setuptools.command.egg_info import egg_info as _egg_info -+ -+ class cmd_egg_info(_egg_info): -+ def find_sources(self) -> None: -+ # egg_info.find_sources builds the manifest list and writes it -+ # in one shot -+ super().find_sources() -+ -+ # Modify the filelist and normalize it -+ root = get_root() -+ cfg = get_config_from_root(root) -+ self.filelist.append("versioneer.py") -+ if cfg.versionfile_source: -+ # There are rare cases where versionfile_source might not be -+ # included by default, so we must be explicit -+ self.filelist.append(cfg.versionfile_source) -+ self.filelist.sort() -+ self.filelist.remove_duplicates() -+ -+ # The write method is hidden in the manifest_maker instance that -+ # generated the filelist and was thrown away -+ # We will instead replicate their final normalization (to unicode, -+ # and POSIX-style paths) -+ from setuptools import unicode_utils -+ -+ normalized = [ -+ unicode_utils.filesys_decode(f).replace(os.sep, "/") -+ for f in self.filelist.files -+ ] -+ -+ manifest_filename = os.path.join(self.egg_info, "SOURCES.txt") -+ with open(manifest_filename, "w") as fobj: -+ fobj.write("\n".join(normalized)) -+ -+ cmds["egg_info"] = cmd_egg_info -+ - # we override different "sdist" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.sdist import sdist as _sdist -+ if "sdist" in cmds: -+ _sdist: Any = cmds["sdist"] - else: -- from distutils.command.sdist import sdist as _sdist -+ from setuptools.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): -- def run(self): -+ def run(self) -> None: - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old -@@ -1634,7 +2159,7 @@ def get_cmdclass(): - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - -- def make_release_tree(self, base_dir, files): -+ def make_release_tree(self, base_dir: str, files: List[str]) -> None: - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) -@@ -1643,8 +2168,10 @@ def get_cmdclass(): - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) -- write_to_version_file(target_versionfile, -- self._versioneer_generated_versions) -+ write_to_version_file( -+ target_versionfile, self._versioneer_generated_versions -+ ) -+ - cmds["sdist"] = cmd_sdist - - return cmds -@@ -1687,23 +2214,26 @@ SAMPLE_CONFIG = """ - - """ - --INIT_PY_SNIPPET = """ -+OLD_SNIPPET = """ - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - """ - -+INIT_PY_SNIPPET = """ -+from . import {0} -+__version__ = {0}.get_versions()['version'] -+""" -+ - --def do_setup(): -- """Main VCS-independent setup function for installing Versioneer.""" -+def do_setup() -> int: -+ """Do main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) -- except (EnvironmentError, configparser.NoSectionError, -- configparser.NoOptionError) as e: -- if isinstance(e, (EnvironmentError, configparser.NoSectionError)): -- print("Adding sample versioneer config to setup.cfg", -- file=sys.stderr) -+ except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: -+ if isinstance(e, (OSError, configparser.NoSectionError)): -+ print("Adding sample versioneer config to setup.cfg", file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) -@@ -1712,71 +2242,49 @@ def do_setup(): - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -- -- ipy = os.path.join(os.path.dirname(cfg.versionfile_source), -- "__init__.py") -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ -+ ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") -+ maybe_ipy: Optional[str] = ipy - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() -- except EnvironmentError: -+ except OSError: - old = "" -- if INIT_PY_SNIPPET not in old: -+ module = os.path.splitext(os.path.basename(cfg.versionfile_source))[0] -+ snippet = INIT_PY_SNIPPET.format(module) -+ if OLD_SNIPPET in old: -+ print(" replacing boilerplate in %s" % ipy) -+ with open(ipy, "w") as f: -+ f.write(old.replace(OLD_SNIPPET, snippet)) -+ elif snippet not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: -- f.write(INIT_PY_SNIPPET) -+ f.write(snippet) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) -- ipy = None -- -- # Make sure both the top-level "versioneer.py" and versionfile_source -- # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so -- # they'll be copied into source distributions. Pip won't be able to -- # install the package without this. -- manifest_in = os.path.join(root, "MANIFEST.in") -- simple_includes = set() -- try: -- with open(manifest_in, "r") as f: -- for line in f: -- if line.startswith("include "): -- for include in line.split()[1:]: -- simple_includes.add(include) -- except EnvironmentError: -- pass -- # That doesn't cover everything MANIFEST.in can do -- # (http://docs.python.org/2/distutils/sourcedist.html#commands), so -- # it might give some false negatives. Appending redundant 'include' -- # lines is safe, though. -- if "versioneer.py" not in simple_includes: -- print(" appending 'versioneer.py' to MANIFEST.in") -- with open(manifest_in, "a") as f: -- f.write("include versioneer.py\n") -- else: -- print(" 'versioneer.py' already in MANIFEST.in") -- if cfg.versionfile_source not in simple_includes: -- print(" appending versionfile_source ('%s') to MANIFEST.in" % -- cfg.versionfile_source) -- with open(manifest_in, "a") as f: -- f.write("include %s\n" % cfg.versionfile_source) -- else: -- print(" versionfile_source already in MANIFEST.in") -+ maybe_ipy = None - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. -- do_vcs_install(manifest_in, cfg.versionfile_source, ipy) -+ do_vcs_install(cfg.versionfile_source, maybe_ipy) - return 0 - - --def scan_setup_py(): -+def scan_setup_py() -> int: - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False -@@ -1813,10 +2321,14 @@ def scan_setup_py(): - return errors - - -+def setup_command() -> NoReturn: -+ """Set up Versioneer and exit with appropriate error code.""" -+ errors = do_setup() -+ errors += scan_setup_py() -+ sys.exit(1 if errors else 0) -+ -+ - if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": -- errors = do_setup() -- errors += scan_setup_py() -- if errors: -- sys.exit(1) -+ setup_command() --- -2.41.0 - diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in index c92af7a9579..bb1cbb546ac 100644 --- a/package/python-magic-wormhole/Config.in +++ b/package/python-magic-wormhole/Config.in @@ -7,12 +7,13 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_ITERABLE_IO # 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 + select BR2_PACKAGE_PYTHON_ZIPSTREAM_NG # runtime help Securely transfer data between computers. diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash index 5a3ffab7320..38ac016f0d6 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.hash +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/magic-wormhole/json -md5 baf778af8df5416e6d01bb2b95fa5cc5 magic-wormhole-0.13.0.tar.gz -sha256 ac3bd68286270e7f149c06149a8e409e5fa34d7feb0e88844a26d29eed2d1516 magic-wormhole-0.13.0.tar.gz +md5 61143e1480353de7b502d1b904837fb0 magic_wormhole-0.17.0.tar.gz +sha256 142c7a271684b0b04470792601848f6b0ade0d8bf54fbcb30c6259d75edd9d06 magic_wormhole-0.17.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 index 3349bfd4e12..37fddf6c219 100644 --- a/package/python-magic-wormhole/python-magic-wormhole.mk +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAGIC_WORMHOLE_VERSION = 0.13.0 -PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz -PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/cc/e1/75c31ad5db873268ba0750006b3d0e40c30b0ad39e6f58b1e28a28d6de48 +PYTHON_MAGIC_WORMHOLE_VERSION = 0.17.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic_wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/1b/a8/32a54e75643206665f569dac6ab19727aefb508b148882f1d05dff003667 PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools PYTHON_MAGIC_WORMHOLE_LICENSE = MIT PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index 03651cf9567..0a39db7db9b 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 90da23903468efe9aa88dc88081579ff Mako-1.3.0.tar.gz -sha256 e3a9d388fd00e87043edbe8792f45880ac0114e9c4adc69f6e9bfb2c55e3b11b Mako-1.3.0.tar.gz +md5 ca119a43eb3eff532bd5d55d585d1caa mako-1.3.6.tar.gz +sha256 9ec3a1583713479fae654f83ed9fa8c9a4c16b7bb0daba0e6bbebff50c0d983d mako-1.3.6.tar.gz # Locally computed sha256 checksums -sha256 0a326e448dd22f220dd30796677ddbdf3ddaa6427a9744fea9deaa51d9d74fd9 LICENSE +sha256 15627b36b38d0729cdd686df9abf606503d99d624b2f5ec5cb254a75d5afa891 LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 2eba772b263..68cfc98bc2f 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.3.0 -PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/a9/6e/6b41e654bbdcef90c6b9e7f280bf7cbd756dc2560ce76214f5cdbc4ddab5 +PYTHON_MAKO_VERSION = 1.3.6 +PYTHON_MAKO_SOURCE = mako-$(PYTHON_MAKO_VERSION).tar.gz +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/fa/0b/29bc5a230948bf209d3ed3165006d257e547c02c3c2a96f6286320dfe8dc 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 21f0c28bacc..9a452bb4f78 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 1bd2746a8f32643f151991719fe7faf9 Markdown-3.5.1.tar.gz -sha256 b65d7beb248dc22f2e8a31fb706d93798093c308dc1aba295aedeb9d41a813bd Markdown-3.5.1.tar.gz -# Locally computed sha256 -sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md +md5 de4cdc6db368c7386f733d6dd8c858b1 markdown-3.7.tar.gz +sha256 2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 markdown-3.7.tar.gz +# Locally computed sha256 checksums +sha256 7ba4eb6d10b32b2d11dce13821340351cdbbb30ba8ccc67841db2ffd86e79aca LICENSE.md diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk index b491660f24a..4cacee24f87 100644 --- a/package/python-markdown/python-markdown.mk +++ b/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.5.1 -PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/35/14/1ec9742e151f3b06a723a20d9af7201a389ebd3aae8b7d93b521819489dc +PYTHON_MARKDOWN_VERSION = 3.7 +PYTHON_MARKDOWN_SOURCE = markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/54/28/3af612670f82f4c056911fbbbb42760255801b3068c48de792d354ff4472 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 0a764991853..f5c2adb0e13 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 69cdd2c9ee1f6837cb173a44d6a0622d markdown2-2.4.12.tar.gz -sha256 1bc8692696954d597778e0e25713c14ca56d87992070dedd95c17eddaf709204 markdown2-2.4.12.tar.gz +md5 1b6f79fa3baea447e6b4dda5132e2fbc markdown2-2.5.1.tar.gz +sha256 12fc04ea5a87f7bb4b65acf5bf3af1183b20838cc7d543b74c92ec7eea4bbc74 markdown2-2.5.1.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 a78e6ea0d8f..228c5d0effd 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.4.12 +PYTHON_MARKDOWN2_VERSION = 2.5.1 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/3c/e4/87a454674ac303e2ca6c25713845d2ae1b59c1a88576054cbec25aaebad1 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/05/92/22e3645e352562ea9bfc89aeaeb9a76feb79e20907b18bc25d5ca340b50f 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 c6f9cd47028..c5ba0155928 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 8fe7227653f2fb9b1ffe7f9f2058998a MarkupSafe-2.1.5.tar.gz -sha256 d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b MarkupSafe-2.1.5.tar.gz +md5 cb0071711b573b155cc8f86e1de72167 markupsafe-3.0.2.tar.gz +sha256 ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0 markupsafe-3.0.2.tar.gz # Locally computed sha256 checksums -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.txt diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index b54a77365f7..11e87082707 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 2.1.5 -PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d +PYTHON_MARKUPSAFE_VERSION = 3.0.2 +PYTHON_MARKUPSAFE_SOURCE = markupsafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62 PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause -PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst +PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-marshmallow-sqlalchemy/Config.in b/package/python-marshmallow-sqlalchemy/Config.in index f48d27edd62..f7f1975c72a 100644 --- a/package/python-marshmallow-sqlalchemy/Config.in +++ b/package/python-marshmallow-sqlalchemy/Config.in @@ -1,7 +1,6 @@ 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 diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index 3194513dfc4..68892165f5f 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 61e46e0ad5fabd0e9e11f895e1243bc3 marshmallow-sqlalchemy-0.30.0.tar.gz -sha256 29ad0a4fd1b4a1e52dcb07f9673d284a6b0795141916cc2169d4ee9a5d007347 marshmallow-sqlalchemy-0.30.0.tar.gz +md5 1cdbefa0aa35a1205d7e3bb3674743bb marshmallow_sqlalchemy-1.1.0.tar.gz +sha256 2ab092da269dafa8a05d51a58409af71a8d2183958ba47143127dd239e0359d8 marshmallow_sqlalchemy-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 5f6cd082e01dda8a7c157687e196be98d68224cf41c0cee1968eb5c08e0c076a LICENSE +sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk index a95e53022b0..a334bec1f52 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.30.0 -PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz -PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/5d/3f/21aa202f3df31d2d20d4ae8dfe9c7f1ce0a1eecba7003915a986a7599778 -PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 1.1.0 +PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow_sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/82/f8/2e565045b17dd60b38aafc3242ac44f5403315df08963501d07463d089ac +PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = flit PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash index cb60216a263..8a6a3cf85b1 100644 --- a/package/python-marshmallow/python-marshmallow.hash +++ b/package/python-marshmallow/python-marshmallow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow/json -md5 c6093f980a650b1088bbc5610055a05c marshmallow-3.20.1.tar.gz -sha256 5d2371bbe42000f2b3fb5eaa065224df7d8f8597bc19a1bbfa5bfe7fba8da889 marshmallow-3.20.1.tar.gz +md5 45f26839a3486cac60f6aa043e5035dd marshmallow-3.23.1.tar.gz +sha256 3a8dfda6edd8dcdbf216c0ede1d1e78d230a6dc9c5a088f58c4083b974a0d468 marshmallow-3.23.1.tar.gz # Locally computed sha256 checksums -sha256 759dc79c383ad79340c6e41f712e80407fe0d2cb3cbaad1ed98aa9c3e28a602c LICENSE +sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index afd4068f446..2c2e7f1ee31 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_MARSHMALLOW_VERSION = 3.20.1 +PYTHON_MARSHMALLOW_VERSION = 3.23.1 PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz -PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/e4/e0/3e49c0f91f3e8954806c1076f4eae2c95a9d3ed2546f267c683b877d327b -PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/6d/30/14d8609f65c8aeddddd3181c06d2c9582da6278f063b27c910bbf9903441 +PYTHON_MARSHMALLOW_SETUP_TYPE = flit PYTHON_MARSHMALLOW_LICENSE = MIT -PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE docs/license.rst PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.hash b/package/python-matplotlib-inline/python-matplotlib-inline.hash index 7382fc34060..1925a098089 100644 --- a/package/python-matplotlib-inline/python-matplotlib-inline.hash +++ b/package/python-matplotlib-inline/python-matplotlib-inline.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/matplotlib-inline/json -md5 aded9a57e2f526f76b3a4851d5528d4f matplotlib-inline-0.1.6.tar.gz -sha256 f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304 matplotlib-inline-0.1.6.tar.gz +md5 96fe871bf30dc414e6724423c1e2ebb1 matplotlib_inline-0.1.7.tar.gz +sha256 8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90 matplotlib_inline-0.1.7.tar.gz # Locally computed sha256 checksums sha256 8521b036c6448e0e0aa7213d4713b6fdee0f4c64c9f320450f77346bf5c0e8e4 LICENSE diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.mk b/package/python-matplotlib-inline/python-matplotlib-inline.mk index c9c22605ca9..961b50120a6 100644 --- a/package/python-matplotlib-inline/python-matplotlib-inline.mk +++ b/package/python-matplotlib-inline/python-matplotlib-inline.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_INLINE_VERSION = 0.1.6 -PYTHON_MATPLOTLIB_INLINE_SOURCE = matplotlib-inline-$(PYTHON_MATPLOTLIB_INLINE_VERSION).tar.gz -PYTHON_MATPLOTLIB_INLINE_SITE = https://files.pythonhosted.org/packages/d9/50/3af8c0362f26108e54d58c7f38784a3bdae6b9a450bab48ee8482d737f44 +PYTHON_MATPLOTLIB_INLINE_VERSION = 0.1.7 +PYTHON_MATPLOTLIB_INLINE_SOURCE = matplotlib_inline-$(PYTHON_MATPLOTLIB_INLINE_VERSION).tar.gz +PYTHON_MATPLOTLIB_INLINE_SITE = https://files.pythonhosted.org/packages/99/5b/a36a337438a14116b16480db471ad061c36c3694df7c2084a0da7ba538b7 PYTHON_MATPLOTLIB_INLINE_SETUP_TYPE = setuptools PYTHON_MATPLOTLIB_INLINE_LICENSE = BSD-3-Clause PYTHON_MATPLOTLIB_INLINE_LICENSE_FILES = LICENSE diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b3d84e2b434..13894004aa5 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -13,8 +13,10 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_FONTTOOLS # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index c2fb907e2c8..2882997b8ad 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/matplotlib/json -md5 72896b8c240903ebddc47be6451d813b matplotlib-3.8.2.tar.gz -sha256 01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1 matplotlib-3.8.2.tar.gz +md5 bb92dfd3c1e9c816100b91008be5e300 matplotlib-3.9.2.tar.gz +sha256 96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 matplotlib-3.9.2.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 5f5d53172e0..7312d2b1ec1 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.8.2 +PYTHON_MATPLOTLIB_VERSION = 3.9.2 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/fb/ab/38a0e94cb01dacb50f06957c2bed1c83b8f9dac6618988a37b2487862944 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/9e/d8/3d7f706c69e024d4287c1110d74f7dabac91d9843b99eadc90de9efc8869 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE PYTHON_MATPLOTLIB_DEPENDENCIES = \ @@ -19,16 +19,16 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ python-cycler \ python-pybind \ qhull -PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools -PYTHON_MATPLOTLIB_BUILD_OPTS = --skip-dependency-check +PYTHON_MATPLOTLIB_CONF_OPTS = \ + -Dmacosx=false \ + -Dsystem-freetype=true \ + -Dsystem-qhull=true +PYTHON_MATPLOTLIB_CONF_ENV += \ + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 endif -define PYTHON_MATPLOTLIB_COPY_SETUP_CFG - cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/mplsetup.cfg -endef -PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG - -$(eval $(python-package)) +$(eval $(meson-package)) diff --git a/package/python-matplotlib/setup.cfg b/package/python-matplotlib/setup.cfg deleted file mode 100644 index 4bda0d4376e..00000000000 --- a/package/python-matplotlib/setup.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[libs] -# Disable LTO to prevent the following error: -# Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' -# which may bind externally can not be used when making a shared object; -# recompile with -fPIC -enable_lto = False - -# Freetype and qhull are provided by Buildroot -system_freetype = True -system_qhull = True diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index 3c5f836ad55..218b7892950 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 56c18b09d38080f9975fb679be1fda01b936d21f5ef233967cda3dd74905e683 maturin-1.7.0.tar.gz +sha256 1595a7bdc135888ed0f2c595819f010738196392e3d42569af4bdfe718654899 python-maturin-1.7.4-cargo2.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 70cdb15949e..2e59538212f 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.7.0 -PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/80/da/a4bbd6e97f3645f4ebd725321aa235e22e31037dfd92caf4539f721c0a5a +PYTHON_MATURIN_VERSION = 1.7.4 +PYTHON_MATURIN_SOURCE_PYPI = maturin-$(PYTHON_MATURIN_VERSION).tar.gz +PYTHON_MATURIN_SITE_PYPI = https://files.pythonhosted.org/packages/51/28/31a650d9209d873b6aec759c944bd284155154d7a01f7f541786d7c435ca +PYTHON_MATURIN_SITE = $(PYTHON_MATURIN_SITE_PYPI)/$(PYTHON_MATURIN_SOURCE_PYPI)?buildroot-path=filename PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit diff --git a/package/python-meson-python/python-meson-python.hash b/package/python-meson-python/python-meson-python.hash index 537353bad20..11f18071447 100644 --- a/package/python-meson-python/python-meson-python.hash +++ b/package/python-meson-python/python-meson-python.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/meson-python/json -md5 e91eb9946d7bb8be06e434c5a2dadd05 meson_python-0.15.0.tar.gz -sha256 fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f meson_python-0.15.0.tar.gz +md5 bf1299782f02e4bb590a437bd140fd12 meson_python-0.17.1.tar.gz +sha256 efb91f69f2e19eef7bc9a471ed2a4e730088cc6b39eacaf3e49fc4f930eb5f83 meson_python-0.17.1.tar.gz # Locally computed sha256 checksums sha256 8f82ea9ef9a55b47f4170536d02e48b5bc33fc5135e5b4a1b5f8d6404833ec9b LICENSE diff --git a/package/python-meson-python/python-meson-python.mk b/package/python-meson-python/python-meson-python.mk index 64d5de4ba91..be8ab00c6aa 100644 --- a/package/python-meson-python/python-meson-python.mk +++ b/package/python-meson-python/python-meson-python.mk @@ -4,15 +4,16 @@ # ################################################################################ -PYTHON_MESON_PYTHON_VERSION = 0.15.0 +PYTHON_MESON_PYTHON_VERSION = 0.17.1 PYTHON_MESON_PYTHON_SOURCE = meson_python-$(PYTHON_MESON_PYTHON_VERSION).tar.gz -PYTHON_MESON_PYTHON_SITE = https://files.pythonhosted.org/packages/a2/3b/276b596824a0820987fdcc7721618453b4f9a8305fe20b611a00ac3f948e +PYTHON_MESON_PYTHON_SITE = https://files.pythonhosted.org/packages/67/66/91d242ea8dd1729addd36069318ba2cd03874872764f316c3bb51b633ed2 PYTHON_MESON_PYTHON_SETUP_TYPE = pep517 PYTHON_MESON_PYTHON_LICENSE = MIT PYTHON_MESON_PYTHON_LICENSE_FILES = LICENSE HOST_PYTHON_MESON_PYTHON_DEPENDENCIES = \ host-meson \ host-patchelf \ + host-python-packaging \ host-python-pyproject-metadata $(eval $(host-python-package)) diff --git a/package/python-mimeparse/python-mimeparse.hash b/package/python-mimeparse/python-mimeparse.hash index 00985841dc2..d8c9070fa7b 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 e3d6505e9af0629a15b4d56d7f34b2ef python_mimeparse-2.0.0.tar.gz +sha256 5b9a9dcf7aa82465e31bd667f5cb7000604811dce83554f1c8a43693a32cb303 python_mimeparse-2.0.0.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-mimeparse/python-mimeparse.mk b/package/python-mimeparse/python-mimeparse.mk index 00bb1cf8f42..a67d02f818f 100644 --- a/package/python-mimeparse/python-mimeparse.mk +++ b/package/python-mimeparse/python-mimeparse.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_MIMEPARSE_VERSION = 1.6.0 -PYTHON_MIMEPARSE_SITE = https://files.pythonhosted.org/packages/0f/40/ac5f9e44a55b678c3cd881b4c3376e5b002677dbeab6fb3a50bac5d50d29 +PYTHON_MIMEPARSE_VERSION = 2.0.0 +PYTHON_MIMEPARSE_SOURCE = python_mimeparse-$(PYTHON_MIMEPARSE_VERSION).tar.gz +PYTHON_MIMEPARSE_SITE = https://files.pythonhosted.org/packages/cd/85/c40f2e0b2128905f6c34894be01803c114f2b2efab0e8b4c3dca5e56b999 PYTHON_MIMEPARSE_SETUP_TYPE = setuptools PYTHON_MIMEPARSE_LICENSE = MIT PYTHON_MIMEPARSE_LICENSE_FILES = LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index 53bfacb5283..e11ae88abfa 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz -sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz +md5 0d4d585a69dc36ce685c487c99fcc59a ml_dtypes-0.5.0.tar.gz +sha256 3e7d3a380fe73a63c884f06136f8baa7a5249cc8e9fdec677997dd78549f8128 ml_dtypes-0.5.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 80972650789..060fe555c59 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.3.2 +PYTHON_ML_DTYPES_VERSION = 0.5.0 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/ab/79/717c5e22ad25d63ce3acdfe8ff8d64bdedec18914256c59b838218708b16 PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE PYTHON_ML_DTYPES_SETUP_TYPE = setuptools diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 4d119cb2038..a7983a4449e 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 1737bb4d9d09501f75f498538efe3cf4 more-itertools-10.2.0.tar.gz -sha256 8fccb480c43d3e99a00087634c06dd02b0d50fbf088b380de5a41a015ec239e1 more-itertools-10.2.0.tar.gz +md5 43150affe17a010264115f2caea5de70 more-itertools-10.5.0.tar.gz +sha256 5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6 more-itertools-10.5.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 98b499c3c0a..8fac2abac24 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 10.2.0 +PYTHON_MORE_ITERTOOLS_VERSION = 10.5.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/df/ad/7905a7fd46ffb61d976133a4f47799388209e73cbc8c1253593335da88b4 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/51/78/65922308c4248e0eb08ebcbe67c95d48615cc6f27854b6f2e57143e9178f PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 50462db8db9..acacd6c664e 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 a5a4172b2e89812ec28267dd8942b77d msgpack-1.0.7.tar.gz -sha256 572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87 msgpack-1.0.7.tar.gz +md5 e5769d4ab610491ac561c84fde4cf4a7 msgpack-1.1.0.tar.gz +sha256 dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e msgpack-1.1.0.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 9cdf5263de2..92d3516186f 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.7 +PYTHON_MSGPACK_VERSION = 1.1.0 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db1571110b5b51647aed4b56dfbd01bfae789fa566a2be1f385d1 +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/cb/d0/7555686ae7ff5731205df1012ede15dd9d927f6227ea151e901c7406af4f PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools -PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check - -# When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives -# using the pure python implementation rather than rely on the C++ native code. -# So we can't force it to use C++; we can only force it to use pure python. -ifeq ($(BR2_INSTALL_LIBSTDCPP),) -PYTHON_MSGPACK_ENV = MSGPACK_PUREPYTHON=1 -endif $(eval $(python-package)) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index d23a3de3eb7..3230ac9b56b 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 abcf9bf19365d06aa784de07da02115d multidict-6.0.5.tar.gz -sha256 f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da multidict-6.0.5.tar.gz +md5 2c8cf03b6e92e1b9c335de56b606c2fc multidict-6.1.0.tar.gz +sha256 22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a multidict-6.1.0.tar.gz # Locally computed sha256 checksums sha256 93d11a968e2f0f36373c40811ff6d20e173f58c3cab5884cd6617bbfd795492a LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 3c9a21f1dce..6b952244bcf 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.5 +PYTHON_MULTIDICT_VERSION = 6.1.0 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/f9/79/722ca999a3a09a63b35aac12ec27dfa8e5bb3a38b0f857f7a1a209a88836 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/d6/be/504b89a5e9ca731cd47487e91c469064f8ae5af93b7259758dcfc2b9c848 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-multipart/python-multipart.hash b/package/python-multipart/python-multipart.hash index 29f7f2bc887..d68be9e0e30 100644 --- a/package/python-multipart/python-multipart.hash +++ b/package/python-multipart/python-multipart.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-multipart/json -md5 0339000d92e78abbaac815954da6b826 python_multipart-0.0.9.tar.gz -sha256 03f54688c663f1b7977105f021043b0793151e4cb1c1a9d4a11fc13d622c4026 python_multipart-0.0.9.tar.gz +md5 7051f07d9645d3f2e72c0a889329057b python_multipart-0.0.17.tar.gz +sha256 41330d831cae6e2f22902704ead2826ea038d0419530eadff3ea80175aec5538 python_multipart-0.0.17.tar.gz # Locally computed sha256 checksums sha256 a8e833176cd617daf00b9d6d39fa15ca8edebc6d1643079cd2f4893c0c289be2 LICENSE.txt diff --git a/package/python-multipart/python-multipart.mk b/package/python-multipart/python-multipart.mk index 62ae37d7490..1f8d581d689 100644 --- a/package/python-multipart/python-multipart.mk +++ b/package/python-multipart/python-multipart.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_MULTIPART_VERSION = 0.0.9 +PYTHON_MULTIPART_VERSION = 0.0.17 PYTHON_MULTIPART_SOURCE = python_multipart-$(PYTHON_MULTIPART_VERSION).tar.gz -PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/5c/0f/9c55ac6c84c0336e22a26fa84ca6c51d58d7ac3a2d78b0dfa8748826c883 -PYTHON_MULTIPART_SETUP_TYPE = pep517 +PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/40/22/edea41c2d4a22e666c0c7db7acdcbf7bc8c1c1f7d3b3ca246ec982fec612 +PYTHON_MULTIPART_SETUP_TYPE = hatch PYTHON_MULTIPART_LICENSE = Apache-2.0 PYTHON_MULTIPART_LICENSE_FILES = LICENSE.txt -PYTHON_MULTIPART_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in index dc93e6c0dff..1473793ec90 100644 --- a/package/python-mwclient/Config.in +++ b/package/python-mwclient/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_MWCLIENT bool "python-mwclient" select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Python client library to interface with the MediaWiki API diff --git a/package/python-mwclient/python-mwclient.hash b/package/python-mwclient/python-mwclient.hash index 354bd685e41..5f870bb55ff 100644 --- a/package/python-mwclient/python-mwclient.hash +++ b/package/python-mwclient/python-mwclient.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mwclient/json -md5 148bd36bfaaf591bd9c0076cbf1ed888 mwclient-0.10.1.tar.gz -sha256 79363dd8d12f5e3b91b92b63152bf9dfef27da786c076a244e1f148c8dd67139 mwclient-0.10.1.tar.gz -# Locally computed +md5 791213fdc5d071c8652d81986da9ae6a mwclient-0.11.0.tar.gz +sha256 2bb7696f3703243eb33514ab162d7f6076dcedd011be90682936046c5e34fd06 mwclient-0.11.0.tar.gz +# Locally computed sha256 checksums sha256 67689d1fd48a5adba31272eed653c12160dd3abbfe92ab056ac42a155e12e523 LICENSE.md diff --git a/package/python-mwclient/python-mwclient.mk b/package/python-mwclient/python-mwclient.mk index 07aa877ed9d..60154f6eebe 100644 --- a/package/python-mwclient/python-mwclient.mk +++ b/package/python-mwclient/python-mwclient.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MWCLIENT_VERSION = 0.10.1 +PYTHON_MWCLIENT_VERSION = 0.11.0 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/97/b4/5fc70ad3286a8d8ec4b9ac01acad0f6b00c5a48d4a16b9d3be6519b7eb21 +PYTHON_MWCLIENT_SITE = https://files.pythonhosted.org/packages/5e/b3/0f77b8838a22e99b9cb64aef15fb96a4a8315fe890dbe3bff6f8364e8940 PYTHON_MWCLIENT_LICENSE = MIT PYTHON_MWCLIENT_LICENSE_FILES = LICENSE.md PYTHON_MWCLIENT_SETUP_TYPE = setuptools diff --git a/package/python-mwscrape/python-mwscrape.hash b/package/python-mwscrape/python-mwscrape.hash index 0f64a9e19c9..82964d317ec 100644 --- a/package/python-mwscrape/python-mwscrape.hash +++ b/package/python-mwscrape/python-mwscrape.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d0e6c747f6a866dedbc759f78830b3f496e8d03401a3c727d0b48735341c5b6 python-mwscrape-568ccbe6e12dd6391277df02adf724ba0e5f9197.tar.gz +sha256 11b97dab59a4494238fc7f86c3d132bd9f042890284e9f477ed4cef0e869921f python-mwscrape-2e153faa678b90402ca87aa765f7d11386d7942c.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE.txt diff --git a/package/python-mwscrape/python-mwscrape.mk b/package/python-mwscrape/python-mwscrape.mk index 8b6c718c563..b15e0265054 100644 --- a/package/python-mwscrape/python-mwscrape.mk +++ b/package/python-mwscrape/python-mwscrape.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE_VERSION = 568ccbe6e12dd6391277df02adf724ba0e5f9197 +PYTHON_MWSCRAPE_VERSION = 2e153faa678b90402ca87aa765f7d11386d7942c PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) PYTHON_MWSCRAPE_LICENSE = MPL-2.0 PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.hash b/package/python-mwscrape2slob/python-mwscrape2slob.hash index 51b625856c5..e72adb288b9 100644 --- a/package/python-mwscrape2slob/python-mwscrape2slob.hash +++ b/package/python-mwscrape2slob/python-mwscrape2slob.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 f1c1c79526fb3e0dac1c2c43e57a38b8641672e7008c5530d4b75e864eff232a python-mwscrape2slob-e01d3e92f0a372ebd0f57390e437a28f9d3c0438.tar.gz +sha256 41f6749ea9d411dfac2abc9b81b1b58bc3cc533518797ccdc922e23affc2df07 python-mwscrape2slob-69eb1c90d2cce75cb91601763bcf8fad8ff8366d.tar.gz diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.mk b/package/python-mwscrape2slob/python-mwscrape2slob.mk index a99005ba7c7..58ae63e3158 100644 --- a/package/python-mwscrape2slob/python-mwscrape2slob.mk +++ b/package/python-mwscrape2slob/python-mwscrape2slob.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MWSCRAPE2SLOB_VERSION = e01d3e92f0a372ebd0f57390e437a28f9d3c0438 +PYTHON_MWSCRAPE2SLOB_VERSION = 69eb1c90d2cce75cb91601763bcf8fad8ff8366d PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = setuptools diff --git a/package/python-netaddr/python-netaddr.hash b/package/python-netaddr/python-netaddr.hash index f969aeecfc7..1ad35966bb5 100644 --- a/package/python-netaddr/python-netaddr.hash +++ b/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/netaddr/json -md5 c0d7b080da18c851ea436389813d7652 netaddr-0.10.1.tar.gz -sha256 f4da4222ca8c3f43c8e18a8263e5426c750a3a837fdfeccf74c68d0408eaa3bf netaddr-0.10.1.tar.gz +md5 b0307617f8f3aa73bbcfadac52d91df7 netaddr-1.3.0.tar.gz +sha256 5c3c3d9895b551b763779ba7db7a03487dc1f8e3b385af819af341ae9ef6e48a netaddr-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE +sha256 36dcdc429f76107d1697396ca0d8c43b343808c98beacb3405f472a76b65bffa LICENSE.rst diff --git a/package/python-netaddr/python-netaddr.mk b/package/python-netaddr/python-netaddr.mk index 79e55a739fa..7c26b16bb43 100644 --- a/package/python-netaddr/python-netaddr.mk +++ b/package/python-netaddr/python-netaddr.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_NETADDR_VERSION = 0.10.1 +PYTHON_NETADDR_VERSION = 1.3.0 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/af/96/f4878091248450bbdebfbd01bf1d95821bd47eb38e756815a0431baa6b07 +PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/54/90/188b2a69654f27b221fba92fda7217778208532c962509e959a9cee5229d PYTHON_NETADDR_LICENSE = BSD-3-Clause -PYTHON_NETADDR_LICENSE_FILES = LICENSE +PYTHON_NETADDR_LICENSE_FILES = LICENSE.rst PYTHON_NETADDR_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index b9fe50fd9c5..5433192a732 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 e81583dcb3d929b60660721912f3faed networkx-3.2.1.tar.gz -sha256 9f1bb5cf3409bf324e0a722c20bdb4c20ee39bf1c30ce8ae499c8502b0b5e0c6 networkx-3.2.1.tar.gz +md5 b6cde64de26aca58aa8431c0b232512f networkx-3.4.2.tar.gz +sha256 307c3669428c5362aab27c8a1260aa8f47c4e91d3891f48be0141738d8d053e1 networkx-3.4.2.tar.gz # Locally computed sha256 checksums -sha256 50b5a27cb43f7a20cede7aa7b9ab2033552e0412c9a1fde51d38885c1417e95f LICENSE.txt +sha256 5b433b90f755eb9bbd06feff1d1a4f5f232c5208a185694199e45fa95d762792 LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index e463dca40a9..37780ef36a5 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 3.2.1 +PYTHON_NETWORKX_VERSION = 3.4.2 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/c4/80/a84676339aaae2f1cfdf9f418701dd634aef9cc76f708ef55c36ff39c3ca +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/fd/1d/06475e1cd5264c0b870ea2cc6fdb3e37177c1e565c43f56ff17a10e3937f PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 37d4a918047..d3e4eff81b5 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS default y if BR2_mipsel default y if BR2_powerpc default y if BR2_powerpc64 + default y if BR2_riscv default y if BR2_sh default y if BR2_x86_64 default y if BR2_riscv diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index f5856019a52..0bf137ef95c 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asyncua/json -md5 37000bc60b98b4822511ced1c2b4c020 asyncua-1.0.5.tar.gz -sha256 2757163f2a2ff1d8b923297d4af9b8161d25bed95867c1f67078faaf7f2d3f92 asyncua-1.0.5.tar.gz +md5 8c41793e873928027dad4da9035aaf8a asyncua-1.1.5.tar.gz +sha256 d5edac9234fd7f1ed6a923fad1bd709bd0fd3f8a0d41637d645666620375173f asyncua-1.1.5.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 226b9bbc21c..e7da7482fb2 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 = 1.0.5 +PYTHON_OPCUA_ASYNCIO_VERSION = 1.1.5 PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8b5335faffc2f08c728008c5ae7cc46d24f674bc1038a69d1849ef6 +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/49/be/be6dad2b7db58fc9e92260fa9fdda8604841f2863d60ec2c49dccb1f9661 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 index 420e023b0a7..258024032d7 100644 --- a/package/python-orjson/Config.in +++ b/package/python-orjson/Config.in @@ -1,7 +1,6 @@ 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 diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index c010097fc78..ddea73f629d 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 30dbdd4ebd62a40b6f13a3c741bb215004778c17fd951d0ce5812a7c34476b09 python-orjson-3.9.10-cargo2.tar.gz +sha256 144d268da63c96d800f5aa0c0901cf09c9337a6dc5372a4539415d2cf7f45b2d python-orjson-3.10.11-cargo2.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index dd538acb0a5..85ad6c32482 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,13 +4,12 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.9.10 +PYTHON_ORJSON_VERSION = 3.10.11 PYTHON_ORJSON_SOURCE_PYPI = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE_PYPI = https://files.pythonhosted.org/packages/72/75/642688bf5d99131fe8cf603f4ef9f26e4b1c6ed8f7f5c7e6fb31def54fb7 +PYTHON_ORJSON_SITE_PYPI = https://files.pythonhosted.org/packages/db/3a/10320029954badc7eaa338a15ee279043436f396e965dafc169610e4933f PYTHON_ORJSON_SITE = $(PYTHON_ORJSON_SITE_PYPI)/$(PYTHON_ORJSON_SOURCE_PYPI)?buildroot-path=filename PYTHON_ORJSON_SETUP_TYPE = maturin PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_ORJSON_DEPENDENCIES = host-python-cffi $(eval $(python-package)) diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 1c15c2e82b8..1d1956e2ba2 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 8e3bc7b152efc9ffadabddc9f8465b02 packaging-24.0.tar.gz -sha256 eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9 packaging-24.0.tar.gz +md5 97dbaca91e00d6b9fd86866e8c7897ae packaging-24.2.tar.gz +sha256 c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f packaging-24.2.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 e795b618814..14d9c5ea4c5 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 24.0 +PYTHON_PACKAGING_VERSION = 24.2 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/ee/b5/b43a27ac7472e1818c4bafd44430e69605baefe1f34440593e0332ec8b4d +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index 095d6e1f900..90ed8370f7d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -8,7 +8,6 @@ PYTHON_PAHO_MQTT_VERSION = 2.1.0 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 = pep517 -PYTHON_PAHO_MQTT_DEPENDENCIES = host-python-hatchling +PYTHON_PAHO_MQTT_SETUP_TYPE = hatch $(eval $(python-package)) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index 893aac074ec..918dda17e1d 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 be485ba66b576d8bc7e1c0ad96e87108 paramiko-3.4.0.tar.gz -sha256 aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3 paramiko-3.4.0.tar.gz +md5 2ea59e8a3423fe050398071b209b9b69 paramiko-3.5.0.tar.gz +sha256 ad11e540da4f55cedda52931f1a3f812a8238a7af7f62a60de538cd80bb28124 paramiko-3.5.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 8d921486c74..e79860c4420 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 3.4.0 +PYTHON_PARAMIKO_VERSION = 3.5.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cc/af/11996c4df4f9caff87997ad2d3fd8825078c277d6a928446d2b6cf249889 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/1b/0f/c00296e36ff7485935b83d466c4f2cf5934b84b0ad14e81796e1d9d3609b PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE diff --git a/package/python-parso/python-parso.hash b/package/python-parso/python-parso.hash index 67e77a162ef..83224a28bf0 100644 --- a/package/python-parso/python-parso.hash +++ b/package/python-parso/python-parso.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/parso/json -md5 7ee251113f31f8d851c4a5d9e98977cb parso-0.8.3.tar.gz -sha256 8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 parso-0.8.3.tar.gz +md5 f83b2e4164f6589ccae39b16c30ed5de parso-0.8.4.tar.gz +sha256 eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d parso-0.8.4.tar.gz # Locally computed sha256 checksums sha256 fa67973073753d17624caf8684d5ee816d70c89d912c5bca7ca0f08e7b150edb LICENSE.txt sha256 9c1e620a5cf8e74fe81c1fd4c55e9cc0b189fc04e677cfc7ef915de746c3f59e docs/_themes/flask/LICENSE diff --git a/package/python-parso/python-parso.mk b/package/python-parso/python-parso.mk index ce1d3401ffa..65d10ebfc00 100644 --- a/package/python-parso/python-parso.mk +++ b/package/python-parso/python-parso.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARSO_VERSION = 0.8.3 +PYTHON_PARSO_VERSION = 0.8.4 PYTHON_PARSO_SOURCE = parso-$(PYTHON_PARSO_VERSION).tar.gz -PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/a2/0e/41f0cca4b85a6ea74d66d2226a7cda8e41206a624f5b330b958ef48e2e52 +PYTHON_PARSO_SITE = https://files.pythonhosted.org/packages/66/94/68e2e17afaa9169cf6412ab0f28623903be73d1b32e208d9e8e541bb086d PYTHON_PARSO_SETUP_TYPE = setuptools PYTHON_PARSO_LICENSE = MIT, Python-2.0, BSD-3-Clause (flask theme) PYTHON_PARSO_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE test/normalizer_issue_files/LICENSE diff --git a/package/python-path/Config.in b/package/python-path/Config.in new file mode 100644 index 00000000000..a03b5685930 --- /dev/null +++ b/package/python-path/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PATH + bool "python-path" + help + Object-oriented file system path manipulation. + + https://github.com/jaraco/path diff --git a/package/python-path/python-path.hash b/package/python-path/python-path.hash new file mode 100644 index 00000000000..9a0d1a3681c --- /dev/null +++ b/package/python-path/python-path.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/path/json +md5 b970d0bcde985133cae6926a02e496b9 path-17.0.0.tar.gz +sha256 e1540261d22df1416fb1b498b3b1ed5353a371a48fe197d66611bb01e7fab2d5 path-17.0.0.tar.gz +# Locally computed sha256 checksums +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-path/python-path.mk b/package/python-path/python-path.mk new file mode 100644 index 00000000000..6e094aaad5d --- /dev/null +++ b/package/python-path/python-path.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-path +# +################################################################################ + +PYTHON_PATH_VERSION = 17.0.0 +PYTHON_PATH_SOURCE = path-$(PYTHON_PATH_VERSION).tar.gz +PYTHON_PATH_SITE = https://files.pythonhosted.org/packages/ff/a3/5dac44ce60ad6543578736a5729c5c2130cdac1c3117c61aad0583c2e3c6 +PYTHON_PATH_SETUP_TYPE = setuptools +PYTHON_PATH_LICENSE = MIT +PYTHON_PATH_LICENSE_FILES = LICENSE +PYTHON_PATH_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index 4442d82ac1c..dc6a1999e00 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 2a76cbe4e08f58087f418d150a1461b5 pathvalidate-3.2.0.tar.gz -sha256 5e8378cf6712bff67fbe7a8307d99fa8c1a0cb28aa477056f8fc374f0dff24ad pathvalidate-3.2.0.tar.gz +md5 cc99f63c6f835eae4fe8643c79b8ca68 pathvalidate-3.2.1.tar.gz +sha256 f5d07b1e2374187040612a1fcd2bcb2919f8db180df254c9581bb90bf903377d pathvalidate-3.2.1.tar.gz # Locally computed sha256 checksums -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +sha256 36289157e371aaae5b5d3ba4be87359ed07548cdc7a9f19ff61dc67cfc536a9c LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index 243f5418924..f5eb257cc1f 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 3.2.0 +PYTHON_PATHVALIDATE_VERSION = 3.2.1 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/27/93/e2b086c7aba96c70b5e7ef48251702fb95027638fb5a3e787d2efd65783e +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/b4/8c/8713d8dcd8e357b9358695b441ee974580a8addfaea4f01437df07577052 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE +PYTHON_PATHVALIDATE_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-pbr/python-pbr.hash b/package/python-pbr/python-pbr.hash index cfeef9419de..02db9aca027 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 e01bcc0e9154d513ecad3e766f9582d7 pbr-6.0.0.tar.gz -sha256 d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9 pbr-6.0.0.tar.gz +md5 06361b83d178fb62dcd1b4ba9a9b418c pbr-6.1.0.tar.gz +sha256 788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24 pbr-6.1.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 aaea80d389f..993e748a2be 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 6.0.0 +PYTHON_PBR_VERSION = 6.1.0 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/8d/c2/ee43b3b11bf2b40e56536183fc9f22afbb04e882720332b6276ee2454c24 +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/b2/35/80cf8f6a4f34017a7fe28242dc45161a1baa55c41563c354d8147e8358b2 PYTHON_PBR_SETUP_TYPE = setuptools PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pdm-backend/python-pdm-backend.hash b/package/python-pdm-backend/python-pdm-backend.hash index cc26e584622..9e33849329b 100644 --- a/package/python-pdm-backend/python-pdm-backend.hash +++ b/package/python-pdm-backend/python-pdm-backend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pdm-backend/json -md5 b2805090bbe41c86eb051b1311c7ba34 pdm_backend-2.3.1.tar.gz -sha256 c03cfb3a803325c049b57ba2502b409479ebb22b6a4ee3746c1f688b939764e8 pdm_backend-2.3.1.tar.gz +md5 3aad60c8b253336b09129551677912ad pdm_backend-2.4.3.tar.gz +sha256 dbd9047a7ac10d11a5227e97163b617ad5d665050476ff63867d971758200728 pdm_backend-2.4.3.tar.gz # Locally computed sha256 checksums sha256 1da058ed0440fea5df1765b19a1418800439b18fd6f1c13c7d429cb81e9c6d47 LICENSE diff --git a/package/python-pdm-backend/python-pdm-backend.mk b/package/python-pdm-backend/python-pdm-backend.mk index a95024ec9bb..0565de5b8cf 100644 --- a/package/python-pdm-backend/python-pdm-backend.mk +++ b/package/python-pdm-backend/python-pdm-backend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PDM_BACKEND_VERSION = 2.3.1 +PYTHON_PDM_BACKEND_VERSION = 2.4.3 PYTHON_PDM_BACKEND_SOURCE = pdm_backend-$(PYTHON_PDM_BACKEND_VERSION).tar.gz -PYTHON_PDM_BACKEND_SITE = https://files.pythonhosted.org/packages/70/f4/eaa4da6e3eaa32d902177e0b81563bb5526b2c387aa312d0dfbecf3c7109 +PYTHON_PDM_BACKEND_SITE = https://files.pythonhosted.org/packages/d9/bf/d75d568521cef171ae9138d9ab55c169a98ee803853ca87b7096e4636d5b PYTHON_PDM_BACKEND_SETUP_TYPE = pep517 PYTHON_PDM_BACKEND_LICENSE = MIT PYTHON_PDM_BACKEND_LICENSE_FILES = LICENSE diff --git a/package/python-pefile/python-pefile.hash b/package/python-pefile/python-pefile.hash index af2288487d1..2174b7afd25 100644 --- a/package/python-pefile/python-pefile.hash +++ b/package/python-pefile/python-pefile.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pefile/json -md5 fa0eba7c91f4e696771ddbfacdca25e4 pefile-2023.2.7.tar.gz -sha256 82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc pefile-2023.2.7.tar.gz +md5 f511b370db4c80137aadf457a905fa53 pefile-2024.8.26.tar.gz +sha256 3ff6c5d8b43e8c37bb6e6dd5085658d658a7a0bdcd20b6a07b1fcfc1c4e9d632 pefile-2024.8.26.tar.gz # Locally computed sha256 checksums -sha256 bfd4b5e4f8a99c961fd6f94d708e38396cc146bfe8fbc5d2a86e63aa29fb4208 LICENSE +sha256 b44409c067c6da52bfb54bb6624fb11a7b52157c3a13ae1400232f8196e86ad3 LICENSE diff --git a/package/python-pefile/python-pefile.mk b/package/python-pefile/python-pefile.mk index c65f1deb603..e04db7a116d 100644 --- a/package/python-pefile/python-pefile.mk +++ b/package/python-pefile/python-pefile.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEFILE_VERSION = 2023.2.7 +PYTHON_PEFILE_VERSION = 2024.8.26 PYTHON_PEFILE_SOURCE = pefile-$(PYTHON_PEFILE_VERSION).tar.gz -PYTHON_PEFILE_SITE = https://files.pythonhosted.org/packages/78/c5/3b3c62223f72e2360737fd2a57c30e5b2adecd85e70276879609a7403334 +PYTHON_PEFILE_SITE = https://files.pythonhosted.org/packages/03/4f/2750f7f6f025a1507cd3b7218691671eecfd0bbebebe8b39aa0fe1d360b8 PYTHON_PEFILE_SETUP_TYPE = setuptools PYTHON_PEFILE_LICENSE = MIT PYTHON_PEFILE_LICENSE_FILES = LICENSE diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 352536a035e..0ef6ebc820a 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,5 @@ -# md5, sha256 https://pypi.org/project/pillow/10.3.0/#copy-hash-modal-125abe0d-59be-40cd-89a3-3e2f78136be0 -md5 6c21a12849ae42f93881f614d8f6f651 pillow-10.3.0.tar.gz -sha256 9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d pillow-10.3.0.tar.gz - +# md5, sha256 from https://pypi.org/pypi/pillow/json +md5 22912b3db645a51ab4b4ff036b559ca8 pillow-11.0.0.tar.gz +sha256 72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739 pillow-11.0.0.tar.gz # Locally computed sha256 checksums sha256 cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 38214376ce0..9626268b6ec 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.3.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ef/43/c50c17c5f7d438e836c169e343695534c38c77f60e7c90389bd77981bc21 +PYTHON_PILLOW_VERSION = 11.0.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/a5/26/0d95c04c868f6bdb0c447e3ee2de5564411845e36a858cfd63766bc7b563 PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE @@ -14,60 +14,65 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing +PYTHON_PILLOW_BUILD_OPTS = \ + -Cplatform-guessing=disable \ + -Cimagequant=disable \ + -Craqm=disable ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -Cfreetype=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -Cfreetype=disable endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -Cjpeg=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -Cjpeg=disable endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -Clcms=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -Clcms=disable endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -Cxcb=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -Cxcb=disable endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -Cjpeg2000=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -Cjpeg2000=disable endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -Ctiff=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -Ctiff=disable endif -ifeq ($(BR2_PACKAGE_WEBP),y) +ifeq ($(BR2_PACKAGE_WEBP)$(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yyy) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp -ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -Cwebp=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -Cwebp=disable endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +PYTHON_PILLOW_DEPENDENCIES += zlib +PYTHON_PILLOW_BUILD_OPTS += -Czlib=enable else -PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -Czlib=disable endif $(eval $(python-package)) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index d2cc649b016..9ecdcbace46 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 38dd5f7ab301167df063405c7fc16c84 pip-23.3.2.tar.gz -sha256 7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149 pip-23.3.2.tar.gz +md5 ddc01fbcc66b449a9c8dc78d9c13e4df pip-24.3.1.tar.gz +sha256 ebcb60557f2aefabc2e0f918751cd24ea0d56d8ec5445fe1807f1d2109660b99 pip-24.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 552b47eb7d8..7fe70c9bc19 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 23.3.2 +PYTHON_PIP_VERSION = 24.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/b7/06/6b1ad0ae8f97d7a0d6f6ad640db10780578999e647a9593512ceb6f06469 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f4/b1/b422acd212ad7eedddaf7981eee6e5de085154ff726459cf2da7c5a184c1 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pkgconfig/python-pkgconfig.mk b/package/python-pkgconfig/python-pkgconfig.mk index 239dd90a5d4..fc7e8273fe8 100644 --- a/package/python-pkgconfig/python-pkgconfig.mk +++ b/package/python-pkgconfig/python-pkgconfig.mk @@ -7,10 +7,8 @@ PYTHON_PKGCONFIG_VERSION = 1.5.5 PYTHON_PKGCONFIG_SOURCE = pkgconfig-$(PYTHON_PKGCONFIG_VERSION).tar.gz PYTHON_PKGCONFIG_SITE = https://files.pythonhosted.org/packages/c4/e0/e05fee8b5425db6f83237128742e7e5ef26219b687ab8f0d41ed0422125e -PYTHON_PKGCONFIG_SETUP_TYPE = setuptools +PYTHON_PKGCONFIG_SETUP_TYPE = poetry PYTHON_PKGCONFIG_LICENSE = MIT PYTHON_PKGCONFIG_LICENSE_FILES = LICENSE -HOST_PYTHON_PKGCONFIG_DEPENDENCIES = host-python-poetry-core - $(eval $(host-python-package)) diff --git a/package/python-pluggy/python-pluggy.hash b/package/python-pluggy/python-pluggy.hash index 338b08d0b16..522c1e3b6cf 100644 --- a/package/python-pluggy/python-pluggy.hash +++ b/package/python-pluggy/python-pluggy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pluggy/json -md5 ffb69741271eaeefab3f2ef2435e2d5f pluggy-1.4.0.tar.gz -sha256 8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be pluggy-1.4.0.tar.gz +md5 ac0870be78ba0ee227a5c3955efeba59 pluggy-1.5.0.tar.gz +sha256 2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 pluggy-1.5.0.tar.gz # Locally computed sha256 checksums sha256 d6b65e6c213a5d0b577911d34d6e5949b9f59d76c238c5071a2f3fc16cfb2606 LICENSE diff --git a/package/python-pluggy/python-pluggy.mk b/package/python-pluggy/python-pluggy.mk index a703a93b9cc..f8a0b729b5b 100644 --- a/package/python-pluggy/python-pluggy.mk +++ b/package/python-pluggy/python-pluggy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PLUGGY_VERSION = 1.4.0 +PYTHON_PLUGGY_VERSION = 1.5.0 PYTHON_PLUGGY_SOURCE = pluggy-$(PYTHON_PLUGGY_VERSION).tar.gz -PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/54/c6/43f9d44d92aed815e781ca25ba8c174257e27253a94630d21be8725a2b59 +PYTHON_PLUGGY_SITE = https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6 PYTHON_PLUGGY_SETUP_TYPE = setuptools PYTHON_PLUGGY_LICENSE = MIT PYTHON_PLUGGY_LICENSE_FILES = LICENSE diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash index 2dc1198a76e..eaed4dc728d 100644 --- a/package/python-poetry-core/python-poetry-core.hash +++ b/package/python-poetry-core/python-poetry-core.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/poetry-core/json -md5 eb8730e30aec5f644754b29587b47122 poetry_core-1.9.0.tar.gz -sha256 fa7a4001eae8aa572ee84f35feb510b321bd652e5cf9293249d62853e1f935a2 poetry_core-1.9.0.tar.gz +md5 64e2c60933b5647f274151ebb1c968f0 poetry_core-1.9.1.tar.gz +sha256 7a2d49214bf58b4f17f99d6891d947a9836c9899a67a5069f52d7b67217f61b8 poetry_core-1.9.1.tar.gz # Locally computed sha256 checksums sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk index 5b9b8a15d5b..107ad1bebb3 100644 --- a/package/python-poetry-core/python-poetry-core.mk +++ b/package/python-poetry-core/python-poetry-core.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POETRY_CORE_VERSION = 1.9.0 +PYTHON_POETRY_CORE_VERSION = 1.9.1 PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz -PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/f2/db/20a9f9cae3f3c213a8c406deb4395698459fd96962cea8f2ccb230b1943c +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/c7/5c/3609519b7d890ced542fe327ea26a7c8ea55ef298c323c46cca2a011c1cb PYTHON_POETRY_CORE_SETUP_TYPE = pep517 PYTHON_POETRY_CORE_LICENSE = MIT PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash new file mode 100644 index 00000000000..abe063096df --- /dev/null +++ b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-dynamic-versioning/json +md5 91032d27f9da010d8a9b7e76bfd09d24 poetry_dynamic_versioning-1.4.1.tar.gz +sha256 21584d21ca405aa7d83d23d38372e3c11da664a8742995bdd517577e8676d0e1 poetry_dynamic_versioning-1.4.1.tar.gz +# Locally computed sha256 checksums +sha256 cd75c5564078e3aadf662a9df3d23430f4705dfeedebbd0ebbeef53998ad94a8 LICENSE diff --git a/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk new file mode 100644 index 00000000000..e159e80324e --- /dev/null +++ b/package/python-poetry-dynamic-versioning/python-poetry-dynamic-versioning.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python-poetry-dynamic-versioning +# +################################################################################ + +PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION = 1.4.1 +PYTHON_POETRY_DYNAMIC_VERSIONING_SOURCE = poetry_dynamic_versioning-$(PYTHON_POETRY_DYNAMIC_VERSIONING_VERSION).tar.gz +PYTHON_POETRY_DYNAMIC_VERSIONING_SITE = https://files.pythonhosted.org/packages/dd/70/1138211a6e5051d28596922ed39acf20b42819db5ae1f93e465b9a903c28 +PYTHON_POETRY_DYNAMIC_VERSIONING_SETUP_TYPE = poetry +PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE = MIT +PYTHON_POETRY_DYNAMIC_VERSIONING_LICENSE_FILES = LICENSE +HOST_PYTHON_POETRY_DYNAMIC_VERSIONING_DEPENDENCIES = \ + host-python-dunamai \ + host-python-jinja2 \ + host-python-tomlkit + +$(eval $(host-python-package)) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 1821d4d65c5..ee8237c7b08 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 f33c0f4ae8d11addababf6d90c98f8bc prompt_toolkit-3.0.43.tar.gz -sha256 3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d prompt_toolkit-3.0.43.tar.gz +md5 2448470c36f2f250c9decefcc337b9f7 prompt_toolkit-3.0.48.tar.gz +sha256 d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90 prompt_toolkit-3.0.48.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 31c0d9783f4..a03f76dcadb 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.43 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.48 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/cc/c6/25b6a3d5cd295304de1e32c9edbcf319a52e965b339629d37d42bb7126ca +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/2d/4f/feb5e137aff82f7c7f3248267b97451da3644f6cdc218edfe549fb354127 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE diff --git a/package/python-propcache/Config.in b/package/python-propcache/Config.in new file mode 100644 index 00000000000..a387d6520ca --- /dev/null +++ b/package/python-propcache/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PROPCACHE + bool "python-propcache" + help + Accelerated property cache. + + https://github.com/aio-libs/propcache diff --git a/package/python-propcache/python-propcache.hash b/package/python-propcache/python-propcache.hash new file mode 100644 index 00000000000..56a491433f3 --- /dev/null +++ b/package/python-propcache/python-propcache.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/propcache/json +md5 70b121a9845a0da06eccfbc42ff74335 propcache-0.2.0.tar.gz +sha256 df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70 propcache-0.2.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-propcache/python-propcache.mk b/package/python-propcache/python-propcache.mk new file mode 100644 index 00000000000..37ceec731da --- /dev/null +++ b/package/python-propcache/python-propcache.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-propcache +# +################################################################################ + +PYTHON_PROPCACHE_VERSION = 0.2.0 +PYTHON_PROPCACHE_SOURCE = propcache-$(PYTHON_PROPCACHE_VERSION).tar.gz +PYTHON_PROPCACHE_SITE = https://files.pythonhosted.org/packages/a9/4d/5e5a60b78dbc1d464f8a7bbaeb30957257afdc8512cbb9dfd5659304f5cd +PYTHON_PROPCACHE_SETUP_TYPE = setuptools +PYTHON_PROPCACHE_LICENSE = Apache-2.0 +PYTHON_PROPCACHE_LICENSE_FILES = LICENSE +PYTHON_PROPCACHE_DEPENDENCIES = \ + host-python-cython \ + host-python-expandvars + +$(eval $(python-package)) diff --git a/package/python-proto-plus/Config.in b/package/python-proto-plus/Config.in new file mode 100644 index 00000000000..49c73e5f6bb --- /dev/null +++ b/package/python-proto-plus/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PROTO_PLUS + bool "python-proto-plus" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + help + Beautiful, Pythonic protocol buffers. + + https://github.com/googleapis/proto-plus-python diff --git a/package/python-proto-plus/python-proto-plus.hash b/package/python-proto-plus/python-proto-plus.hash new file mode 100644 index 00000000000..ebf3426886e --- /dev/null +++ b/package/python-proto-plus/python-proto-plus.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/proto-plus/json +md5 f1465151dcad7bb3c4ec3271e4afbc3d proto_plus-1.25.0.tar.gz +sha256 fbb17f57f7bd05a68b7707e745e26528b0b3c34e378db91eef93912c54982d91 proto_plus-1.25.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-proto-plus/python-proto-plus.mk b/package/python-proto-plus/python-proto-plus.mk new file mode 100644 index 00000000000..734c6b20035 --- /dev/null +++ b/package/python-proto-plus/python-proto-plus.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-proto-plus +# +################################################################################ + +PYTHON_PROTO_PLUS_VERSION = 1.25.0 +PYTHON_PROTO_PLUS_SOURCE = proto_plus-$(PYTHON_PROTO_PLUS_VERSION).tar.gz +PYTHON_PROTO_PLUS_SITE = https://files.pythonhosted.org/packages/7e/05/74417b2061e1bf1b82776037cad97094228fa1c1b6e82d08a78d3fb6ddb6 +PYTHON_PROTO_PLUS_SETUP_TYPE = setuptools +PYTHON_PROTO_PLUS_LICENSE = Apache-2.0 +PYTHON_PROTO_PLUS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index c5f4f39fe05..0b7c3f6bedc 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 afcc40a779f84f6d909570a8934cebc3 psutil-5.9.7.tar.gz -sha256 3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c psutil-5.9.7.tar.gz +md5 2baae02411c42c185e129c3f26030079 psutil-6.1.0.tar.gz +sha256 353815f59a7f64cdaca1c0307ee13558a0512f6db064e92fe833784f08539c7a psutil-6.1.0.tar.gz # Locally computed sha256 checksums sha256 b89c063b3786e28e0c0a38f1931db61fed35e69dd2a2966fbecffee0f46c8d10 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index e83193f20fe..73f54231b66 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.7 +PYTHON_PSUTIL_VERSION = 6.1.0 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/a0/d0/c9ae661a302931735237791f04cb7086ac244377f78692ba3b3eae3a9619 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/26/10/2a30b13c61e7cf937f4adf90710776b7918ed0a9c434e2c38224732af310 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index 6659c6cef86..52f3f767121 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 eae35fa97cdc92b910b706c720a257c7 psycopg2-2.9.9.tar.gz -sha256 d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156 psycopg2-2.9.9.tar.gz +md5 3a1ed36b492a74789563577edc0b0689 psycopg2-2.9.10.tar.gz +sha256 12ec0b40b0273f95296233e8750441339298e6a572f7039da5b260e3c8b60e11 psycopg2-2.9.10.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 59a3190ae1f..0df79c54124 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.9.9 +PYTHON_PSYCOPG2_VERSION = 2.9.10 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/c9/5e/dc6acaf46d78979d6b03458b7a1618a68e152a6776fce95daac5e0f0301b +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/62/51/2007ea29e605957a17ac6357115d0c1a1b60c8c984951c19419b3474cdfd PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE diff --git a/package/python-psygnal/Config.in b/package/python-psygnal/Config.in new file mode 100644 index 00000000000..d6fbcbcd6a8 --- /dev/null +++ b/package/python-psygnal/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PSYGNAL + bool "python-psygnal" + help + Python observer pattern (callback/event system). + + https://github.com/pyapp-kit/psygnal diff --git a/package/python-psygnal/python-psygnal.hash b/package/python-psygnal/python-psygnal.hash new file mode 100644 index 00000000000..f3788610635 --- /dev/null +++ b/package/python-psygnal/python-psygnal.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/psygnal/json +md5 13955249103622604d4022e7d5ef94e0 psygnal-0.11.1.tar.gz +sha256 f9b02ca246ab0adb108c4010b4a486e464f940543201074591e50370cd7b0cc0 psygnal-0.11.1.tar.gz +# Locally computed sha256 checksums +sha256 50169b145e35e6ae11a1e05cebdaa7052a58a8a2325dd5c394f8a68199c78415 LICENSE diff --git a/package/python-psygnal/python-psygnal.mk b/package/python-psygnal/python-psygnal.mk new file mode 100644 index 00000000000..5bfa1e67420 --- /dev/null +++ b/package/python-psygnal/python-psygnal.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-psygnal +# +################################################################################ + +PYTHON_PSYGNAL_VERSION = 0.11.1 +PYTHON_PSYGNAL_SOURCE = psygnal-$(PYTHON_PSYGNAL_VERSION).tar.gz +PYTHON_PSYGNAL_SITE = https://files.pythonhosted.org/packages/bc/b0/194cfbcb76dbf9c4a1c4271ccc825b38406d20fb7f95fd18320c28708800 +PYTHON_PSYGNAL_SETUP_TYPE = hatch +PYTHON_PSYGNAL_LICENSE = BSD-3-Clause +PYTHON_PSYGNAL_LICENSE_FILES = LICENSE +PYTHON_PSYGNAL_DEPENDENCIES = host-python-hatch-vcs + +$(eval $(python-package)) diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index a6d6b9dbae1..9918f3e041a 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 65639ff646f9e1f452446f4364b2e47f pudb-2024.1.tar.gz -sha256 fc9d6a976a59b590764c8379ec200fecd47faa84259b64efd8cd86066a0af338 pudb-2024.1.tar.gz +md5 dc73886506e57c8ba2116e5cbe112fb8 pudb-2024.1.3.tar.gz +sha256 264f239e0538e52e83d3d020143100b3171cae17227674bb1b9f8b075f34849c pudb-2024.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 68fe3850aca..4dedda0bc29 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2024.1 +PYTHON_PUDB_VERSION = 2024.1.3 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/b3/a1/db467e7c828e2ced173d9dbb47abc17ca0e0b3225cb1f4066293e63a2ed9 -PYTHON_PUDB_SETUP_TYPE = setuptools +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/36/27/fb087bdf2cd9c8e56d0347b863ce5995967c15a3e2a0b9245c7a8f6f1598 +PYTHON_PUDB_SETUP_TYPE = hatch PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE diff --git a/package/python-pure-eval/python-pure-eval.hash b/package/python-pure-eval/python-pure-eval.hash index 5bf5dcb749c..24c6d15ad63 100644 --- a/package/python-pure-eval/python-pure-eval.hash +++ b/package/python-pure-eval/python-pure-eval.hash @@ -1,5 +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 +md5 d545186f2c899d9dd273c03d71b7ffb7 pure_eval-0.2.3.tar.gz +sha256 5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42 pure_eval-0.2.3.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 index f139ea270fc..721640eabdc 100644 --- a/package/python-pure-eval/python-pure-eval.mk +++ b/package/python-pure-eval/python-pure-eval.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PURE_EVAL_VERSION = 0.2.2 +PYTHON_PURE_EVAL_VERSION = 0.2.3 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_SITE = https://files.pythonhosted.org/packages/cd/05/0a34433a064256a578f1783a10da6df098ceaa4a57bbeaa96a6c0352786b PYTHON_PURE_EVAL_SETUP_TYPE = setuptools PYTHON_PURE_EVAL_LICENSE = MIT PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyaml/Config.in b/package/python-pyaml/Config.in new file mode 100644 index 00000000000..72d00d5c4ce --- /dev/null +++ b/package/python-pyaml/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYAML + bool "python-pyaml" + select BR2_PACKAGE_PYTHON_PYYAML # runtime + help + PyYAML-based module to produce a bit more pretty and + readable YAML-serialized data. + + https://github.com/mk-fg/pretty-yaml diff --git a/package/python-pyaml/python-pyaml.hash b/package/python-pyaml/python-pyaml.hash new file mode 100644 index 00000000000..06e99448d08 --- /dev/null +++ b/package/python-pyaml/python-pyaml.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyaml/json +md5 1301f53ad68626ac295c2663315b1804 pyaml-24.9.0.tar.gz +sha256 e78dee8b0d4fed56bb9fa11a8a7858e6fade1ec70a9a122cee6736efac3e69b5 pyaml-24.9.0.tar.gz +# Locally computed sha256 checksums +sha256 dc1342cc1cb49e24c1c9e8a495acc9625ce2e04146c116279af0ab0949cd829c COPYING diff --git a/package/python-pyaml/python-pyaml.mk b/package/python-pyaml/python-pyaml.mk new file mode 100644 index 00000000000..e908aa089a1 --- /dev/null +++ b/package/python-pyaml/python-pyaml.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyaml +# +################################################################################ + +PYTHON_PYAML_VERSION = 24.9.0 +PYTHON_PYAML_SOURCE = pyaml-$(PYTHON_PYAML_VERSION).tar.gz +PYTHON_PYAML_SITE = https://files.pythonhosted.org/packages/fd/a6/5b51160ff7ce60b0c60ec825359c0e818b0ce4a2504fa3dd1470f42f9b10 +PYTHON_PYAML_SETUP_TYPE = setuptools +PYTHON_PYAML_LICENSE = WTFPL +PYTHON_PYAML_LICENSE_FILES = COPYING + +$(eval $(python-package)) diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.hash b/package/python-pyasn1-modules/python-pyasn1-modules.hash index 6f4bb6faf08..fd7b7327913 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 94ee572b06ae09f1903b11333575b091 pyasn1_modules-0.3.0.tar.gz -sha256 5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c pyasn1_modules-0.3.0.tar.gz +md5 2cb6c7001ac5caa2ead3ad2d28c9a43e pyasn1_modules-0.4.1.tar.gz +sha256 c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c pyasn1_modules-0.4.1.tar.gz # Locally computed sha256 checksums sha256 2aad5fc00f705c4a1addb83eed10a6a75d286a3779f0cf8519d87e62bc4735fd LICENSE.txt diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.mk b/package/python-pyasn1-modules/python-pyasn1-modules.mk index 41987028fc0..7087d5c44d6 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.3.0 +PYTHON_PYASN1_MODULES_VERSION = 0.4.1 PYTHON_PYASN1_MODULES_SOURCE = pyasn1_modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/3b/e4/7dec823b1b5603c5b3c51e942d5d9e65efd6ff946e713a325ed4146d070f +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/1d/67/6afbf0d507f73c32d21084a79946bfcfca5fbc62a72057e9c23797a737c9 PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyasynchat/Config.in b/package/python-pyasynchat/Config.in index bf11cc5b391..17204a1b30f 100644 --- a/package/python-pyasynchat/Config.in +++ b/package/python-pyasynchat/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_PYTHON_PYASYNCHAT Make asynchat available for Python 3.12 onwards. This is a compatibility package using the code removed from - the standard libary, upstream does not intend any + the standard library, upstream does not intend any maintenance. https://github.com/simonrob/pyasynchat diff --git a/package/python-pyasyncore/Config.in b/package/python-pyasyncore/Config.in index ad1376a2432..09318baa585 100644 --- a/package/python-pyasyncore/Config.in +++ b/package/python-pyasyncore/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PYTHON_PYASYNCORE Make asyncore available for Python 3.12 onwards. This is a compatibility package using the code removed from - the standard libary, upstream does not intend any + the standard library, upstream does not intend any maintenance. https://github.com/simonrob/pyasyncore diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index c831007d4d5..a046181a9bd 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 51631e88960a8856f9c497027f55c9f2f9115cafb08c0005439838a05ba17bfc python-pybind-2.13.1.tar.gz +sha256 e08cb87f4773da97fa7b5f035de8763abc656d87d5773e62f6da0587d1f0ec20 python-pybind-2.13.6.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 a1cc02ee040..8d815ac38f6 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.13.1 +PYTHON_PYBIND_VERSION = 2.13.6 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index f44afe6fc43..633b31d9757 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 7669cdc70111d01ba6faecd65d8cdbf6 pycairo-1.25.1.tar.gz -sha256 7e2be4fbc3b4536f16db7a11982cbf713e75069a4d73d44fe5a49b68423f5c0c pycairo-1.25.1.tar.gz +md5 12097575a1bb683cab7dc425d9769a68 pycairo-1.27.0.tar.gz +sha256 5cb21e7a00a2afcafea7f14390235be33497a2cce53a98a19389492a60628430 pycairo-1.27.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 eb60293ff8d..8d9459e9e27 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,12 +4,20 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.25.1 +PYTHON_PYCAIRO_VERSION = 1.27.0 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/c7/7c/de4d40316ee563e4f15a0f05f28c8458833fbef80c4588b9dd51f39b78ee -PYTHON_PYCAIRO_SETUP_TYPE = setuptools +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/07/4a/42b26390181a7517718600fa7d98b951da20be982a50cd4afb3d46c2e603 PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 -$(eval $(python-package)) +PYTHON_PYCAIRO_CONF_OPTS = \ + -Dpython=$(HOST_DIR)/bin/python \ + -Dtests=false \ + -Dwheel=false + +PYTHON_PYCAIRO_CONF_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) + +$(eval $(meson-package)) diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index 5489f9290f1..e86f16a8b2a 100644 --- a/package/python-pycrate/python-pycrate.hash +++ b/package/python-pycrate/python-pycrate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycrate/json -md5 37e1bda10f41fe947512e9d5f8289518 pycrate-0.7.2.tar.gz -sha256 8abd3fb9f3e7a2dc62061490f01e99b2a6185e88b1c9bf30db68853b748b8f61 pycrate-0.7.2.tar.gz +md5 d5bc1e0e801ebfe27e2cae35ea45bc95 pycrate-0.7.7.tar.gz +sha256 72f86a9a50497342fb2a940b1398a46e0aa2401a90cf77405074f2264b0e3734 pycrate-0.7.7.tar.gz # Locally computed sha256 checksums sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk index 41ad30fcc8d..a6f3dccc5f8 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.7.2 +PYTHON_PYCRATE_VERSION = 0.7.7 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/f4/01/09aac6ea758ca7b7b1b4832c0c39003752ef7b6c1478e6db2f34171db3fe +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/45/26/04cc9fd3df1a03a5f046e72d35f268c4dfebd278fcad228e81701576ca9d PYTHON_PYCRATE_SETUP_TYPE = setuptools PYTHON_PYCRATE_LICENSE = LGPL-2.1+ PYTHON_PYCRATE_LICENSE_FILES = license.txt diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 10447fd8002..357d9e8c2b0 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 db8f8d516e0229f503dd111ac4de177f pycryptodomex-3.19.1.tar.gz -sha256 0b7154aff2272962355f8941fd514104a88cb29db2d8f43a29af900d6398eb1c pycryptodomex-3.19.1.tar.gz +md5 1f75ba3b07402102857b5ed496f48718 pycryptodomex-3.21.0.tar.gz +sha256 222d0bd05381dd25c32dd6065c071ebf084212ab79bab4599ba9e6a3e0009e6c pycryptodomex-3.21.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 d969e600a32..96a55050e6c 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.19.1 +PYTHON_PYCRYPTODOMEX_VERSION = 3.21.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/3f/13/84f2aea851d75e12e7f32ccc11a00f1defc3d285b4ed710e5d049f31c5a6 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/11/dc/e66551683ade663b5f07d7b3bc46434bf703491dbd22ee12d1f979ca828f PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ diff --git a/package/python-pycups/python-pycups.hash b/package/python-pycups/python-pycups.hash index d1498b61cf9..d6b7963cfcf 100644 --- a/package/python-pycups/python-pycups.hash +++ b/package/python-pycups/python-pycups.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycups/json -md5 41eef188b86d01ccfdbaaa05cf0f6ca4 pycups-2.0.1.tar.gz -sha256 57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90 pycups-2.0.1.tar.gz +md5 a4e9bcdc2012fcff660e0806416a1fb3 pycups-2.0.4.tar.gz +sha256 843e385c1dbf694996ca84ef02a7f30c28376035588f5fbeacd6bae005cf7c8d pycups-2.0.4.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-pycups/python-pycups.mk b/package/python-pycups/python-pycups.mk index bf61400afe9..60f4b483f71 100644 --- a/package/python-pycups/python-pycups.mk +++ b/package/python-pycups/python-pycups.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCUPS_VERSION = 2.0.1 +PYTHON_PYCUPS_VERSION = 2.0.4 PYTHON_PYCUPS_SOURCE = pycups-$(PYTHON_PYCUPS_VERSION).tar.gz -PYTHON_PYCUPS_SITE = https://files.pythonhosted.org/packages/0c/bb/82546806a86dc16f5eeb76f62ffdc42cce3d43aacd4e25a8b5300eec0263 +PYTHON_PYCUPS_SITE = https://files.pythonhosted.org/packages/96/c4/b077f0422cd031e4f3a47c75ce0bcf77f2f2e5bf3648f6945a4d09fd44a5 PYTHON_PYCUPS_SETUP_TYPE = setuptools PYTHON_PYCUPS_LICENSE = GPL-2.0+ PYTHON_PYCUPS_LICENSE_FILES = COPYING diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 9f2ab55508d..ae4e1bab2f0 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydal/json -md5 b2072b7b000223890b56830ca1ab3616 pydal-20231114.3.tar.gz -sha256 c42d16fca9e3bb6d399aefb2434c0e70862ee13c75437852f421920432ee5fb1 pydal-20231114.3.tar.gz +md5 7e6e1e955750752715f0f135a9f5cd4f pydal-20241027.1.tar.gz +sha256 8f7e9eeb5806d4433dcebda53efca1954eafd5c776fa19ee91e3efad1b9ff414 pydal-20241027.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 245383f2446..4eff89b0d75 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20231114.3 +PYTHON_PYDAL_VERSION = 20241027.1 PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/0b/3b/86302e165af07bc3d9225aea6ed8f52386270220e4aac1aad0101a48aac1 +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/31/7c/aa20d1d25f22d575e180181feeae4a077ff36414e0547060434c398d159a PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index 3554d0c0f61..76e05eb20ee 100644 --- a/package/python-pydantic-core/python-pydantic-core.hash +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 87cee9e796c31e3470dd13675286f13d58084e4362dae9288a9fa45b1264c084 pydantic_core-2.20.1.tar.gz +sha256 c9a9e5970fbe54f24023635743dfe0f9a0adbebafb467729b674399f06a2d0b5 python-pydantic-core-2.26.0-cargo2.tar.gz # Locally computed sha256 checksums sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk index 4332c4f6a6d..865c7d0c84e 100644 --- a/package/python-pydantic-core/python-pydantic-core.mk +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYDANTIC_CORE_VERSION = 2.20.1 -PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/12/e3/0d5ad91211dba310f7ded335f4dad871172b9cc9ce204f5a56d76ccd6247 +PYTHON_PYDANTIC_CORE_VERSION = 2.26.0 +PYTHON_PYDANTIC_CORE_SOURCE_PYPI = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz +PYTHON_PYDANTIC_CORE_SITE_PYPI = https://files.pythonhosted.org/packages/98/85/0ac4f8fc632fa1bb3f473e4dfb1cd520ede11179f76a028edfd2ca989ed4 +PYTHON_PYDANTIC_CORE_SITE = $(PYTHON_PYDANTIC_CORE_SITE_PYPI)/$(PYTHON_PYDANTIC_CORE_SOURCE_PYPI)?buildroot-path=filename PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE diff --git a/package/python-pydantic-settings/Config.in b/package/python-pydantic-settings/Config.in new file mode 100644 index 00000000000..0e8dbc29b5c --- /dev/null +++ b/package/python-pydantic-settings/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_PYDANTIC_SETTINGS + bool "python-pydantic-settings" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_DOTENV # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + help + Settings management using Pydantic. + + https://github.com/pydantic/pydantic-settings diff --git a/package/python-pydantic-settings/python-pydantic-settings.hash b/package/python-pydantic-settings/python-pydantic-settings.hash new file mode 100644 index 00000000000..c1acb00dc29 --- /dev/null +++ b/package/python-pydantic-settings/python-pydantic-settings.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pydantic-settings/json +md5 eb50e2f88dfb5229d7319be57dcc4ed0 pydantic_settings-2.6.1.tar.gz +sha256 e0f92546d8a9923cb8941689abf85d6601a8c19a23e97a34b2964a2e3f813ca0 pydantic_settings-2.6.1.tar.gz +# Locally computed sha256 checksums +sha256 eb355a753e020346d33d83bf9769135b89fc610568ac531a01c295bcee7fd998 LICENSE diff --git a/package/python-pydantic-settings/python-pydantic-settings.mk b/package/python-pydantic-settings/python-pydantic-settings.mk new file mode 100644 index 00000000000..90e982b3ff5 --- /dev/null +++ b/package/python-pydantic-settings/python-pydantic-settings.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pydantic-settings +# +################################################################################ + +PYTHON_PYDANTIC_SETTINGS_VERSION = 2.6.1 +PYTHON_PYDANTIC_SETTINGS_SOURCE = pydantic_settings-$(PYTHON_PYDANTIC_SETTINGS_VERSION).tar.gz +PYTHON_PYDANTIC_SETTINGS_SITE = https://files.pythonhosted.org/packages/b5/d4/9dfbe238f45ad8b168f5c96ee49a3df0598ce18a0795a983b419949ce65b +PYTHON_PYDANTIC_SETTINGS_SETUP_TYPE = hatch +PYTHON_PYDANTIC_SETTINGS_LICENSE = MIT +PYTHON_PYDANTIC_SETTINGS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 6127dcaf378..b0db8ab4ef2 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 940d760de174d3567d4f5be28fd215f5 pydantic-2.8.2.tar.gz -sha256 6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a pydantic-2.8.2.tar.gz +md5 84624d794e7d2b528fe1d34eeeeb481a pydantic-2.9.2.tar.gz +sha256 d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f pydantic-2.9.2.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index c549970db92..2b9cd6c38a8 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,16 +4,14 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.8.2 +PYTHON_PYDANTIC_VERSION = 2.9.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/8c/99/d0a5dca411e0a017762258013ba9905cd6e7baa9a3fd1fe8b6529472902e -PYTHON_PYDANTIC_SETUP_TYPE = pep517 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/a9/b7/d9e3f12af310e1120c21603644a1cd86f59060e040ec5c3a80b8f05fae30 +PYTHON_PYDANTIC_SETUP_TYPE = hatch PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE PYTHON_PYDANTIC_CPE_ID_VENDOR = pydantic_project PYTHON_PYDANTIC_CPE_ID_PRODUCT = pydantic -PYTHON_PYDANTIC_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-fancy-pypi-readme +PYTHON_PYDANTIC_DEPENDENCIES = host-python-hatch-fancy-pypi-readme $(eval $(python-package)) diff --git a/package/python-pydyf/python-pydyf.hash b/package/python-pydyf/python-pydyf.hash index b2dac045169..f3eed457824 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 a3650927d9a84da1dc0aa1d268f21376 pydyf-0.8.0.tar.gz -sha256 b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a pydyf-0.8.0.tar.gz +md5 271295d0295c0e5609bf142b851fa266 pydyf-0.11.0.tar.gz +sha256 394dddf619cca9d0c55715e3c55ea121a9bf9cbc780cdc1201a2427917b86b64 pydyf-0.11.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 e9b7d229c75..5566114f8ea 100644 --- a/package/python-pydyf/python-pydyf.mk +++ b/package/python-pydyf/python-pydyf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDYF_VERSION = 0.8.0 +PYTHON_PYDYF_VERSION = 0.11.0 PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz -PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/18/dc/b607bbc7c15327c5d5ec25681a3707c847906134925d21a26ec6e7416a4a +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/2e/c2/97fc6ce4ce0045080dc99446def812081b57750ed8aa67bfdfafa4561fe5 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 70af8104b96..0c848cdca6a 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 2b4f82fd30436834b9357a5e74b8ceb7 pyelftools-0.30.tar.gz -sha256 2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40 pyelftools-0.30.tar.gz +md5 abd09b11e10bf32bfa6cf968b7a41e57 pyelftools-0.31.tar.gz +sha256 c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99 pyelftools-0.31.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 0e52c0b885b..9c46419e412 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.30 +PYTHON_PYELFTOOLS_VERSION = 0.31 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/84/05/fd41cd647de044d1ffec90ce5aaae935126ac217f8ecb302186655284fc8 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/88/56/0f2d69ed9a0060da009f672ddec8a71c041d098a66f6b1d80264bf6bbdc0 PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-pyftpdlib/Config.in b/package/python-pyftpdlib/Config.in index e25c34e5a31..6567385ecfb 100644 --- a/package/python-pyftpdlib/Config.in +++ b/package/python-pyftpdlib/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_PYFTPDLIB bool "python-pyftpdlib" + select BR2_PACKAGE_PYTHON_PYASYNCHAT # runtime + select BR2_PACKAGE_PYTHON_PYASYNCORE # runtime help Extremely fast and scalable Python FTP server library. diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 7b5dabdfdc6..a463e98d7f8 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 cb32bca52ba0d4850a92513154c253e1 pyftpdlib-1.5.9.tar.gz -sha256 323d4c42f1406aedb4df18faf680f64f32c080ff66f6c26090ba592f5bfc4a0f pyftpdlib-1.5.9.tar.gz +md5 16bbc0f0e06964a7da16e88de5f38e20 pyftpdlib-2.0.1.tar.gz +sha256 ef0d172a82bfae10e2dec222e87533514609d41bf4b0fd0f07e29d4380fb96bf pyftpdlib-2.0.1.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 da101083b69..85be95da576 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.9 +PYTHON_PYFTPDLIB_VERSION = 2.0.1 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/47/9f/5dc055ab2db58db561f72b1b2f18b1dafc025f2ac5dd842c40259c17195e +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/b4/0c/32bf0a7c88efe147bc3bc6586216d92269d196c59f149b05efa973834946 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index a742a05e523..0b5d2cfe72f 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 7c059773b0f4808f9402eb0650de6bd4 pygments-2.17.2.tar.gz -sha256 da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367 pygments-2.17.2.tar.gz +md5 fbb7976df756f832f3391008778e8999 pygments-2.18.0.tar.gz +sha256 786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 pygments-2.18.0.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index e42f613cf11..d3e6624ad46 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,14 +4,13 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.17.2 +PYTHON_PYGMENTS_VERSION = 2.18.0 PYTHON_PYGMENTS_SOURCE = pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/55/59/8bccf4157baf25e4aa5a0bb7fa3ba8600907de105ebc22b0c78cfbf6f565 +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments PYTHON_PYGMENTS_CPE_ID_PRODUCT = pygments -PYTHON_PYGMENTS_SETUP_TYPE = pep517 -PYTHON_PYGMENTS_DEPENDENCIES = host-python-hatchling +PYTHON_PYGMENTS_SETUP_TYPE = hatch $(eval $(python-package)) diff --git a/package/python-pyhamcrest/python-pyhamcrest.mk b/package/python-pyhamcrest/python-pyhamcrest.mk index 6631ff1d6a0..712fc8af3da 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.mk +++ b/package/python-pyhamcrest/python-pyhamcrest.mk @@ -7,11 +7,9 @@ PYTHON_PYHAMCREST_VERSION = 2.1.0 PYTHON_PYHAMCREST_SOURCE = pyhamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/16/3f/f286caba4e64391a8dc9200e6de6ce0d07471e3f718248c3276843b7793b -PYTHON_PYHAMCREST_SETUP_TYPE = pep517 +PYTHON_PYHAMCREST_SETUP_TYPE = hatch PYTHON_PYHAMCREST_LICENSE = BSD-3-Clause PYTHON_PYHAMCREST_LICENSE_FILES = LICENSE.txt -PYTHON_PYHAMCREST_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-vcs +PYTHON_PYHAMCREST_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index 01d4bf7fdfa..a765897601e 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 a4411ff1ed8a09e3e9c1d0d02dc89ad8 PyICU-2.12.tar.gz -sha256 bd7ab5efa93ad692e6daa29cd249364e521218329221726a113ca3cb281c8611 PyICU-2.12.tar.gz +md5 7ec5ad0d62a2a27f919ca8a775352a71 PyICU-2.14.tar.gz +sha256 acc7eb92bd5c554ed577249c6978450a4feda0aa6f01470152b3a7b382a02132 PyICU-2.14.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 50962f601eb..413f5954144 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.12 +PYTHON_PYICU_VERSION = 2.14 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/c8/25/38a2104fd48373cfd4eac5104f104ef486f61527e48d627de74794354a2c +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/52/21/4e9b0a3ace3027fc63107fa2b5d6e66e321e104da071d787856962fbad52 PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 06b91bc14ad..a6c8d90853b 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 a683445793adb7fcf39ad3e55c5c347c PyJWT-2.8.0.tar.gz -sha256 57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de PyJWT-2.8.0.tar.gz +md5 88c9dbeb3e6302c7db813195e202420a pyjwt-2.9.0.tar.gz +sha256 7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c pyjwt-2.9.0.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index d4cf2269412..084d4ac8029 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.8.0 -PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/30/72/8259b2bccfe4673330cea843ab23f86858a419d8f1493f66d413a76c7e3b +PYTHON_PYJWT_VERSION = 2.9.0 +PYTHON_PYJWT_SOURCE = pyjwt-$(PYTHON_PYJWT_VERSION).tar.gz +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/fb/68/ce067f09fca4abeca8771fe667d89cc347d1e99da3e093112ac329c6020e PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE diff --git a/package/python-pylibfdt/python-pylibfdt.hash b/package/python-pylibfdt/python-pylibfdt.hash index 82527e727ed..456fe41005d 100644 --- a/package/python-pylibfdt/python-pylibfdt.hash +++ b/package/python-pylibfdt/python-pylibfdt.hash @@ -1,6 +1,6 @@ -# md5, sha256 from https://pypi.python.org/pypi/pylibfdt/json -md5 353ee3063d0b10e94d165e032897d34e pylibfdt-1.7.0.post1.tar.gz -sha256 2d048f9f8ce9a0527d497f423dea1f1135f9811c05b009cc5d5753771c1f9ba1 pylibfdt-1.7.0.post1.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/pylibfdt/json +md5 78859f23154da8c951770f2c5287804e pylibfdt-1.7.2.tar.gz +sha256 b18c6c40400ed4374d0a142dcdb07e5402574ff1304454019a1fd92735b54756 pylibfdt-1.7.2.tar.gz +# Locally computed sha256 checksums sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk index 9591439b014..7d7398a9954 100644 --- a/package/python-pylibfdt/python-pylibfdt.mk +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -4,14 +4,16 @@ # ################################################################################ -PYTHON_PYLIBFDT_VERSION = 1.7.0.post1 +PYTHON_PYLIBFDT_VERSION = 1.7.2 PYTHON_PYLIBFDT_SOURCE = pylibfdt-$(PYTHON_PYLIBFDT_VERSION).tar.gz -PYTHON_PYLIBFDT_SITE = https://files.pythonhosted.org/packages/96/5c/77ef0f0459e0b13f39ecc22e21ad4ac9fbe741e8a7cd70702ac8165f80e2 +PYTHON_PYLIBFDT_SITE = https://files.pythonhosted.org/packages/b1/cc/54fc80135b3eb7fcbfded65eee7c71b2b970b5124e3066a158421222f191 PYTHON_PYLIBFDT_SETUP_TYPE = pep517 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 +PYTHON_PYLIBFDT_BUILD_OPTS = --skip-dependency-check HOST_PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig +HOST_PYTHON_PYLIBFDT_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index 5d8a19647f7..00cee048f4c 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 75b63f325b760cc6342b7d35fbb84fde pylibftdi-0.21.0.tar.gz -sha256 eb7e2f5052852547f4c6c46022a1665f9d7453439639171eade56fdc80a58832 pylibftdi-0.21.0.tar.gz +md5 a1d3039e8e09b3fb73cb03f1d6f3119b pylibftdi-0.22.0.tar.gz +sha256 85a6aab438f765342843aa2d59bb28fbb0d30847a621fb9800985185990f01af pylibftdi-0.22.0.tar.gz # Locally computed sha256 checksums sha256 b8a7b113cfaa2c01d0701183de16ba653465692b1e29e0229244eee42fb3a9a8 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 7607c90d4a4..1085c4879ac 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,14 +4,12 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.21.0 +PYTHON_PYLIBFTDI_VERSION = 0.22.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/74/b3/a3c333a250143d204a0bb60de7c1e5f841543231f04c71ff4fa65e5b90c2 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt -PYTHON_PYLIBFTDI_SETUP_TYPE = pep517 -PYTHON_PYLIBFTDI_DEPENDENCIES = \ - host-python-poetry-core \ - libftdi +PYTHON_PYLIBFTDI_SETUP_TYPE = poetry +PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi $(eval $(python-package)) diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 7c8f352de46..7e3cadce706 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymodbus/json -md5 3bdc2a574cbfd10ec6dddf38c3f26598 pymodbus-3.7.0.tar.gz -sha256 5c772babaa61a65ff908293faa668aedcd9d9e10f4bcf5c77a8fe51a6fd9ed47 pymodbus-3.7.0.tar.gz +md5 0371a857e08b555cabf3935044675f39 pymodbus-3.7.4.tar.gz +sha256 573c370aea04523403eea1e159616a583cd7b93cfc5c81b07340d3cccd52c99f pymodbus-3.7.4.tar.gz # Locally computed sha256 checksums sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 6a7c384cf63..0bd99cc3da8 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.7.0 +PYTHON_PYMODBUS_VERSION = 3.7.4 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/cc/83/de0c3596f17ac4833f591e96cafee7ae6109d846d607387b48f88d66759a +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/0b/bc/f98789706351e778676a3e84ed6203160c4f581092e298eb075bc9e08230 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash index 641d5dba97a..d697dfae888 100644 --- a/package/python-pymysql/python-pymysql.hash +++ b/package/python-pymysql/python-pymysql.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymysql/json -md5 81d559c87414017075de030d8ce93257 PyMySQL-1.1.0.tar.gz -sha256 4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PyMySQL-1.1.0.tar.gz +md5 66e1b2c679250e0ae9ae037444de950a pymysql-1.1.1.tar.gz +sha256 e127611aaf2b417403c60bf4dc570124aeb4a57f5f37b8e95ae399a42f904cd0 pymysql-1.1.1.tar.gz # Locally computed sha256 checksums sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk index c600fe515cb..742fb4f6f1c 100644 --- a/package/python-pymysql/python-pymysql.mk +++ b/package/python-pymysql/python-pymysql.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMYSQL_VERSION = 1.1.0 -PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/41/9d/ee68dee1c8821c839bb31e6e5f40e61035a5278f7c1307dde758f0c90452 +PYTHON_PYMYSQL_VERSION = 1.1.1 +PYTHON_PYMYSQL_SOURCE = pymysql-$(PYTHON_PYMYSQL_VERSION).tar.gz +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/b3/8f/ce59b5e5ed4ce8512f879ff1fa5ab699d211ae2495f1adaa5fbba2a1eada PYTHON_PYMYSQL_LICENSE = MIT PYTHON_PYMYSQL_LICENSE_FILES = LICENSE PYTHON_PYMYSQL_SETUP_TYPE = setuptools diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index fb5f75db96e..6c968eff163 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 4c4f6f9e1c731b8ee7adcd9fbeccec62 pyOpenSSL-23.3.0.tar.gz -sha256 6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12 pyOpenSSL-23.3.0.tar.gz +md5 4e41c41b8a14ac141dde132c348aaf5d pyopenssl-24.2.1.tar.gz +sha256 4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95 pyopenssl-24.2.1.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 9865f2bb000..077322131f9 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 23.3.0 -PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/bf/a0/e667c3c43b65a188cc3041fa00c50655315b93be45182b2c94d185a2610e +PYTHON_PYOPENSSL_VERSION = 24.2.1 +PYTHON_PYOPENSSL_SOURCE = pyopenssl-$(PYTHON_PYOPENSSL_VERSION).tar.gz +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/5d/70/ff56a63248562e77c0c8ee4aefc3224258f1856977e0c1472672b62dadb8 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 a4e207e4e41..e4e6a8f181c 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 9675d7b278f4533b9b75701e6e87390b build-1.2.1.tar.gz -sha256 526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d build-1.2.1.tar.gz +md5 f80cc64db8e7fd8f8403a5e8a0562d4d build-1.2.2.tar.gz +sha256 119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c build-1.2.2.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 d8a23ddd8b3..9404f083020 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 1.2.1 +PYTHON_PYPA_BUILD_VERSION = 1.2.2 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/ce/9e/2d725d2f7729c6e79ca62aeb926492abbc06e25910dd30139d60a68bcb19 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/dd/bb/4a1b7e3a7520e310cf7bfece43788071604e1ccf693a7f0c4638c59068d6 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = flit-bootstrap diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index d029ebda2dc..458da628884 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 2bfafdb2d02d19ca4a3dfd02a9dbdfa7 pyparsing-3.1.2.tar.gz -sha256 a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad pyparsing-3.1.2.tar.gz +md5 c9fb29820d6bf6e83651a0bd7411f02c pyparsing-3.2.0.tar.gz +sha256 cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c pyparsing-3.2.0.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 b7cbbd4262f..20faa35d389 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.1.2 +PYTHON_PYPARSING_VERSION = 3.2.0 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/46/3a/31fd28064d016a2182584d579e033ec95b809d8e220e74c4af6f0f2e8842 +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/8c/d5/e5aeee5387091148a19e1145f63606619cb5f20b83fccb63efae6474e7b2 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE PYTHON_PYPARSING_SETUP_TYPE = flit diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 47b9009ea18..d37b9069101 100644 --- a/package/python-pyphen/python-pyphen.hash +++ b/package/python-pyphen/python-pyphen.hash @@ -1,8 +1,8 @@ # md5, sha256 from https://pypi.org/pypi/Pyphen/json -md5 19e799bbf459ac675698c37c5fae34a8 pyphen-0.14.0.tar.gz -sha256 596c8b3be1c1a70411ba5f6517d9ccfe3083c758ae2b94a45f2707346d8e66fa pyphen-0.14.0.tar.gz +md5 acb06fb5953d2b5435fa8d1428d6652f pyphen-0.17.0.tar.gz +sha256 1d13acd1ce37a384d7612954ae6c7801bb4c5316da0e2b937b2127ba702a3da4 pyphen-0.17.0.tar.gz # Locally computed sha256 checksums -sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE +sha256 4fd1c78fcec632bc872ba7b42ba04be330029cfffa411039b48a4f2262bb8240 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LGPL sha256 ad192a67649aa23ac9681939840f4f241643a98da9cd8aec8de28c3b8c6ee854 COPYING.MPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 9baa2e7b981..61f050c8c9b 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.14.0 +PYTHON_PYPHEN_VERSION = 0.17.0 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/4b/52/46b119f94b3f68e4193ada36941606d8e26852b67bb6e099b0e310540b41 +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/66/46/3dd0ae4b52016496069af6c4fca3b5918b0281fc92678f739edb8f3eb377 PYTHON_PYPHEN_SETUP_TYPE = flit PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.hash b/package/python-pypika-tortoise/python-pypika-tortoise.hash index 629762f4f7a..5c78509af2b 100644 --- a/package/python-pypika-tortoise/python-pypika-tortoise.hash +++ b/package/python-pypika-tortoise/python-pypika-tortoise.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pypika-tortoise/json -md5 98c9677516f06f61f211f834d51949a6 pypika-tortoise-0.1.6.tar.gz -sha256 d802868f479a708e3263724c7b5719a26ad79399b2a70cea065f4a4cadbebf36 pypika-tortoise-0.1.6.tar.gz +md5 69e74ea7ee7236de921c662a3b0940bc pypika_tortoise-0.2.1.tar.gz +sha256 979bbb9d60fe9f6e4129a25c44ee008aab4a4e97b296350be9983dcaa2766354 pypika_tortoise-0.2.1.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.mk b/package/python-pypika-tortoise/python-pypika-tortoise.mk index 84aa19cfbb2..ba4845e1009 100644 --- a/package/python-pypika-tortoise/python-pypika-tortoise.mk +++ b/package/python-pypika-tortoise/python-pypika-tortoise.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_PYPIKA_TORTOISE_VERSION = 0.1.6 -PYTHON_PYPIKA_TORTOISE_SOURCE = pypika-tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz -PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/86/55/1bfd4150f664d2e07b36c8f442178cc1f717bb9ae6cae20f21e851c208c6 -PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = pep517 +PYTHON_PYPIKA_TORTOISE_VERSION = 0.2.1 +PYTHON_PYPIKA_TORTOISE_SOURCE = pypika_tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz +PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/30/af/b4a6035611cf6f3990879385cf6d077013c1bdf7ea294d6ceebfa14c8d08 +PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = poetry PYTHON_PYPIKA_TORTOISE_LICENSE = Apache-2.0 PYTHON_PYPIKA_TORTOISE_LICENSE_FILES = LICENSE -PYTHON_PYPIKA_TORTOISE_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.hash b/package/python-pyproject-hooks/python-pyproject-hooks.hash index 9fdcd335968..fdbcb9816b7 100644 --- a/package/python-pyproject-hooks/python-pyproject-hooks.hash +++ b/package/python-pyproject-hooks/python-pyproject-hooks.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyproject_hooks/json -md5 69b0b6de189bc04c3f9e304281765741 pyproject_hooks-1.0.0.tar.gz -sha256 f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 pyproject_hooks-1.0.0.tar.gz +md5 ed3dd1b984339e83e35f676d7169c192 pyproject_hooks-1.2.0.tar.gz +sha256 1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 pyproject_hooks-1.2.0.tar.gz # Locally computed sha256 checksums sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pyproject-hooks/python-pyproject-hooks.mk b/package/python-pyproject-hooks/python-pyproject-hooks.mk index a42dbb0ab10..7edbd642941 100644 --- a/package/python-pyproject-hooks/python-pyproject-hooks.mk +++ b/package/python-pyproject-hooks/python-pyproject-hooks.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYPROJECT_HOOKS_VERSION = 1.0.0 +PYTHON_PYPROJECT_HOOKS_VERSION = 1.2.0 PYTHON_PYPROJECT_HOOKS_SOURCE = pyproject_hooks-$(PYTHON_PYPROJECT_HOOKS_VERSION).tar.gz -PYTHON_PYPROJECT_HOOKS_SITE = https://files.pythonhosted.org/packages/25/c1/374304b8407d3818f7025457b7366c8e07768377ce12edfe2aa58aa0f64c +PYTHON_PYPROJECT_HOOKS_SITE = https://files.pythonhosted.org/packages/e7/82/28175b2414effca1cdac8dc99f76d660e7a4fb0ceefa4b4ab8f5f6742925 PYTHON_PYPROJECT_HOOKS_SETUP_TYPE = flit-bootstrap PYTHON_PYPROJECT_HOOKS_LICENSE = MIT PYTHON_PYPROJECT_HOOKS_LICENSE_FILES = LICENSE diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.hash b/package/python-pyproject-metadata/python-pyproject-metadata.hash index 51a3e4b85b5..90f51c8c28e 100644 --- a/package/python-pyproject-metadata/python-pyproject-metadata.hash +++ b/package/python-pyproject-metadata/python-pyproject-metadata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyproject-metadata/json -md5 ca5e9527cff96153a976e14530b53746 pyproject-metadata-0.7.1.tar.gz -sha256 0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67 pyproject-metadata-0.7.1.tar.gz +md5 d947b3c632f4aee9cf23bb5950ac02f9 pyproject_metadata-0.9.0.tar.gz +sha256 8511c00a4cad96686af6a6b4143433298beb96105a9379afdc9b0328f4f260c9 pyproject_metadata-0.9.0.tar.gz # Locally computed sha256 checksums sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.mk b/package/python-pyproject-metadata/python-pyproject-metadata.mk index 6fac22abee9..7429ba8af3e 100644 --- a/package/python-pyproject-metadata/python-pyproject-metadata.mk +++ b/package/python-pyproject-metadata/python-pyproject-metadata.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYPROJECT_METADATA_VERSION = 0.7.1 -PYTHON_PYPROJECT_METADATA_SOURCE = pyproject-metadata-$(PYTHON_PYPROJECT_METADATA_VERSION).tar.gz -PYTHON_PYPROJECT_METADATA_SITE = https://files.pythonhosted.org/packages/38/af/b0e6a9eba989870fd26e10889446d1bec2e6d5be0a1bae2dc4dcda9ce199 -PYTHON_PYPROJECT_METADATA_SETUP_TYPE = setuptools +PYTHON_PYPROJECT_METADATA_VERSION = 0.9.0 +PYTHON_PYPROJECT_METADATA_SOURCE = pyproject_metadata-$(PYTHON_PYPROJECT_METADATA_VERSION).tar.gz +PYTHON_PYPROJECT_METADATA_SITE = https://files.pythonhosted.org/packages/c0/79/406a9f56c435caaaca4a1c66397e4f63ecd48a72a6c4fc1d9ecdaac66acb +PYTHON_PYPROJECT_METADATA_SETUP_TYPE = flit PYTHON_PYPROJECT_METADATA_LICENSE = MIT PYTHON_PYPROJECT_METADATA_LICENSE_FILES = LICENSE +HOST_PYTHON_PYPROJECT_METADATA_DEPENDENCIES = host-python-packaging $(eval $(host-python-package)) diff --git a/package/python-pyqt5-sip/python-pyqt5-sip.hash b/package/python-pyqt5-sip/python-pyqt5-sip.hash index fb4a8cb04d4..909ee2ef336 100644 --- a/package/python-pyqt5-sip/python-pyqt5-sip.hash +++ b/package/python-pyqt5-sip/python-pyqt5-sip.hash @@ -1,7 +1,6 @@ -# from https://pypi.org/project/PyQt5-sip/12.30.0 -sha256 7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91 PyQt5_sip-12.13.0.tar.gz +# From https://pypi.org/pypi/PyQt5-sip/json +md5 9e0909e79f40619b0f2d3d3c33b4d4f7 PyQt5_sip-12.15.0.tar.gz +sha256 d23fdfcf363b5cedd9d39f8a9c5710e7d52804f5b08a58e91c638b36eafcb702 PyQt5_sip-12.15.0.tar.gz -# Hash for license files: -md5 9cd437778ebd1c056a76b4ded73b3a6d LICENSE -md5 e91355d8a6f8bd8f7c699d62863c7303 LICENSE-GPL2 -md5 7ea41d866d6638e430db5287a3f66090 LICENSE-GPL3 +# Locally calculated +sha256 3859cfca971e429d6b79bdfeb1dc9e43aa9592f7295bf28fdd62824097909383 LICENSE diff --git a/package/python-pyqt5-sip/python-pyqt5-sip.mk b/package/python-pyqt5-sip/python-pyqt5-sip.mk index e52081ab457..49762ec58c2 100644 --- a/package/python-pyqt5-sip/python-pyqt5-sip.mk +++ b/package/python-pyqt5-sip/python-pyqt5-sip.mk @@ -1,14 +1,24 @@ ################################################################################ # -# python-SIP-QT5 +# python-sip-qt5 # ################################################################################ -PYTHON_PYQT5_SIP_VERSION = 12.13.0 -PYTHON_PYQT5_SIP_SITE = https://files.pythonhosted.org/packages/ee/81/fce2a475aa56c1f49707d9306b930695b6ff078c2242c9f2fd72a3214e1f +# Note about the package version: +# This module version corresponds in fact to the "sip" ABI +# version (not the version of its generator). See: +# https://github.com/Python-SIP/sip/blob/6.8.6/sipbuild/module/source/12/sip.h.in#L43 +# The source git repository of this module is located at: +# https://github.com/Python-SIP/sip/tree/main/sipbuild/module/source +# The Python-SIP version/tag which generated a given "sip" module is +# recorded in the PyPI source file "sip.h", in the SIP_VERSION_STR +# macro. For example, PyQt5-sip 12.15.0 was generated with Python-SIP +# 6.8.6. +PYTHON_PYQT5_SIP_VERSION = 12.15.0 +PYTHON_PYQT5_SIP_SITE = https://files.pythonhosted.org/packages/1b/15/78318d50f10062c428e97e7ce387e772616a4673c356018b905f247a6a85 PYTHON_PYQT5_SIP_SOURCE = PyQt5_sip-$(PYTHON_PYQT5_SIP_VERSION).tar.gz -PYTHON_PYQT5_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 -PYTHON_PYQT5_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 +PYTHON_PYQT5_SIP_LICENSE = BSD-2-Clause +PYTHON_PYQT5_SIP_LICENSE_FILES = LICENSE PYTHON_PYQT5_SIP_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index 54b7f201b80..bee0c529cad 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -139,7 +139,7 @@ endef # The file "qt.conf" can be used to override the hard-coded paths that are # compiled into the Qt library. We need it to make "qmake" relocatable and -# tweak the per-package install pathes +# tweak the per-package install paths PYTHON_PYQT5_PRE_CONFIGURE_HOOKS += QT5_QT_CONF_FIXUP PYTHON_PYQT5_CONF_OPTS = \ diff --git a/package/python-pyroute2/python-pyroute2.hash b/package/python-pyroute2/python-pyroute2.hash index 87693d028b3..e346ca4f664 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 0566531c56ec453cc9ca0aff2c3f2f31 pyroute2-0.7.10.tar.gz -sha256 cc2f90aad1517cb0b301041f678cc8d3c3427c26e53f15c78c93c67928d89a02 pyroute2-0.7.10.tar.gz -# Locally computed sha256 +md5 04e3b1a6550840c2eaa75da16b83f62b pyroute2-0.7.12.tar.gz +sha256 54d226fc3ff2732f49bac9b26853c50c9d05be05a4d9daf09c7cf6d77301eff3 pyroute2-0.7.12.tar.gz +# Locally computed sha256 checksums 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 023b8e7c44a..a4029c7321c 100644 --- a/package/python-pyroute2/python-pyroute2.mk +++ b/package/python-pyroute2/python-pyroute2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYROUTE2_VERSION = 0.7.10 +PYTHON_PYROUTE2_VERSION = 0.7.12 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/18/44/930e15e4fd5d0c7c54dfd303f644a057d88f411a97581d6edc5cb9e16f9e +PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/39/16/323b947c34530436658331e2cf393b72ebcbd923a75154a7efb28feefd5d PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+ PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache-2.0 LICENSE.GPL-2.0-or-later README.license.rst PYTHON_PYROUTE2_SETUP_TYPE = setuptools diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 87b1edf5957..cc4f5531060 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30558c11ba141e9ad26e5edb1b85b94813a335ed5c0fe11df8046942b0c7e813 pysmb-1.2.9.tar.gz +sha256 a3897153177d4a88bd4086ed07890f0b4d1d8d1c99866392edc2ce744ce9c3f1 pysmb-1.2.10.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 394a9d806cb..b4d010e1b0c 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.9 +PYTHON_PYSMB_VERSION = 1.2.10 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/Config.in b/package/python-pysmi/Config.in index 2e4453d8868..d30e24afd15 100644 --- a/package/python-pysmi/Config.in +++ b/package/python-pysmi/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_PYTHON_PYSMI bool "python-pysmi" + select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_PLY # runtime + select BR2_PACKAGE_PYTHON_REQUESTS # runtime help SNMP SMI/MIB Parser. diff --git a/package/python-pysmi/python-pysmi.hash b/package/python-pysmi/python-pysmi.hash index bb13f0ef004..30043f1b951 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 187efbaa8ebb5d6d880906bab0116ef8 pysmi-1.5.9.tar.gz +sha256 f6dfda838e3cba133169f1ff57f71a2841815d43db2e5c619b6e5db3b8560707 pysmi-1.5.9.tar.gz # Locally computed sha256 checksums -sha256 c43704eafcfa2bc33e56168f2b498c3c34a1d7865855626a52b5af411fc5837f LICENSE.rst +sha256 bc211b99a3eb46f3b1f64f8152dffc869d3bc4bffed82545732ef9e34628513b LICENSE.rst diff --git a/package/python-pysmi/python-pysmi.mk b/package/python-pysmi/python-pysmi.mk index 2aee27b1860..454cd114472 100644 --- a/package/python-pysmi/python-pysmi.mk +++ b/package/python-pysmi/python-pysmi.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYSMI_VERSION = 0.3.4 +PYTHON_PYSMI_VERSION = 1.5.9 PYTHON_PYSMI_SOURCE = pysmi-$(PYTHON_PYSMI_VERSION).tar.gz -PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/52/42/ddaeb06ff551672b17b77f81bc2e26b7c6060b28fe1552226edc6476ce37 -PYTHON_PYSMI_SETUP_TYPE = setuptools +PYTHON_PYSMI_SITE = https://files.pythonhosted.org/packages/be/b0/19085322fc24f6b4a7bbc151643641c391b8b8d9aa4fd0e40d8178b2a5f5 +PYTHON_PYSMI_SETUP_TYPE = poetry PYTHON_PYSMI_LICENSE = BSD-2-Clause PYTHON_PYSMI_LICENSE_FILES = LICENSE.rst diff --git a/package/python-pysnmp/Config.in b/package/python-pysnmp/Config.in index a034b16852a..f29eb79a461 100644 --- a/package/python-pysnmp/Config.in +++ b/package/python-pysnmp/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_PYTHON_PYSNMP bool "python-pysnmp" - select BR2_PACKAGE_PYTHON_PYSMI # runtime - select BR2_PACKAGE_PYTHON_PYCRYPTODOMEX # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime help PySNMP is a cross-platform, pure-Python SNMP engine diff --git a/package/python-pysnmp/python-pysnmp.hash b/package/python-pysnmp/python-pysnmp.hash index 3b0af1af620..1081f44512e 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 ce0165cfb056a1c71f6b4fe73044cae9 pysnmp-7.1.13.tar.gz +sha256 535b275e6703e37d5a65328ee32ece2d28c876482f83de781785b550b1f5cfe3 pysnmp-7.1.13.tar.gz # Locally computed sha256 checksums -sha256 d0b2edd772164395320fc5ad7dfaa9806fa038fb29762b347c549891d7a79237 LICENSE.rst +sha256 4954453957449b5e6f797d070f4d91024dceb3e056c99d72350795b71db0fc70 LICENSE.rst diff --git a/package/python-pysnmp/python-pysnmp.mk b/package/python-pysnmp/python-pysnmp.mk index 520ce2877ac..a1d03f785cd 100644 --- a/package/python-pysnmp/python-pysnmp.mk +++ b/package/python-pysnmp/python-pysnmp.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYSNMP_VERSION = 4.4.12 +PYTHON_PYSNMP_VERSION = 7.1.13 PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz -PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/4e/75/72f64c451bf5884715f84f8217b69b4025da0b67628d611cd14a5b7db217 -PYTHON_PYSNMP_SETUP_TYPE = setuptools -PYTHON_PYSNMP_LICENSE = BSD-3-Clause +PYTHON_PYSNMP_SITE = https://files.pythonhosted.org/packages/d2/de/b766b1dc85e02c99835e05518d5efe9b2f1c875d406079584b4799d02db9 +PYTHON_PYSNMP_SETUP_TYPE = poetry +PYTHON_PYSNMP_LICENSE = BSD-2-Clause PYTHON_PYSNMP_LICENSE_FILES = LICENSE.rst $(eval $(python-package)) diff --git a/package/python-pysnmpcrypto/Config.in b/package/python-pysnmpcrypto/Config.in new file mode 100644 index 00000000000..da9dd6cf435 --- /dev/null +++ b/package/python-pysnmpcrypto/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_PYSNMPCRYPTO + bool "python-pysnmpcrypto" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + help + Strong cryptography support for PySNMP (SNMP library for + Python). + + https://github.com/lextudio/pysnmpcrypto diff --git a/package/python-pysnmpcrypto/python-pysnmpcrypto.hash b/package/python-pysnmpcrypto/python-pysnmpcrypto.hash new file mode 100644 index 00000000000..d36d20b43ff --- /dev/null +++ b/package/python-pysnmpcrypto/python-pysnmpcrypto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pysnmpcrypto/json +md5 969f3690cf2ba4309c047af31d17617e pysnmpcrypto-0.1.0.tar.gz +sha256 ee6819247ceee09aa2de54b998c51ccf595d75a9ccc2e303383b39a5ac63816c pysnmpcrypto-0.1.0.tar.gz +# Locally computed sha256 checksums +sha256 24c90090900edc62b49e27888132293a096248408f73993dc8f0147a6fe200ae LICENSE.rst diff --git a/package/python-pysnmpcrypto/python-pysnmpcrypto.mk b/package/python-pysnmpcrypto/python-pysnmpcrypto.mk new file mode 100644 index 00000000000..f58bff11367 --- /dev/null +++ b/package/python-pysnmpcrypto/python-pysnmpcrypto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pysnmpcrypto +# +################################################################################ + +PYTHON_PYSNMPCRYPTO_VERSION = 0.1.0 +PYTHON_PYSNMPCRYPTO_SOURCE = pysnmpcrypto-$(PYTHON_PYSNMPCRYPTO_VERSION).tar.gz +PYTHON_PYSNMPCRYPTO_SITE = https://files.pythonhosted.org/packages/e6/70/b71f5f1321ea548a7152fc23926258caaec353c8c3edce1aaafbb030ba76 +PYTHON_PYSNMPCRYPTO_SETUP_TYPE = poetry +PYTHON_PYSNMPCRYPTO_LICENSE = BSD-2-Clause +PYTHON_PYSNMPCRYPTO_LICENSE_FILES = LICENSE.rst + +$(eval $(python-package)) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index dc808d4204d..59e5463096e 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 b633cab73a1481c5dbc2d6f6857569d0 pyspnego-0.10.2.tar.gz -sha256 9a22c23aeae7b4424fdb2482450d3f8302ac012e2644e1cfe735cf468fcd12ed pyspnego-0.10.2.tar.gz +md5 f13229784747c05d880c25880872f856 pyspnego-0.11.1.tar.gz +sha256 e92ed8b0a62765b9d6abbb86a48cf871228ddb97678598dc01c9c39a626823f6 pyspnego-0.11.1.tar.gz # Locally computed sha256 checksums sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 740e6eec154..166e1ec85b5 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.10.2 +PYTHON_PYSPNEGO_VERSION = 0.11.1 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/3a/c3/401a5ae889b51f80e91474b6acda7dae8d704c6fe8424fd40e0ff0702812 +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/46/f5/1f938a781742d18475ac43a101ec8a9499e1655da0984e08b59e20012c04 PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE diff --git a/package/python-pytablereader/Config.in b/package/python-pytablereader/Config.in index 00be18510ff..308e06236a2 100644 --- a/package/python-pytablereader/Config.in +++ b/package/python-pytablereader/Config.in @@ -5,9 +5,8 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_PATHPY # runtime + select BR2_PACKAGE_PYTHON_PATH # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help diff --git a/package/python-pytablereader/python-pytablereader.hash b/package/python-pytablereader/python-pytablereader.hash index 2034cfd61ea..18a26847c8b 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 8d732b706186666a4c28d14927c26754 pytablereader-0.31.3.tar.gz -sha256 e292b81ecd96546fe0f53d9c83e716a4682d07d7ead6d9be8beb14ab0591df11 pytablereader-0.31.3.tar.gz +md5 d92cbcb2716ecea0eee58649a591edc0 pytablereader-0.31.4.tar.gz +sha256 ad97308308525cafe0eaa4b6a80a02499e0b4c6c979efb17452d302ad78bd5b1 pytablereader-0.31.4.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-pytablereader/python-pytablereader.mk b/package/python-pytablereader/python-pytablereader.mk index daa484d3934..40614472a69 100644 --- a/package/python-pytablereader/python-pytablereader.mk +++ b/package/python-pytablereader/python-pytablereader.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEREADER_VERSION = 0.31.3 +PYTHON_PYTABLEREADER_VERSION = 0.31.4 PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz -PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/b5/c8/67590578e27cb1716c7b71291946d685b5bf63fbfe7a254a7cb3f6f8aeab +PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/0a/44/e42c24df7b6f1c880b5bf614112e2009ac088fee79b6bc4d1fa43789c460 PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools PYTHON_PYTABLEREADER_LICENSE = MIT PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index 53bf62340cb..a88d1c58413 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 e419d6fbc626b366814b7b698fa79236 pytest-asyncio-0.23.6.tar.gz -sha256 ffe523a89c1c222598c76856e76852b787504ddb72dd5d9b6617ffa8aa2cde5f pytest-asyncio-0.23.6.tar.gz +md5 510ca6136236bba0f0581aa46060ae03 pytest_asyncio-0.24.0.tar.gz +sha256 d081d828e576d85f875399194281e92bf8a68d60d72d1a2faf2feddb6c46b276 pytest_asyncio-0.24.0.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 88f93d83e05..ae0934e00f0 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.23.6 -PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/cd/ef/80107b9e939875ad613c705d99d91e4510dcf5fed29613ac9aecbcba0a8d +PYTHON_PYTEST_ASYNCIO_VERSION = 0.24.0 +PYTHON_PYTEST_ASYNCIO_SOURCE = pytest_asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/52/6d/c6cf50ce320cf8611df7a1254d86233b3df7cc07f9b5f5cbcb82e08aa534 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 1d5a8742384..15ac04a6eaf 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 6a85eccffeb0fa15c104f408d82ce7fa pytest-8.1.1.tar.gz -sha256 ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044 pytest-8.1.1.tar.gz +md5 71466867181a5a7aefdb298b7146bcad pytest-8.3.3.tar.gz +sha256 70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 pytest-8.3.3.tar.gz # Locally computed sha256 checksums sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 90dc91b654b..256b6954f0f 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 8.1.1 +PYTHON_PYTEST_VERSION = 8.3.3 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/30/b7/7d44bbc04c531dcc753056920e0988032e5871ac674b5a84cb979de6e7af +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/8b/6c/62bbd536103af674e227c41a8f3dcd022d591f6eed5facb5a0f31ee33bbc PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash index a46825c933e..b72acfbe475 100644 --- a/package/python-pythran/python-pythran.hash +++ b/package/python-pythran/python-pythran.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pythran/json -md5 cc6fa05e583733182d06d2e41e03cc10 pythran-0.15.0.tar.gz -sha256 f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c pythran-0.15.0.tar.gz +md5 b754bc4c5cf37c4f0c4a3ae38009e799 pythran-0.17.0.tar.gz +sha256 3b77d6d970a6cf5b448facc7d4f6229c3e73909ac27ea2480c843afdadbad0fb pythran-0.17.0.tar.gz # Locally computed sha256 checksums sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk index 43853a514dc..b9b1faee85f 100644 --- a/package/python-pythran/python-pythran.mk +++ b/package/python-pythran/python-pythran.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTHRAN_VERSION = 0.15.0 +PYTHON_PYTHRAN_VERSION = 0.17.0 PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/82/31/cc6fd7a2b91efc6cdb03e7c42df895b4a65a8f049b074579d45d1def746f +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/34/2d/4ac363a2eecd68c372b058d1b95a5f262c70776e107619cdcb5a4b68e1a3 PYTHON_PYTHRAN_SETUP_TYPE = setuptools PYTHON_PYTHRAN_LICENSE = BSD-3-Clause PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index a8bfe678179..ca64cb7d798 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 b26bb090d1fe96064019bf7068eeb801 pytz-2024.1.tar.gz -sha256 2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 pytz-2024.1.tar.gz +md5 efcb554763a36b3e18acee074f44d1a5 pytz-2024.2.tar.gz +sha256 2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a pytz-2024.2.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 300e26befe8..1d37d09ab13 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2024.1 +PYTHON_PYTZ_VERSION = 2024.2 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/90/26/9f1f00a5d021fff16dee3de13d43e5e978f3d58928e129c3a62cf7eb9738 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/3a/31/3c70bf7603cc2dca0f19bdc53b4537a797747a58875b552c8c413d963a3f PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index 72eb323e1f8..e9596b7b437 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 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz -sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz +md5 07bbe9111308d2509645705b8321c416 pyudev-0.24.3.tar.gz +sha256 2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7 pyudev-0.24.3.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 53d60572a8d..fa11ce5040b 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.24.1 +PYTHON_PYUDEV_VERSION = 0.24.3 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/c4/5c/6cc034da13830e3da123ccf9a30910bc868fa16670362f004e4b788d0df1 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash index e1f9412c300..47bd6d1ef90 100644 --- a/package/python-pyyaml/python-pyyaml.hash +++ b/package/python-pyyaml/python-pyyaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyYAML/json -md5 c9246277af2d9a13b7018af267a0831a PyYAML-6.0.1.tar.gz -sha256 bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 PyYAML-6.0.1.tar.gz +md5 9600ee49b2b4e1a0237cf4173b6dc594 pyyaml-6.0.2.tar.gz +sha256 d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e pyyaml-6.0.2.tar.gz # Locally computed sha256 checksums sha256 8d3928f9dc4490fd635707cb88eb26bd764102a7282954307d3e5167a577e8a4 LICENSE diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 40a1c25758a..1101b592763 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYYAML_VERSION = 6.0.1 -PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/cd/e5/af35f7ea75cf72f2cd079c95ee16797de7cd71f29ea7c68ae5ce7be1eda0 +PYTHON_PYYAML_VERSION = 6.0.2 +PYTHON_PYYAML_SOURCE = pyyaml-$(PYTHON_PYYAML_VERSION).tar.gz +PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17 PYTHON_PYYAML_SETUP_TYPE = setuptools PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE diff --git a/package/python-qrcode/Config.in b/package/python-qrcode/Config.in index 6e63d83e41a..9a17cc1f081 100644 --- a/package/python-qrcode/Config.in +++ b/package/python-qrcode/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_PYTHON_QRCODE bool "python-qrcode" - select BR2_PACKAGE_PYTHON_PYPNG # runtime - select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Pure python QR Code generator diff --git a/package/python-qrcode/python-qrcode.hash b/package/python-qrcode/python-qrcode.hash index 48b2d7b2b0e..ceeaf05f493 100644 --- a/package/python-qrcode/python-qrcode.hash +++ b/package/python-qrcode/python-qrcode.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/qrcode/json -md5 a4c47fe5ff966b105098998cfb2294de qrcode-7.4.2.tar.gz -sha256 9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845 qrcode-7.4.2.tar.gz +md5 29561c9082864010f884d2fc5b3e62de qrcode-8.0.tar.gz +sha256 025ce2b150f7fe4296d116ee9bad455a6643ab4f6e7dce541613a4758cbce347 qrcode-8.0.tar.gz # Locally computed sha256 checksums sha256 40dfb903c94ee3f789500131311186548ecba5cefd3557623d7700e2522ab994 LICENSE diff --git a/package/python-qrcode/python-qrcode.mk b/package/python-qrcode/python-qrcode.mk index 97b181a1e1e..8222ceac8ec 100644 --- a/package/python-qrcode/python-qrcode.mk +++ b/package/python-qrcode/python-qrcode.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_QRCODE_VERSION = 7.4.2 +PYTHON_QRCODE_VERSION = 8.0 PYTHON_QRCODE_SOURCE = qrcode-$(PYTHON_QRCODE_VERSION).tar.gz -PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/30/35/ad6d4c5a547fe9a5baf85a9edbafff93fc6394b014fab30595877305fa59 -PYTHON_QRCODE_SETUP_TYPE = setuptools +PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/d7/db/6fc9631cac1327f609d2c8ae3680ecd987a2e97472437f2de7ead1235156 +PYTHON_QRCODE_SETUP_TYPE = poetry PYTHON_QRCODE_LICENSE = BSD-3-Clause PYTHON_QRCODE_LICENSE_FILES = LICENSE diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 2d9df87a101..57d85571569 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 f4bff9e3819ec832bb789b8b58363d6b redis-5.0.1.tar.gz -sha256 0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f redis-5.0.1.tar.gz +md5 a3210ca8428bd0ac9691789c08b14478 redis-5.2.0.tar.gz +sha256 0b1087665a771b1ff2e003aa5bdd354f15a70c9e25d5a7dbf9c722c16528a7b0 redis-5.2.0.tar.gz # Locally computed sha256 checksums sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 067a7543521..2c1734151db 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 5.0.1 +PYTHON_REDIS_VERSION = 5.2.0 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/4a/4c/3c3b766f4ecbb3f0bec91ef342ee98d179e040c25b6ecc99e510c2570f2a +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/17/2f4a87ffa4cd93714cf52edfa3ea94589e9de65f71e9f99cbcfa84347a53 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash index 2880a474779..a19dd4a24ba 100644 --- a/package/python-referencing/python-referencing.hash +++ b/package/python-referencing/python-referencing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/referencing/json -md5 d1a0a4ae03ebba4b86b22bfb825f150b referencing-0.32.1.tar.gz -sha256 3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3 referencing-0.32.1.tar.gz +md5 4cd2bdcefd1f9a9db2d1ea31338b4ae3 referencing-0.35.1.tar.gz +sha256 25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c referencing-0.35.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 66d59ed8091..ce0e8955489 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -4,19 +4,15 @@ # ################################################################################ -PYTHON_REFERENCING_VERSION = 0.32.1 +PYTHON_REFERENCING_VERSION = 0.35.1 PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/81/ce/910573eca7b1a1c6358b0dc0774ce1eeb81f4c98d4ee371f1c85f22040a1 +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/99/5b/73ca1f8e72fff6fa52119dbd185f73a907b1989428917b24cff660129b6d PYTHON_REFERENCING_SETUP_TYPE = pep517 PYTHON_REFERENCING_LICENSE = MIT PYTHON_REFERENCING_LICENSE_FILES = COPYING -PYTHON_REFERENCING_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-vcs +PYTHON_REFERENCING_DEPENDENCIES = host-python-hatch-vcs -HOST_PYTHON_REFERENCING_DEPENDENCIES = \ - host-python-hatchling \ - host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = host-python-hatch-vcs # This is a runtime dependency, but we don't have the concept of # runtime dependencies for host packages. diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 7454db99bbb..1eb8936d5fb 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 3f97f0aef9bf334fe50ae5980b183e68 regex-2023.12.25.tar.gz -sha256 29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5 regex-2023.12.25.tar.gz +md5 02b86394591ba39d34bc35d11e9e7d96 regex-2024.11.6.tar.gz +sha256 7ab159b063c52a0333c884e4679f8d7a85112ee3078fe3d9004b2dd875585519 regex-2024.11.6.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 6b1938bc0c4..ef8c1f198c8 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REGEX_VERSION = 2023.12.25 +PYTHON_REGEX_VERSION = 2024.11.6 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/b5/39/31626e7e75b187fae7f121af3c538a991e725c744ac893cc2cfd70ce2853 +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/8e/5f/bd69653fbfb76cf8604468d3b4ec4c403197144c7bfe0e6a5fc9e02a07cb PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = Apache-2.0 PYTHON_REGEX_LICENSE_FILES = LICENSE.txt diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.hash b/package/python-requests-oauthlib/python-requests-oauthlib.hash index 08c19ab1f6b..5d37e09f76d 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 c4f3b4ecdb72a56a13675e5a3302852a requests-oauthlib-1.3.1.tar.gz -sha256 75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a requests-oauthlib-1.3.1.tar.gz +md5 713dc7856f9ff625d75335c10d332a1b requests-oauthlib-2.0.0.tar.gz +sha256 b3dffaebd884d8cd778494369603a9e7b58d29111bf6b41bdc2dcd87203af4e9 requests-oauthlib-2.0.0.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 cdd334fb9a9..823b8140fbc 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.1 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 2.0.0 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/95/52/531ef197b426646f26b53815a7d2a67cb7a331ef098bb276db26a68ac49f +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/42/f2/05f29bc3913aea15eb670be136045bf5c5bbf4b99ecb839da9b422bb2c85 PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-rgbmatrix/Config.in b/package/python-rgbmatrix/Config.in new file mode 100644 index 00000000000..32fd6d191ac --- /dev/null +++ b/package/python-rgbmatrix/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PYTHON_RGBMATRIX + bool "python-rgbmatrix" + depends on BR2_aarch64 || BR2_arm # rpi-rgb-led-matrix + depends on BR2_INSTALL_LIBSTDCPP # rpi-rgb-led-matrix + depends on BR2_TOOLCHAIN_HAS_THREADS # rpi-rgb-led-matrix + depends on !BR2_STATIC_LIBS # rpi-rgb-led-matrix + select BR2_PACKAGE_HOST_PYTHON_CYTHON + select BR2_PACKAGE_RPI_RGB_LED_MATRIX + +comment "python-rgbmatrix needs a toolchain w/ C++, threads, dynamic libraries" + depends on BR2_aarch64 || BR2_arm + depends on !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS diff --git a/package/python-rgbmatrix/python-rgbmatrix.hash b/package/python-rgbmatrix/python-rgbmatrix.hash new file mode 100644 index 00000000000..175081eb5d0 --- /dev/null +++ b/package/python-rgbmatrix/python-rgbmatrix.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9a6da5b0ad730883a5fa18afc59b1297b4b05eb581c2c14ae50a3583296a4bed python-rgbmatrix-f55736f7595bc028451658996eedea9742688bbc.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-rgbmatrix/python-rgbmatrix.mk b/package/python-rgbmatrix/python-rgbmatrix.mk new file mode 100644 index 00000000000..2bd5bc97b71 --- /dev/null +++ b/package/python-rgbmatrix/python-rgbmatrix.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# python-rgbmatrix +# +################################################################################ + +# When updating the version, please also update rpi-rgb-led-matrix +PYTHON_RGBMATRIX_VERSION = f55736f7595bc028451658996eedea9742688bbc # 2024-08-18 +PYTHON_RGBMATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(PYTHON_RGBMATRIX_VERSION)) +PYTHON_RGBMATRIX_LICENSE = GPL-2.0 +PYTHON_RGBMATRIX_LICENSE_FILES = COPYING +PYTHON_RGBMATRIX_INSTALL_STAGING = YES +PYTHON_RGBMATRIX_SETUP_TYPE = setuptools +PYTHON_RGBMATRIX_SUBDIR = bindings/python +PYTHON_RGBMATRIX_DEPENDENCIES = host-python-cython rpi-rgb-led-matrix + +# Generate bindings with cython +define PYTHON_RGBMATRIX_CYTHON + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/bindings/python/rgbmatrix \ + CYTHON=$(HOST_DIR)/bin/cython all +endef +PYTHON_RGBMATRIX_PRE_BUILD_HOOKS += PYTHON_RGBMATRIX_CYTHON + +$(eval $(python-package)) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index 3071f60df77..a2b36b8d06b 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 c16ec7e898efa0302cde6ac3c83ef8a2400f865d44941085b4f87784325fb89a python-rpds-py-0.18.1-cargo2.tar.gz +sha256 a2bafde869e0a9e6390de8b1d1144a4c874850b016898c71fd5313c027ba709e python-rpds-py-0.21.0-cargo2.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 398ac6682bc..87172cdc597 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.18.1 +PYTHON_RPDS_PY_VERSION = 0.21.0 PYTHON_RPDS_PY_SOURCE_PYPI = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE_PYPI = https://files.pythonhosted.org/packages/2d/aa/e7c404bdee1db7be09860dff423d022ffdce9269ec8e6532cce09ee7beea +PYTHON_RPDS_PY_SITE_PYPI = https://files.pythonhosted.org/packages/23/80/afdf96daf9b27d61483ef05b38f282121db0e38f5fd4e89f40f5c86c2a4f PYTHON_RPDS_PY_SITE = $(PYTHON_RPDS_PY_SITE_PYPI)/$(PYTHON_RPDS_PY_SOURCE_PYPI)?buildroot-path=filename PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index 69a6309b194..f1c6cf5f3fa 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -7,10 +7,9 @@ PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 -PYTHON_RSA_SETUP_TYPE = pep517 +PYTHON_RSA_SETUP_TYPE = poetry PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE PYTHON_RSA_CPE_ID_VALID = YES -PYTHON_RSA_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash index 937afc3df1c..2bb726819c6 100644 --- a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ruamel.yaml.clib/json -md5 b72e549363fa1b9c4f9123e98f2b46cc ruamel.yaml.clib-0.2.8.tar.gz -sha256 beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512 ruamel.yaml.clib-0.2.8.tar.gz +md5 53fa5737bbe5a07fac7db3d1a083fee9 ruamel.yaml.clib-0.2.12.tar.gz +sha256 6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f ruamel.yaml.clib-0.2.12.tar.gz # Locally computed sha256 checksums -sha256 5458f90e82366f660f956b3c929ba5f7a0efdb99a99a847e2f51f2020ffbe887 LICENSE +sha256 99f72489621ceea1254f9f0ea7c6e8a5e8e38b62edd1d983e6e1cb20d533f0a6 LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk index 25c3b44131a..2a4d8a98d1b 100644 --- a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.8 +PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.12 PYTHON_RUAMEL_YAML_CLIB_SOURCE = ruamel.yaml.clib-$(PYTHON_RUAMEL_YAML_CLIB_VERSION).tar.gz -PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/46/ab/bab9eb1566cd16f060b54055dd39cf6a34bfa0240c53a7218c43e974295b +PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5 PYTHON_RUAMEL_YAML_CLIB_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_CLIB_LICENSE = MIT PYTHON_RUAMEL_YAML_CLIB_LICENSE_FILES = LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 02845d112b2..94a0d43544f 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json -md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz -sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz +md5 964a8e48646e26533d8e5f03cff99dde ruamel.yaml-0.18.6.tar.gz +sha256 8b27e6a217e786c6fbe5634d8f3f11bc63e0f80f6a5890f28863d9c45aac311b ruamel.yaml-0.18.6.tar.gz # Locally computed sha256 checksums -sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE +sha256 e84ff196f03668af751abae0c4cbd9169aa365121f50c30bb9a329666ab6260a LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index bbdac591ca0..83a4aa12e87 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.18.5 +PYTHON_RUAMEL_YAML_VERSION = 0.18.6 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/29/81/4dfc17eb6ebb1aac314a3eb863c1325b907863a1b8b1382cdffcb6ac0ed9 PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE diff --git a/package/python-s3transfer/python-s3transfer.hash b/package/python-s3transfer/python-s3transfer.hash index 48be6b3a8b6..9b2c7d62828 100644 --- a/package/python-s3transfer/python-s3transfer.hash +++ b/package/python-s3transfer/python-s3transfer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/s3transfer/json -md5 ba84e7c06bc1dcd3151c3d2132621cfc s3transfer-0.10.0.tar.gz -sha256 d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b s3transfer-0.10.0.tar.gz +md5 3c81bf7128a462187e9a88d9f400b5b4 s3transfer-0.10.3.tar.gz +sha256 4f50ed74ab84d474ce614475e0b8d5047ff080810aac5d01ea25231cfc944b0c s3transfer-0.10.3.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-s3transfer/python-s3transfer.mk b/package/python-s3transfer/python-s3transfer.mk index 6fae824862e..dad4033c026 100644 --- a/package/python-s3transfer/python-s3transfer.mk +++ b/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.10.0 +PYTHON_S3TRANSFER_VERSION = 0.10.3 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/a0/b5/4c570b08cb85fdcc65037b5229e00412583bb38d974efecb7ec3495f40ba +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/a0/a8/e0a98fd7bd874914f0608ef7c90ffde17e116aefad765021de0f012690a2 PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index 7b21e6cb306..4f86177e9bb 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 f546b1c82c2c98e0dae1a436219dd042 scapy-2.5.0.tar.gz -sha256 5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 scapy-2.5.0.tar.gz +md5 b8951038f22c9ec447538be8b08ac503 scapy-2.6.1.tar.gz +sha256 7600d7e2383c853e5c3a6e05d37e17643beebf2b3e10d7914dffcc3bc3c6e6c5 scapy-2.6.1.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 a2c6cc6872f..f1d6ff346ba 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.5.0 +PYTHON_SCAPY_VERSION = 2.6.1 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/67/a1/2a60d5b6f0fed297dd0c0311c887d5e8a30ba1250506585b897e5a662f4c +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/df/2f/035d3888f26d999e9680af8c7ddb7ce4ea0fd8d0e01c000de634c22dcf13 PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE diff --git a/package/python-schedule/python-schedule.hash b/package/python-schedule/python-schedule.hash index 59c84c20024..abbf07ffb95 100644 --- a/package/python-schedule/python-schedule.hash +++ b/package/python-schedule/python-schedule.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/schedule/json -md5 ecb436a797e1a149bac4643330b268ca schedule-1.2.1.tar.gz -sha256 843bc0538b99c93f02b8b50e3e39886c06f2d003b24f48e1aa4cadfa3f341279 schedule-1.2.1.tar.gz +md5 e9a2733aad7fb33107444a53f8b87d48 schedule-1.2.2.tar.gz +sha256 15fe9c75fe5fd9b9627f3f19cc0ef1420508f9f9a46f45cd0769ef75ede5f0b7 schedule-1.2.2.tar.gz # Locally computed sha256 checksums sha256 30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/package/python-schedule/python-schedule.mk b/package/python-schedule/python-schedule.mk index 11be2e49d4c..f78b2dcb118 100644 --- a/package/python-schedule/python-schedule.mk +++ b/package/python-schedule/python-schedule.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCHEDULE_VERSION = 1.2.1 +PYTHON_SCHEDULE_VERSION = 1.2.2 PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz -PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/29/22/9dd374cbf76a42ece1f1f41cc8f4957f0ad512577372527cd3dd52758241 +PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/0c/91/b525790063015759f34447d4cf9d2ccb52cdee0f1dd6ff8764e863bcb74c PYTHON_SCHEDULE_SETUP_TYPE = setuptools PYTHON_SCHEDULE_LICENSE = MIT PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-sdbus-networkmanager/Config.in b/package/python-sdbus-networkmanager/Config.in new file mode 100644 index 00000000000..5529dcb5785 --- /dev/null +++ b/package/python-sdbus-networkmanager/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_SDBUS_NETWORKMANAGER + bool "python-sdbus-networkmanager" + depends on BR2_PACKAGE_SYSTEMD + depends on BR2_PACKAGE_NETWORK_MANAGER # runtime + select BR2_PACKAGE_PYTHON_SDBUS # runtime + help + NetworkManager bindings for sdbus. + + https://github.com/igo95862/python-sdbus + +comment "python-sdbus-networkmanager needs systemd and network-manager" + depends on !BR2_PACKAGE_SYSTEMD || !BR2_PACKAGE_NETWORK_MANAGER diff --git a/package/python-sdbus-networkmanager/python-sdbus-networkmanager.hash b/package/python-sdbus-networkmanager/python-sdbus-networkmanager.hash new file mode 100644 index 00000000000..da65e3cda40 --- /dev/null +++ b/package/python-sdbus-networkmanager/python-sdbus-networkmanager.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sdbus-networkmanager/json +md5 ce27908559f200219a090b61503c2ef6 sdbus-networkmanager-2.0.0.tar.gz +sha256 3572ac3a8189c683ec0416acb148761773a8f0881ad3d78b6d6f6864eff9c50b sdbus-networkmanager-2.0.0.tar.gz +# Locally computed sha256 checksums +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-sdbus-networkmanager/python-sdbus-networkmanager.mk b/package/python-sdbus-networkmanager/python-sdbus-networkmanager.mk new file mode 100644 index 00000000000..2ad93852fcc --- /dev/null +++ b/package/python-sdbus-networkmanager/python-sdbus-networkmanager.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sdbus-networkmanager +# +################################################################################ + +PYTHON_SDBUS_NETWORKMANAGER_VERSION = 2.0.0 +PYTHON_SDBUS_NETWORKMANAGER_SOURCE = sdbus-networkmanager-$(PYTHON_SDBUS_NETWORKMANAGER_VERSION).tar.gz +PYTHON_SDBUS_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/31/ab/e864c6c2eb778c194cfb56cd9d98b5594dc00573210fdf6b44904745a0bf +PYTHON_SDBUS_NETWORKMANAGER_SETUP_TYPE = setuptools +PYTHON_SDBUS_NETWORKMANAGER_LICENSE = LGPL-2.1+ +PYTHON_SDBUS_NETWORKMANAGER_LICENSE_FILES = COPYING + +$(eval $(python-package)) diff --git a/package/python-sdbus/Config.in b/package/python-sdbus/Config.in new file mode 100644 index 00000000000..b2d3990ab4e --- /dev/null +++ b/package/python-sdbus/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_SDBUS + bool "python-sdbus" + depends on BR2_PACKAGE_SYSTEMD # required to get sd-bus + help + Modern Python D-Bus library. Based on sd-bus from + libsystemd. + + https://github.com/igo95862/python-sdbus + +comment "python-sdbus needs systemd" + depends on !BR2_PACKAGE_SYSTEMD diff --git a/package/python-sdbus/python-sdbus.hash b/package/python-sdbus/python-sdbus.hash new file mode 100644 index 00000000000..62a45876284 --- /dev/null +++ b/package/python-sdbus/python-sdbus.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/sdbus/json +md5 ea63ebfd0499940dc32878b0ffb9601c sdbus-0.13.0.tar.gz +sha256 801bd46608ee82614d42960c8ba8ae9300edb1bf5bbeb534bc8fd21f13d2c20e sdbus-0.13.0.tar.gz +# Locally computed sha256 checksums +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-sdbus/python-sdbus.mk b/package/python-sdbus/python-sdbus.mk new file mode 100644 index 00000000000..111c4bd648a --- /dev/null +++ b/package/python-sdbus/python-sdbus.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-sdbus +# +################################################################################ + +PYTHON_SDBUS_VERSION = 0.13.0 +PYTHON_SDBUS_SOURCE = sdbus-$(PYTHON_SDBUS_VERSION).tar.gz +PYTHON_SDBUS_SITE = https://files.pythonhosted.org/packages/4f/c7/8740ff78e9ffdbb9a28e7722e145795015c62ea7ce812242f5968073511c +PYTHON_SDBUS_SETUP_TYPE = setuptools +PYTHON_SDBUS_LICENSE = LGPL-2.1+ +PYTHON_SDBUS_LICENSE_FILES = COPYING +PYTHON_SDBUS_DEPENDENCIES = systemd +PYTHON_SDBUS_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" + +ifeq ($(BR2_STATIC_LIBS),y) +PYTHON_SDBUS_ENV += PYTHON_SDBUS_USE_STATIC_LINK=1 +endif + +$(eval $(python-package)) diff --git a/package/python-segno/python-segno.hash b/package/python-segno/python-segno.hash index 58142c184f7..a467b663e8a 100644 --- a/package/python-segno/python-segno.hash +++ b/package/python-segno/python-segno.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/segno/json -md5 b80c19075a7a07cce50b054e9e221cf7 segno-1.6.0.tar.gz -sha256 8d3b11098ac6dd93161499544dedbfb187d4459088109b8855ff0bbe98105047 segno-1.6.0.tar.gz +md5 3835036bcf44667eb0a155107ed1ac67 segno-1.6.1.tar.gz +sha256 f23da78b059251c36e210d0cf5bfb1a9ec1604ae6e9f3d42f9a7c16d306d847e segno-1.6.1.tar.gz # Locally computed sha256 checksums -sha256 3af9b2f15c736a571978760b2d60598502c205eb6daebe2ec36f0272c380ed28 LICENSE +sha256 720b7b93e4e80374be9aee88c650a468ae6a6b6471ce4581058dedce23d3cf9d LICENSE diff --git a/package/python-segno/python-segno.mk b/package/python-segno/python-segno.mk index 2c230ee26b1..03efcb5c0f3 100644 --- a/package/python-segno/python-segno.mk +++ b/package/python-segno/python-segno.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_SEGNO_VERSION = 1.6.0 +PYTHON_SEGNO_VERSION = 1.6.1 PYTHON_SEGNO_SOURCE = segno-$(PYTHON_SEGNO_VERSION).tar.gz -PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/51/a8/960844fec8d853a4e8e91f64bdde323ea5a2a44357eca799e7f7f7bf2f1e -PYTHON_SEGNO_SETUP_TYPE = setuptools +PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/5d/74/3896e205306a1b43d6b88326e5838572d97b4b74df8c9cd11acfcd9db503 +PYTHON_SEGNO_SETUP_TYPE = flit PYTHON_SEGNO_LICENSE = BSD-3-Clause PYTHON_SEGNO_LICENSE_FILES = LICENSE diff --git a/package/python-selenium/Config.in b/package/python-selenium/Config.in index 30820f07f8a..fa725cdf440 100644 --- a/package/python-selenium/Config.in +++ b/package/python-selenium/Config.in @@ -1,10 +1,13 @@ config BR2_PACKAGE_PYTHON_SELENIUM bool "python-selenium" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS 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_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime + select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime help Python language bindings for Selenium WebDriver. diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash index ef1c34bfd32..c3dd0879cd6 100644 --- a/package/python-selenium/python-selenium.hash +++ b/package/python-selenium/python-selenium.hash @@ -1,3 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/selenium/json -md5 9afd7110a9e06721baae028ac42a2221 selenium-4.16.0.tar.gz -sha256 b2e987a445306151f7be0e6dfe2aa72a479c2ac6a91b9d5ef2d6dd4e49ad0435 selenium-4.16.0.tar.gz +# Locally calculated after vendoring +sha256 0c7bbef3f83aa48e1786ecc089e8d6a23c35164e7e9b02917697eca7a23628a2 python-selenium-4.26.1-cargo2.tar.gz +# Locally computed sha256 checksums +sha256 de658a7d3761e92b471e2f630ea99eeb3389b27820809b1e4853baabd5fbadb7 LICENSE diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk index 0428cefa469..8f5f2c3598b 100644 --- a/package/python-selenium/python-selenium.mk +++ b/package/python-selenium/python-selenium.mk @@ -4,10 +4,12 @@ # ################################################################################ -PYTHON_SELENIUM_VERSION = 4.16.0 -PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz -PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/16/fd/a0ef793383077dd6296e4637acc82d1e9893e9a49a47f56e96996909e427 -PYTHON_SELENIUM_SETUP_TYPE = setuptools +PYTHON_SELENIUM_VERSION = 4.26.1 +PYTHON_SELENIUM_SOURCE_PYPI = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz +PYTHON_SELENIUM_SITE_PYPI = https://files.pythonhosted.org/packages/3f/b1/e9efcb88d5682e802cf03bdee4886f854d75bdb2859d1e72cb74041b4ef6 +PYTHON_SELENIUM_SITE = $(PYTHON_SELENIUM_SITE_PYPI)/$(PYTHON_SELENIUM_SOURCE_PYPI)?buildroot-path=filename +PYTHON_SELENIUM_SETUP_TYPE = setuptools-rust PYTHON_SELENIUM_LICENSE = Apache-2.0 +PYTHON_SELENIUM_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 6060b6cab76..62436326851 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 98621433d1f8565f1f00576d47be30ce sentry_sdk-2.7.1.tar.gz -sha256 25006c7e68b75aaa5e6b9c6a420ece22e8d7daec4b7a906ffd3a8607b67c037b sentry_sdk-2.7.1.tar.gz +md5 d68e388f9a261c00515e0f758303240f sentry_sdk-2.18.0.tar.gz +sha256 0dc21febd1ab35c648391c664df96f5f79fb0d92d7d4225cd9832e53a617cafd sentry_sdk-2.18.0.tar.gz # Locally computed sha256 checksums sha256 6d7ec62dc20e8b92cb88b89fb3b55ee8576505f3e1afa57952548f6eea5d008e LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 50ca854330e..e2cbdcf405a 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 2.7.1 +PYTHON_SENTRY_SDK_VERSION = 2.18.0 PYTHON_SENTRY_SDK_SOURCE = sentry_sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/b8/63/310d89868a0dab17f6d7c1f35eba9c304dd06c2a17d0d26905738763b614 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/24/cc/0d87cc8246f52d92228aa6718a24e1988a2893f4abe2f64ec5a8bcba4185 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash index 32d8f21ad4a..1d7f66fd5e0 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 14a751406024544784459474d93d1ea5 service_identity-23.1.0.tar.gz -sha256 ecb33cd96307755041e978ab14f8b14e13b40f1fbd525a4dc78f46d2b986431d service_identity-23.1.0.tar.gz +md5 e575db51719742ec39191c896e4c2971 service_identity-24.2.0.tar.gz +sha256 b8683ba13f0d39c6cd5d625d2c5f65421d6d707b013b375c355751557cbe8e09 service_identity-24.2.0.tar.gz # Locally computed sha256 checksums -sha256 51f7c647190e74d19f9f24f1b19645b425eb8f30f049196053686bff188505cf LICENSE +sha256 24bd0a9ba7d0eae08a3a6e32a1b09f8e6871fa0325520a2fcb00e1539eaa602a LICENSE diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk index 6e61dd951bf..7965811c6a2 100644 --- a/package/python-service-identity/python-service-identity.mk +++ b/package/python-service-identity/python-service-identity.mk @@ -4,14 +4,13 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 23.1.0 +PYTHON_SERVICE_IDENTITY_VERSION = 24.2.0 PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/3b/98/2a46c7414ffc1d06ba67d2c2dd62a207a70cb351028a8cd8c85b3dbd1cf7 +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/07/a5/dfc752b979067947261dbbf2543470c58efe735c3c1301dd870ef27830ee PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = pep517 +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = hatch PYTHON_SERVICE_IDENTITY_DEPENDENCIES = \ - host-python-hatchling \ host-python-hatch-vcs \ host-python-hatch-fancy-pypi-readme diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index 61d2c8a1509..fbaa515863e 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 e3be6366d0d71304ca859edca3c89606 setuptools-rust-1.9.0.tar.gz -sha256 704df0948f2e4cc60c2596ad6e840ea679f4f43e58ed4ad0c1857807240eab96 setuptools-rust-1.9.0.tar.gz +md5 755ce9ab3d5e7b9f420992ca891a3965 setuptools_rust-1.10.2.tar.gz +sha256 5d73e7eee5f87a6417285b617c97088a7c20d1a70fcea60e3bdc94ff567c29dc setuptools_rust-1.10.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 14930501d07..ab1023ea4a6 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.9.0 -PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/9d/f1/2cb8887cad0726a5e429cc9c58e30767f58d22c34d55b075d2f845d4a2a5 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.10.2 +PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools_rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/d3/6b/99a1588d826ceb108694ba00f78bc6afda10ed5d72d550ae8f256af1f7b4 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 1a884dbbbf3..f2bdf8a2084 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 a05e98ab9ae447e173f0c747e0d49e81 setuptools-scm-8.0.4.tar.gz -sha256 b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7 setuptools-scm-8.0.4.tar.gz +md5 d8046dce093a94dc382b68b45f6a6257 setuptools_scm-8.1.0.tar.gz +sha256 42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7 setuptools_scm-8.1.0.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 4cbf9146905..e6461477859 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 8.0.4 -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools-scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/eb/b1/0248705f10f6de5eefe7ff93e399f7192257b23df4d431d2f5680bb2778f +PYTHON_SETUPTOOLS_SCM_VERSION = 8.1.0 +PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4f/a4/00a9ac1b555294710d4a68d2ce8dfdf39d72aa4d769a7395d05218d88a42 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/0001-add-executable.patch index da1bc68b396..cd3cb66a5b6 100644 --- a/package/python-setuptools/0001-add-executable.patch +++ b/package/python-setuptools/0001-add-executable.patch @@ -1,4 +1,4 @@ -From a35dffe950d7bb0f7988d78ec4a963c5ce67e3c8 Mon Sep 17 00:00:00 2001 +From aa232855cf717835a5d16954f1fd8ead315a5fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 7 Dec 2015 01:14:33 +0100 Subject: [PATCH] add executable @@ -22,18 +22,18 @@ Signed-off-by: James Hilliard 2 files changed, 11 insertions(+) diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index c49fcda93..851950522 100644 +index e2ec1abdd..e78ace3d4 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py -@@ -18,6 +18,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" +@@ -26,6 +26,7 @@ class install(orig.install): + distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution user_options = orig.install.user_options + [ + ('executable=', 'e', "specify final destination interpreter path"), ('old-and-unmanageable', None, "Try not to use this!"), ( 'single-version-externally-managed', -@@ -50,6 +51,7 @@ class install(orig.install): +@@ -60,6 +61,7 @@ class install(orig.install): ) super().initialize_options() @@ -42,10 +42,10 @@ index c49fcda93..851950522 100644 self.single_version_externally_managed = None diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index f44281b49..9e91cad87 100644 +index 7b90611d1..216cadf80 100644 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py -@@ -14,6 +14,13 @@ class install_scripts(orig.install_scripts): +@@ -18,6 +18,13 @@ class install_scripts(orig.install_scripts): def initialize_options(self): orig.install_scripts.initialize_options(self) self.no_ep = False @@ -59,7 +59,7 @@ index f44281b49..9e91cad87 100644 def run(self) -> None: self.run_command("egg_info") -@@ -40,6 +47,8 @@ class install_scripts(orig.install_scripts): +@@ -45,6 +52,8 @@ class install_scripts(orig.install_scripts): ) bs_cmd = self.get_finalized_command('build_scripts') exec_param = getattr(bs_cmd, 'executable', None) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 29237427a0f..e99fc7d9b26 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 f404be507829989fcff7a8b63d92f357 setuptools-71.0.3.tar.gz -sha256 3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d setuptools-71.0.3.tar.gz +md5 ca5ea2d5e9622d6a7b9f6c6664821853 setuptools-75.3.0.tar.gz +sha256 fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686 setuptools-75.3.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index cf7016ecff0..d6b65a2b9e9 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 71.0.3 +PYTHON_SETUPTOOLS_VERSION = 75.3.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/d1/8e/1d0b941ce1151009c6d98a0a590a608f346d4d272ce95ca09ee2bbb592cd +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ed/22/a438e0caa4576f8c383fa4d35f1cc01655a46c75be358960d815bfbb12bd 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 c0d3f62f126..79a34056dce 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 aadf37759a9cb4862257cef3cf44a27b sh-2.0.6.tar.gz -sha256 9b2998f313f201c777e2c0061f0b1367497097ef13388595be147e2a00bf7ba1 sh-2.0.6.tar.gz +md5 eba6bd8ec843a707bdc481577835980d sh-2.1.0.tar.gz +sha256 7e27301c574bec8ca5bf6f211851357526455ee97cd27a7c4c6cc5e2375399cb sh-2.1.0.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 29843d645b7..a59c6f1324c 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SH_VERSION = 2.0.6 +PYTHON_SH_VERSION = 2.1.0 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d -PYTHON_SH_SETUP_TYPE = pep517 +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/52/12/b7965006c5adc57ba5459385358bd27c4983cd490884a75be86eb1d3efeb +PYTHON_SH_SETUP_TYPE = poetry PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt -PYTHON_SH_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-simple-websocket/Config.in b/package/python-simple-websocket/Config.in new file mode 100644 index 00000000000..187d20a3a3f --- /dev/null +++ b/package/python-simple-websocket/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SIMPLE_WEBSOCKET + bool "python-simple-websocket" + select BR2_PACKAGE_PYTHON_WSPROTO # runtime + help + Simple WebSocket server and client for Python. + + https://github.com/miguelgrinberg/simple-websocket diff --git a/package/python-simple-websocket/python-simple-websocket.hash b/package/python-simple-websocket/python-simple-websocket.hash new file mode 100644 index 00000000000..2350f4d2c3f --- /dev/null +++ b/package/python-simple-websocket/python-simple-websocket.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/simple-websocket/json +md5 2c5f6f6bad380676db0eb7e2c4070454 simple_websocket-1.1.0.tar.gz +sha256 7939234e7aa067c534abdab3a9ed933ec9ce4691b0713c78acb195560aa52ae4 simple_websocket-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 4b8abadcc5e3dd29c71905b84952945699f0a7ba41e6af99eaba46faabe95bb7 LICENSE diff --git a/package/python-simple-websocket/python-simple-websocket.mk b/package/python-simple-websocket/python-simple-websocket.mk new file mode 100644 index 00000000000..a77d9a66f6d --- /dev/null +++ b/package/python-simple-websocket/python-simple-websocket.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-simple-websocket +# +################################################################################ + +PYTHON_SIMPLE_WEBSOCKET_VERSION = 1.1.0 +PYTHON_SIMPLE_WEBSOCKET_SOURCE = simple_websocket-$(PYTHON_SIMPLE_WEBSOCKET_VERSION).tar.gz +PYTHON_SIMPLE_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/b0/d4/bfa032f961103eba93de583b161f0e6a5b63cebb8f2c7d0c6e6efe1e3d2e +PYTHON_SIMPLE_WEBSOCKET_SETUP_TYPE = setuptools +PYTHON_SIMPLE_WEBSOCKET_LICENSE = MIT +PYTHON_SIMPLE_WEBSOCKET_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 9f96f99bf40..52e927edbb9 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 3b334627d870a3c849e1322d18a7bfe7 simplejson-3.19.2.tar.gz -sha256 9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c simplejson-3.19.2.tar.gz +md5 a198e17c5dcc426ff83ec4a02190eae5 simplejson-3.19.3.tar.gz +sha256 8e086896c36210ab6050f2f9f095a5f1e03c83fa0e7f296d6cba425411364680 simplejson-3.19.3.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 d5ba3948b78..8a0acf545d9 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.19.2 +PYTHON_SIMPLEJSON_VERSION = 3.19.3 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/79/79/3ccb95bb4154952532f280f7a41979fbfb0fbbaee4d609810ecb01650afa +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/3d/29/085111f19717f865eceaf0d4397bf3e76b08d60428b076b64e2a1903706d 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-simplelogging/0001-Switch-build-backend-to-poetry-core.patch b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch deleted file mode 100644 index 2c345fe2684..00000000000 --- a/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 76c1c545bad28f592405ca1e5bcf6081051c946a Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 13 Feb 2024 13:37:00 -0700 -Subject: [PATCH] Switch build-backend to poetry-core - -poetry-core is the lightweight counterpart of poetry that is intended -to be used as a build-backend. Unlike poetry, it does not require -installing all the dependencies of the package manager, making -the builds much faster. The generated artifacts are the same. - -Signed-off-by: James Hilliard -Upstream: https://github.com/vpoulailleau/simplelogging/pull/230 ---- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index a89ab64..79403cb 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -55,5 +55,5 @@ commands = - """ - - [build-system] --requires = ["poetry>=0.12"] --build-backend = "poetry.masonry.api" -+requires = ["poetry-core>=1.0.0"] -+build-backend = "poetry.core.masonry.api" --- -2.34.1 - diff --git a/package/python-simplelogging/python-simplelogging.hash b/package/python-simplelogging/python-simplelogging.hash index 6d80fb93ec3..f080a3b123a 100644 --- a/package/python-simplelogging/python-simplelogging.hash +++ b/package/python-simplelogging/python-simplelogging.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplelogging/json -md5 97b5f2a5cd9cff1b60c727cd03b3ffe1 simplelogging-0.11.0.tar.gz -sha256 23a128b47d3e88213adc51fdd102aae15a398cf459d782eb19534945d23f0bc5 simplelogging-0.11.0.tar.gz +md5 993862aca6fe6d0962effe07a335b554 simplelogging-0.12.0.tar.gz +sha256 a9695b05090951c029733606f14e24a783c7a100bbe96f8f16a5f2c4c9b08102 simplelogging-0.12.0.tar.gz # Locally computed sha256 checksums -sha256 bd2a0fe3b3bab7092ffa7f58d46bb05d98f12f107b3a6be947c098f7c2ad1d1a LICENSE +sha256 71cc6fb7236f1a0734c24b4e5dff18d3afc87a5fb68f25f2d368d8fe099a6cda LICENSE diff --git a/package/python-simplelogging/python-simplelogging.mk b/package/python-simplelogging/python-simplelogging.mk index dbd9ce3ae30..43f2e0781a6 100644 --- a/package/python-simplelogging/python-simplelogging.mk +++ b/package/python-simplelogging/python-simplelogging.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SIMPLELOGGING_VERSION = 0.11.0 +PYTHON_SIMPLELOGGING_VERSION = 0.12.0 PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz -PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/73/d6/4c06aa7f2c3b9fc09429a1196fd357357cc555de5e16c09b2d12e9db1ebb -PYTHON_SIMPLELOGGING_SETUP_TYPE = pep517 +PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/30/71/d6b6513598e6a4300f6142a839d1b0e10a25a4707f1b586d9a6331be91bb +PYTHON_SIMPLELOGGING_SETUP_TYPE = poetry PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE -PYTHON_SIMPLELOGGING_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-slob/python-slob.hash b/package/python-slob/python-slob.hash index 5bce1f13260..4eb6a521804 100644 --- a/package/python-slob/python-slob.hash +++ b/package/python-slob/python-slob.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 18eb4f45d09d49b1f776cac52ea70ab951566c60cd30bbec39e88f10908fd8ff python-slob-31ad0e769360a5b10a4893f686587bb8e48c3895.tar.gz +sha256 adb265b94a76257e64ee9d71437afa4226e4e87a13d5b964ecfc4236c5f28ae6 python-slob-c21d695707db7d2fe4ec7ec27a018bb7b0fcc209.tar.gz sha256 db09bc6733ab28dc59bfbcd01819feb9d05241cbef3ca3f5f58ec739b341d56f LICENSE diff --git a/package/python-slob/python-slob.mk b/package/python-slob/python-slob.mk index 4a0d1a7e1ca..552cbc6e66d 100644 --- a/package/python-slob/python-slob.mk +++ b/package/python-slob/python-slob.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895 +PYTHON_SLOB_VERSION = c21d695707db7d2fe4ec7ec27a018bb7b0fcc209 PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION)) PYTHON_SLOB_LICENSE = GPL-3.0 PYTHON_SLOB_LICENSE_FILES = LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash index b9d5f74999a..e3de9e87d35 100644 --- a/package/python-smbprotocol/python-smbprotocol.hash +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/smbprotocol/json -md5 ccbb42bdd58a0070f56e966d8562451b smbprotocol-1.12.0.tar.gz -sha256 5916a4b6c948bb70f82c246bdbfc86cf152226b71dac9f33b3d731d91e86274f smbprotocol-1.12.0.tar.gz +md5 ca5c38cbe82d7995ed2147021a7d2950 smbprotocol-1.14.0.tar.gz +sha256 4918ba10a0b0b344308e7a043c1c6741bf7282c3937059a5852de702d3b684da smbprotocol-1.14.0.tar.gz # Locally computed sha256 checksums sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk index ece07442521..fc464fcbd36 100644 --- a/package/python-smbprotocol/python-smbprotocol.mk +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMBPROTOCOL_VERSION = 1.12.0 +PYTHON_SMBPROTOCOL_VERSION = 1.14.0 PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/57/72/d95216a9fd5da1b2fa225130741f50d4949c8f76d46669d30921c06d69ff +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/41/0d/d178f651591de45607d6dfc5637e7dcd8c5190b137275303cda005d9a13a PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools PYTHON_SMBPROTOCOL_LICENSE = MIT PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE diff --git a/package/python-smmap2/python-smmap2.hash b/package/python-smmap2/python-smmap2.hash index 424fa58e8c9..ee9c1ec570d 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 82b22288dcabfe257d4c1f04c83c7fdd smmap-5.0.0.tar.gz -sha256 c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936 smmap-5.0.0.tar.gz +md5 9779723a7cbd7498d07b2c17b0d0442b smmap-5.0.1.tar.gz +sha256 dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62 smmap-5.0.1.tar.gz # Locally computed sha256 checksums sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE diff --git a/package/python-smmap2/python-smmap2.mk b/package/python-smmap2/python-smmap2.mk index 489cf0f758f..e43296912da 100644 --- a/package/python-smmap2/python-smmap2.mk +++ b/package/python-smmap2/python-smmap2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMMAP2_VERSION = 5.0.0 +PYTHON_SMMAP2_VERSION = 5.0.1 PYTHON_SMMAP2_SOURCE = smmap-$(PYTHON_SMMAP2_VERSION).tar.gz -PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/21/2d/39c6c57032f786f1965022563eec60623bb3e1409ade6ad834ff703724f3 +PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/88/04/b5bf6d21dc4041000ccba7eb17dd3055feb237e7ffc2c20d3fae3af62baa PYTHON_SMMAP2_SETUP_TYPE = setuptools PYTHON_SMMAP2_LICENSE = BSD-3-Clause PYTHON_SMMAP2_LICENSE_FILES = LICENSE diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index a7756eb39da..709278fd5f5 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 207c7452bf6f1f444d8b70cac8801647 python-socketio-5.11.0.tar.gz -sha256 b03186e04b942088781f6286c13604a853e5e35ed59158c51ff7af22fa032e6f python-socketio-5.11.0.tar.gz +md5 d55f0439cf7d056c0dca99fe13ad8054 python_socketio-5.11.4.tar.gz +sha256 8b0b8ff2964b2957c865835e936310190639c00310a47d77321a594d1665355e python_socketio-5.11.4.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 dc0c24fef50..bc6cef6fc63 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.11.0 -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/7a/e1/2817819a5635a099fda9fc758c51dc2f07996d6928d744639afcf5c5ddbb +PYTHON_SOCKETIO_VERSION = 5.11.4 +PYTHON_SOCKETIO_SOURCE = python_socketio-$(PYTHON_SOCKETIO_VERSION).tar.gz +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/32/31/4ba0d9d86c645ba335d645f49167ca58b0874ca0e421682f97964e8adb42 PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE diff --git a/package/python-sockjs/Config.in b/package/python-sockjs/Config.in index 92489ec71f7..12346217c7d 100644 --- a/package/python-sockjs/Config.in +++ b/package/python-sockjs/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_SOCKJS bool "python-sockjs" select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime help SockJS server implementation for aiohttp. diff --git a/package/python-sockjs/python-sockjs.hash b/package/python-sockjs/python-sockjs.hash index 137b54a89d7..30a4ae10729 100644 --- a/package/python-sockjs/python-sockjs.hash +++ b/package/python-sockjs/python-sockjs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sockjs/json -md5 e28c1a82aa84c3994817905090abb169 sockjs-0.11.0.tar.gz -sha256 0347d404ed9ef3196506787ed8018f87ee4e2d0baea49d420cdd53a969bec229 sockjs-0.11.0.tar.gz +md5 0d35a367e2e82644112d6070d867bf7c sockjs-0.13.0.tar.gz +sha256 57e959a23f20a8d55149d1e5db0b3b870726f2b4ad8166d41bdcf411b36cdf76 sockjs-0.13.0.tar.gz # Locally computed sha256 checksums -sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE.txt +sha256 7be23c071df0314fadeba6077a3830340a5121ad88bfa66b0c095051a766e141 LICENSE diff --git a/package/python-sockjs/python-sockjs.mk b/package/python-sockjs/python-sockjs.mk index 0aea63f934c..d9cfaf58ff6 100644 --- a/package/python-sockjs/python-sockjs.mk +++ b/package/python-sockjs/python-sockjs.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SOCKJS_VERSION = 0.11.0 +PYTHON_SOCKJS_VERSION = 0.13.0 PYTHON_SOCKJS_SOURCE = sockjs-$(PYTHON_SOCKJS_VERSION).tar.gz -PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/88/e9/af7b321f70325fd2af3941aa147efd097156150da635e09efc7ccf70e54d +PYTHON_SOCKJS_SITE = https://files.pythonhosted.org/packages/00/a4/644d5901d51aecb9fff218bbfc2525ef9362d4d03c2fcb8cb322aa0ce77f PYTHON_SOCKJS_SETUP_TYPE = setuptools PYTHON_SOCKJS_LICENSE = Apache-2.0 -PYTHON_SOCKJS_LICENSE_FILES = LICENSE.txt +PYTHON_SOCKJS_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash index 278c7d1b0c8..d220c8c7728 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 88ae72bd970b425692235d17224204e6 soupsieve-2.5.tar.gz -sha256 5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 soupsieve-2.5.tar.gz +md5 19126989f90d775ebe752b7fcacf1fc5 soupsieve-2.6.tar.gz +sha256 e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb soupsieve-2.6.tar.gz # Locally computed sha256 checksums -sha256 ceb7b9053b88addffa3102a457302bd840d123925ee9ed9c2ac90cf6548b33bf LICENSE.md +sha256 7e1f14c81e9939ef23b472176cda08410cc238752d180abaa0151d8a1c48f594 LICENSE.md diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk index 581df7e7870..b37d552fe18 100644 --- a/package/python-soupsieve/python-soupsieve.mk +++ b/package/python-soupsieve/python-soupsieve.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SOUPSIEVE_VERSION = 2.5 +PYTHON_SOUPSIEVE_VERSION = 2.6 PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/ce/21/952a240de1c196c7e3fbcd4e559681f0419b1280c617db21157a0390717b -PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/d7/ce/fbaeed4f9fb8b2daa961f90591662df6a86c1abf25c548329a86920aedfb +PYTHON_SOUPSIEVE_SETUP_TYPE = hatch 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/0001-Update-versioneer-to-0.29.patch b/package/python-spake2/0001-Update-versioneer-to-0.29.patch deleted file mode 100644 index 3b5db5342c4..00000000000 --- a/package/python-spake2/0001-Update-versioneer-to-0.29.patch +++ /dev/null @@ -1,2194 +0,0 @@ -From 5b5436f11d01e66505bb4c148304c2eb49346529 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 24 Oct 2023 09:56:57 +0200 -Subject: [PATCH] Update versioneer to 0.29 - -Fixes builds against Python 3.12.0 - -Upstream: https://github.com/warner/python-spake2/pull/15 - -Signed-off-by: Adam Duskett ---- - versioneer.py | 1350 ++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 931 insertions(+), 419 deletions(-) - -diff --git a/versioneer.py b/versioneer.py -index 64fea1c..de97d90 100644 ---- a/versioneer.py -+++ b/versioneer.py -@@ -1,5 +1,4 @@ -- --# Version: 0.18 -+# Version: 0.29 - - """The Versioneer - like a rocketeer, but for versions. - -@@ -7,18 +6,14 @@ The Versioneer - ============== - - * like a rocketeer, but for versions! --* https://github.com/warner/python-versioneer -+* https://github.com/python-versioneer/python-versioneer - * Brian Warner --* License: Public Domain --* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6, and pypy --* [![Latest Version] --(https://pypip.in/version/versioneer/badge.svg?style=flat) --](https://pypi.python.org/pypi/versioneer/) --* [![Build Status] --(https://travis-ci.org/warner/python-versioneer.png?branch=master) --](https://travis-ci.org/warner/python-versioneer) -- --This is a tool for managing a recorded version number in distutils-based -+* License: Public Domain (Unlicense) -+* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3 -+* [![Latest Version][pypi-image]][pypi-url] -+* [![Build Status][travis-image]][travis-url] -+ -+This is a tool for managing a recorded version number in setuptools-based - python projects. The goal is to remove the tedious and error-prone "update - the embedded version string" step from your release process. Making a new - release should be as easy as recording a new tag in your version-control -@@ -27,9 +22,38 @@ system, and maybe making new tarballs. - - ## Quick Install - --* `pip install versioneer` to somewhere to your $PATH --* add a `[versioneer]` section to your setup.cfg (see below) --* run `versioneer install` in your source tree, commit the results -+Versioneer provides two installation modes. The "classic" vendored mode installs -+a copy of versioneer into your repository. The experimental build-time dependency mode -+is intended to allow you to skip this step and simplify the process of upgrading. -+ -+### Vendored mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+ * Note that you will need to add `tomli; python_version < "3.11"` to your -+ build-time dependencies if you use `pyproject.toml` -+* run `versioneer install --vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` -+ -+### Build-time dependency mode -+ -+* `pip install versioneer` to somewhere in your $PATH -+ * A [conda-forge recipe](https://github.com/conda-forge/versioneer-feedstock) is -+ available, so you can also use `conda install -c conda-forge versioneer` -+* add a `[tool.versioneer]` section to your `pyproject.toml` or a -+ `[versioneer]` section to your `setup.cfg` (see [Install](INSTALL.md)) -+* add `versioneer` (with `[toml]` extra, if configuring in `pyproject.toml`) -+ to the `requires` key of the `build-system` table in `pyproject.toml`: -+ ```toml -+ [build-system] -+ requires = ["setuptools", "versioneer[toml]"] -+ build-backend = "setuptools.build_meta" -+ ``` -+* run `versioneer install --no-vendor` in your source tree, commit the results -+* verify version information with `python setup.py version` - - ## Version Identifiers - -@@ -61,7 +85,7 @@ version 1.3). Many VCS systems can report a description that captures this, - for example `git describe --tags --dirty --always` reports things like - "0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the - 0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has --uncommitted changes. -+uncommitted changes). - - The version identifier is used for multiple purposes: - -@@ -166,7 +190,7 @@ which may help identify what went wrong). - - Some situations are known to cause problems for Versioneer. This details the - most significant ones. More can be found on Github --[issues page](https://github.com/warner/python-versioneer/issues). -+[issues page](https://github.com/python-versioneer/python-versioneer/issues). - - ### Subprojects - -@@ -180,7 +204,7 @@ two common reasons why `setup.py` might not be in the root: - `setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI - distributions (and upload multiple independently-installable tarballs). - * Source trees whose main purpose is to contain a C library, but which also -- provide bindings to Python (and perhaps other langauges) in subdirectories. -+ provide bindings to Python (and perhaps other languages) in subdirectories. - - Versioneer will look for `.git` in parent directories, and most operations - should get the right version string. However `pip` and `setuptools` have bugs -@@ -194,9 +218,9 @@ work too. - Pip-8.1.1 is known to have this problem, but hopefully it will get fixed in - some later version. - --[Bug #38](https://github.com/warner/python-versioneer/issues/38) is tracking -+[Bug #38](https://github.com/python-versioneer/python-versioneer/issues/38) is tracking - this issue. The discussion in --[PR #61](https://github.com/warner/python-versioneer/pull/61) describes the -+[PR #61](https://github.com/python-versioneer/python-versioneer/pull/61) describes the - issue from the Versioneer side in more detail. - [pip PR#3176](https://github.com/pypa/pip/pull/3176) and - [pip PR#3615](https://github.com/pypa/pip/pull/3615) contain work to improve -@@ -224,31 +248,20 @@ regenerated while a different version is checked out. Many setup.py commands - cause egg_info to be rebuilt (including `sdist`, `wheel`, and installing into - a different virtualenv), so this can be surprising. - --[Bug #83](https://github.com/warner/python-versioneer/issues/83) describes -+[Bug #83](https://github.com/python-versioneer/python-versioneer/issues/83) describes - this one, but upgrading to a newer version of setuptools should probably - resolve it. - --### Unicode version strings -- --While Versioneer works (and is continually tested) with both Python 2 and --Python 3, it is not entirely consistent with bytes-vs-unicode distinctions. --Newer releases probably generate unicode version strings on py2. It's not --clear that this is wrong, but it may be surprising for applications when then --write these strings to a network connection or include them in bytes-oriented --APIs like cryptographic checksums. -- --[Bug #71](https://github.com/warner/python-versioneer/issues/71) investigates --this question. -- - - ## Updating Versioneer - - To upgrade your project to a new release of Versioneer, do the following: - - * install the new Versioneer (`pip install -U versioneer` or equivalent) --* edit `setup.cfg`, if necessary, to include any new configuration settings -- indicated by the release notes. See [UPGRADING](./UPGRADING.md) for details. --* re-run `versioneer install` in your source tree, to replace -+* edit `setup.cfg` and `pyproject.toml`, if necessary, -+ to include any new configuration settings indicated by the release notes. -+ See [UPGRADING](./UPGRADING.md) for details. -+* re-run `versioneer install --[no-]vendor` in your source tree, to replace - `SRC/_version.py` - * commit any changed files - -@@ -265,35 +278,70 @@ installation by editing setup.py . Alternatively, it might go the other - direction and include code from all supported VCS systems, reducing the - number of intermediate scripts. - -+## Similar projects -+ -+* [setuptools_scm](https://github.com/pypa/setuptools_scm/) - a non-vendored build-time -+ dependency -+* [minver](https://github.com/jbweston/miniver) - a lightweight reimplementation of -+ versioneer -+* [versioningit](https://github.com/jwodder/versioningit) - a PEP 518-based setuptools -+ plugin - - ## License - - To make Versioneer easier to embed, all its code is dedicated to the public - domain. The `_version.py` that it creates is also in the public domain. --Specifically, both are released under the Creative Commons "Public Domain --Dedication" license (CC0-1.0), as described in --https://creativecommons.org/publicdomain/zero/1.0/ . -+Specifically, both are released under the "Unlicense", as described in -+https://unlicense.org/. -+ -+[pypi-image]: https://img.shields.io/pypi/v/versioneer.svg -+[pypi-url]: https://pypi.python.org/pypi/versioneer/ -+[travis-image]: -+https://img.shields.io/travis/com/python-versioneer/python-versioneer.svg -+[travis-url]: https://travis-ci.com/github/python-versioneer/python-versioneer - - """ -+# pylint:disable=invalid-name,import-outside-toplevel,missing-function-docstring -+# pylint:disable=missing-class-docstring,too-many-branches,too-many-statements -+# pylint:disable=raise-missing-from,too-many-lines,too-many-locals,import-error -+# pylint:disable=too-few-public-methods,redefined-outer-name,consider-using-with -+# pylint:disable=attribute-defined-outside-init,too-many-arguments - --from __future__ import print_function --try: -- import configparser --except ImportError: -- import ConfigParser as configparser -+import configparser - import errno - import json - import os - import re - import subprocess - import sys -+from pathlib import Path -+from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Union -+from typing import NoReturn -+import functools -+ -+have_tomllib = True -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ try: -+ import tomli as tomllib -+ except ImportError: -+ have_tomllib = False - - - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ versionfile_source: str -+ versionfile_build: Optional[str] -+ parentdir_prefix: Optional[str] -+ verbose: Optional[bool] -+ - --def get_root(): -+def get_root() -> str: - """Get the project root directory. - - We require that all commands are run from the project root, i.e. the -@@ -301,18 +349,30 @@ def get_root(): - """ - root = os.path.realpath(os.path.abspath(os.getcwd())) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): - # allow 'python path/to/setup.py COMMAND' - root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) - setup_py = os.path.join(root, "setup.py") -+ pyproject_toml = os.path.join(root, "pyproject.toml") - versioneer_py = os.path.join(root, "versioneer.py") -- if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): -- err = ("Versioneer was unable to run the project root directory. " -- "Versioneer requires setup.py to be executed from " -- "its immediate directory (like 'python setup.py COMMAND'), " -- "or in a way that lets it use sys.argv[0] to find the root " -- "(like 'python path/to/setup.py COMMAND').") -+ if not ( -+ os.path.exists(setup_py) -+ or os.path.exists(pyproject_toml) -+ or os.path.exists(versioneer_py) -+ ): -+ err = ( -+ "Versioneer was unable to run the project root directory. " -+ "Versioneer requires setup.py to be executed from " -+ "its immediate directory (like 'python setup.py COMMAND'), " -+ "or in a way that lets it use sys.argv[0] to find the root " -+ "(like 'python path/to/setup.py COMMAND')." -+ ) - raise VersioneerBadRootError(err) - try: - # Certain runtime workflows (setup.py install/develop in a setuptools -@@ -321,43 +381,64 @@ def get_root(): - # module-import table will cache the first one. So we can't use - # os.path.dirname(__file__), as that will find whichever - # versioneer.py was first imported, even in later projects. -- me = os.path.realpath(os.path.abspath(__file__)) -- me_dir = os.path.normcase(os.path.splitext(me)[0]) -+ my_path = os.path.realpath(os.path.abspath(__file__)) -+ me_dir = os.path.normcase(os.path.splitext(my_path)[0]) - vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) -- if me_dir != vsr_dir: -- print("Warning: build in %s is using versioneer.py from %s" -- % (os.path.dirname(me), versioneer_py)) -+ if me_dir != vsr_dir and "VERSIONEER_PEP518" not in globals(): -+ print( -+ "Warning: build in %s is using versioneer.py from %s" -+ % (os.path.dirname(my_path), versioneer_py) -+ ) - except NameError: - pass - return root - - --def get_config_from_root(root): -+def get_config_from_root(root: str) -> VersioneerConfig: - """Read the project setup.cfg file to determine Versioneer config.""" -- # This might raise EnvironmentError (if setup.cfg is missing), or -+ # This might raise OSError (if setup.cfg is missing), or - # configparser.NoSectionError (if it lacks a [versioneer] section), or - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . -- setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -- with open(setup_cfg, "r") as f: -- parser.readfp(f) -- VCS = parser.get("versioneer", "VCS") # mandatory -- -- def get(parser, name): -- if parser.has_option("versioneer", name): -- return parser.get("versioneer", name) -- return None -+ root_pth = Path(root) -+ pyproject_toml = root_pth / "pyproject.toml" -+ setup_cfg = root_pth / "setup.cfg" -+ section: Union[Dict[str, Any], configparser.SectionProxy, None] = None -+ if pyproject_toml.exists() and have_tomllib: -+ try: -+ with open(pyproject_toml, "rb") as fobj: -+ pp = tomllib.load(fobj) -+ section = pp["tool"]["versioneer"] -+ except (tomllib.TOMLDecodeError, KeyError) as e: -+ print(f"Failed to load config from {pyproject_toml}: {e}") -+ print("Try to load it from setup.cfg") -+ if not section: -+ parser = configparser.ConfigParser() -+ with open(setup_cfg) as cfg_file: -+ parser.read_file(cfg_file) -+ parser.get("versioneer", "VCS") # raise error if missing -+ -+ section = parser["versioneer"] -+ -+ # `cast`` really shouldn't be used, but its simplest for the -+ # common VersioneerConfig users at the moment. We verify against -+ # `None` values elsewhere where it matters -+ - cfg = VersioneerConfig() -- cfg.VCS = VCS -- cfg.style = get(parser, "style") or "" -- cfg.versionfile_source = get(parser, "versionfile_source") -- cfg.versionfile_build = get(parser, "versionfile_build") -- cfg.tag_prefix = get(parser, "tag_prefix") -- if cfg.tag_prefix in ("''", '""'): -+ cfg.VCS = section["VCS"] -+ cfg.style = section.get("style", "") -+ cfg.versionfile_source = cast(str, section.get("versionfile_source")) -+ cfg.versionfile_build = section.get("versionfile_build") -+ cfg.tag_prefix = cast(str, section.get("tag_prefix")) -+ if cfg.tag_prefix in ("''", '""', None): - cfg.tag_prefix = "" -- cfg.parentdir_prefix = get(parser, "parentdir_prefix") -- cfg.verbose = get(parser, "verbose") -+ cfg.parentdir_prefix = section.get("parentdir_prefix") -+ if isinstance(section, configparser.SectionProxy): -+ # Make sure configparser translates to bool -+ cfg.verbose = section.getboolean("verbose") -+ else: -+ cfg.verbose = section.get("verbose") -+ - return cfg - - -@@ -366,37 +447,54 @@ class NotThisMethod(Exception): - - - # these dictionaries contain VCS-specific tools --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" -- if vcs not in HANDLERS: -- HANDLERS[vcs] = {} -- HANDLERS[vcs][method] = f -+ HANDLERS.setdefault(vcs, {})[method] = f - return f -+ - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen( -+ [command] + args, -+ cwd=cwd, -+ env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr else None), -+ **popen_kwargs, -+ ) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -407,26 +505,27 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %s (error)" % dispcmd) - print("stdout was %s" % stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --LONG_VERSION_PY['git'] = ''' -+LONG_VERSION_PY[ -+ "git" -+] = r''' - # This file helps to compute a version number in source trees obtained from - # git-archive tarball (such as those provided by githubs download-from-tag - # feature). Distribution tarballs (built by setup.py sdist) and build - # directories (produced by setup.py build) will contain a much shorter file - # that just contains the computed version number. - --# This file is released into the public domain. Generated by --# versioneer-0.18 (https://github.com/warner/python-versioneer) -+# This file is released into the public domain. -+# Generated by versioneer-0.29 -+# https://github.com/python-versioneer/python-versioneer - - """Git implementation of _version.py.""" - -@@ -435,9 +534,11 @@ import os - import re - import subprocess - import sys -+from typing import Any, Callable, Dict, List, Optional, Tuple -+import functools - - --def get_keywords(): -+def get_keywords() -> Dict[str, str]: - """Get the keywords needed to look up the version information.""" - # these strings will be replaced by git during git-archive. - # setup.py/versioneer.py will grep for the variable names, so they must -@@ -453,8 +554,15 @@ def get_keywords(): - class VersioneerConfig: - """Container for Versioneer configuration parameters.""" - -+ VCS: str -+ style: str -+ tag_prefix: str -+ parentdir_prefix: str -+ versionfile_source: str -+ verbose: bool -+ - --def get_config(): -+def get_config() -> VersioneerConfig: - """Create, populate and return the VersioneerConfig() object.""" - # these strings are filled in when 'setup.py versioneer' creates - # _version.py -@@ -472,13 +580,13 @@ class NotThisMethod(Exception): - """Exception raised if a method is not valid for the current scenario.""" - - --LONG_VERSION_PY = {} --HANDLERS = {} -+LONG_VERSION_PY: Dict[str, str] = {} -+HANDLERS: Dict[str, Dict[str, Callable]] = {} - - --def register_vcs_handler(vcs, method): # decorator -- """Decorator to mark a method as the handler for a particular VCS.""" -- def decorate(f): -+def register_vcs_handler(vcs: str, method: str) -> Callable: # decorator -+ """Create decorator to mark a method as the handler of a VCS.""" -+ def decorate(f: Callable) -> Callable: - """Store f in HANDLERS[vcs][method].""" - if vcs not in HANDLERS: - HANDLERS[vcs] = {} -@@ -487,22 +595,35 @@ def register_vcs_handler(vcs, method): # decorator - return decorate - - --def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, -- env=None): -+def run_command( -+ commands: List[str], -+ args: List[str], -+ cwd: Optional[str] = None, -+ verbose: bool = False, -+ hide_stderr: bool = False, -+ env: Optional[Dict[str, str]] = None, -+) -> Tuple[Optional[str], Optional[int]]: - """Call the given command(s).""" - assert isinstance(commands, list) -- p = None -- for c in commands: -+ process = None -+ -+ popen_kwargs: Dict[str, Any] = {} -+ if sys.platform == "win32": -+ # This hides the console window if pythonw.exe is used -+ startupinfo = subprocess.STARTUPINFO() -+ startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW -+ popen_kwargs["startupinfo"] = startupinfo -+ -+ for command in commands: - try: -- dispcmd = str([c] + args) -+ dispcmd = str([command] + args) - # remember shell=False, so use git.cmd on windows, not just git -- p = subprocess.Popen([c] + args, cwd=cwd, env=env, -- stdout=subprocess.PIPE, -- stderr=(subprocess.PIPE if hide_stderr -- else None)) -+ process = subprocess.Popen([command] + args, cwd=cwd, env=env, -+ stdout=subprocess.PIPE, -+ stderr=(subprocess.PIPE if hide_stderr -+ else None), **popen_kwargs) - break -- except EnvironmentError: -- e = sys.exc_info()[1] -+ except OSError as e: - if e.errno == errno.ENOENT: - continue - if verbose: -@@ -513,18 +634,20 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, - if verbose: - print("unable to find command, tried %%s" %% (commands,)) - return None, None -- stdout = p.communicate()[0].strip() -- if sys.version_info[0] >= 3: -- stdout = stdout.decode() -- if p.returncode != 0: -+ stdout = process.communicate()[0].strip().decode() -+ if process.returncode != 0: - if verbose: - print("unable to run %%s (error)" %% dispcmd) - print("stdout was %%s" %% stdout) -- return None, p.returncode -- return stdout, p.returncode -+ return None, process.returncode -+ return stdout, process.returncode - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -533,15 +656,14 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): - return {"version": dirname[len(parentdir_prefix):], - "full-revisionid": None, - "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: - print("Tried directories %%s but none started with prefix %%s" %% -@@ -550,41 +672,48 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -597,11 +726,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG):] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %%d -@@ -610,7 +739,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r'\d', r)} - if verbose: - print("discarding '%%s', no digits" %% ",".join(refs - tags)) - if verbose: -@@ -619,6 +748,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): - r = ref[len(tag_prefix):] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r'\d', r): -+ continue - if verbose: - print("picking %%s" %% r) - return {"version": r, -@@ -634,7 +768,12 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, -+ root: str, -+ verbose: bool, -+ runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -645,8 +784,15 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, -+ hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %%s not under git control" %% root) -@@ -654,24 +800,57 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%%s*" %% tag_prefix], -- cwd=root) -+ describe_out, rc = runner(GITS, [ -+ "describe", "--tags", "--dirty", "--always", "--long", -+ "--match", f"{tag_prefix}[[:digit:]]*" -+ ], cwd=root) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], -+ cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -688,7 +867,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - # TAG-NUM-gHEX - mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -+ # unparsable. Maybe git-describe is misbehaving? - pieces["error"] = ("unable to parse git-describe output: '%%s'" - %% describe_out) - return pieces -@@ -713,26 +892,27 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -757,23 +937,71 @@ def render_pep440(pieces): - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%%d.g%%s" %% (pieces["distance"], -+ pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%%d" %% pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%%d.dev%%d" %% (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%%d" %% (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%%d" %% pieces["distance"] -+ rendered = "0.post0.dev%%d" %% pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -800,12 +1028,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%%d" %% pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%%s" %% pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -822,7 +1079,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -842,7 +1099,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -862,7 +1119,7 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: - return {"version": "unknown", -@@ -876,10 +1133,14 @@ def render(pieces, style): - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -894,7 +1155,7 @@ def render(pieces, style): - "date": pieces.get("date")} - - --def get_versions(): -+def get_versions() -> Dict[str, Any]: - """Get version information or return default if unable to do so.""" - # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have - # __file__, we can work backwards from there to the root. Some -@@ -915,7 +1176,7 @@ def get_versions(): - # versionfile_source is the relative path from the top of the source - # tree (where the .git directory might live) to this file. Invert - # this to find the root from __file__. -- for i in cfg.versionfile_source.split('/'): -+ for _ in cfg.versionfile_source.split('/'): - root = os.path.dirname(root) - except NameError: - return {"version": "0+unknown", "full-revisionid": None, -@@ -942,41 +1203,48 @@ def get_versions(): - - - @register_vcs_handler("git", "get_keywords") --def git_get_keywords(versionfile_abs): -+def git_get_keywords(versionfile_abs: str) -> Dict[str, str]: - """Extract version information from the given file.""" - # the code embedded in _version.py can just fetch the value of these - # keywords. When used from setup.py, we don't want to import _version.py, - # so we do it with a regexp instead. This function is not used from - # _version.py. -- keywords = {} -+ keywords: Dict[str, str] = {} - try: -- f = open(versionfile_abs, "r") -- for line in f.readlines(): -- if line.strip().startswith("git_refnames ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["refnames"] = mo.group(1) -- if line.strip().startswith("git_full ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["full"] = mo.group(1) -- if line.strip().startswith("git_date ="): -- mo = re.search(r'=\s*"(.*)"', line) -- if mo: -- keywords["date"] = mo.group(1) -- f.close() -- except EnvironmentError: -+ with open(versionfile_abs, "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith("git_refnames ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["refnames"] = mo.group(1) -+ if line.strip().startswith("git_full ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["full"] = mo.group(1) -+ if line.strip().startswith("git_date ="): -+ mo = re.search(r'=\s*"(.*)"', line) -+ if mo: -+ keywords["date"] = mo.group(1) -+ except OSError: - pass - return keywords - - - @register_vcs_handler("git", "keywords") --def git_versions_from_keywords(keywords, tag_prefix, verbose): -+def git_versions_from_keywords( -+ keywords: Dict[str, str], -+ tag_prefix: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Get version information from git keywords.""" -- if not keywords: -- raise NotThisMethod("no keywords at all, weird") -+ if "refnames" not in keywords: -+ raise NotThisMethod("Short version file found") - date = keywords.get("date") - if date is not None: -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] -+ - # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant - # datestamp. However we prefer "%ci" (which expands to an "ISO-8601 - # -like" string, which we must then edit to make compliant), because -@@ -989,11 +1257,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - if verbose: - print("keywords are unexpanded, not using") - raise NotThisMethod("unexpanded keywords, not a git-archive tarball") -- refs = set([r.strip() for r in refnames.strip("()").split(",")]) -+ refs = {r.strip() for r in refnames.strip("()").split(",")} - # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of - # just "foo-1.0". If we see a "tag: " prefix, prefer those. - TAG = "tag: " -- tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) -+ tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} - if not tags: - # Either we're using git < 1.8.3, or there really are no tags. We use - # a heuristic: assume all version tags have a digit. The old git %d -@@ -1002,7 +1270,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - # between branches and tags. By ignoring refnames without digits, we - # filter out many common branch names like "release" and - # "stabilization", as well as "HEAD" and "master". -- tags = set([r for r in refs if re.search(r'\d', r)]) -+ tags = {r for r in refs if re.search(r"\d", r)} - if verbose: - print("discarding '%s', no digits" % ",".join(refs - tags)) - if verbose: -@@ -1010,23 +1278,37 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): - for ref in sorted(tags): - # sorting will prefer e.g. "2.0" over "2.0rc1" - if ref.startswith(tag_prefix): -- r = ref[len(tag_prefix):] -+ r = ref[len(tag_prefix) :] -+ # Filter out refs that exactly match prefix or that don't start -+ # with a number once the prefix is stripped (mostly a concern -+ # when prefix is '') -+ if not re.match(r"\d", r): -+ continue - if verbose: - print("picking %s" % r) -- return {"version": r, -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": None, -- "date": date} -+ return { -+ "version": r, -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": None, -+ "date": date, -+ } - # no suitable tags, so version is "0+unknown", but full hex is still there - if verbose: - print("no suitable tags, using unknown + full revision id") -- return {"version": "0+unknown", -- "full-revisionid": keywords["full"].strip(), -- "dirty": False, "error": "no suitable tags", "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": keywords["full"].strip(), -+ "dirty": False, -+ "error": "no suitable tags", -+ "date": None, -+ } - - - @register_vcs_handler("git", "pieces_from_vcs") --def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): -+def git_pieces_from_vcs( -+ tag_prefix: str, root: str, verbose: bool, runner: Callable = run_command -+) -> Dict[str, Any]: - """Get version from 'git describe' in the root of the source tree. - - This only gets called if the git-archive 'subst' keywords were *not* -@@ -1037,8 +1319,14 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - -- out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root, -- hide_stderr=True) -+ # GIT_DIR can interfere with correct operation of Versioneer. -+ # It may be intended to be passed to the Versioneer-versioned project, -+ # but that should not change where we get our version from. -+ env = os.environ.copy() -+ env.pop("GIT_DIR", None) -+ runner = functools.partial(runner, env=env) -+ -+ _, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root, hide_stderr=not verbose) - if rc != 0: - if verbose: - print("Directory %s not under git control" % root) -@@ -1046,24 +1334,65 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - - # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] - # if there isn't one, this yields HEX[-dirty] (no NUM) -- describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty", -- "--always", "--long", -- "--match", "%s*" % tag_prefix], -- cwd=root) -+ describe_out, rc = runner( -+ GITS, -+ [ -+ "describe", -+ "--tags", -+ "--dirty", -+ "--always", -+ "--long", -+ "--match", -+ f"{tag_prefix}[[:digit:]]*", -+ ], -+ cwd=root, -+ ) - # --long was added in git-1.5.5 - if describe_out is None: - raise NotThisMethod("'git describe' failed") - describe_out = describe_out.strip() -- full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) -+ full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root) - if full_out is None: - raise NotThisMethod("'git rev-parse' failed") - full_out = full_out.strip() - -- pieces = {} -+ pieces: Dict[str, Any] = {} - pieces["long"] = full_out - pieces["short"] = full_out[:7] # maybe improved later - pieces["error"] = None - -+ branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) -+ # --abbrev-ref was added in git-1.6.3 -+ if rc != 0 or branch_name is None: -+ raise NotThisMethod("'git rev-parse --abbrev-ref' returned error") -+ branch_name = branch_name.strip() -+ -+ if branch_name == "HEAD": -+ # If we aren't exactly on a branch, pick a branch which represents -+ # the current commit. If all else fails, we are on a branchless -+ # commit. -+ branches, rc = runner(GITS, ["branch", "--contains"], cwd=root) -+ # --contains was added in git-1.5.4 -+ if rc != 0 or branches is None: -+ raise NotThisMethod("'git branch --contains' returned error") -+ branches = branches.split("\n") -+ -+ # Remove the first line if we're running detached -+ if "(" in branches[0]: -+ branches.pop(0) -+ -+ # Strip off the leading "* " from the list of branches. -+ branches = [branch[2:] for branch in branches] -+ if "master" in branches: -+ branch_name = "master" -+ elif not branches: -+ branch_name = None -+ else: -+ # Pick the first branch that is returned. Good or bad. -+ branch_name = branches[0] -+ -+ pieces["branch"] = branch_name -+ - # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] - # TAG might have hyphens. - git_describe = describe_out -@@ -1072,17 +1401,16 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - dirty = git_describe.endswith("-dirty") - pieces["dirty"] = dirty - if dirty: -- git_describe = git_describe[:git_describe.rindex("-dirty")] -+ git_describe = git_describe[: git_describe.rindex("-dirty")] - - # now we have TAG-NUM-gHEX or HEX - - if "-" in git_describe: - # TAG-NUM-gHEX -- mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) -+ mo = re.search(r"^(.+)-(\d+)-g([0-9a-f]+)$", git_describe) - if not mo: -- # unparseable. Maybe git-describe is misbehaving? -- pieces["error"] = ("unable to parse git-describe output: '%s'" -- % describe_out) -+ # unparsable. Maybe git-describe is misbehaving? -+ pieces["error"] = "unable to parse git-describe output: '%s'" % describe_out - return pieces - - # tag -@@ -1091,10 +1419,12 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - if verbose: - fmt = "tag '%s' doesn't start with prefix '%s'" - print(fmt % (full_tag, tag_prefix)) -- pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" -- % (full_tag, tag_prefix)) -+ pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % ( -+ full_tag, -+ tag_prefix, -+ ) - return pieces -- pieces["closest-tag"] = full_tag[len(tag_prefix):] -+ pieces["closest-tag"] = full_tag[len(tag_prefix) :] - - # distance: number of commits since tag - pieces["distance"] = int(mo.group(2)) -@@ -1105,19 +1435,20 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): - else: - # HEX: no tags - pieces["closest-tag"] = None -- count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"], -- cwd=root) -- pieces["distance"] = int(count_out) # total number of commits -+ out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root) -+ pieces["distance"] = len(out.split()) # total number of commits - - # commit date: see ISO-8601 comment in git_versions_from_keywords() -- date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"], -- cwd=root)[0].strip() -+ date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip() -+ # Use only the last line. Previous lines may contain GPG signature -+ # information. -+ date = date.splitlines()[-1] - pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1) - - return pieces - - --def do_vcs_install(manifest_in, versionfile_source, ipy): -+def do_vcs_install(versionfile_source: str, ipy: Optional[str]) -> None: - """Git-specific installation logic for Versioneer. - - For Git, this means creating/changing .gitattributes to mark _version.py -@@ -1126,36 +1457,40 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] -- files = [manifest_in, versionfile_source] -+ files = [versionfile_source] - if ipy: - files.append(ipy) -- try: -- me = __file__ -- if me.endswith(".pyc") or me.endswith(".pyo"): -- me = os.path.splitext(me)[0] + ".py" -- versioneer_file = os.path.relpath(me) -- except NameError: -- versioneer_file = "versioneer.py" -- files.append(versioneer_file) -+ if "VERSIONEER_PEP518" not in globals(): -+ try: -+ my_path = __file__ -+ if my_path.endswith((".pyc", ".pyo")): -+ my_path = os.path.splitext(my_path)[0] + ".py" -+ versioneer_file = os.path.relpath(my_path) -+ except NameError: -+ versioneer_file = "versioneer.py" -+ files.append(versioneer_file) - present = False - try: -- f = open(".gitattributes", "r") -- for line in f.readlines(): -- if line.strip().startswith(versionfile_source): -- if "export-subst" in line.strip().split()[1:]: -- present = True -- f.close() -- except EnvironmentError: -+ with open(".gitattributes", "r") as fobj: -+ for line in fobj: -+ if line.strip().startswith(versionfile_source): -+ if "export-subst" in line.strip().split()[1:]: -+ present = True -+ break -+ except OSError: - pass - if not present: -- f = open(".gitattributes", "a+") -- f.write("%s export-subst\n" % versionfile_source) -- f.close() -+ with open(".gitattributes", "a+") as fobj: -+ fobj.write(f"{versionfile_source} export-subst\n") - files.append(".gitattributes") - run_command(GITS, ["add", "--"] + files) - - --def versions_from_parentdir(parentdir_prefix, root, verbose): -+def versions_from_parentdir( -+ parentdir_prefix: str, -+ root: str, -+ verbose: bool, -+) -> Dict[str, Any]: - """Try to determine the version from the parent directory name. - - Source tarballs conventionally unpack into a directory that includes both -@@ -1164,24 +1499,29 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): - """ - rootdirs = [] - -- for i in range(3): -+ for _ in range(3): - dirname = os.path.basename(root) - if dirname.startswith(parentdir_prefix): -- return {"version": dirname[len(parentdir_prefix):], -- "full-revisionid": None, -- "dirty": False, "error": None, "date": None} -- else: -- rootdirs.append(root) -- root = os.path.dirname(root) # up a level -+ return { -+ "version": dirname[len(parentdir_prefix) :], -+ "full-revisionid": None, -+ "dirty": False, -+ "error": None, -+ "date": None, -+ } -+ rootdirs.append(root) -+ root = os.path.dirname(root) # up a level - - if verbose: -- print("Tried directories %s but none started with prefix %s" % -- (str(rootdirs), parentdir_prefix)) -+ print( -+ "Tried directories %s but none started with prefix %s" -+ % (str(rootdirs), parentdir_prefix) -+ ) - raise NotThisMethod("rootdir doesn't start with parentdir_prefix") - - - SHORT_VERSION_PY = """ --# This file was generated by 'versioneer.py' (0.18) from -+# This file was generated by 'versioneer.py' (0.29) from - # revision-control system data, or from the parent directory name of an - # unpacked source archive. Distribution tarballs contain a pre-generated copy - # of this file. -@@ -1198,42 +1538,42 @@ def get_versions(): - """ - - --def versions_from_file(filename): -+def versions_from_file(filename: str) -> Dict[str, Any]: - """Try to determine the version from _version.py if present.""" - try: - with open(filename) as f: - contents = f.read() -- except EnvironmentError: -+ except OSError: - raise NotThisMethod("unable to read _version.py") -- mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: -- mo = re.search(r"version_json = '''\r\n(.*)''' # END VERSION_JSON", -- contents, re.M | re.S) -+ mo = re.search( -+ r"version_json = '''\r\n(.*)''' # END VERSION_JSON", contents, re.M | re.S -+ ) - if not mo: - raise NotThisMethod("no version_json in _version.py") - return json.loads(mo.group(1)) - - --def write_to_version_file(filename, versions): -+def write_to_version_file(filename: str, versions: Dict[str, Any]) -> None: - """Write the given version number to the given _version.py file.""" -- os.unlink(filename) -- contents = json.dumps(versions, sort_keys=True, -- indent=1, separators=(",", ": ")) -+ contents = json.dumps(versions, sort_keys=True, indent=1, separators=(",", ": ")) - with open(filename, "w") as f: - f.write(SHORT_VERSION_PY % contents) - - print("set %s to '%s'" % (filename, versions["version"])) - - --def plus_or_dot(pieces): -+def plus_or_dot(pieces: Dict[str, Any]) -> str: - """Return a + if we don't already have one, else return a .""" - if "+" in pieces.get("closest-tag", ""): - return "." - return "+" - - --def render_pep440(pieces): -+def render_pep440(pieces: Dict[str, Any]) -> str: - """Build up version string, with post-release "local version identifier". - - Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you -@@ -1251,30 +1591,76 @@ def render_pep440(pieces): - rendered += ".dirty" - else: - # exception #1 -- rendered = "0+untagged.%d.g%s" % (pieces["distance"], -- pieces["short"]) -+ rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) - if pieces["dirty"]: - rendered += ".dirty" - return rendered - - --def render_pep440_pre(pieces): -- """TAG[.post.devDISTANCE] -- No -dirty. -+def render_pep440_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[[.dev0]+DISTANCE.gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. Note that .dev0 sorts backwards -+ (a feature branch will appear "older" than the master branch). - - Exceptions: -- 1: no tags. 0.post.devDISTANCE -+ 1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty] - """ - if pieces["closest-tag"]: - rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0" -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+untagged.%d.g%s" % (pieces["distance"], pieces["short"]) -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def pep440_split_post(ver: str) -> Tuple[str, Optional[int]]: -+ """Split pep440 version string at the post-release segment. -+ -+ Returns the release segments before the post-release and the -+ post-release version number (or -1 if no post-release segment is present). -+ """ -+ vc = str.split(ver, ".post") -+ return vc[0], int(vc[1] or 0) if len(vc) == 2 else None -+ -+ -+def render_pep440_pre(pieces: Dict[str, Any]) -> str: -+ """TAG[.postN.devDISTANCE] -- No -dirty. -+ -+ Exceptions: -+ 1: no tags. 0.post0.devDISTANCE -+ """ -+ if pieces["closest-tag"]: - if pieces["distance"]: -- rendered += ".post.dev%d" % pieces["distance"] -+ # update the post release segment -+ tag_version, post_version = pep440_split_post(pieces["closest-tag"]) -+ rendered = tag_version -+ if post_version is not None: -+ rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"]) -+ else: -+ rendered += ".post0.dev%d" % (pieces["distance"]) -+ else: -+ # no commits, use the tag as the version -+ rendered = pieces["closest-tag"] - else: - # exception #1 -- rendered = "0.post.dev%d" % pieces["distance"] -+ rendered = "0.post0.dev%d" % pieces["distance"] - return rendered - - --def render_pep440_post(pieces): -+def render_pep440_post(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]+gHEX] . - - The ".dev0" means dirty. Note that .dev0 sorts backwards -@@ -1301,12 +1687,41 @@ def render_pep440_post(pieces): - return rendered - - --def render_pep440_old(pieces): -+def render_pep440_post_branch(pieces: Dict[str, Any]) -> str: -+ """TAG[.postDISTANCE[.dev0]+gHEX[.dirty]] . -+ -+ The ".dev0" means not master branch. -+ -+ Exceptions: -+ 1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty] -+ """ -+ if pieces["closest-tag"]: -+ rendered = pieces["closest-tag"] -+ if pieces["distance"] or pieces["dirty"]: -+ rendered += ".post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += plus_or_dot(pieces) -+ rendered += "g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ else: -+ # exception #1 -+ rendered = "0.post%d" % pieces["distance"] -+ if pieces["branch"] != "master": -+ rendered += ".dev0" -+ rendered += "+g%s" % pieces["short"] -+ if pieces["dirty"]: -+ rendered += ".dirty" -+ return rendered -+ -+ -+def render_pep440_old(pieces: Dict[str, Any]) -> str: - """TAG[.postDISTANCE[.dev0]] . - - The ".dev0" means dirty. - -- Eexceptions: -+ Exceptions: - 1: no tags. 0.postDISTANCE[.dev0] - """ - if pieces["closest-tag"]: -@@ -1323,7 +1738,7 @@ def render_pep440_old(pieces): - return rendered - - --def render_git_describe(pieces): -+def render_git_describe(pieces: Dict[str, Any]) -> str: - """TAG[-DISTANCE-gHEX][-dirty]. - - Like 'git describe --tags --dirty --always'. -@@ -1343,7 +1758,7 @@ def render_git_describe(pieces): - return rendered - - --def render_git_describe_long(pieces): -+def render_git_describe_long(pieces: Dict[str, Any]) -> str: - """TAG-DISTANCE-gHEX[-dirty]. - - Like 'git describe --tags --dirty --always -long'. -@@ -1363,24 +1778,30 @@ def render_git_describe_long(pieces): - return rendered - - --def render(pieces, style): -+def render(pieces: Dict[str, Any], style: str) -> Dict[str, Any]: - """Render the given version pieces into the requested style.""" - if pieces["error"]: -- return {"version": "unknown", -- "full-revisionid": pieces.get("long"), -- "dirty": None, -- "error": pieces["error"], -- "date": None} -+ return { -+ "version": "unknown", -+ "full-revisionid": pieces.get("long"), -+ "dirty": None, -+ "error": pieces["error"], -+ "date": None, -+ } - - if not style or style == "default": - style = "pep440" # the default - - if style == "pep440": - rendered = render_pep440(pieces) -+ elif style == "pep440-branch": -+ rendered = render_pep440_branch(pieces) - elif style == "pep440-pre": - rendered = render_pep440_pre(pieces) - elif style == "pep440-post": - rendered = render_pep440_post(pieces) -+ elif style == "pep440-post-branch": -+ rendered = render_pep440_post_branch(pieces) - elif style == "pep440-old": - rendered = render_pep440_old(pieces) - elif style == "git-describe": -@@ -1390,16 +1811,20 @@ def render(pieces, style): - else: - raise ValueError("unknown style '%s'" % style) - -- return {"version": rendered, "full-revisionid": pieces["long"], -- "dirty": pieces["dirty"], "error": None, -- "date": pieces.get("date")} -+ return { -+ "version": rendered, -+ "full-revisionid": pieces["long"], -+ "dirty": pieces["dirty"], -+ "error": None, -+ "date": pieces.get("date"), -+ } - - - class VersioneerBadRootError(Exception): - """The project root directory is unknown or missing key files.""" - - --def get_versions(verbose=False): -+def get_versions(verbose: bool = False) -> Dict[str, Any]: - """Get the project version from whatever source is available. - - Returns dict with two keys: 'version' and 'full'. -@@ -1414,9 +1839,10 @@ def get_versions(verbose=False): - assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" - handlers = HANDLERS.get(cfg.VCS) - assert handlers, "unrecognized VCS '%s'" % cfg.VCS -- verbose = verbose or cfg.verbose -- assert cfg.versionfile_source is not None, \ -- "please set versioneer.versionfile_source" -+ verbose = verbose or bool(cfg.verbose) # `bool()` used to avoid `None` -+ assert ( -+ cfg.versionfile_source is not None -+ ), "please set versioneer.versionfile_source" - assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" - - versionfile_abs = os.path.join(root, cfg.versionfile_source) -@@ -1470,18 +1896,26 @@ def get_versions(verbose=False): - if verbose: - print("unable to compute version") - -- return {"version": "0+unknown", "full-revisionid": None, -- "dirty": None, "error": "unable to compute version", -- "date": None} -+ return { -+ "version": "0+unknown", -+ "full-revisionid": None, -+ "dirty": None, -+ "error": "unable to compute version", -+ "date": None, -+ } - - --def get_version(): -+def get_version() -> str: - """Get the short version string for this project.""" - return get_versions()["version"] - - --def get_cmdclass(): -- """Get the custom setuptools/distutils subclasses used by Versioneer.""" -+def get_cmdclass(cmdclass: Optional[Dict[str, Any]] = None): -+ """Get the custom setuptools subclasses used by Versioneer. -+ -+ If the package uses a different cmdclass (e.g. one from numpy), it -+ should be provide as an argument. -+ """ - if "versioneer" in sys.modules: - del sys.modules["versioneer"] - # this fixes the "python setup.py develop" case (also 'install' and -@@ -1495,25 +1929,25 @@ def get_cmdclass(): - # parent is protected against the child's "import versioneer". By - # removing ourselves from sys.modules here, before the child build - # happens, we protect the child from the parent's versioneer too. -- # Also see https://github.com/warner/python-versioneer/issues/52 -+ # Also see https://github.com/python-versioneer/python-versioneer/issues/52 - -- cmds = {} -+ cmds = {} if cmdclass is None else cmdclass.copy() - -- # we add "version" to both distutils and setuptools -- from distutils.core import Command -+ # we add "version" to setuptools -+ from setuptools import Command - - class cmd_version(Command): - description = "report generated version string" -- user_options = [] -- boolean_options = [] -+ user_options: List[Tuple[str, str, str]] = [] -+ boolean_options: List[str] = [] - -- def initialize_options(self): -+ def initialize_options(self) -> None: - pass - -- def finalize_options(self): -+ def finalize_options(self) -> None: - pass - -- def run(self): -+ def run(self) -> None: - vers = get_versions(verbose=True) - print("Version: %s" % vers["version"]) - print(" full-revisionid: %s" % vers.get("full-revisionid")) -@@ -1521,9 +1955,10 @@ def get_cmdclass(): - print(" date: %s" % vers.get("date")) - if vers["error"]: - print(" error: %s" % vers["error"]) -+ - cmds["version"] = cmd_version - -- # we override "build_py" in both distutils and setuptools -+ # we override "build_py" in setuptools - # - # most invocation pathways end up running build_py: - # distutils/build -> build_py -@@ -1538,29 +1973,71 @@ def get_cmdclass(): - # then does setup.py bdist_wheel, or sometimes setup.py install - # setup.py egg_info -> ? - -+ # pip install -e . and setuptool/editable_wheel will invoke build_py -+ # but the build_py command is not expected to copy any files. -+ - # we override different "build_py" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.build_py import build_py as _build_py -+ if "build_py" in cmds: -+ _build_py: Any = cmds["build_py"] - else: -- from distutils.command.build_py import build_py as _build_py -+ from setuptools.command.build_py import build_py as _build_py - - class cmd_build_py(_build_py): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() - _build_py.run(self) -+ if getattr(self, "editable_mode", False): -+ # During editable installs `.py` and data files are -+ # not copied to build_lib -+ return - # now locate _version.py in the new build/ directory and replace - # it with an updated value - if cfg.versionfile_build: -- target_versionfile = os.path.join(self.build_lib, -- cfg.versionfile_build) -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) - print("UPDATING %s" % target_versionfile) - write_to_version_file(target_versionfile, versions) -+ - cmds["build_py"] = cmd_build_py - -+ if "build_ext" in cmds: -+ _build_ext: Any = cmds["build_ext"] -+ else: -+ from setuptools.command.build_ext import build_ext as _build_ext -+ -+ class cmd_build_ext(_build_ext): -+ def run(self) -> None: -+ root = get_root() -+ cfg = get_config_from_root(root) -+ versions = get_versions() -+ _build_ext.run(self) -+ if self.inplace: -+ # build_ext --inplace will only build extensions in -+ # build/lib<..> dir with no _version.py to write to. -+ # As in place builds will already have a _version.py -+ # in the module dir, we do not need to write one. -+ return -+ # now locate _version.py in the new build/ directory and replace -+ # it with an updated value -+ if not cfg.versionfile_build: -+ return -+ target_versionfile = os.path.join(self.build_lib, cfg.versionfile_build) -+ if not os.path.exists(target_versionfile): -+ print( -+ f"Warning: {target_versionfile} does not exist, skipping " -+ "version update. This can happen if you are running build_ext " -+ "without first running build_py." -+ ) -+ return -+ print("UPDATING %s" % target_versionfile) -+ write_to_version_file(target_versionfile, versions) -+ -+ cmds["build_ext"] = cmd_build_ext -+ - if "cx_Freeze" in sys.modules: # cx_freeze enabled? -- from cx_Freeze.dist import build_exe as _build_exe -+ from cx_Freeze.dist import build_exe as _build_exe # type: ignore -+ - # nczeczulin reports that py2exe won't like the pep440-style string - # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. - # setup(console=[{ -@@ -1569,7 +2046,7 @@ def get_cmdclass(): - # ... - - class cmd_build_exe(_build_exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1581,24 +2058,28 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["build_exe"] = cmd_build_exe - del cmds["build_py"] - -- if 'py2exe' in sys.modules: # py2exe enabled? -+ if "py2exe" in sys.modules: # py2exe enabled? - try: -- from py2exe.distutils_buildexe import py2exe as _py2exe # py3 -+ from py2exe.setuptools_buildexe import py2exe as _py2exe # type: ignore - except ImportError: -- from py2exe.build_exe import py2exe as _py2exe # py2 -+ from py2exe.distutils_buildexe import py2exe as _py2exe # type: ignore - - class cmd_py2exe(_py2exe): -- def run(self): -+ def run(self) -> None: - root = get_root() - cfg = get_config_from_root(root) - versions = get_versions() -@@ -1610,23 +2091,67 @@ def get_cmdclass(): - os.unlink(target_versionfile) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % -- {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ - cmds["py2exe"] = cmd_py2exe - -+ # sdist farms its file list building out to egg_info -+ if "egg_info" in cmds: -+ _egg_info: Any = cmds["egg_info"] -+ else: -+ from setuptools.command.egg_info import egg_info as _egg_info -+ -+ class cmd_egg_info(_egg_info): -+ def find_sources(self) -> None: -+ # egg_info.find_sources builds the manifest list and writes it -+ # in one shot -+ super().find_sources() -+ -+ # Modify the filelist and normalize it -+ root = get_root() -+ cfg = get_config_from_root(root) -+ self.filelist.append("versioneer.py") -+ if cfg.versionfile_source: -+ # There are rare cases where versionfile_source might not be -+ # included by default, so we must be explicit -+ self.filelist.append(cfg.versionfile_source) -+ self.filelist.sort() -+ self.filelist.remove_duplicates() -+ -+ # The write method is hidden in the manifest_maker instance that -+ # generated the filelist and was thrown away -+ # We will instead replicate their final normalization (to unicode, -+ # and POSIX-style paths) -+ from setuptools import unicode_utils -+ -+ normalized = [ -+ unicode_utils.filesys_decode(f).replace(os.sep, "/") -+ for f in self.filelist.files -+ ] -+ -+ manifest_filename = os.path.join(self.egg_info, "SOURCES.txt") -+ with open(manifest_filename, "w") as fobj: -+ fobj.write("\n".join(normalized)) -+ -+ cmds["egg_info"] = cmd_egg_info -+ - # we override different "sdist" commands for both environments -- if "setuptools" in sys.modules: -- from setuptools.command.sdist import sdist as _sdist -+ if "sdist" in cmds: -+ _sdist: Any = cmds["sdist"] - else: -- from distutils.command.sdist import sdist as _sdist -+ from setuptools.command.sdist import sdist as _sdist - - class cmd_sdist(_sdist): -- def run(self): -+ def run(self) -> None: - versions = get_versions() - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old -@@ -1634,7 +2159,7 @@ def get_cmdclass(): - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - -- def make_release_tree(self, base_dir, files): -+ def make_release_tree(self, base_dir: str, files: List[str]) -> None: - root = get_root() - cfg = get_config_from_root(root) - _sdist.make_release_tree(self, base_dir, files) -@@ -1643,8 +2168,10 @@ def get_cmdclass(): - # updated value - target_versionfile = os.path.join(base_dir, cfg.versionfile_source) - print("UPDATING %s" % target_versionfile) -- write_to_version_file(target_versionfile, -- self._versioneer_generated_versions) -+ write_to_version_file( -+ target_versionfile, self._versioneer_generated_versions -+ ) -+ - cmds["sdist"] = cmd_sdist - - return cmds -@@ -1687,23 +2214,26 @@ SAMPLE_CONFIG = """ - - """ - --INIT_PY_SNIPPET = """ -+OLD_SNIPPET = """ - from ._version import get_versions - __version__ = get_versions()['version'] - del get_versions - """ - -+INIT_PY_SNIPPET = """ -+from . import {0} -+__version__ = {0}.get_versions()['version'] -+""" -+ - --def do_setup(): -- """Main VCS-independent setup function for installing Versioneer.""" -+def do_setup() -> int: -+ """Do main VCS-independent setup function for installing Versioneer.""" - root = get_root() - try: - cfg = get_config_from_root(root) -- except (EnvironmentError, configparser.NoSectionError, -- configparser.NoOptionError) as e: -- if isinstance(e, (EnvironmentError, configparser.NoSectionError)): -- print("Adding sample versioneer config to setup.cfg", -- file=sys.stderr) -+ except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: -+ if isinstance(e, (OSError, configparser.NoSectionError)): -+ print("Adding sample versioneer config to setup.cfg", file=sys.stderr) - with open(os.path.join(root, "setup.cfg"), "a") as f: - f.write(SAMPLE_CONFIG) - print(CONFIG_ERROR, file=sys.stderr) -@@ -1712,71 +2242,49 @@ def do_setup(): - print(" creating %s" % cfg.versionfile_source) - with open(cfg.versionfile_source, "w") as f: - LONG = LONG_VERSION_PY[cfg.VCS] -- f.write(LONG % {"DOLLAR": "$", -- "STYLE": cfg.style, -- "TAG_PREFIX": cfg.tag_prefix, -- "PARENTDIR_PREFIX": cfg.parentdir_prefix, -- "VERSIONFILE_SOURCE": cfg.versionfile_source, -- }) -- -- ipy = os.path.join(os.path.dirname(cfg.versionfile_source), -- "__init__.py") -+ f.write( -+ LONG -+ % { -+ "DOLLAR": "$", -+ "STYLE": cfg.style, -+ "TAG_PREFIX": cfg.tag_prefix, -+ "PARENTDIR_PREFIX": cfg.parentdir_prefix, -+ "VERSIONFILE_SOURCE": cfg.versionfile_source, -+ } -+ ) -+ -+ ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") -+ maybe_ipy: Optional[str] = ipy - if os.path.exists(ipy): - try: - with open(ipy, "r") as f: - old = f.read() -- except EnvironmentError: -+ except OSError: - old = "" -- if INIT_PY_SNIPPET not in old: -+ module = os.path.splitext(os.path.basename(cfg.versionfile_source))[0] -+ snippet = INIT_PY_SNIPPET.format(module) -+ if OLD_SNIPPET in old: -+ print(" replacing boilerplate in %s" % ipy) -+ with open(ipy, "w") as f: -+ f.write(old.replace(OLD_SNIPPET, snippet)) -+ elif snippet not in old: - print(" appending to %s" % ipy) - with open(ipy, "a") as f: -- f.write(INIT_PY_SNIPPET) -+ f.write(snippet) - else: - print(" %s unmodified" % ipy) - else: - print(" %s doesn't exist, ok" % ipy) -- ipy = None -- -- # Make sure both the top-level "versioneer.py" and versionfile_source -- # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so -- # they'll be copied into source distributions. Pip won't be able to -- # install the package without this. -- manifest_in = os.path.join(root, "MANIFEST.in") -- simple_includes = set() -- try: -- with open(manifest_in, "r") as f: -- for line in f: -- if line.startswith("include "): -- for include in line.split()[1:]: -- simple_includes.add(include) -- except EnvironmentError: -- pass -- # That doesn't cover everything MANIFEST.in can do -- # (http://docs.python.org/2/distutils/sourcedist.html#commands), so -- # it might give some false negatives. Appending redundant 'include' -- # lines is safe, though. -- if "versioneer.py" not in simple_includes: -- print(" appending 'versioneer.py' to MANIFEST.in") -- with open(manifest_in, "a") as f: -- f.write("include versioneer.py\n") -- else: -- print(" 'versioneer.py' already in MANIFEST.in") -- if cfg.versionfile_source not in simple_includes: -- print(" appending versionfile_source ('%s') to MANIFEST.in" % -- cfg.versionfile_source) -- with open(manifest_in, "a") as f: -- f.write("include %s\n" % cfg.versionfile_source) -- else: -- print(" versionfile_source already in MANIFEST.in") -+ maybe_ipy = None - - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-subst keyword - # substitution. -- do_vcs_install(manifest_in, cfg.versionfile_source, ipy) -+ do_vcs_install(cfg.versionfile_source, maybe_ipy) - return 0 - - --def scan_setup_py(): -+def scan_setup_py() -> int: - """Validate the contents of setup.py against Versioneer's expectations.""" - found = set() - setters = False -@@ -1813,10 +2321,14 @@ def scan_setup_py(): - return errors - - -+def setup_command() -> NoReturn: -+ """Set up Versioneer and exit with appropriate error code.""" -+ errors = do_setup() -+ errors += scan_setup_py() -+ sys.exit(1 if errors else 0) -+ -+ - if __name__ == "__main__": - cmd = sys.argv[1] - if cmd == "setup": -- errors = do_setup() -- errors += scan_setup_py() -- if errors: -- sys.exit(1) -+ setup_command() --- -2.41.0 - diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in index 1c2e3a49af3..64cf95fc49c 100644 --- a/package/python-spake2/Config.in +++ b/package/python-spake2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_SPAKE2 bool "python-spake2" - select BR2_PACKAGE_PYTHON_HKDF # runtime + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime help SPAKE2 password-authenticated key exchange (in pure python). diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash index 30052b1b368..008d4348df2 100644 --- a/package/python-spake2/python-spake2.hash +++ b/package/python-spake2/python-spake2.hash @@ -1,5 +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 +md5 612dc68fb0e8844de550cfba7ea61060 spake2-0.9.tar.gz +sha256 421fc4a8d5ac395af7af0206ffd9e6cdf188c105cb1b883d9d683312bb5a9334 spake2-0.9.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 index 99ce7dae13a..0eb91dcf983 100644 --- a/package/python-spake2/python-spake2.mk +++ b/package/python-spake2/python-spake2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_VERSION = 0.9 PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz -PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/c5/4b/32ad65f8ff5c49254e218ccaae8fc16900cfc289954fb372686159ebe315 PYTHON_SPAKE2_SETUP_TYPE = setuptools PYTHON_SPAKE2_LICENSE = MIT PYTHON_SPAKE2_LICENSE_FILES = LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index a413fcc266c..4e38d4ec582 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 dfa687701ddf1416cba19024e6f9ec3d SQLAlchemy-2.0.31.tar.gz -sha256 b607489dd4a54de56984a0c7656247504bd5523d9d0ba799aef59d4add009484 SQLAlchemy-2.0.31.tar.gz +md5 7a4444524e4930a29f22dbca0cb16d4b sqlalchemy-2.0.36.tar.gz +sha256 7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5 sqlalchemy-2.0.36.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 567ffbbb87d..1bc2f3929a2 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.31 -PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/ba/7d/e3312ae374fe7a4af7e1494735125a714a0907317c829ab8d8a31d89ded4 +PYTHON_SQLALCHEMY_VERSION = 2.0.36 +PYTHON_SQLALCHEMY_SOURCE = sqlalchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/50/65/9cbc9c4c3287bed2499e05033e207473504dc4df999ce49385fb1f8b058a PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 57cef1d6723..de5ee15beed 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -7,10 +7,9 @@ PYTHON_SQLPARSE_VERSION = 0.5.1 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/73/82/dfa23ec2cbed08a801deab02fe7c904bfb00765256b155941d789a338c68 -PYTHON_SQLPARSE_SETUP_TYPE = pep517 +PYTHON_SQLPARSE_SETUP_TYPE = hatch PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE -PYTHON_SQLPARSE_DEPENDENCIES = host-python-hatchling PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index f04aaea7c05..f422e6cfe0e 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 b0ba8178dd4bf2cdff53c8702212be52 starlette-0.37.2.tar.gz -sha256 9af890290133b79fc3db55474ade20f6220a364a0402e0b556e7cd5e1e093823 starlette-0.37.2.tar.gz +md5 97321ad76438c1106ddd817baddcda06 starlette-0.41.2.tar.gz +sha256 9834fd799d1a87fd346deb76158668cfa0b0d56f85caefe8268e2d97c3468b62 starlette-0.41.2.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index af2c2d4ac78..3caa136987c 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,13 +4,12 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.37.2 +PYTHON_STARLETTE_VERSION = 0.41.2 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/61/b5/6bceb93ff20bd7ca36e6f7c540581abb18f53130fabb30ba526e26fd819b -PYTHON_STARLETTE_SETUP_TYPE = pep517 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/3e/da/1fb4bdb72ae12b834becd7e1e7e47001d32f91ec0ce8d7bc1b618d9f0bd9 +PYTHON_STARLETTE_SETUP_TYPE = hatch PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md -PYTHON_STARLETTE_DEPENDENCIES = host-python-hatchling PYTHON_STARLETTE_CPE_ID_VENDOR = encode PYTHON_STARLETTE_CPE_ID_PRODUCT = starlette diff --git a/package/python-sympy/python-sympy.hash b/package/python-sympy/python-sympy.hash index 947edfd4e08..09cb0bfd713 100644 --- a/package/python-sympy/python-sympy.hash +++ b/package/python-sympy/python-sympy.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/sympy/json -md5 3e0033109352d7303ea97b9216e16645 sympy-1.12.tar.gz -sha256 ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8 sympy-1.12.tar.gz +md5 0902c1a6a7399c8a5ed1bbe95d559c10 sympy-1.13.3.tar.gz +sha256 b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9 sympy-1.13.3.tar.gz # Locally computed sha256 checksums sha256 07a5e9819f727b4986ad2829c7a29a6320d42575f720eb24d71b7fef573a0286 LICENSE sha256 596639d3681fdb67bb2f05a9fcd2503d88bc549471a89b2e500cd9759ae2a3fa data/TeXmacs/LICENSE diff --git a/package/python-sympy/python-sympy.mk b/package/python-sympy/python-sympy.mk index 0f160649ad4..246da3b2191 100644 --- a/package/python-sympy/python-sympy.mk +++ b/package/python-sympy/python-sympy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SYMPY_VERSION = 1.12 +PYTHON_SYMPY_VERSION = 1.13.3 PYTHON_SYMPY_SOURCE = sympy-$(PYTHON_SYMPY_VERSION).tar.gz -PYTHON_SYMPY_SITE = https://github.com/sympy/sympy/releases/download/sympy-$(PYTHON_SYMPY_VERSION) +PYTHON_SYMPY_SITE = https://files.pythonhosted.org/packages/11/8a/5a7fd6284fa8caac23a26c9ddf9c30485a48169344b4bd3b0f02fef1890f PYTHON_SYMPY_SETUP_TYPE = setuptools PYTHON_SYMPY_LICENSE = BSD-3-Clause PYTHON_SYMPY_LICENSE_FILES = LICENSE data/TeXmacs/LICENSE sympy/parsing/latex/LICENSE.txt diff --git a/package/python-tcolorpy/python-tcolorpy.hash b/package/python-tcolorpy/python-tcolorpy.hash index cf5ca0e5f39..0bba6e47fed 100644 --- a/package/python-tcolorpy/python-tcolorpy.hash +++ b/package/python-tcolorpy/python-tcolorpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tcolorpy/json -md5 ca571cccff812ecdc0c73968c9d24ebf tcolorpy-0.1.4.tar.gz -sha256 f0dceb1cb95e554cee63024b3cd2fd8d4628c568773de2d1e6b4f0478461901c tcolorpy-0.1.4.tar.gz +md5 a4a8404d2b6ecfae4eeca8c71e4634c6 tcolorpy-0.1.6.tar.gz +sha256 8cea0bf5f8cf03f77528a9acfbf312df935573892ba5ea3b2516e61fa54de9a5 tcolorpy-0.1.6.tar.gz # Locally computed sha256 checksums sha256 f41a0456d5f2bba25fd4d7e50b51a95de304770ff1db5a79515d03397a914d8d LICENSE diff --git a/package/python-tcolorpy/python-tcolorpy.mk b/package/python-tcolorpy/python-tcolorpy.mk index 5c42320c17f..bdc66f61bc2 100644 --- a/package/python-tcolorpy/python-tcolorpy.mk +++ b/package/python-tcolorpy/python-tcolorpy.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TCOLORPY_VERSION = 0.1.4 +PYTHON_TCOLORPY_VERSION = 0.1.6 PYTHON_TCOLORPY_SOURCE = tcolorpy-$(PYTHON_TCOLORPY_VERSION).tar.gz -PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/ba/e0/20b99847e76bb89784b68634399261d770b01054bca16cd19a06ac9c2e67 +PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/af/f6/b17885354c5addfb93c14f3ed7172c33494f989dd5f83c0340d2c8fa3b69 PYTHON_TCOLORPY_SETUP_TYPE = setuptools PYTHON_TCOLORPY_LICENSE = MIT PYTHON_TCOLORPY_LICENSE_FILES = LICENSE +PYTHON_TCOLORPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index ff7093394f3..9d3487d67b2 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 39314c5843bc3f40f8ce4f5cc340c479 tempora-5.5.0.tar.gz -sha256 13e4fcc997d0509c3306d6841f03e9381b7e5e46b2bebfae9151af90085f0c26 tempora-5.5.0.tar.gz +md5 e4ca48a06f4c8b9aa21b8081937353f2 tempora-5.7.0.tar.gz +sha256 888190a2dbe3255ff26dfa9fcecb25f4d38434c0f1943cd61de98bb41c410c50 tempora-5.7.0.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index d1b333ec0a8..aeb2e4687cc 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.5.0 +PYTHON_TEMPORA_VERSION = 5.7.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/c9/dc/97d90b9f64dbe4f599023e19602b33a2cced68462db67a3d4805a77cf784 +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/5d/52/b4ff0ca21695a4f8ac0f158d884587b5eba08b0e95356b0ea210e00446ac 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 ed69ab06d1e..4bed487025e 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 1d567737d43835549d2fd1bc87ec6c7d termcolor-2.4.0.tar.gz -sha256 aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a termcolor-2.4.0.tar.gz +md5 26f496075070852b5d39762bbd14ec46 termcolor-2.5.0.tar.gz +sha256 998d8d27da6d48442e8e1f016119076b690d962507531df4890fcd2db2ef8a6f termcolor-2.5.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index c242cfa4740..e2492ab3c49 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.4.0 +PYTHON_TERMCOLOR_VERSION = 2.5.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/10/56/d7d66a84f96d804155f6ff2873d065368b25a07222a6fd51c4f24ef6d764 -PYTHON_TERMCOLOR_SETUP_TYPE = pep517 +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/37/72/88311445fd44c455c7d553e61f95412cf89054308a1aa2434ab835075fc5 +PYTHON_TERMCOLOR_SETUP_TYPE = hatch PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt -PYTHON_TERMCOLOR_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs +PYTHON_TERMCOLOR_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index 062643adeed..900a577f36f 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,9 +7,8 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 +PYTHON_TERMINALTABLES_SETUP_TYPE = poetry PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE -PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash index 560749b238a..538aa784584 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 83eb15fb541dd857ff051a8d0c979b9c texttable-1.6.7.tar.gz -sha256 290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2 texttable-1.6.7.tar.gz +md5 e5d380c04fab132ccf0bbfd4f761bd51 texttable-1.7.0.tar.gz +sha256 2d2068fb55115807d3ac77a4ca68fa48803e84ebb0ee2340f858107a36522638 texttable-1.7.0.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 c63fb5786ca..1e4e7572c9b 100644 --- a/package/python-texttable/python-texttable.mk +++ b/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.7 +PYTHON_TEXTTABLE_VERSION = 1.7.0 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/e4/84/4686ee611bb020038375c5f11fe7b6b3bb94ee78614a1faba45effe51591 +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/1c/dc/0aff23d6036a4d3bf4f1d8c8204c5c79c4437e25e0ae94ffe4bbb55ee3c2 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 0907a6e88f0..042c801b88f 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 486887192acd558636a1528dfddf918c thrift-0.16.0.tar.gz -sha256 2b5b6488fcded21f9d312aa23c9ff6a0195d0f6ae26ddbd5ad9e3e25dfc14408 thrift-0.16.0.tar.gz +md5 1e7f196bad9e3ce3f9092a38f5287d9f thrift-0.21.0.tar.gz +sha256 5e6f7c50f936ebfa23e924229afc95eb219f8c8e5a83202dd4a391244803e402 thrift-0.21.0.tar.gz # Locally computed sha256 checksums sha256 35e2508f171c3ac2529f402c123c12f3b2ac91643f2e52b334f71f8c861be321 README.md diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index 23a2ad0476e..ebfcff0e3ca 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.16.0 +PYTHON_THRIFT_VERSION = 0.21.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/e4/23/dd951c9883cb49a73b750bdfe91e39d78e8a3f1f7175608634f381a197d5 +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/33/1c/418058b4750176b638ab60b4d5a554a2969dcd2363ae458519d0f747adff PYTHON_THRIFT_SETUP_TYPE = setuptools PYTHON_THRIFT_LICENSE = Apache-2.0 PYTHON_THRIFT_LICENSE_FILES = README.md diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index f9b638df6ce..4a7b26de82c 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 e8a06102e7f42ca791463f11ce7b814d tinycss2-1.2.1.tar.gz -sha256 8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627 tinycss2-1.2.1.tar.gz +md5 de6bd20b47354352c2b2344c842385c7 tinycss2-1.4.0.tar.gz +sha256 10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7 tinycss2-1.4.0.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 de26639587e..b269617ad12 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.2.1 +PYTHON_TINYCSS2_VERSION = 1.4.0 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/75/be/24179dfaa1d742c9365cbd0e3f0edc5d3aa3abad415a2327c5a6ff8ca077 +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/7a/fd/7a5ee21fd08ff70d3d33a5781c255cbe779659bd03278feb98b19ee550f4 PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE diff --git a/package/python-tinyhtml5/Config.in b/package/python-tinyhtml5/Config.in new file mode 100644 index 00000000000..3243d143e76 --- /dev/null +++ b/package/python-tinyhtml5/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TINYHTML5 + bool "python-tinyhtml5" + select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime + help + HTML parser based on the WHATWG HTML specification. + + https://github.com/CourtBouillon/tinyhtml5 diff --git a/package/python-tinyhtml5/python-tinyhtml5.hash b/package/python-tinyhtml5/python-tinyhtml5.hash new file mode 100644 index 00000000000..55afa09597f --- /dev/null +++ b/package/python-tinyhtml5/python-tinyhtml5.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tinyhtml5/json +md5 c5fa2991d6d1ea65e923279c435b816e tinyhtml5-2.0.0.tar.gz +sha256 086f998833da24c300c414d9fe81d9b368fd04cb9d2596a008421cbc705fcfcc tinyhtml5-2.0.0.tar.gz +# Locally computed sha256 checksums +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f LICENSE diff --git a/package/python-tinyhtml5/python-tinyhtml5.mk b/package/python-tinyhtml5/python-tinyhtml5.mk new file mode 100644 index 00000000000..373ab8aa54f --- /dev/null +++ b/package/python-tinyhtml5/python-tinyhtml5.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tinyhtml5 +# +################################################################################ + +PYTHON_TINYHTML5_VERSION = 2.0.0 +PYTHON_TINYHTML5_SOURCE = tinyhtml5-$(PYTHON_TINYHTML5_VERSION).tar.gz +PYTHON_TINYHTML5_SITE = https://files.pythonhosted.org/packages/fd/03/6111ed99e9bf7dfa1c30baeef0e0fb7e0bd387bd07f8e5b270776fe1de3f +PYTHON_TINYHTML5_SETUP_TYPE = flit +PYTHON_TINYHTML5_LICENSE = MIT +PYTHON_TINYHTML5_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-tinyrpc/Config.in b/package/python-tinyrpc/Config.in index 3c643c754a9..e8f0f9ea0c1 100644 --- a/package/python-tinyrpc/Config.in +++ b/package/python-tinyrpc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_TINYRPC bool "python-tinyrpc" - select BR2_PACKAGE_PYTHON_SIX # runtime help A small, modular, transport and protocol neutral RPC library that, among other things, supports JSON-RPC and diff --git a/package/python-tinyrpc/python-tinyrpc.hash b/package/python-tinyrpc/python-tinyrpc.hash index d4bd348e616..f1b2781ee3c 100644 --- a/package/python-tinyrpc/python-tinyrpc.hash +++ b/package/python-tinyrpc/python-tinyrpc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinyrpc/json -md5 cc7e62891eee806dfbbafb6e3875825e tinyrpc-1.1.4.tar.gz -sha256 c99f412e5d9849c2deb468ea37fee2faf12fbc95bdd3616ae5c276ea195ed6bd tinyrpc-1.1.4.tar.gz +md5 b5079a23bbd8c41a33fe15c7486acf3e tinyrpc-1.1.7.tar.gz +sha256 15a8f41838e7b8be274467de59ad5c571e4cb5a2fe93bc2940b1d103bce4c6e5 tinyrpc-1.1.7.tar.gz # Locally computed sha256 checksums sha256 587f1ea174824613f4a7e0d7fb95fda000a7f58ca17df12416e014c9ee82e619 LICENSE diff --git a/package/python-tinyrpc/python-tinyrpc.mk b/package/python-tinyrpc/python-tinyrpc.mk index e976778fa25..1b3e4a83ed8 100644 --- a/package/python-tinyrpc/python-tinyrpc.mk +++ b/package/python-tinyrpc/python-tinyrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TINYRPC_VERSION = 1.1.4 +PYTHON_TINYRPC_VERSION = 1.1.7 PYTHON_TINYRPC_SOURCE = tinyrpc-$(PYTHON_TINYRPC_VERSION).tar.gz -PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/d2/86/2741f0c74cc339416c9803b6393eaf230254ecf36ffd839614799e15a202 +PYTHON_TINYRPC_SITE = https://files.pythonhosted.org/packages/6a/31/b0d0403cafda7965fab0741bcb7c63b26eab7fcfb605d4ece31a6f7b034d PYTHON_TINYRPC_SETUP_TYPE = setuptools PYTHON_TINYRPC_LICENSE = MIT PYTHON_TINYRPC_LICENSE_FILES = LICENSE diff --git a/package/python-tomli-w/python-tomli-w.hash b/package/python-tomli-w/python-tomli-w.hash index 778c22583a5..1d0bbf881e5 100644 --- a/package/python-tomli-w/python-tomli-w.hash +++ b/package/python-tomli-w/python-tomli-w.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomli-w/json -md5 2c050134d4842b449ec4129c97d51e62 tomli_w-1.0.0.tar.gz -sha256 f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9 tomli_w-1.0.0.tar.gz +md5 8a074845fdcbb1fb6855bec753f0f94e tomli_w-1.1.0.tar.gz +sha256 49e847a3a304d516a169a601184932ef0f6b61623fe680f836a2aa7128ed0d33 tomli_w-1.1.0.tar.gz # Locally computed sha256 checksums sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe LICENSE diff --git a/package/python-tomli-w/python-tomli-w.mk b/package/python-tomli-w/python-tomli-w.mk index d5d7ab9f2cd..a6ca0cfbbcd 100644 --- a/package/python-tomli-w/python-tomli-w.mk +++ b/package/python-tomli-w/python-tomli-w.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_W_VERSION = 1.0.0 +PYTHON_TOMLI_W_VERSION = 1.1.0 PYTHON_TOMLI_W_SOURCE = tomli_w-$(PYTHON_TOMLI_W_VERSION).tar.gz -PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/49/05/6bf21838623186b91aedbda06248ad18f03487dc56fbc20e4db384abde6c +PYTHON_TOMLI_W_SITE = https://files.pythonhosted.org/packages/d4/19/b65f1a088ee23e37cdea415b357843eca8b1422a7b11a9eee6e35d4ec273 PYTHON_TOMLI_W_SETUP_TYPE = flit PYTHON_TOMLI_W_LICENSE = MIT PYTHON_TOMLI_W_LICENSE_FILES = LICENSE diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash index 8368f9ee13f..8ee4939af0a 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 d4341621d423a7ca6822e23d6d52bb9a tomli-2.0.1.tar.gz -sha256 de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f tomli-2.0.1.tar.gz +md5 e65b234adc4513d94792c69bb025b622 tomli-2.0.2.tar.gz +sha256 d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed tomli-2.0.2.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 5d259f71a3a..3c3d4dc1826 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TOMLI_VERSION = 2.0.1 +PYTHON_TOMLI_VERSION = 2.0.2 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz -PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3 +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/35/b9/de2a5c0144d7d75a57ff355c0c24054f965b2dc3036456ae03a51ea6264b PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE PYTHON_TOMLI_SETUP_TYPE = flit diff --git a/package/python-tomlkit/python-tomlkit.hash b/package/python-tomlkit/python-tomlkit.hash index 8c6d3c2377b..21e61dd5fcd 100644 --- a/package/python-tomlkit/python-tomlkit.hash +++ b/package/python-tomlkit/python-tomlkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tomlkit/json -md5 e182df9625d617692a9ae035266634fe tomlkit-0.12.4.tar.gz -sha256 7ca1cfc12232806517a8515047ba66a19369e71edf2439d0f5824f91032b6cc3 tomlkit-0.12.4.tar.gz +md5 0db1a3750c64b141720f05430df9b433 tomlkit-0.13.2.tar.gz +sha256 fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79 tomlkit-0.13.2.tar.gz # Locally computed sha256 checksums sha256 f2f9b460ba719da6626add264d3782f275a4ff7aab677beda08b330911e23adb LICENSE diff --git a/package/python-tomlkit/python-tomlkit.mk b/package/python-tomlkit/python-tomlkit.mk index ad82719ee2a..79138d69e8c 100644 --- a/package/python-tomlkit/python-tomlkit.mk +++ b/package/python-tomlkit/python-tomlkit.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_TOMLKIT_VERSION = 0.12.4 +PYTHON_TOMLKIT_VERSION = 0.13.2 PYTHON_TOMLKIT_SOURCE = tomlkit-$(PYTHON_TOMLKIT_VERSION).tar.gz -PYTHON_TOMLKIT_SITE = https://files.pythonhosted.org/packages/7d/49/4c0764898ee67618996148bdba4534a422c5e698b4dbf4001f7c6f930797 -PYTHON_TOMLKIT_SETUP_TYPE = pep517 +PYTHON_TOMLKIT_SITE = https://files.pythonhosted.org/packages/b1/09/a439bec5888f00a54b8b9f05fa94d7f901d6735ef4e55dcec9bc37b5d8fa +PYTHON_TOMLKIT_SETUP_TYPE = poetry PYTHON_TOMLKIT_LICENSE = MIT PYTHON_TOMLKIT_LICENSE_FILES = LICENSE -PYTHON_TOMLKIT_DEPENDENCIES = host-python-poetry-core $(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 deleted file mode 100644 index 357c6f2f129..00000000000 --- a/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 f30a6bb136c..f8ac0ceaf37 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 32fbad606b439c3e1bf4e79d4e872741 tornado-6.2.tar.gz -sha256 9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13 tornado-6.2.tar.gz +md5 07ebd88a2a7acee1b819738f3f4ca7ef tornado-6.4.1.tar.gz +sha256 92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9 tornado-6.4.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index f4a4c97d2a2..c5e5a2ca0c1 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,15 +4,13 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.2 +PYTHON_TORNADO_VERSION = 6.4.1 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/f3/9e/225a41452f2d9418d89be5e32cf824c84fe1e639d350d6e8d49db5b7f73a +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/ee/66/398ac7167f1c7835406888a386f6d0d26ee5dbf197d8a571300be57662d3 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-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash index 4796c8277fc..5e97c6302fa 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.hash +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tortoise-orm/json -md5 aa5efa50e69d0a67b75c187f7550acd7 tortoise_orm-0.20.0.tar.gz -sha256 283af584d685dcc58d6cc1da35b9115bb1e41c89075eae2a19c493b39b9b41f7 tortoise_orm-0.20.0.tar.gz +md5 328373e7e6112eab38984d6c1c7caf41 tortoise_orm-0.21.7.tar.gz +sha256 8a790a931828aa37ac364b344c561e603422aced2af5e403f6790575da0f19c5 tortoise_orm-0.21.7.tar.gz # Locally computed sha256 checksums sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk index cc1c2126b7e..0a8f173c86a 100644 --- a/package/python-tortoise-orm/python-tortoise-orm.mk +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_TORTOISE_ORM_VERSION = 0.20.0 +PYTHON_TORTOISE_ORM_VERSION = 0.21.7 PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz -PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/3b/84/8ca142fe370d59c4e3135825b2822d199c4f885ae855657c1a7361e68511 -PYTHON_TORTOISE_ORM_SETUP_TYPE = pep517 +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/e8/0e/ad8e7554b0259072887d602617a67ef21055e1d8aa061936e381ecc1a9a5 +PYTHON_TORTOISE_ORM_SETUP_TYPE = poetry PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt -PYTHON_TORTOISE_ORM_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) diff --git a/package/python-tpm2-pytss/Config.in b/package/python-tpm2-pytss/Config.in index dec9a311d4e..e66df9f0b05 100644 --- a/package/python-tpm2-pytss/Config.in +++ b/package/python-tpm2-pytss/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_PYTHON_TPM2_PYTSS select BR2_PACKAGE_PYTHON_ASN1CRYPTO # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime select BR2_PACKAGE_TPM2_TSS help TPM 2.0 TSS Bindings for Python. diff --git a/package/python-tpm2-pytss/python-tpm2-pytss.hash b/package/python-tpm2-pytss/python-tpm2-pytss.hash index 10a9f112b74..0e73f6d4603 100644 --- a/package/python-tpm2-pytss/python-tpm2-pytss.hash +++ b/package/python-tpm2-pytss/python-tpm2-pytss.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tpm2-pytss/json -md5 069a02c99d3203fada940c3dd43b699c tpm2-pytss-2.2.1.tar.gz -sha256 b8f15473422f377f59c7217dcd1479165cce62dfa33934ec976a278baf2e9efe tpm2-pytss-2.2.1.tar.gz +md5 241696dfce31c539ae418a5d3587b945 tpm2-pytss-2.3.0.tar.gz +sha256 20071129379656f5f3c3bc16d364612672b147d81191fb4eb9f9ff9fbee48410 tpm2-pytss-2.3.0.tar.gz # Locally computed sha256 checksums sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/python-tpm2-pytss/python-tpm2-pytss.mk b/package/python-tpm2-pytss/python-tpm2-pytss.mk index 80491aac46e..9a192fc7ca1 100644 --- a/package/python-tpm2-pytss/python-tpm2-pytss.mk +++ b/package/python-tpm2-pytss/python-tpm2-pytss.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TPM2_PYTSS_VERSION = 2.2.1 +PYTHON_TPM2_PYTSS_VERSION = 2.3.0 PYTHON_TPM2_PYTSS_SOURCE = tpm2-pytss-$(PYTHON_TPM2_PYTSS_VERSION).tar.gz -PYTHON_TPM2_PYTSS_SITE = https://files.pythonhosted.org/packages/13/e5/8d4a9ac91579c741ec9fb63befcf6577107f22f3508c364fd53e277d7237 +PYTHON_TPM2_PYTSS_SITE = https://files.pythonhosted.org/packages/07/1f/0f2521440e330342ef757a6605b61e1dbf5fe47fd97397c6e5f02791d520 PYTHON_TPM2_PYTSS_SETUP_TYPE = setuptools PYTHON_TPM2_PYTSS_LICENSE = BSD-2-Clause PYTHON_TPM2_PYTSS_LICENSE_FILES = LICENSE diff --git a/package/python-tqdm/python-tqdm.hash b/package/python-tqdm/python-tqdm.hash index 4be54de7de4..7bbb37e5ba2 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 5822af464d77ea156ad1167c23e1bdac tqdm-4.64.1.tar.gz -sha256 5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4 tqdm-4.64.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/tqdm/json +md5 3495f2a40a26a4f1caea279630f13521 tqdm-4.67.0.tar.gz +sha256 fe5a6f95e6fe0b9755e9469b77b9c3cf850048224ecaa8293d7d2d31f97d869a tqdm-4.67.0.tar.gz # Locally computed sha256 checksums -sha256 a0fc1785a8f2a200a3124d703d49550601b7741ccffc861713c2ddaa07a537dd LICENCE +sha256 dc33252e829015e3b150086fb9b3a40f6ad6fb32c2f4610ce812fa677d35986a LICENCE diff --git a/package/python-tqdm/python-tqdm.mk b/package/python-tqdm/python-tqdm.mk index a6296bd0f5b..4c2db7f249a 100644 --- a/package/python-tqdm/python-tqdm.mk +++ b/package/python-tqdm/python-tqdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TQDM_VERSION = 4.64.1 +PYTHON_TQDM_VERSION = 4.67.0 PYTHON_TQDM_SOURCE = tqdm-$(PYTHON_TQDM_VERSION).tar.gz -PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/c1/c2/d8a40e5363fb01806870e444fc1d066282743292ff32a9da54af51ce36a2 +PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/e8/4f/0153c21dc5779a49a0598c445b1978126b1344bab9ee71e53e44877e14e0 PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 80fa8d4d440..56fc5694369 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 95b21c721316bbc06922df9d97af5158 traitlets-5.8.0.tar.gz -sha256 6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84 traitlets-5.8.0.tar.gz +md5 f6e6529cca4cbe3299e3f07ce24d3fdc traitlets-5.14.3.tar.gz +sha256 9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7 traitlets-5.14.3.tar.gz # Locally computed sha256 checksums -sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md +sha256 2f51727d9063b54856773cb51388bdb79f2936ee4a1b692ef553d8c4201311ab LICENSE diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 7054557a486..f0f99e3dfba 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.8.0 +PYTHON_TRAITLETS_VERSION = 5.14.3 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/56/48/0eb99357330a02974d537be8e4096bc58cfac1089e3153570119ccea7a40 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/eb/79/72064e6a701c2183016abbbfedaba506d81e30e232a68c9f0d6f6fcd1574 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause -PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md -PYTHON_TRAITLETS_SETUP_TYPE = pep517 -PYTHON_TRAITLETS_DEPENDENCIES = host-python-hatchling +PYTHON_TRAITLETS_LICENSE_FILES = LICENSE +PYTHON_TRAITLETS_SETUP_TYPE = hatch $(eval $(python-package)) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 5d76a5cdd65..9b75ff40d6a 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_PYTHON_TREQ select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help treq is an HTTP library inspired by requests but written on top of Twisted's Agents. It provides a simple, higher level diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index aecf71aad89..b44aba35d35 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 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz -sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz +md5 a48996ff540651deded304b638ba54ea treq-24.9.1.tar.gz +sha256 15da7fc404f3e4ed59d0abe5f8eef4966fabbe618039a2a23bc7c15305cefea8 treq-24.9.1.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 57dc50ee744..65179246f56 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 22.2.0 +PYTHON_TREQ_VERSION = 24.9.1 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/08/94/424f3bb11eaf464880d076cca2e9d0ee21a1be805fe9761b87eccba5b3ae 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 index 7d35fd02968..1b9093e5d2b 100644 --- a/package/python-trio-websocket/Config.in +++ b/package/python-trio-websocket/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-trio-websocket/python-trio-websocket.hash b/package/python-trio-websocket/python-trio-websocket.hash index 3e6e832d900..b7e8302b58c 100644 --- a/package/python-trio-websocket/python-trio-websocket.hash +++ b/package/python-trio-websocket/python-trio-websocket.hash @@ -1,3 +1,5 @@ # 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 +md5 3d9bb51b62f562dbdbc2ec067132c4a6 trio-websocket-0.11.1.tar.gz +sha256 18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f trio-websocket-0.11.1.tar.gz +# Locally computed sha256 checksums +sha256 2d5e3fc506b6c87ad93b77b9aa76009a58fea72be5fb56e6803bc08cb2887999 LICENSE diff --git a/package/python-trio-websocket/python-trio-websocket.mk b/package/python-trio-websocket/python-trio-websocket.mk index 4522b87c9c2..3e79bb7108e 100644 --- a/package/python-trio-websocket/python-trio-websocket.mk +++ b/package/python-trio-websocket/python-trio-websocket.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_TRIO_WEBSOCKET_VERSION = 0.9.2 +PYTHON_TRIO_WEBSOCKET_VERSION = 0.11.1 PYTHON_TRIO_WEBSOCKET_SOURCE = trio-websocket-$(PYTHON_TRIO_WEBSOCKET_VERSION).tar.gz -PYTHON_TRIO_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/75/91/44a0a016025794ba9fef530a6fbe59987153e2cbea7e11fe2f3d8c618740 +PYTHON_TRIO_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/dd/36/abad2385853077424a11b818d9fd8350d249d9e31d583cb9c11cd4c85eda PYTHON_TRIO_WEBSOCKET_SETUP_TYPE = setuptools PYTHON_TRIO_WEBSOCKET_LICENSE = MIT +PYTHON_TRIO_WEBSOCKET_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-trio/Config.in b/package/python-trio/Config.in index 0aa53c90cae..02931aadb55 100644 --- a/package/python-trio/Config.in +++ b/package/python-trio/Config.in @@ -1,6 +1,5 @@ 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 diff --git a/package/python-trio/python-trio.hash b/package/python-trio/python-trio.hash index 487194662ed..35de5d6c3b2 100644 --- a/package/python-trio/python-trio.hash +++ b/package/python-trio/python-trio.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/trio/json -md5 f7dbfa6a8722065f09da188641d8ed93 trio-0.22.0.tar.gz -sha256 ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf trio-0.22.0.tar.gz +md5 81c1aa4eefa98e1b2895a85369211d24 trio-0.27.0.tar.gz +sha256 1dcc95ab1726b2da054afea8fd761af74bad79bd52381b84eae408e983c76831 trio-0.27.0.tar.gz # Locally computed sha256 checksums sha256 418d025e1284311f2690263e6efa6bf51585e5741818ece63e5862487e505bb9 LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 diff --git a/package/python-trio/python-trio.mk b/package/python-trio/python-trio.mk index 80da203c159..dace4eec9ef 100644 --- a/package/python-trio/python-trio.mk +++ b/package/python-trio/python-trio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRIO_VERSION = 0.22.0 +PYTHON_TRIO_VERSION = 0.27.0 PYTHON_TRIO_SOURCE = trio-$(PYTHON_TRIO_VERSION).tar.gz -PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/0b/b8/1b81d2149c3e2c25900d40b8e6c8d3ca502a3cc844b90c962b0854aaf3f3 +PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/17/d1/a83dee5be404da7afe5a71783a33b8907bacb935a6dc8c69ab785e4a3eed PYTHON_TRIO_SETUP_TYPE = setuptools PYTHON_TRIO_LICENSE = Apache-2.0 or MIT PYTHON_TRIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT diff --git a/package/python-trove-classifiers/python-trove-classifiers.hash b/package/python-trove-classifiers/python-trove-classifiers.hash index 2aac714a373..02ea021527d 100644 --- a/package/python-trove-classifiers/python-trove-classifiers.hash +++ b/package/python-trove-classifiers/python-trove-classifiers.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/trove-classifiers/json -md5 1e574abaf8803bab35289ab54d6bb251 trove-classifiers-2024.3.3.tar.gz -sha256 df7edff9c67ff86b733628998330b180e81d125b1e096536d83ac0fd79673fdc trove-classifiers-2024.3.3.tar.gz +md5 c2820cfbb09e91d84ade85e0e65d87ae trove_classifiers-2024.10.21.16.tar.gz +sha256 17cbd055d67d5e9d9de63293a8732943fabc21574e4c7b74edf112b4928cf5f3 trove_classifiers-2024.10.21.16.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-trove-classifiers/python-trove-classifiers.mk b/package/python-trove-classifiers/python-trove-classifiers.mk index 5bfd045c388..ab2421cbe52 100644 --- a/package/python-trove-classifiers/python-trove-classifiers.mk +++ b/package/python-trove-classifiers/python-trove-classifiers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TROVE_CLASSIFIERS_VERSION = 2024.3.3 -PYTHON_TROVE_CLASSIFIERS_SOURCE = trove-classifiers-$(PYTHON_TROVE_CLASSIFIERS_VERSION).tar.gz -PYTHON_TROVE_CLASSIFIERS_SITE = https://files.pythonhosted.org/packages/13/11/e13906315b498cb8f5ce5a7ff39fc35941e8291e914158157937fd1c095d +PYTHON_TROVE_CLASSIFIERS_VERSION = 2024.10.21.16 +PYTHON_TROVE_CLASSIFIERS_SOURCE = trove_classifiers-$(PYTHON_TROVE_CLASSIFIERS_VERSION).tar.gz +PYTHON_TROVE_CLASSIFIERS_SITE = https://files.pythonhosted.org/packages/99/85/92c2667cf221b37648041ce9319427f92fa76cbec634aad844e67e284706 PYTHON_TROVE_CLASSIFIERS_SETUP_TYPE = setuptools PYTHON_TROVE_CLASSIFIERS_LICENSE = Apache-2.0 PYTHON_TROVE_CLASSIFIERS_LICENSE_FILES = LICENSE diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 1f3baf57e2e..3254278fe94 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -5,9 +5,10 @@ config BR2_PACKAGE_PYTHON_TWISTED select BR2_PACKAGE_PYTHON_AUTOMAT # runtime select BR2_PACKAGE_PYTHON_CONSTANTLY # runtime select BR2_PACKAGE_PYTHON_HYPERLINK # runtime - select BR2_PACKAGE_PYTHON_PYHAMCREST # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Twisted is an event-driven networking engine written in Python. @@ -35,7 +36,6 @@ config BR2_PACKAGE_PYTHON_TWISTED_CONCH 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" diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 36612ff5e72..03c637c9ed3 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 c9a5dad0813512fabd9de502738c0bf8 Twisted-22.10.0.tar.gz -sha256 32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31 Twisted-22.10.0.tar.gz -# Locally computed sha256 -sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE +md5 bbe77df51bb6375ac61b9be634ff59f3 twisted-24.10.0.tar.gz +sha256 02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e twisted-24.10.0.tar.gz +# Locally computed sha256 checksums +sha256 78d059391dddba18a695c1998ac9dde68160a1df1635f34adcfb3ecba4564802 LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 398baed2a87..424efdadbac 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,14 +4,16 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.10.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/b2/ce/cbb56597127b1d51905b0cddcc3f314cc769769efc5e9a8a67f4617f7bca -PYTHON_TWISTED_SETUP_TYPE = setuptools +PYTHON_TWISTED_VERSION = 24.10.0 +PYTHON_TWISTED_SOURCE = twisted-$(PYTHON_TWISTED_VERSION).tar.gz +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/b2/0f/2d0b0dcd52a849db64ff63619aead94ae1091fe4d4d7e100371efe513585 +PYTHON_TWISTED_SETUP_TYPE = hatch PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE PYTHON_TWISTED_CPE_ID_VENDOR = twistedmatrix PYTHON_TWISTED_CPE_ID_PRODUCT = twisted -PYTHON_TWISTED_DEPENDENCIES = python-incremental host-python-incremental +PYTHON_TWISTED_DEPENDENCIES = \ + host-python-hatch-fancy-pypi-readme \ + host-python-incremental $(eval $(python-package)) diff --git a/package/python-txtorcon/Config.in b/package/python-txtorcon/Config.in index fbea7be8cf8..e96ba678c68 100644 --- a/package/python-txtorcon/Config.in +++ b/package/python-txtorcon/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_PYTHON_TXTORCON bool "python-txtorcon" - # python-pyopenssl -> python-cryptography - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_AUTOMAT # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime help Twisted-based Tor controller client, with state-tracking and diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash index 9c8e3599ea1..b322eac23f4 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 17a84954a4ba13fa6ee443129bdc401a txtorcon-22.0.0.tar.gz -sha256 89a1b65e32a4b369d67e6c166387fbc468cc5d05227448d239a5e7e9718aa053 txtorcon-22.0.0.tar.gz +md5 c3e9d8fe545effa09c0e43612c91ca17 txtorcon-24.8.0.tar.gz +sha256 befe19138d9c8c5307b6ee6d4fe446d0c201ffd1cc404aeb265ed90309978ad0 txtorcon-24.8.0.tar.gz # Locally computed sha256 checksums sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index c17d5da0740..13a2454d6a9 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 22.0.0 +PYTHON_TXTORCON_VERSION = 24.8.0 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/47/ca/7941660345c769637a97bdbaf25202460fbab35eead55c538fb1fe61b71e +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/b9/9f/7815b07d8bc775d9578d9131267bb7ce3e91e31305688736ed796ae724d1 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 index 6fd83515704..8ade27eacbe 100644 --- a/package/python-typeguard/Config.in +++ b/package/python-typeguard/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_TYPEGUARD bool "python-typeguard" + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Run-time type checker for Python. diff --git a/package/python-typeguard/python-typeguard.hash b/package/python-typeguard/python-typeguard.hash index 76394bcb195..8cd3dd0dc63 100644 --- a/package/python-typeguard/python-typeguard.hash +++ b/package/python-typeguard/python-typeguard.hash @@ -1,5 +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 +md5 842237266846dbb102b7239fcf4faeb6 typeguard-4.4.1.tar.gz +sha256 0d22a89d00b453b47c49875f42b6601b961757541a2e1e0ef517b6e24213c21b typeguard-4.4.1.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 index 8471f2e4fdc..df5433993dc 100644 --- a/package/python-typeguard/python-typeguard.mk +++ b/package/python-typeguard/python-typeguard.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPEGUARD_VERSION = 2.13.3 +PYTHON_TYPEGUARD_VERSION = 4.4.1 PYTHON_TYPEGUARD_SOURCE = typeguard-$(PYTHON_TYPEGUARD_VERSION).tar.gz -PYTHON_TYPEGUARD_SITE = https://files.pythonhosted.org/packages/3a/38/c61bfcf62a7b572b5e9363a802ff92559cb427ee963048e1442e3aef7490 +PYTHON_TYPEGUARD_SITE = https://files.pythonhosted.org/packages/62/c3/400917dd37d7b8c07e9723f3046818530423e1e759a56a22133362adab00 PYTHON_TYPEGUARD_SETUP_TYPE = setuptools PYTHON_TYPEGUARD_LICENSE = MIT PYTHON_TYPEGUARD_LICENSE_FILES = LICENSE diff --git a/package/python-typepy/python-typepy.hash b/package/python-typepy/python-typepy.hash index eade667341b..0b73f9f4dff 100644 --- a/package/python-typepy/python-typepy.hash +++ b/package/python-typepy/python-typepy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/typepy/json -md5 9f73bef9ce9e9ccf49ed63a2dadada90 typepy-1.3.0.tar.gz -sha256 96788530614083164993d1443959f6c58e6bb8e2da839812ddf462c203e4b84c typepy-1.3.0.tar.gz +md5 2637fdf609b8a7b9b8ec722852efc706 typepy-1.3.2.tar.gz +sha256 b69fd48b9f50cdb3809906eef36b855b3134ff66c8893a4f8580abddb0b39517 typepy-1.3.2.tar.gz # Locally computed sha256 checksums sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/package/python-typepy/python-typepy.mk b/package/python-typepy/python-typepy.mk index 6c556df9866..cd67d4e8884 100644 --- a/package/python-typepy/python-typepy.mk +++ b/package/python-typepy/python-typepy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPEPY_VERSION = 1.3.0 +PYTHON_TYPEPY_VERSION = 1.3.2 PYTHON_TYPEPY_SOURCE = typepy-$(PYTHON_TYPEPY_VERSION).tar.gz -PYTHON_TYPEPY_SITE = https://files.pythonhosted.org/packages/07/7b/fb32933f2a17992af75c0f96e5538a25fecebd439a82dcc31926ba55d336 +PYTHON_TYPEPY_SITE = https://files.pythonhosted.org/packages/cc/86/9672794fb1c87a17b839666976ed4c8cb779ce05d471bed3166a39a53c4d PYTHON_TYPEPY_SETUP_TYPE = setuptools PYTHON_TYPEPY_LICENSE = MIT PYTHON_TYPEPY_LICENSE_FILES = LICENSE diff --git a/package/python-types-python-dateutil/python-types-python-dateutil.hash b/package/python-types-python-dateutil/python-types-python-dateutil.hash index ef5e9380cf7..6143f7bb2d1 100644 --- a/package/python-types-python-dateutil/python-types-python-dateutil.hash +++ b/package/python-types-python-dateutil/python-types-python-dateutil.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/types-python-dateutil/json -md5 58072922ac0c740121e311e970f003bf types-python-dateutil-2.8.19.14.tar.gz -sha256 1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b types-python-dateutil-2.8.19.14.tar.gz +md5 986aa3f3706c4b38dfcd141572a4f515 types-python-dateutil-2.9.0.20241003.tar.gz +sha256 58cb85449b2a56d6684e41aeefb4c4280631246a0da1a719bdbe6f3fb0317446 types-python-dateutil-2.9.0.20241003.tar.gz diff --git a/package/python-types-python-dateutil/python-types-python-dateutil.mk b/package/python-types-python-dateutil/python-types-python-dateutil.mk index b2303941209..53d16de74c4 100644 --- a/package/python-types-python-dateutil/python-types-python-dateutil.mk +++ b/package/python-types-python-dateutil/python-types-python-dateutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPES_PYTHON_DATEUTIL_VERSION = 2.8.19.14 +PYTHON_TYPES_PYTHON_DATEUTIL_VERSION = 2.9.0.20241003 PYTHON_TYPES_PYTHON_DATEUTIL_SOURCE = types-python-dateutil-$(PYTHON_TYPES_PYTHON_DATEUTIL_VERSION).tar.gz -PYTHON_TYPES_PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/1b/2d/f189e5c03c22700c4ce5aece4b51bb73fa8adcfd7848629de0fb78af5f6f +PYTHON_TYPES_PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/31/f8/f6ee4c803a7beccffee21bb29a71573b39f7037c224843eff53e5308c16e PYTHON_TYPES_PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_TYPES_PYTHON_DATEUTIL_LICENSE = Apache-2.0 diff --git a/package/python-typing-inspect/Config.in b/package/python-typing-inspect/Config.in index dda057a19c6..b8976769969 100644 --- a/package/python-typing-inspect/Config.in +++ b/package/python-typing-inspect/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TYPING_INSPECT bool "python-typing-inspect" select BR2_PACKAGE_PYTHON_MYPY_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Runtime inspection utilities for typing module. diff --git a/package/python-typing-inspect/python-typing-inspect.hash b/package/python-typing-inspect/python-typing-inspect.hash index 737373d609d..55c29bf7bab 100644 --- a/package/python-typing-inspect/python-typing-inspect.hash +++ b/package/python-typing-inspect/python-typing-inspect.hash @@ -1,5 +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 +md5 334f7f909260ceebb05e10ebd7039ff0 typing_inspect-0.9.0.tar.gz +sha256 b23fc42ff6f6ef6954e4852c1fb512cdd18dbea03134f91f856a95ccc9461f78 typing_inspect-0.9.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 index 8573bb1c273..09930058b56 100644 --- a/package/python-typing-inspect/python-typing-inspect.mk +++ b/package/python-typing-inspect/python-typing-inspect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TYPING_INSPECT_VERSION = 0.8.0 +PYTHON_TYPING_INSPECT_VERSION = 0.9.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_SITE = https://files.pythonhosted.org/packages/dc/74/1789779d91f1961fa9438e9a8710cdae6bd138c80d7303996933d117264a PYTHON_TYPING_INSPECT_SETUP_TYPE = setuptools PYTHON_TYPING_INSPECT_LICENSE = MIT PYTHON_TYPING_INSPECT_LICENSE_FILES = LICENSE diff --git a/package/python-u-msgpack/python-u-msgpack.hash b/package/python-u-msgpack/python-u-msgpack.hash index 0ec23855339..22005747b9c 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 6c4fbe9e1df1c1563ecc9e435b82fdcb u-msgpack-python-2.7.2.tar.gz -sha256 e86f7ac6aa0ef4c6c49f004b4fd435bce99c23e2dd5d73003f3f9816024c2bd8 u-msgpack-python-2.7.2.tar.gz +md5 062ac5812bcd32f967356c384a37297c u-msgpack-python-2.8.0.tar.gz +sha256 b801a83d6ed75e6df41e44518b4f2a9c221dc2da4bcd5380e3a0feda520bc61a u-msgpack-python-2.8.0.tar.gz # Locally computed sha256 checksums -sha256 f938fe2d3b7b329005d4b2851f106fd4351ca55f0836335acbe52386312f7f31 LICENSE +sha256 2466f2b37a97e92bfe1ab9910c9e112e7b0dfd5d261f39cadb92629db503d13c LICENSE diff --git a/package/python-u-msgpack/python-u-msgpack.mk b/package/python-u-msgpack/python-u-msgpack.mk index 372c5a8d457..f4a11eb0b91 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.2 +PYTHON_U_MSGPACK_VERSION = 2.8.0 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/44/a7/1cb4f059bbf72ea24364f9ba3ef682725af09969e29df988aa5437f0044e +PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/36/9d/a40411a475e7d4838994b7f6bcc6bfca9acc5b119ce3a7503608c4428b49 PYTHON_U_MSGPACK_SETUP_TYPE = setuptools PYTHON_U_MSGPACK_LICENSE = MIT PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 759cafc2501..153a49ca666 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 f93bd7aa33e3e6ed41c9e3782abe7b48 ujson-5.7.0.tar.gz -sha256 e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23 ujson-5.7.0.tar.gz +md5 7e61ead11ccf121cf4b1c121ec444e49 ujson-5.10.0.tar.gz +sha256 b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1 ujson-5.10.0.tar.gz # Locally computed sha256 checksums -sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt +sha256 36866344f0a486541bd9800f1a407a056c0c214a82c658f059694daf3dc394d2 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 3afd33cb5a0..c6de382305d 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.7.0 +PYTHON_UJSON_VERSION = 5.10.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/f0/00/3110fd566786bfa542adb7932d62035e0c0ef662a8ff6544b6643b3d6fd7 PYTHON_UJSON_SETUP_TYPE = setuptools -PYTHON_UJSON_LICENSE = BSD-3-Clause +PYTHON_UJSON_LICENSE = BSD-3-Clause, TCL PYTHON_UJSON_LICENSE_FILES = LICENSE.txt PYTHON_UJSON_DEPENDENCIES = host-python-setuptools-scm double-conversion PYTHON_UJSON_ENV = \ diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 209cfe277ea..7f4a7505a97 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 5a264ef3ae827e5842bbc80536a343dd urllib3-2.0.7.tar.gz -sha256 c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 urllib3-2.0.7.tar.gz +md5 d65de4f0effae2b52669246f0aab0a91 urllib3-2.2.3.tar.gz +sha256 e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9 urllib3-2.2.3.tar.gz # Locally computed sha256 checksums sha256 130e3a64d5fdd5d096a752694634a7d9df284469de86e5732100268041e3d686 LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index ba041082db3..fdd75317d49 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,16 +4,16 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 2.0.7 +PYTHON_URLLIB3_VERSION = 2.2.3 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/af/47/b215df9f71b4fdba1025fc05a77db2ad243fa0926755a52c5e71659f4e3c +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python PYTHON_URLLIB3_CPE_ID_PRODUCT = urllib3 -PYTHON_URLLIB3_SETUP_TYPE = pep517 -PYTHON_URLLIB3_DEPENDENCIES = host-python-hatchling -HOST_PYTHON_URLLIB3_DEPENDENCIES = host-python-hatchling +PYTHON_URLLIB3_SETUP_TYPE = hatch +PYTHON_URLLIB3_DEPENDENCIES = host-python-hatch-vcs +HOST_PYTHON_URLLIB3_DEPENDENCIES = host-python-hatch-vcs $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-urwid-readline/python-urwid-readline.hash b/package/python-urwid-readline/python-urwid-readline.hash index 75220e937bb..0afc4a9f855 100644 --- a/package/python-urwid-readline/python-urwid-readline.hash +++ b/package/python-urwid-readline/python-urwid-readline.hash @@ -1,3 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/urwid_readline/json -md5 6e0bd170f621f0ad3edab1875bdb5c5f urwid_readline-0.13.tar.gz -sha256 018020cbc864bb5ed87be17dc26b069eae2755cb29f3a9c569aac3bded1efaf4 urwid_readline-0.13.tar.gz +md5 6bf957af6a09aa1f2bd76e0dab298562 urwid_readline-0.15.1.tar.gz +sha256 9301444b86d58f7d26388506b704f142cefd193888488b4070d3a0fdfcfc0f84 urwid_readline-0.15.1.tar.gz +# Locally computed sha256 checksums +sha256 f1c8165a2cdb20b93abacab61fda24889e93f156bfda7fef1025cd22da59ffa8 LICENSE.md +sha256 f1c8165a2cdb20b93abacab61fda24889e93f156bfda7fef1025cd22da59ffa8 LICENSE diff --git a/package/python-urwid-readline/python-urwid-readline.mk b/package/python-urwid-readline/python-urwid-readline.mk index 782c425b653..edd49b82e0a 100644 --- a/package/python-urwid-readline/python-urwid-readline.mk +++ b/package/python-urwid-readline/python-urwid-readline.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_URWID_READLINE_VERSION = 0.13 +PYTHON_URWID_READLINE_VERSION = 0.15.1 PYTHON_URWID_READLINE_SOURCE = urwid_readline-$(PYTHON_URWID_READLINE_VERSION).tar.gz -PYTHON_URWID_READLINE_SITE = https://files.pythonhosted.org/packages/ab/bb/c5b3fec22268d97ad30232f5533d4a5939d4df7ed3917a8d20d447f1d0a7 -PYTHON_URWID_READLINE_LICENSE = MIT +PYTHON_URWID_READLINE_SITE = https://files.pythonhosted.org/packages/ad/70/be318554495555eba7d8ff6e489f6f74ddb225b24086ba4af62a82e723fd PYTHON_URWID_READLINE_SETUP_TYPE = setuptools +PYTHON_URWID_READLINE_LICENSE = MIT +PYTHON_URWID_READLINE_LICENSE_FILES = LICENSE.md LICENSE $(eval $(python-package)) diff --git a/package/python-urwid/Config.in b/package/python-urwid/Config.in index f584a9258d2..573d71f1c95 100644 --- a/package/python-urwid/Config.in +++ b/package/python-urwid/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_URWID bool "python-urwid" + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + select BR2_PACKAGE_PYTHON_WCWIDTH # runtime help Urwid is a console user interface library for Python diff --git a/package/python-urwid/python-urwid.hash b/package/python-urwid/python-urwid.hash index aad6f6f672e..871cafccd4d 100644 --- a/package/python-urwid/python-urwid.hash +++ b/package/python-urwid/python-urwid.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urwid/json -md5 324cf0f877a5bc7b7d2de7d7f36b13ee urwid-2.6.10.tar.gz -sha256 ae33355c414c13214e541d3634f3c8a0bfb373914e62ffbcf2fa863527706321 urwid-2.6.10.tar.gz +md5 214f9cea321ccae131cecfaef2a4aa9a urwid-2.6.16.tar.gz +sha256 93ad239939e44c385e64aa00027878b9e5c486d59e855ec8ab5b1e1adcdb32a2 urwid-2.6.16.tar.gz # Locally computed sha256 checksums sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/python-urwid/python-urwid.mk b/package/python-urwid/python-urwid.mk index d7943a8b5ca..411727660f7 100644 --- a/package/python-urwid/python-urwid.mk +++ b/package/python-urwid/python-urwid.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URWID_VERSION = 2.6.10 +PYTHON_URWID_VERSION = 2.6.16 PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz -PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/8e/74/8c2082f2b07a72ff5d2438447c13a70f0cbede73584e0a262c166a30785c +PYTHON_URWID_SITE = https://files.pythonhosted.org/packages/98/21/ad23c9e961b2d36d57c63686a6f86768dd945d406323fb58c84f09478530 PYTHON_URWID_LICENSE = LGPL-2.1+ PYTHON_URWID_LICENSE_FILES = COPYING PYTHON_URWID_SETUP_TYPE = setuptools diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index e662adda1ee..42f29766db5 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 c43ec29f83c3706b99c48a7eeb0208ac uvicorn-0.30.5.tar.gz -sha256 ac6fdbd4425c5fd17a9fe39daf4d4d075da6fdc80f653e5894cdc2fd98752bee uvicorn-0.30.5.tar.gz +md5 ec8e5bbfecd14029c81730c0a42ed731 uvicorn-0.32.0.tar.gz +sha256 f78b36b143c16f54ccdb8190d0a26b5f1901fe5a3c777e1ab29f26391af8551e uvicorn-0.32.0.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 276aa898046..35eb6f42c0e 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,14 +4,13 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.30.5 +PYTHON_UVICORN_VERSION = 0.32.0 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/c3/ad/02b1b412e43605aa6aac8d0392c383ff3f6ae8267b7864e48e3b5f3f601e -PYTHON_UVICORN_SETUP_TYPE = pep517 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e0/fc/1d785078eefd6945f3e5bab5c076e4230698046231eb0f3747bc5c8fa992 +PYTHON_UVICORN_SETUP_TYPE = hatch PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md PYTHON_UVICORN_CPE_ID_VENDOR = encode PYTHON_UVICORN_CPE_ID_PRODUCT = uvicorn -PYTHON_UVICORN_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 481dbd0569f..24111e759be 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 0107f6e04c23bdcd93a0a712a0e52ffb uvloop-0.19.0.tar.gz -sha256 0246f4fd1bf2bf702e06b0d45ee91677ee5c31242f39aab4ea6fe0c51aedd0fd uvloop-0.19.0.tar.gz +md5 adedf20cf065ff49a96813b783ec1d29 uvloop-0.21.0.tar.gz +sha256 3bf12b0fda68447806a7ad847bfa591613177275d35b6724b1ee573faa3704e3 uvloop-0.21.0.tar.gz # Locally computed sha256 checksums sha256 377025287798f9dcd819e1f826fa5fc5e2f382528691ab0528c5cf8c8c282c27 LICENSE-APACHE sha256 6dd4c399f26de043d77a2ad7e31db4cb5bf08ea8368b0a42d6e158635cc8ab62 LICENSE-MIT diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index aaeab2805f3..fbdf74769ed 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.19.0 +PYTHON_UVLOOP_VERSION = 0.21.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e6eddb299c5aec4d10eaf25335a5af04e8c0abd68e2e9d32 +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/af/c0/854216d09d33c543f12a44b393c402e89a920b1a0a7dc634c42de91b9cf6 PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index 3682850cb30..e60f540f7d1 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 e7b36d935ebafe149629146cbfe5b0c8 validators-0.22.0.tar.gz -sha256 77b2689b172eeeb600d9605ab86194641670cdb73b60afd577142a9397873370 validators-0.22.0.tar.gz +md5 8cae932ff53da1607ed2ca354a93ba54 validators-0.34.0.tar.gz +sha256 647fe407b45af9a74d245b943b18e6a816acf4926974278f6dd617778e1e781f validators-0.34.0.tar.gz # Locally computed sha256 checksums -sha256 7c1bdc4712afecb46d402ec79da0ea2877811711e76dbaf1e425ee0b0e331b1f LICENSE +sha256 9d10adf59f4505a733162ff7de6887645dcef1fb495b8070d8b207da0f6b3a16 LICENSE.txt diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index 09ccbe6ab7b..7db6d985466 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.22.0 +PYTHON_VALIDATORS_VERSION = 0.34.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/9b/21/40a249498eee5a244a017582c06c0af01851179e2617928063a3d628bc8f +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/64/07/91582d69320f6f6daaf2d8072608a4ad8884683d4840e7e4f3a9dbdcc639 PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT -PYTHON_VALIDATORS_LICENSE_FILES = LICENSE +PYTHON_VALIDATORS_LICENSE_FILES = LICENSE.txt PYTHON_VALIDATORS_CPE_ID_VENDOR = validators_project PYTHON_VALIDATORS_CPE_ID_PRODUCT = validators diff --git a/package/python-watchdog/Config.in b/package/python-watchdog/Config.in index 18f569ee44a..06518e0fde6 100644 --- a/package/python-watchdog/Config.in +++ b/package/python-watchdog/Config.in @@ -1,9 +1,5 @@ config BR2_PACKAGE_PYTHON_WATCHDOG bool "python-watchdog" - select BR2_PACKAGE_PYTHON_ARGH # runtime - select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime - select BR2_PACKAGE_PYTHON_PYYAML # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help Python API and shell utilities to monitor file system events. diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 0653787110c..508cf88b27d 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 04cda210c7ffd04582d2466328ee7368 watchdog-2.2.1.tar.gz -sha256 cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f watchdog-2.2.1.tar.gz +md5 d3adf236e17e5747e397f7d0b93e05b4 watchdog-6.0.0.tar.gz +sha256 9ddf7c82fda3ae8e24decda1338ede66e1c99883db93711d8fb941eaa2d8c282 watchdog-6.0.0.tar.gz # Locally computed sha256 checksums -sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING +sha256 39f081828db6f94c70123fa4fb30c1bce3e215a8fdece53a49991fe076a69c08 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 9c058e38ad4..888cce6e1ab 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.2.1 +PYTHON_WATCHDOG_VERSION = 6.0.0 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/11/6f/0396d373e039b89c60e23a1a9025edc6dd203121fe0af7d1427e85d5ec98 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/db/7d/7f3d619e951c88ed75c6037b246ddcf2d322812ee8ea189be89511721d54 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 216182c2ed0..7883ef44de2 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 a07a75f99d316e14838ac760c831ea37 wcwidth-0.2.5.tar.gz -sha256 c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83 wcwidth-0.2.5.tar.gz +md5 5ce8dd9e6993dae268142feb1e605cd8 wcwidth-0.2.13.tar.gz +sha256 72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5 wcwidth-0.2.13.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 a170a8e395d..75199974fa0 100644 --- a/package/python-wcwidth/python-wcwidth.mk +++ b/package/python-wcwidth/python-wcwidth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.2.5 +PYTHON_WCWIDTH_VERSION = 0.2.13 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/89/38/459b727c381504f361832b9e5ace19966de1a235d73cdbdea91c771a1155 +PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/6c/63/53559446a878410fc5a5974feb13d31d78d752eb18aeba59c7fef1af7598 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT PYTHON_WCWIDTH_LICENSE_FILES = LICENSE diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in index 65210fb1eb7..5ed84e075ea 100644 --- a/package/python-weasyprint/Config.in +++ b/package/python-weasyprint/Config.in @@ -5,11 +5,11 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime select BR2_PACKAGE_PYTHON_FONTTOOLS # runtime - select BR2_PACKAGE_PYTHON_HTML5LIB # runtime select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYDYF # runtime select BR2_PACKAGE_PYTHON_PYPHEN # runtime select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime + select BR2_PACKAGE_PYTHON_TINYHTML5 # runtime select BR2_PACKAGE_PYTHON_ZOPFLI # runtime help The Awesome Document Factory. diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index c22677cad0a..3e274058465 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 2cb135e7c5318bb1652205035f083922 weasyprint-59.0.tar.gz -sha256 223a76636b3744eaa4ab8a2885f50cf46cf8ebb1acb99b5276d02feccf507492 weasyprint-59.0.tar.gz +md5 3c9e76bdee0db8aaef391d658cbdcb7c weasyprint-63.0.tar.gz +sha256 ec24c64fdcc63e4168b2c24eb89b1ee8a711281a7d7fdb3eed3f54995489c9d1 weasyprint-63.0.tar.gz # Locally computed sha256 checksums sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk index a1e3d23b751..2619351cdee 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 59.0 +PYTHON_WEASYPRINT_VERSION = 63.0 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/1d/69/11343bbb46d4f2a311677058e19cc2f7bc55a769b64c547a64ea1e2b6045 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/78/57/213cd566b7e14130d62babd91c5c5c2b94cbdbcdc0c7a0936a236bc88db0 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 1b4d8f56320..ce3896a1ad7 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d5d79f6260ec9f53f90447ad59313a8fac0571fce0018aa5f6fcf95d28c04382 python-web2py-2.26.1.tar.gz +sha256 2221840e4ef2c1e3810017921b2a72f2d5d1f888ca1f771cf7263bfead60570c python-web2py-2.27.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index fe7774fc2bd..ed10333f53e 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.26.1 +PYTHON_WEB2PY_VERSION = 2.27.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/python-webargs.hash b/package/python-webargs/python-webargs.hash index 10bb3651f08..3416a441dd2 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +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 +md5 bb65a1f2964f24f77650b8a14ddfbdb1 webargs-8.6.0.tar.gz +sha256 b8d098ab92bd74c659eca705afa31d681475f218cb15c1e57271fa2103c0547a webargs-8.6.0.tar.gz # Locally computed sha256 checksums -sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE +sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index ce270842c13..9edca07a153 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEBARGS_VERSION = 8.2.0 +PYTHON_WEBARGS_VERSION = 8.6.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_SITE = https://files.pythonhosted.org/packages/8c/51/e9ee5d8315864adf65e92f858f826514538e30db542d4782dd94c2418464 +PYTHON_WEBARGS_SETUP_TYPE = flit PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project diff --git a/package/python-webob/Config.in b/package/python-webob/Config.in index d3397587a1e..d4b24d3d871 100644 --- a/package/python-webob/Config.in +++ b/package/python-webob/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WEBOB bool "python-webob" + select BR2_PACKAGE_PYTHON_LEGACY_CGI # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help WSGI request and response object. diff --git a/package/python-webob/python-webob.hash b/package/python-webob/python-webob.hash index a46c1dbc94b..8f9c7a1fe28 100644 --- a/package/python-webob/python-webob.hash +++ b/package/python-webob/python-webob.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webob/json -md5 10191c69fa5a2c00f3b9abfb8937b415 WebOb-1.8.7.tar.gz -sha256 b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323 WebOb-1.8.7.tar.gz +md5 4167b16880e0d4c22aadee8ec3cc6c26 webob-1.8.9.tar.gz +sha256 ad6078e2edb6766d1334ec3dee072ac6a7f95b1e32ce10def8ff7f0f02d56589 webob-1.8.9.tar.gz # Locally computed sha256 checksums sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/package/python-webob/python-webob.mk b/package/python-webob/python-webob.mk index 11ba104476d..1e58d590d12 100644 --- a/package/python-webob/python-webob.mk +++ b/package/python-webob/python-webob.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBOB_VERSION = 1.8.7 -PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz -PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/c7/45/ee5f034fb4ebe3236fa49e5a4fcbc54444dd22ecf33079cf56f9606d479d +PYTHON_WEBOB_VERSION = 1.8.9 +PYTHON_WEBOB_SOURCE = webob-$(PYTHON_WEBOB_VERSION).tar.gz +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/85/0b/1732085540b01f65e4e7999e15864fe14cd18b12a95731a43fd6fd11b26a PYTHON_WEBOB_SETUP_TYPE = setuptools PYTHON_WEBOB_LICENSE = MIT PYTHON_WEBOB_LICENSE_FILES = docs/license.txt diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 5da778027b0..373906c3dca 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 26d1d8db59c9417570d8ec73ace1687b websocket-client-1.4.2.tar.gz -sha256 d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 websocket-client-1.4.2.tar.gz +md5 9cffbda9eefb0a17e9c4cda3b7884493 websocket_client-1.8.0.tar.gz +sha256 3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da websocket_client-1.8.0.tar.gz # Locally computed sha256 checksums -sha256 638eb70dcc4af2e6d8388de0636ced399f7c24716e11b8573a6b06f879e80691 LICENSE +sha256 453e6a69427ed9ff92a03ef2d7b21ef1db41fdf56d62307a49ba85059f7a0c62 LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index 79cde7e590b..ce582e89b7b 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 1.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_VERSION = 1.8.0 +PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/e6/30/fba0d96b4b5fbf5948ed3f4681f7da2f9f64512e1d303f94b4cc174c24a5 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 8d0bda501cb..5d24d5f6c4d 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 49d033c8236aa56ba2524f65570a27c5 websockets-12.0.tar.gz -sha256 81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b websockets-12.0.tar.gz +md5 ff1293b549e8177a5272e54208659d0d websockets-13.1.tar.gz +sha256 a3b3366087c1bc0a2795111edcadddb8b3b59509d5db5d7ea3fdd69f954a8878 websockets-13.1.tar.gz # Locally computed sha256 checksums sha256 3d6a0c050d8bec52fabad502e45fb25bd02bcadbd70dea34d447b6a0ff4e6da8 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 2b8761c0290..6fbdf983e96 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 12.0 +PYTHON_WEBSOCKETS_VERSION = 13.1 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/2e/62/7a7874b7285413c954a4cca3c11fd851f11b2fe5b4ae2d9bee4f6d9bdb10 +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/e2/73/9223dbc7be3dcaf2a7bbf756c351ec8da04b1fa573edaf545b95f6b0c7fd PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/package/python-werkzeug/Config.in b/package/python-werkzeug/Config.in index 27b2fdeaab3..7b2a9a09ad4 100644 --- a/package/python-werkzeug/Config.in +++ b/package/python-werkzeug/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WERKZEUG bool "python-werkzeug" + select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Werkzeug is a WSGI utility library for Python. It's widely diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 34adc67088e..29621bb332e 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 3bb49cd2f2b51a1c638532e9a935e207 werkzeug-2.3.8.tar.gz -sha256 554b257c74bbeb7a0d254160a4f8ffe185243f52a52035060b761ca62d977f03 werkzeug-2.3.8.tar.gz +md5 b6005d403d01d08b9fe2330a0cfea05a werkzeug-3.1.3.tar.gz +sha256 60723ce945c19328679790e3282cc758aa4a6040e4bb330f53d30fa546d44746 werkzeug-3.1.3.tar.gz # Locally computed sha256 checksums -sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst +sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.txt diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index e8ef32bb1b3..f9b6a6c27ae 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.3.8 +PYTHON_WERKZEUG_VERSION = 3.1.3 PYTHON_WERKZEUG_SOURCE = werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/3d/4b/d746f1000782c89d6c97df9df43ba8f4d126038608843d3560ae88d201b5 -PYTHON_WERKZEUG_SETUP_TYPE = setuptools +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/9f/69/83029f1f6300c5fb2471d621ab06f6ec6b3324685a2ce0f9777fd4a8b71e +PYTHON_WERKZEUG_SETUP_TYPE = flit PYTHON_WERKZEUG_LICENSE = BSD-3-Clause -PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst +PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.txt PYTHON_WERKZEUG_CPE_ID_VENDOR = palletsprojects PYTHON_WERKZEUG_CPE_ID_PRODUCT = werkzeug diff --git a/package/python-wheel/python-wheel.hash b/package/python-wheel/python-wheel.hash index 377a85c8fd5..35bee60b726 100644 --- a/package/python-wheel/python-wheel.hash +++ b/package/python-wheel/python-wheel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wheel/json -md5 ec5004c46d1905da98bb5bc1a10ddd21 wheel-0.40.0.tar.gz -sha256 cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 wheel-0.40.0.tar.gz +md5 3d1f79ff04a1252fa709dec58aa7249b wheel-0.45.0.tar.gz +sha256 a57353941a3183b3d5365346b567a260a0602a0f8a635926a7dede41b94c674a wheel-0.45.0.tar.gz # Locally computed sha256 checksums sha256 30c23618679108f3e8ea1d2a658c7ca417bdfc891c98ef1a89fa4ff0c9828654 LICENSE.txt diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 320995521ec..21060cfc66d 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WHEEL_VERSION = 0.40.0 +PYTHON_WHEEL_VERSION = 0.45.0 PYTHON_WHEEL_SOURCE = wheel-$(PYTHON_WHEEL_VERSION).tar.gz -PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8096a9e8383e1d472aa14717878ffe07c4772e68b6e8735 +PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/e7/52/fd4516fb8f7d11a08e3f9cd69eb1558f098ab67e79f32d920c4974ee550f PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt diff --git a/package/python-wrapt/python-wrapt.hash b/package/python-wrapt/python-wrapt.hash index cb62e19aa70..b89c805bf69 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 6e7340264f038efdefcba707250c91c2 wrapt-1.14.1.tar.gz -sha256 380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d wrapt-1.14.1.tar.gz +md5 3e370b4bc08f7dcc518cf8895673b19c wrapt-1.16.0.tar.gz +sha256 5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d wrapt-1.16.0.tar.gz # Locally computed sha256 checksums -sha256 77d2a9159cffe12473f539a71a3e741f35117e61bfd005ebd60c3a1778e2c1f1 LICENSE +sha256 5974efbbc8b626b2050810d63c3a907ee21c92bf64b3740fc623ad05eb3448ab LICENSE diff --git a/package/python-wrapt/python-wrapt.mk b/package/python-wrapt/python-wrapt.mk index 406f6c3aa1b..ed4a911e142 100644 --- a/package/python-wrapt/python-wrapt.mk +++ b/package/python-wrapt/python-wrapt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 1.14.1 +PYTHON_WRAPT_VERSION = 1.16.0 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/11/eb/e06e77394d6cf09977d92bff310cb0392930c08a338f99af6066a5a98f92 +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/95/4c/063a912e20bcef7124e0df97282a8af3ff3e4b603ce84c481d6d7346be0a PYTHON_WRAPT_SETUP_TYPE = setuptools PYTHON_WRAPT_LICENSE = BSD-2-Clause PYTHON_WRAPT_LICENSE_FILES = LICENSE diff --git a/package/python-wsaccel/python-wsaccel.hash b/package/python-wsaccel/python-wsaccel.hash index 9991f8f4544..5aaf95c957a 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 b05eecfac9cb19326bfc3b538de495ac wsaccel-0.6.6.tar.gz -sha256 18efec0a7182587ba97102b4cd8df7b4f665f45d7ca36f19783f5f081ea114ea wsaccel-0.6.6.tar.gz +md5 e710fa8736ce37e4269e711d0aeec4a7 wsaccel-0.6.7.tar.gz +sha256 aea79ba46b1a3792dbd1fe364aeb8a10128659c67057770c5c320d1f58588a8c wsaccel-0.6.7.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 7ccb033256e..0f942bb5e4b 100644 --- a/package/python-wsaccel/python-wsaccel.mk +++ b/package/python-wsaccel/python-wsaccel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WSACCEL_VERSION = 0.6.6 +PYTHON_WSACCEL_VERSION = 0.6.7 PYTHON_WSACCEL_SOURCE = wsaccel-$(PYTHON_WSACCEL_VERSION).tar.gz -PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538f6031a247ab4ec5352267f12ed416e3a638b8d55fc33f609 +PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/8b/06/e8f0450952ed1fb4aa2033a30ae5afb59632f5a35d441bcc6801a3aaca47 PYTHON_WSACCEL_LICENSE = Apache-2.0 PYTHON_WSACCEL_LICENSE_FILES = LICENSE PYTHON_WSACCEL_SETUP_TYPE = setuptools diff --git a/package/python-wtforms/python-wtforms.hash b/package/python-wtforms/python-wtforms.hash index 12b980de028..ba683610558 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 509a985769df13938c8307b55a614773 WTForms-3.0.1.tar.gz -sha256 6b351bbb12dd58af57ffef05bc78425d08d1914e0fd68ee14143b7ade023c5bc WTForms-3.0.1.tar.gz +md5 58a16ec4a96043b429c196bfafa5fd96 wtforms-3.2.1.tar.gz +sha256 df3e6b70f3192e92623128123ec8dca3067df9cfadd43d59681e210cfb8d4682 wtforms-3.2.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 65b5748b6bf..69e051f150d 100644 --- a/package/python-wtforms/python-wtforms.mk +++ b/package/python-wtforms/python-wtforms.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WTFORMS_VERSION = 3.0.1 -PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz -PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/9a/7d/d4aa68f5bfcb91dd61a7faf0e862512ae7b3d531c41f24c217910aec0559 -PYTHON_WTFORMS_SETUP_TYPE = setuptools +PYTHON_WTFORMS_VERSION = 3.2.1 +PYTHON_WTFORMS_SOURCE = wtforms-$(PYTHON_WTFORMS_VERSION).tar.gz +PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/01/e4/633d080897e769ed5712dcfad626e55dbd6cf45db0ff4d9884315c6a82da +PYTHON_WTFORMS_SETUP_TYPE = hatch PYTHON_WTFORMS_LICENSE = BSD-3-Clause PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst docs/license.rst PYTHON_WTFORMS_DEPENDENCIES = host-python-babel diff --git a/package/python-xlib/python-xlib.hash b/package/python-xlib/python-xlib.hash index 066f450416f..f516d7b4c46 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 ba31623fb64a1e5a0b1ae1f6495c3bf6 python-xlib-0.32.tar.gz -sha256 20e1382f8a98d8ed0facfa45415c46fd0c8eeb6f9996e58c22d3382a4ed6e37b python-xlib-0.32.tar.gz +md5 20a687ac84ee632aea9b9861206aa0eb python-xlib-0.33.tar.gz +sha256 55af7906a2c75ce6cb280a584776080602444f75815a7aff4d287bb2d7018b32 python-xlib-0.33.tar.gz # Locally computed sha256 checksums -sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE +sha256 3bb6f6bec94b99e2927a8880bf49c401f5e8f48a20ddea96310860264cae20b0 LICENSE diff --git a/package/python-xlib/python-xlib.mk b/package/python-xlib/python-xlib.mk index 32f16e5d66a..23c7b399746 100644 --- a/package/python-xlib/python-xlib.mk +++ b/package/python-xlib/python-xlib.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.32 -PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/4d/cf/a29ecb43a5c84a65ffd726e3b28806f56b3bc5e796ddb533ff52af107dcf +PYTHON_XLIB_VERSION = 0.33 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/86/f5/8c0653e5bb54e0cbdfe27bf32d41f27bc4e12faa8742778c17f2a71be2c0 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 4a4b946fcbc..859fd195324 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 3df433a1b6427d40af6e7cac36f0b5c4 XlsxWriter-3.0.6.tar.gz -sha256 2f9e5ea13343fe85486e349d4e5fdf746bb69dc7bc1dedfa9b5fae2bb48c0795 XlsxWriter-3.0.6.tar.gz +md5 86f1c46dc20ca2b87aacbb2e1fc9c1ea XlsxWriter-3.2.0.tar.gz +sha256 9977d0c661a72866a61f9f7a809e25ebbb0fb7036baa3b9fe74afcfca6b3cb8c XlsxWriter-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 b3b494c7e7456dad12ac1b3e61c60e850d60d3ce865fa056c4ce0ae680c03677 LICENSE.txt +sha256 272e8fbd91096feeea0a250775ed83dfed17143ee4acd5d9567a1e42104c038f LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index f05b10670c4..eb8c692e06b 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.6 +PYTHON_XLSXWRITER_VERSION = 3.2.0 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/d4/b5/cef6fadeaf316a3bbe82a506252081f2e6533cdf4b69ed64f8831ac01fb0 +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/a6/c3/b36fa44a0610a0f65d2e65ba6a262cbe2554b819f1449731971f7c16ea3c PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-xmltodict/python-xmltodict.hash b/package/python-xmltodict/python-xmltodict.hash index 48fb5265f66..9bd8ec68789 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 1ece0a5bbd494bac414058405606475e xmltodict-0.13.0.tar.gz -sha256 341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 xmltodict-0.13.0.tar.gz +md5 6e0d94bf858b3c2ff3daeed487eedc2a xmltodict-0.14.2.tar.gz +sha256 201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553 xmltodict-0.14.2.tar.gz # Locally computed sha256 checksums sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE diff --git a/package/python-xmltodict/python-xmltodict.mk b/package/python-xmltodict/python-xmltodict.mk index 9201bc15070..1a041e05d46 100644 --- a/package/python-xmltodict/python-xmltodict.mk +++ b/package/python-xmltodict/python-xmltodict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XMLTODICT_VERSION = 0.13.0 +PYTHON_XMLTODICT_VERSION = 0.14.2 PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz -PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/39/0d/40df5be1e684bbaecdb9d1e0e40d5d482465de6b00cbb92b84ee5d243c7f +PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/50/05/51dcca9a9bf5e1bce52582683ce50980bcadbc4fa5143b9f2b19ab99958f PYTHON_XMLTODICT_SETUP_TYPE = setuptools PYTHON_XMLTODICT_LICENSE = MIT PYTHON_XMLTODICT_LICENSE_FILES = LICENSE diff --git a/package/python-yarl/Config.in b/package/python-yarl/Config.in index 84e14ce92e0..48ed07cfde7 100644 --- a/package/python-yarl/Config.in +++ b/package/python-yarl/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_YARL bool "python-yarl" - select BR2_PACKAGE_PYTHON_MULTIDICT - select BR2_PACKAGE_PYTHON_IDNA + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + select BR2_PACKAGE_PYTHON_PROPCACHE # runtime help Yet another URL library. diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index 624297aeba1..39183835487 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 4e46a0c7078d34d9734a7c5d182dee92 yarl-1.9.2.tar.gz -sha256 04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571 yarl-1.9.2.tar.gz +md5 d356afad18b20095b766ad47bedcb34a yarl-1.17.1.tar.gz +sha256 067a63fcfda82da6b198fa73079b1ca40b7c9b7994995b6ee38acda728b64d47 yarl-1.17.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index e4424ff5773..c7d846521f6 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.9.2 +PYTHON_YARL_VERSION = 1.17.1 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/5f/3f/04b3c5e57844fb9c034b09c5cb6d2b43de5d64a093c30529fd233e16cf09 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/54/9c/9c0a9bfa683fc1be7fdcd9687635151544d992cccd48892dc5e0a5885a29 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools +PYTHON_YARL_DEPENDENCIES = \ + host-python-cython \ + host-python-expandvars $(eval $(python-package)) diff --git a/package/python-yatl/python-yatl.hash b/package/python-yatl/python-yatl.hash index 61391f63702..5e11fcc17da 100644 --- a/package/python-yatl/python-yatl.hash +++ b/package/python-yatl/python-yatl.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/yatl/json -md5 f02b367e1c56af94eafd5bd1019c03be yatl-20220907.1.tar.gz -sha256 67d43ad79e1f58d8552718018470856a2ad210bdfeec42e978b28b1b21560d00 yatl-20220907.1.tar.gz +md5 aa1ee295477870a084a891f864fb6f0f yatl-20230507.3.tar.gz +sha256 a7d60abff563d7eb680f4f97efb107b60b32f80061c45bf4fab15c4ea2a057e2 yatl-20230507.3.tar.gz +# Locally computed sha256 checksums +sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-yatl/python-yatl.mk b/package/python-yatl/python-yatl.mk index 0c33971b895..aaafef89886 100644 --- a/package/python-yatl/python-yatl.mk +++ b/package/python-yatl/python-yatl.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_YATL_VERSION = 20220907.1 +PYTHON_YATL_VERSION = 20230507.3 PYTHON_YATL_SOURCE = yatl-$(PYTHON_YATL_VERSION).tar.gz -PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/09/68/0c9d0a1192fdad5f3d38db096106c5adabb9b26c9ae107897997f56d1788 +PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/bd/3b/723a667a24512a299e1e139608e787c3b24b7819302c15c7aac09c3bec68 PYTHON_YATL_SETUP_TYPE = setuptools PYTHON_YATL_LICENSE = BSD-3-Clause +PYTHON_YATL_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-zc-lockfile/python-zc-lockfile.hash b/package/python-zc-lockfile/python-zc-lockfile.hash index 181adda1bb2..97f05ddd3f6 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 5e902492de505a0f98e49b1e31cf2bc2 zc.lockfile-3.0.post1.tar.gz +sha256 adb2ee6d9e6a2333c91178dcb2c9b96a5744c78edb7712dc784a7d75648e81ec zc.lockfile-3.0.post1.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zc-lockfile/python-zc-lockfile.mk b/package/python-zc-lockfile/python-zc-lockfile.mk index a4621e6d06b..60648afc297 100644 --- a/package/python-zc-lockfile/python-zc-lockfile.mk +++ b/package/python-zc-lockfile/python-zc-lockfile.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZC_LOCKFILE_VERSION = 2.0 +PYTHON_ZC_LOCKFILE_VERSION = 3.0.post1 PYTHON_ZC_LOCKFILE_SOURCE = zc.lockfile-$(PYTHON_ZC_LOCKFILE_VERSION).tar.gz -PYTHON_ZC_LOCKFILE_SITE = https://files.pythonhosted.org/packages/11/98/f21922d501ab29d62665e7460c94f5ed485fd9d8348c126697947643a881 +PYTHON_ZC_LOCKFILE_SITE = https://files.pythonhosted.org/packages/5b/83/a5432aa08312fc834ea594473385c005525e6a80d768a2ad246e78877afd PYTHON_ZC_LOCKFILE_SETUP_TYPE = setuptools PYTHON_ZC_LOCKFILE_LICENSE = ZPL-2.1 PYTHON_ZC_LOCKFILE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in index 69ea81d93a4..1570674f59a 100644 --- a/package/python-zeroconf/Config.in +++ b/package/python-zeroconf/Config.in @@ -1,6 +1,5 @@ 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 13e1d16cdef..a40bbacb5ee 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 f85fb9d239397b53836495fd49b85e5f zeroconf-0.39.4.tar.gz -sha256 701e4d697f89fe952aa9c13a512ed6bf472dcf4f0a6d275e71085604b3882295 zeroconf-0.39.4.tar.gz +md5 f72c481e45177fa6811822d65881b95c zeroconf-0.136.0.tar.gz +sha256 7a82c7bd0327266ef9f04a5272b0bb79812ddcefccf944320b5f3519586bbc82 zeroconf-0.136.0.tar.gz # Locally computed sha256 checksums -sha256 35e4136e96aace60757a8b939741959d8627c4bc1fce62af99df325395276c56 COPYING +sha256 4d1d974999ae8655ee47afb47ac3b327cd1baeea3509aecb35341ba1a1a53c94 COPYING diff --git a/package/python-zeroconf/python-zeroconf.mk b/package/python-zeroconf/python-zeroconf.mk index d939b2e5aee..973339b4184 100644 --- a/package/python-zeroconf/python-zeroconf.mk +++ b/package/python-zeroconf/python-zeroconf.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.39.4 +PYTHON_ZEROCONF_VERSION = 0.136.0 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/f5/4f/c47cea73d7ae5467b63de3999d7207fd5b14d70cb2f35ce81c4ab7d7a52e -PYTHON_ZEROCONF_SETUP_TYPE = setuptools +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/82/e4/17075a9f1951b031dfd92d57916505574e0d1eab3f2fb7deecabd2be581e +PYTHON_ZEROCONF_SETUP_TYPE = poetry PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING +PYTHON_ZEROCONF_DEPENDENCIES = \ + host-python-cython \ + host-python-setuptools $(eval $(python-package)) diff --git a/package/python-zipstream-ng/Config.in b/package/python-zipstream-ng/Config.in new file mode 100644 index 00000000000..2de36dd8615 --- /dev/null +++ b/package/python-zipstream-ng/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ZIPSTREAM_NG + bool "python-zipstream-ng" + help + A modern and easy to use streamable zip file generator. + + https://github.com/pR0Ps/zipstream-ng diff --git a/package/python-zipstream-ng/python-zipstream-ng.hash b/package/python-zipstream-ng/python-zipstream-ng.hash new file mode 100644 index 00000000000..6feb23834dc --- /dev/null +++ b/package/python-zipstream-ng/python-zipstream-ng.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/zipstream-ng/json +md5 f30b8347aaceee3f4ddc01bda851790a zipstream_ng-1.8.0.tar.gz +sha256 b7129d2c15d26934b3e1cb22256593b6bdbd03c553c26f4199a5bf05110642bc zipstream_ng-1.8.0.tar.gz +# Locally computed sha256 checksums +sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 LICENSE diff --git a/package/python-zipstream-ng/python-zipstream-ng.mk b/package/python-zipstream-ng/python-zipstream-ng.mk new file mode 100644 index 00000000000..289e03b10a2 --- /dev/null +++ b/package/python-zipstream-ng/python-zipstream-ng.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-zipstream-ng +# +################################################################################ + +PYTHON_ZIPSTREAM_NG_VERSION = 1.8.0 +PYTHON_ZIPSTREAM_NG_SOURCE = zipstream_ng-$(PYTHON_ZIPSTREAM_NG_VERSION).tar.gz +PYTHON_ZIPSTREAM_NG_SITE = https://files.pythonhosted.org/packages/ac/16/5d9224baf640214255c34a0a0e9528c8403d2b89e2ba7df9d7cada58beb1 +PYTHON_ZIPSTREAM_NG_SETUP_TYPE = setuptools +PYTHON_ZIPSTREAM_NG_LICENSE = LGPL-3.0 +PYTHON_ZIPSTREAM_NG_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-zlmdb/python-zlmdb.hash b/package/python-zlmdb/python-zlmdb.hash index 1ae5d72efa8..ed1b6db8c2d 100644 --- a/package/python-zlmdb/python-zlmdb.hash +++ b/package/python-zlmdb/python-zlmdb.hash @@ -1,5 +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 +md5 4d96b46d1724b9d4cb6961874e5b4a9a zlmdb-23.1.1.tar.gz +sha256 ddcf680bf49352cabe35bfb5bfe3acbd5d6b8d481cafa508c423e0b18d654d05 zlmdb-23.1.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 index d20ac9e016c..70538ce63c2 100644 --- a/package/python-zlmdb/python-zlmdb.mk +++ b/package/python-zlmdb/python-zlmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZLMDB_VERSION = 22.6.1 +PYTHON_ZLMDB_VERSION = 23.1.1 PYTHON_ZLMDB_SOURCE = zlmdb-$(PYTHON_ZLMDB_VERSION).tar.gz -PYTHON_ZLMDB_SITE = https://files.pythonhosted.org/packages/97/15/992e61a18cb64b573814c9d92676b22d522f2cc2ea79ff78b834bd392b80 +PYTHON_ZLMDB_SITE = https://files.pythonhosted.org/packages/56/b2/abaeb5419435a6224a0beb2b5edad621ec975fe4802297963ecf1728b883 PYTHON_ZLMDB_SETUP_TYPE = setuptools PYTHON_ZLMDB_LICENSE = MIT PYTHON_ZLMDB_LICENSE_FILES = LICENSE diff --git a/package/python-zope-interface/Config.in b/package/python-zope-interface/Config.in index 17f7aed0d96..89da056d6fe 100644 --- a/package/python-zope-interface/Config.in +++ b/package/python-zope-interface/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_ZOPE_INTERFACE bool "python-zope-interface" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help This package provides an implementation of "object interfaces" for Python. Interfaces are a mechanism for diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 7052f77899c..a580b5dff79 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 5a383d71156ce6f89f59a86d957a8d65 zope.interface-5.5.2.tar.gz -sha256 bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671 zope.interface-5.5.2.tar.gz +md5 38f56d8efc8eda2cc40c206d7fd2a016 zope.interface-7.1.1.tar.gz +sha256 4284d664ef0ff7b709836d4de7b13d80873dc5faeffc073abdb280058bfac5e3 zope.interface-7.1.1.tar.gz # Locally computed sha256 checksums sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index 2bada3a7d42..b2e3b8a5610 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 5.5.2 +PYTHON_ZOPE_INTERFACE_VERSION = 7.1.1 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/38/6f/fbfb7dde38be7e5644bb342c4c7cdc444cd5e2ffbd70d091263b3858a8cb +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/3c/f5/1079cab32302359cc09bd1dca9656e680601e0e8af9397322ab0fe85f368 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt +PYTHON_ZOPE_INTERFACE_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) diff --git a/package/python-zopfli/python-zopfli.hash b/package/python-zopfli/python-zopfli.hash index 29bdfe5e5b0..0fd009879cf 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 0c1e41e5403524e0180f3ed9aaa356ec zopfli-0.2.2.zip -sha256 2d49db7540d9991976af464ebc1b9ed12988c04d90691bcb51dc4a373a9e2afc zopfli-0.2.2.zip +md5 2c42e8d5918059b84a42c0d53c5a6852 zopfli-0.2.3.post1.tar.gz +sha256 96484dc0f48be1c5d7ae9f38ed1ce41e3675fd506b27c11a6607f14b49101e99 zopfli-0.2.3.post1.tar.gz # Locally computed sha256 checksums sha256 018b1cb87efdf7a04c2fcc13d57ed63f62149113fb207b27ea13430d64f13513 COPYING diff --git a/package/python-zopfli/python-zopfli.mk b/package/python-zopfli/python-zopfli.mk index d6af6e4b5fb..47a27b10841 100644 --- a/package/python-zopfli/python-zopfli.mk +++ b/package/python-zopfli/python-zopfli.mk @@ -4,18 +4,12 @@ # ################################################################################ -PYTHON_ZOPFLI_VERSION = 0.2.2 -PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).zip -PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/9a/ed/d004d5737f9546167eecf0ecd995ee1a796703e512deb2f2ea26cdbe4b3e +PYTHON_ZOPFLI_VERSION = 0.2.3.post1 +PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).tar.gz +PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/5e/7c/a8f6696e694709e2abcbccd27d05ef761e9b6efae217e11d977471555b62 PYTHON_ZOPFLI_SETUP_TYPE = setuptools PYTHON_ZOPFLI_LICENSE = Apache-2.0 PYTHON_ZOPFLI_LICENSE_FILES = COPYING PYTHON_ZOPFLI_DEPENDENCIES = host-python-setuptools-scm -define PYTHON_ZOPFLI_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_ZOPFLI_DL_DIR)/$(PYTHON_ZOPFLI_SOURCE) - mv $(@D)/zopfli-$(PYTHON_ZOPFLI_VERSION)/* $(@D) - $(RM) -r $(@D)/zopfli-$(PYTHON_ZOPFLI_VERSION) -endef - $(eval $(python-package)) 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 b35b06216c1..83e2e22f525 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From 5d0f69ce7fc05adbd3c71e113c11da0aedbca33a Mon Sep 17 00:00:00 2001 +From 057c836d1d6b61e490d9015fb4d679a54c5e9f2c 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 @@ -17,10 +17,10 @@ Signed-off-by: Adam Duskett 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a957fb004..9c5f3c031a 100644 +index 083f4c750a0..2ff75f51571 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2329,6 +2329,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c +@@ -2335,6 +2335,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt @ # Build PYC files for the 3 optimization levels (0, 1, 2) @@ -28,7 +28,7 @@ index 4a957fb004..9c5f3c031a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \ -@@ -2338,6 +2339,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c +@@ -2344,6 +2345,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -37,10 +37,10 @@ index 4a957fb004..9c5f3c031a 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 8a32cb58f4..611c33949a 100644 +index 9270b5f7172..879e6a2d432 100644 --- a/configure.ac +++ b/configure.ac -@@ -1479,6 +1479,12 @@ fi +@@ -1482,6 +1482,12 @@ fi AC_MSG_CHECKING([LDLIBRARY]) @@ -54,5 +54,5 @@ index 8a32cb58f4..611c33949a 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.34.1 +2.39.5 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 e774e442dc7..81db26fa458 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 3a0d7824f7ddd4dd0336c8419cb4246ba936d711 Mon Sep 17 00:00:00 2001 +From cbdfde1abc7715f7c113e3c2144953d1d25cf8db 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,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 611c33949a..059ac2f883 100644 +index 879e6a2d432..7bc049863c3 100644 --- a/configure.ac +++ b/configure.ac -@@ -5428,7 +5428,7 @@ fi])) +@@ -5433,7 +5433,7 @@ fi])) dnl if ac_cv_func_getaddrinfo ]) @@ -23,5 +23,5 @@ index 611c33949a..059ac2f883 100644 AS_VAR_IF([ipv6], [yes], [ AC_MSG_ERROR([m4_normalize([ -- -2.34.1 +2.39.5 diff --git a/package/python3/0003-Add-an-option-to-disable-pydoc.patch b/package/python3/0003-Add-an-option-to-disable-pydoc.patch index 01ce235afd3..2eaf8689651 100644 --- a/package/python3/0003-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0003-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From f910bdee70b07792c136aaced3850a08eaaafdee Mon Sep 17 00:00:00 2001 +From c1c1a844c1819da38c0e03d1f23a97099b571b86 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 @@ -20,7 +20,7 @@ Signed-off-by: Adam Duskett 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9c5f3c031a..2243a658a9 100644 +index 2ff75f51571..401d130b804 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2050,7 +2050,9 @@ bininstall: commoninstall altbininstall @@ -41,7 +41,7 @@ index 9c5f3c031a..2243a658a9 100644 re \ site-packages \ sqlite3 \ -@@ -2257,6 +2258,10 @@ TESTSUBDIRS= idlelib/idle_test \ +@@ -2263,6 +2264,10 @@ TESTSUBDIRS= idlelib/idle_test \ COMPILEALL_OPTS=-j0 @@ -52,7 +52,7 @@ index 9c5f3c031a..2243a658a9 100644 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall -@@ -2471,7 +2476,9 @@ libainstall: all scripts +@@ -2477,7 +2482,9 @@ libainstall: all scripts $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) @@ -63,10 +63,10 @@ index 9c5f3c031a..2243a658a9 100644 "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ echo; echo "Installing support files for building shared extension modules on AIX:"; \ diff --git a/configure.ac b/configure.ac -index 059ac2f883..1a2dd28d1e 100644 +index 7bc049863c3..ca226dcc5b9 100644 --- a/configure.ac +++ b/configure.ac -@@ -4511,6 +4511,12 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4514,6 +4514,12 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -80,5 +80,5 @@ index 059ac2f883..1a2dd28d1e 100644 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) -- -2.34.1 +2.39.5 diff --git a/package/python3/0004-Add-an-option-to-disable-lib2to3.patch b/package/python3/0004-Add-an-option-to-disable-lib2to3.patch index cc21cbd0b58..7dccf471c4f 100644 --- a/package/python3/0004-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0004-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 572f3164d1dce13db30e897ab0be7c706fa7b731 Mon Sep 17 00:00:00 2001 +From 2a4b87bb00805156d40782a3197fbbf20937da6f 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 @@ -22,7 +22,7 @@ Signed-off-by: Adam Duskett 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2243a658a9..3f314d1354 100644 +index 401d130b804..b44ad736144 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2054,7 +2054,9 @@ ifeq (@PYDOC@,yes) @@ -43,7 +43,7 @@ index 2243a658a9..3f314d1354 100644 logging \ multiprocessing multiprocessing/dummy \ re \ -@@ -2207,10 +2208,6 @@ TESTSUBDIRS= idlelib/idle_test \ +@@ -2208,10 +2209,6 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_importlib/resources/zipdata02 \ test/test_importlib/source \ test/test_json \ @@ -54,7 +54,7 @@ index 2243a658a9..3f314d1354 100644 test/test_module \ test/test_peg_generator \ test/test_pydoc \ -@@ -2262,6 +2259,14 @@ ifeq (@PYDOC@,yes) +@@ -2268,6 +2265,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif @@ -69,7 +69,7 @@ index 2243a658a9..3f314d1354 100644 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall -@@ -2345,10 +2350,12 @@ ifeq (@PYC_BUILD@,yes) +@@ -2351,10 +2356,12 @@ ifeq (@PYC_BUILD@,yes) -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -82,7 +82,7 @@ index 2243a658a9..3f314d1354 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. -@@ -2474,7 +2481,9 @@ libainstall: all scripts +@@ -2480,7 +2487,9 @@ libainstall: all scripts $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config @@ -93,10 +93,10 @@ index 2243a658a9..3f314d1354 100644 ifeq (@PYDOC@,yes) $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) diff --git a/configure.ac b/configure.ac -index 1a2dd28d1e..f0354c580d 100644 +index ca226dcc5b9..9b77582560d 100644 --- a/configure.ac +++ b/configure.ac -@@ -7561,6 +7561,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu +@@ -7572,6 +7572,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]) @@ -110,5 +110,5 @@ index 1a2dd28d1e..f0354c580d 100644 AC_CONFIG_FILES(m4_normalize([ Makefile.pre -- -2.34.1 +2.39.5 diff --git a/package/python3/0005-Add-an-option-to-disable-IDLE.patch b/package/python3/0005-Add-an-option-to-disable-IDLE.patch index e9218af1c83..5bcf66dea2f 100644 --- a/package/python3/0005-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0005-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From ffa7fbceb54918eb518474c8f821fda0a58cf181 Mon Sep 17 00:00:00 2001 +From 5b4755f8d6bbeb68f2966464038c3e1f337868d3 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 @@ -19,7 +19,7 @@ Signed-off-by: Adam Duskett 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3f314d1354..5fad7f82fb 100644 +index b44ad736144..aceb52e31ce 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2048,7 +2048,9 @@ bininstall: commoninstall altbininstall @@ -40,7 +40,7 @@ index 3f314d1354..5fad7f82fb 100644 importlib importlib/resources importlib/metadata \ json \ logging \ -@@ -2267,6 +2268,10 @@ TESTSUBDIRS += test/test_lib2to3 \ +@@ -2273,6 +2274,10 @@ TESTSUBDIRS += test/test_lib2to3 \ test/test_lib2to3/data/fixers/myfixes endif @@ -51,7 +51,7 @@ index 3f314d1354..5fad7f82fb 100644 TEST_MODULES=@TEST_MODULES@ .PHONY: libinstall -@@ -2484,7 +2489,9 @@ libainstall: all scripts +@@ -2490,7 +2495,9 @@ libainstall: all scripts ifeq (@LIB2TO3@,yes) $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) endif @@ -62,10 +62,10 @@ index 3f314d1354..5fad7f82fb 100644 $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) endif diff --git a/configure.ac b/configure.ac -index f0354c580d..43086962e9 100644 +index 9b77582560d..becec336dc2 100644 --- a/configure.ac +++ b/configure.ac -@@ -7567,6 +7567,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -7578,6 +7578,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -79,5 +79,5 @@ index f0354c580d..43086962e9 100644 AC_CONFIG_FILES(m4_normalize([ Makefile.pre -- -2.34.1 +2.39.5 diff --git a/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch b/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch index e594e6cd63c..baffece4a5a 100644 --- a/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch +++ b/package/python3/0006-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch @@ -1,4 +1,4 @@ -From 267516c76208e63b5a3ec7d4dead6c329d8763bb Mon Sep 17 00:00:00 2001 +From 36fbff49ddfe4e91af5683290a68b717aea1b875 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 6 Feb 2024 22:46:59 +0100 Subject: [PATCH] configure.ac: move PY_STDLIB_MOD_SET_NA further up @@ -12,7 +12,7 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 43086962e9..561e33f550 100644 +index becec336dc2..ab68cc3dd73 100644 --- a/configure.ac +++ b/configure.ac @@ -95,6 +95,11 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [ @@ -27,7 +27,7 @@ index 43086962e9..561e33f550 100644 AC_SUBST([BASECPPFLAGS]) if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then # If we're building out-of-tree, we need to make sure the following -@@ -7258,11 +7263,6 @@ AC_ARG_ENABLE([test-modules], +@@ -7261,11 +7266,6 @@ AC_ARG_ENABLE([test-modules], AC_MSG_RESULT([$TEST_MODULES]) AC_SUBST([TEST_MODULES]) @@ -40,5 +40,5 @@ index 43086962e9..561e33f550 100644 dnl Modules that are not available on some platforms dnl AIX has shadow passwords, but access is not via getspent() -- -2.34.1 +2.39.5 diff --git a/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch index f26091ebfba..24138c27613 100644 --- a/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0007-Add-option-to-disable-the-sqlite3-module.patch @@ -1,4 +1,4 @@ -From a8566f6ee2a2b859ba5562f2d9f06cb4d271f277 Mon Sep 17 00:00:00 2001 +From a24aee2ba81617baf01215b333c26434355bf91a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 6 Feb 2024 22:12:20 +0100 Subject: [PATCH] Add option to disable the sqlite3 module @@ -16,7 +16,7 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5fad7f82fb..7b6c9811a6 100644 +index aceb52e31ce..7c5bcea59ba 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ @@ -27,7 +27,7 @@ index 5fad7f82fb..7b6c9811a6 100644 tkinter \ tomllib \ turtledemo \ -@@ -2272,6 +2271,10 @@ ifeq (@IDLE@,yes) +@@ -2278,6 +2277,10 @@ ifeq (@IDLE@,yes) LIBSUBDIRS += idlelib idlelib/Icons endif @@ -39,10 +39,10 @@ index 5fad7f82fb..7b6c9811a6 100644 .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index 561e33f550..d1c54bd67c 100644 +index ab68cc3dd73..3fbcabe29c8 100644 --- a/configure.ac +++ b/configure.ac -@@ -4516,6 +4516,13 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4519,6 +4519,13 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -57,5 +57,5 @@ index 561e33f550..d1c54bd67c 100644 AC_ARG_ENABLE(pydoc, -- -2.34.1 +2.39.5 diff --git a/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch index 97ee2d717c4..6fb80871cb9 100644 --- a/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0008-Add-an-option-to-disable-the-tk-module.patch @@ -1,4 +1,4 @@ -From c1ec9fa46cd7679fd009f66a3ebed8de95d84f10 Mon Sep 17 00:00:00 2001 +From 4d02905278ef62aaf9e984022033c3390d675948 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 @@ -19,7 +19,7 @@ Signed-off-by: Adam Duskett 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7b6c9811a6..6d9527ddd0 100644 +index 7c5bcea59ba..5de6f63220d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2108,7 +2108,6 @@ LIBSUBDIRS= asyncio \ @@ -30,7 +30,7 @@ index 7b6c9811a6..6d9527ddd0 100644 tomllib \ turtledemo \ unittest \ -@@ -2212,7 +2211,6 @@ TESTSUBDIRS= idlelib/idle_test \ +@@ -2213,7 +2212,6 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_peg_generator \ test/test_pydoc \ test/test_sqlite3 \ @@ -38,15 +38,15 @@ index 7b6c9811a6..6d9527ddd0 100644 test/test_tomllib \ test/test_tomllib/data \ test/test_tomllib/data/invalid \ -@@ -2232,7 +2230,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_tomllib/data/valid/dates-and-times \ +@@ -2234,7 +2232,6 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_tomllib/data/valid/multiline-basic-str \ test/test_tools \ + test/test_tools/i18n_data \ - test/test_ttk \ test/test_unittest \ test/test_unittest/testmock \ test/test_warnings \ -@@ -2253,6 +2250,11 @@ TESTSUBDIRS= idlelib/idle_test \ +@@ -2259,6 +2256,11 @@ TESTSUBDIRS= idlelib/idle_test \ test/test_multiprocessing_forkserver \ test/test_multiprocessing_spawn @@ -59,10 +59,10 @@ index 7b6c9811a6..6d9527ddd0 100644 ifeq (@PYDOC@,yes) diff --git a/configure.ac b/configure.ac -index d1c54bd67c..4c5cbe4153 100644 +index 3fbcabe29c8..4331ed4264f 100644 --- a/configure.ac +++ b/configure.ac -@@ -4529,6 +4529,13 @@ AC_ARG_ENABLE(pydoc, +@@ -4532,6 +4532,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -77,5 +77,5 @@ index d1c54bd67c..4c5cbe4153 100644 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) -- -2.34.1 +2.39.5 diff --git a/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch index 139bf1544bf..443005584d1 100644 --- a/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0009-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From d7ea122e8ae506019761b92987b141fe7ea55f76 Mon Sep 17 00:00:00 2001 +From 32ecd62c7f1444652911d05c2c03152ff7fff6b5 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 @@ -15,7 +15,7 @@ Signed-off-by: Adam Duskett 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6d9527ddd0..283ca1bd60 100644 +index 5de6f63220d..2b0307b1282 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2095,7 +2095,6 @@ LIBSUBDIRS= asyncio \ @@ -26,7 +26,7 @@ index 6d9527ddd0..283ca1bd60 100644 dbm \ email email/mime \ encodings \ -@@ -2255,6 +2254,10 @@ LIBSUBDIRS += tkinter +@@ -2261,6 +2260,10 @@ LIBSUBDIRS += tkinter TESTSUBDIRS += test/test_tkinter test/test_ttk endif @@ -38,10 +38,10 @@ index 6d9527ddd0..283ca1bd60 100644 ifeq (@PYDOC@,yes) diff --git a/configure.ac b/configure.ac -index 4c5cbe4153..92d663ed40 100644 +index 4331ed4264f..94bebbfd48e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4523,6 +4523,13 @@ AC_ARG_ENABLE(sqlite3, +@@ -4526,6 +4526,13 @@ AC_ARG_ENABLE(sqlite3, AS_IF([test "$SQLITE3" = "no"], [PY_STDLIB_MOD_SET_NA([_sqlite3])]) @@ -56,5 +56,5 @@ index 4c5cbe4153..92d663ed40 100644 AC_ARG_ENABLE(pydoc, -- -2.34.1 +2.39.5 diff --git a/package/python3/0010-Add-an-option-to-disable-expat.patch b/package/python3/0010-Add-an-option-to-disable-expat.patch index 2363aeb01dd..803bf5f05a5 100644 --- a/package/python3/0010-Add-an-option-to-disable-expat.patch +++ b/package/python3/0010-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From d1701f1c89e9d2319ede200052319183fbb4ae18 Mon Sep 17 00:00:00 2001 +From 455e500067431c19770d637ee0769b450208550f 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 @@ -17,11 +17,11 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett --- Makefile.pre.in | 5 ++++- - configure.ac | 24 +++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) + configure.ac | 22 ++++++++++++---------- + 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 283ca1bd60..13f7512f42 100644 +index 2b0307b1282..fcddbf33e9e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2113,7 +2113,6 @@ LIBSUBDIRS= asyncio \ @@ -32,7 +32,7 @@ index 283ca1bd60..13f7512f42 100644 xmlrpc \ zipfile zipfile/_path \ zoneinfo \ -@@ -2280,6 +2279,10 @@ ifeq (@SQLITE3@,yes) +@@ -2286,6 +2285,10 @@ ifeq (@SQLITE3@,yes) LIBSUBDIRS += sqlite3 endif @@ -44,10 +44,10 @@ index 283ca1bd60..13f7512f42 100644 .PHONY: libinstall diff --git a/configure.ac b/configure.ac -index 92d663ed40..1cb95f41fd 100644 +index 94bebbfd48e..a2436c0733b 100644 --- a/configure.ac +++ b/configure.ac -@@ -3823,17 +3823,19 @@ LIBS="$withval $LIBS" +@@ -3826,17 +3826,19 @@ LIBS="$withval $LIBS" [AC_MSG_RESULT([no])]) # Check for use of the system expat library @@ -58,10 +58,6 @@ index 92d663ed40..1cb95f41fd 100644 - [--with-system-expat], - [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)] - )], [], [with_system_expat="no"]) -- --AC_MSG_RESULT([$with_system_expat]) -- --AS_VAR_IF([with_system_expat], [yes], [ +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), @@ -73,11 +69,14 @@ index 92d663ed40..1cb95f41fd 100644 + [PY_STDLIB_MOD_SET_NA([pyexpat]) + EXPAT=no]) +AC_SUBST(EXPAT) -+ + +-AC_MSG_RESULT([$with_system_expat]) +- +-AS_VAR_IF([with_system_expat], [yes], [ +AS_VAR_IF([with_expat], [system], [ LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""} LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} LIBEXPAT_INTERNAL= -- -2.34.1 +2.39.5 diff --git a/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index a92f78fe575..b3848a69e07 100644 --- a/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0011-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From 3eccbd53df3c51c1c6ece217d19f1d01eb9575a7 Mon Sep 17 00:00:00 2001 +From a52c5db8ffa6715b72ae6813a48491b8cf2ce86e 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 @@ -32,7 +32,7 @@ Signed-off-by: Vincent Fazio 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1cb95f41fd..d142af404a 100644 +index a2436c0733b..d779009f0a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1128,7 +1128,11 @@ AC_MSG_CHECKING([for multiarch]) @@ -49,5 +49,5 @@ index 1cb95f41fd..d142af404a 100644 AC_SUBST([MULTIARCH]) AC_MSG_RESULT([$MULTIARCH]) -- -2.34.1 +2.39.5 diff --git a/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch index 5a7949b2fdd..642209faa64 100644 --- a/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch +++ b/package/python3/0012-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch @@ -1,4 +1,4 @@ -From e7fa6023be567251b409527bd005b93335914501 Mon Sep 17 00:00:00 2001 +From 56149930c412fb35aac124bf91b838a5dd4ae72c Mon Sep 17 00:00:00 2001 From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:55:04 -0600 Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same @@ -48,10 +48,10 @@ Upstream: https://github.com/python/cpython/pull/116294 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441bd1..260aec3127 100644 +index 517b13acaf6..9b9ba869747 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -533,7 +533,20 @@ def _init_posix(vars): +@@ -531,7 +531,20 @@ def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() name = _get_sysconfigdata_name() @@ -74,7 +74,7 @@ index 122d441bd1..260aec3127 100644 vars.update(build_time_vars) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py -index e41646d2d1..f54e570728 100644 +index 04404cbcd52..f97172ad680 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -576,6 +576,7 @@ def _add_cross_compile_opts(self, regrtest_opts): @@ -86,7 +86,7 @@ index e41646d2d1..f54e570728 100644 } old_environ = os.environ diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py -index 6efeaad812..d43e52c9e4 100644 +index 6efeaad8126..d43e52c9e4c 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -326,6 +326,7 @@ def format_groups(groups): @@ -98,7 +98,7 @@ index 6efeaad812..d43e52c9e4 100644 # Sanitizer options diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py -index 445a34ae3e..4077a83424 100644 +index 445a34ae3e8..4077a834245 100644 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -42,6 +42,7 @@ def main(regrtest_args): @@ -110,7 +110,7 @@ index 445a34ae3e..4077a83424 100644 } environ = { diff --git a/configure b/configure -index 6dc8a66e48..a69346db8c 100755 +index 241cf8f3d4a..484da8c43ef 100755 --- a/configure +++ b/configure @@ -3689,7 +3689,7 @@ fi @@ -123,7 +123,7 @@ index 6dc8a66e48..a69346db8c 100755 printf "%s\n" "$with_build_python" >&6; } diff --git a/configure.ac b/configure.ac -index 1cb95f41fd..de420dde2c 100644 +index d779009f0a6..a5a52a4e139 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,7 @@ AC_ARG_WITH([build-python], @@ -136,5 +136,5 @@ index 1cb95f41fd..de420dde2c 100644 ], [ AS_VAR_IF([cross_compiling], [yes], -- -2.34.1 +2.39.5 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index ad73a85a7f2..ea026376fd7 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3127/ -md5 c6c933c1a0db52597cb45a7910490f93 Python-3.12.7.tar.xz +# From https://www.python.org/downloads/release/python-3128/ +md5 d46e5bf9f2e596a3ba45fc0b3c053dd2 Python-3.12.8.tar.xz # Locally computed -sha256 24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550 Python-3.12.7.tar.xz +sha256 c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e Python-3.12.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index d029d3dbbc6..2be6bb7004f 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others diff --git a/package/qbee-agent/qbee-agent.hash b/package/qbee-agent/qbee-agent.hash index 9be642ef6fc..156f911a6d3 100644 --- a/package/qbee-agent/qbee-agent.hash +++ b/package/qbee-agent/qbee-agent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1f77442186f29fa7a0bdf1382334cb05f48af3f1b606e62b316f0a99618b5a9f qbee-agent-2024.23-go2.tar.gz +sha256 6dca3d020bc9f0f80f4c8c5b85c079a65707fb79485b39c85d9bd1cfadafcf9f qbee-agent-2024.36-go2.tar.gz sha256 02d07d96be99eb042b01ba650079a440ce26a78c5e0e1e8060c33a8c9e200404 LICENSE diff --git a/package/qbee-agent/qbee-agent.mk b/package/qbee-agent/qbee-agent.mk index aba9edb824e..1a9653ee7f9 100644 --- a/package/qbee-agent/qbee-agent.mk +++ b/package/qbee-agent/qbee-agent.mk @@ -5,12 +5,12 @@ ################################################################################ # keep QBEE_AGENT_COMMIT_ID in sync when updating -QBEE_AGENT_VERSION = 2024.23 +QBEE_AGENT_VERSION = 2024.36 QBEE_AGENT_SITE = $(call github,qbee-io,qbee-agent,$(QBEE_AGENT_VERSION)) QBEE_AGENT_LICENSE = Apache-2.0 QBEE_AGENT_LICENSE_FILES = LICENSE -QBEE_AGENT_COMMIT_ID = 3219c17730eab4c80598494732b4bed4c4c18b51 +QBEE_AGENT_COMMIT_ID = d52fb5e69b479550636570a2db6cebe06f5f129b QBEE_AGENT_GOMOD = go.qbee.io/agent diff --git a/package/qemu/0002-Revert-target-arm-Fix-usage-of-MMU-indexes-when-EL3-.patch b/package/qemu/0002-Revert-target-arm-Fix-usage-of-MMU-indexes-when-EL3-.patch new file mode 100644 index 00000000000..b7a03ba91f9 --- /dev/null +++ b/package/qemu/0002-Revert-target-arm-Fix-usage-of-MMU-indexes-when-EL3-.patch @@ -0,0 +1,375 @@ +From 4a6a8a9e87e2de4acd37a9de44617d9b773b0b7c Mon Sep 17 00:00:00 2001 +From: Peter Maydell +Date: Fri, 1 Nov 2024 14:28:44 +0000 +Subject: [PATCH] Revert "target/arm: Fix usage of MMU indexes when EL3 is + AArch32" + +This reverts commit 4c2c0474693229c1f533239bb983495c5427784d. + +This commit tried to fix a problem with our usage of MMU indexes when +EL3 is AArch32, using what it described as a "more complicated +approach" where we share the same MMU index values for Secure PL1&0 +and NonSecure PL1&0. In theory this should work, but the change +didn't account for (at least) two things: + +(1) The design change means we need to flush the TLBs at any point +where the CPU state flips from one to the other. We already flush +the TLB when SCR.NS is changed, but we don't flush the TLB when we +take an exception from NS PL1&0 into Mon or when we return from Mon +to NS PL1&0, and the commit didn't add any code to do that. + +(2) The ATS12NS* address translate instructions allow Mon code (which +is Secure) to do a stage 1+2 page table walk for NS. I thought this +was OK because do_ats_write() does a page table walk which doesn't +use the TLBs, so because it can pass both the MMU index and also an +ARMSecuritySpace argument we can tell the table walk that we want NS +stage1+2, not S. But that means that all the code within the ptw +that needs to find e.g. the regime EL cannot do so only with an +mmu_idx -- all these functions like regime_sctlr(), regime_el(), etc +would need to pass both an mmu_idx and the security_space, so they +can tell whether this is a translation regime controlled by EL1 or +EL3 (and so whether to look at SCTLR.S or SCTLR.NS, etc). + +In particular, because regime_el() wasn't updated to look at the +ARMSecuritySpace it would return 1 even when the CPU was in Monitor +mode (and the controlling EL is 3). This meant that page table walks +in Monitor mode would look at the wrong SCTLR, TCR, etc and would +generally fault when they should not. + +Rather than trying to make the complicated changes needed to rescue +the design of 4c2c04746932, we revert it in order to instead take the +route that that commit describes as "the most straightforward" fix, +where we add new MMU indexes EL30_0, EL30_3, EL30_3_PAN to correspond +to "Secure PL1&0 at PL0", "Secure PL1&0 at PL1", and "Secure PL1&0 at +PL1 with PAN". + +This revert will re-expose the "spurious alignment faults in +Secure PL0" issue #2326; we'll fix it again in the next commit. + +Cc: qemu-stable@nongnu.org +Signed-off-by: Peter Maydell +Upstream-Status: Pending +Upstream: https://patchew.org/QEMU/20241101142845.1712482-1-peter.maydell@linaro.org +See: https://gitlab.com/qemu-project/qemu/-/issues/2588#note_2189338512 +Signed-off-by: Romain Naour +--- + target/arm/cpu.h | 31 +++++++++++++------------------ + target/arm/helper.c | 34 +++++++++++----------------------- + target/arm/internals.h | 27 ++++----------------------- + target/arm/ptw.c | 6 +----- + target/arm/tcg/hflags.c | 4 ---- + target/arm/tcg/translate-a64.c | 2 +- + target/arm/tcg/translate.c | 9 ++++----- + target/arm/tcg/translate.h | 2 -- + 8 files changed, 34 insertions(+), 81 deletions(-) + +diff --git a/target/arm/cpu.h b/target/arm/cpu.h +index 9a3fd59562..216774f5d3 100644 +--- a/target/arm/cpu.h ++++ b/target/arm/cpu.h +@@ -2784,7 +2784,8 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync); + * + NonSecure PL1 & 0 stage 1 + * + NonSecure PL1 & 0 stage 2 + * + NonSecure PL2 +- * + Secure PL1 & 0 ++ * + Secure PL0 ++ * + Secure PL1 + * (reminder: for 32 bit EL3, Secure PL1 is *EL3*, not EL1.) + * + * For QEMU, an mmu_idx is not quite the same as a translation regime because: +@@ -2802,39 +2803,37 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync); + * The only use of stage 2 translations is either as part of an s1+2 + * lookup or when loading the descriptors during a stage 1 page table walk, + * and in both those cases we don't use the TLB. +- * 4. we want to be able to use the TLB for accesses done as part of a ++ * 4. we can also safely fold together the "32 bit EL3" and "64 bit EL3" ++ * translation regimes, because they map reasonably well to each other ++ * and they can't both be active at the same time. ++ * 5. we want to be able to use the TLB for accesses done as part of a + * stage1 page table walk, rather than having to walk the stage2 page + * table over and over. +- * 5. we need separate EL1/EL2 mmu_idx for handling the Privileged Access ++ * 6. we need separate EL1/EL2 mmu_idx for handling the Privileged Access + * Never (PAN) bit within PSTATE. +- * 6. we fold together most secure and non-secure regimes for A-profile, ++ * 7. we fold together most secure and non-secure regimes for A-profile, + * because there are no banked system registers for aarch64, so the + * process of switching between secure and non-secure is + * already heavyweight. +- * 7. we cannot fold together Stage 2 Secure and Stage 2 NonSecure, ++ * 8. we cannot fold together Stage 2 Secure and Stage 2 NonSecure, + * because both are in use simultaneously for Secure EL2. + * + * This gives us the following list of cases: + * +- * EL0 EL1&0 stage 1+2 (or AArch32 PL0 PL1&0 stage 1+2) +- * EL1 EL1&0 stage 1+2 (or AArch32 PL1 PL1&0 stage 1+2) +- * EL1 EL1&0 stage 1+2 +PAN (or AArch32 PL1 PL1&0 stage 1+2 +PAN) ++ * EL0 EL1&0 stage 1+2 (aka NS PL0) ++ * EL1 EL1&0 stage 1+2 (aka NS PL1) ++ * EL1 EL1&0 stage 1+2 +PAN + * EL0 EL2&0 + * EL2 EL2&0 + * EL2 EL2&0 +PAN + * EL2 (aka NS PL2) +- * EL3 (not used when EL3 is AArch32) ++ * EL3 (aka S PL1) + * Stage2 Secure + * Stage2 NonSecure + * plus one TLB per Physical address space: S, NS, Realm, Root + * + * for a total of 14 different mmu_idx. + * +- * Note that when EL3 is AArch32, the usage is potentially confusing +- * because the MMU indexes are named for their AArch64 use, so code +- * using the ARMMMUIdx_E10_1 might be at EL3, not EL1. This is because +- * Secure PL1 is always at EL3. +- * + * R profile CPUs have an MPU, but can use the same set of MMU indexes + * as A profile. They only need to distinguish EL0 and EL1 (and + * EL2 for cores like the Cortex-R52). +@@ -3127,10 +3126,6 @@ FIELD(TBFLAG_A32, NS, 10, 1) + * This requires an SME trap from AArch32 mode when using NEON. + */ + FIELD(TBFLAG_A32, SME_TRAP_NONSTREAMING, 11, 1) +-/* +- * Indicates whether we are in the Secure PL1&0 translation regime +- */ +-FIELD(TBFLAG_A32, S_PL1_0, 12, 1) + + /* + * Bit usage when in AArch32 state, for M-profile only. +diff --git a/target/arm/helper.c b/target/arm/helper.c +index 0a582c1cd3..8fb4b474e8 100644 +--- a/target/arm/helper.c ++++ b/target/arm/helper.c +@@ -3700,7 +3700,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value, + */ + format64 = arm_s1_regime_using_lpae_format(env, mmu_idx); + +- if (arm_feature(env, ARM_FEATURE_EL2) && !arm_aa32_secure_pl1_0(env)) { ++ if (arm_feature(env, ARM_FEATURE_EL2)) { + if (mmu_idx == ARMMMUIdx_E10_0 || + mmu_idx == ARMMMUIdx_E10_1 || + mmu_idx == ARMMMUIdx_E10_1_PAN) { +@@ -3774,11 +3774,13 @@ static void ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) + case 0: + /* stage 1 current state PL1: ATS1CPR, ATS1CPW, ATS1CPRP, ATS1CPWP */ + switch (el) { ++ case 3: ++ mmu_idx = ARMMMUIdx_E3; ++ break; + case 2: + g_assert(ss != ARMSS_Secure); /* ARMv8.4-SecEL2 is 64-bit only */ + /* fall through */ + case 1: +- case 3: + if (ri->crm == 9 && arm_pan_enabled(env)) { + mmu_idx = ARMMMUIdx_Stage1_E1_PAN; + } else { +@@ -11859,11 +11861,8 @@ void arm_cpu_do_interrupt(CPUState *cs) + + uint64_t arm_sctlr(CPUARMState *env, int el) + { +- if (arm_aa32_secure_pl1_0(env)) { +- /* In Secure PL1&0 SCTLR_S is always controlling */ +- el = 3; +- } else if (el == 0) { +- /* Only EL0 needs to be adjusted for EL1&0 or EL2&0. */ ++ /* Only EL0 needs to be adjusted for EL1&0 or EL2&0. */ ++ if (el == 0) { + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, 0); + el = mmu_idx == ARMMMUIdx_E20_0 ? 2 : 1; + } +@@ -12523,12 +12522,8 @@ int fp_exception_el(CPUARMState *env, int cur_el) + return 0; + } + +-/* +- * Return the exception level we're running at if this is our mmu_idx. +- * s_pl1_0 should be true if this is the AArch32 Secure PL1&0 translation +- * regime. +- */ +-int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx, bool s_pl1_0) ++/* Return the exception level we're running at if this is our mmu_idx */ ++int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) + { + if (mmu_idx & ARM_MMU_IDX_M) { + return mmu_idx & ARM_MMU_IDX_M_PRIV; +@@ -12540,7 +12535,7 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx, bool s_pl1_0) + return 0; + case ARMMMUIdx_E10_1: + case ARMMMUIdx_E10_1_PAN: +- return s_pl1_0 ? 3 : 1; ++ return 1; + case ARMMMUIdx_E2: + case ARMMMUIdx_E20_2: + case ARMMMUIdx_E20_2_PAN: +@@ -12578,15 +12573,6 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) + idx = ARMMMUIdx_E10_0; + } + break; +- case 3: +- /* +- * AArch64 EL3 has its own translation regime; AArch32 EL3 +- * uses the Secure PL1&0 translation regime. +- */ +- if (arm_el_is_aa64(env, 3)) { +- return ARMMMUIdx_E3; +- } +- /* fall through */ + case 1: + if (arm_pan_enabled(env)) { + idx = ARMMMUIdx_E10_1_PAN; +@@ -12606,6 +12592,8 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) + idx = ARMMMUIdx_E2; + } + break; ++ case 3: ++ return ARMMMUIdx_E3; + default: + g_assert_not_reached(); + } +diff --git a/target/arm/internals.h b/target/arm/internals.h +index 38545552d0..47624318c2 100644 +--- a/target/arm/internals.h ++++ b/target/arm/internals.h +@@ -275,20 +275,6 @@ FIELD(CNTHCTL, CNTPMASK, 19, 1) + #define M_FAKE_FSR_NSC_EXEC 0xf /* NS executing in S&NSC memory */ + #define M_FAKE_FSR_SFAULT 0xe /* SecureFault INVTRAN, INVEP or AUVIOL */ + +-/** +- * arm_aa32_secure_pl1_0(): Return true if in Secure PL1&0 regime +- * +- * Return true if the CPU is in the Secure PL1&0 translation regime. +- * This requires that EL3 exists and is AArch32 and we are currently +- * Secure. If this is the case then the ARMMMUIdx_E10* apply and +- * mean we are in EL3, not EL1. +- */ +-static inline bool arm_aa32_secure_pl1_0(CPUARMState *env) +-{ +- return arm_feature(env, ARM_FEATURE_EL3) && +- !arm_el_is_aa64(env, 3) && arm_is_secure(env); +-} +- + /** + * raise_exception: Raise the specified exception. + * Raise a guest exception with the specified value, syndrome register +@@ -822,12 +808,7 @@ static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_idx) + return mmu_idx | ARM_MMU_IDX_A; + } + +-/** +- * Return the exception level we're running at if our current MMU index +- * is @mmu_idx. @s_pl1_0 should be true if this is the AArch32 +- * Secure PL1&0 translation regime. +- */ +-int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx, bool s_pl1_0); ++int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx); + + /* Return the MMU index for a v7M CPU in the specified security state */ + ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate); +@@ -922,11 +903,11 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) + return 3; + case ARMMMUIdx_E10_0: + case ARMMMUIdx_Stage1_E0: +- case ARMMMUIdx_E10_1: +- case ARMMMUIdx_E10_1_PAN: ++ return arm_el_is_aa64(env, 3) || !arm_is_secure_below_el3(env) ? 1 : 3; + case ARMMMUIdx_Stage1_E1: + case ARMMMUIdx_Stage1_E1_PAN: +- return arm_el_is_aa64(env, 3) || !arm_is_secure_below_el3(env) ? 1 : 3; ++ case ARMMMUIdx_E10_1: ++ case ARMMMUIdx_E10_1_PAN: + case ARMMMUIdx_MPrivNegPri: + case ARMMMUIdx_MUserNegPri: + case ARMMMUIdx_MPriv: +diff --git a/target/arm/ptw.c b/target/arm/ptw.c +index 26e670290f..20ab736793 100644 +--- a/target/arm/ptw.c ++++ b/target/arm/ptw.c +@@ -3576,11 +3576,7 @@ bool get_phys_addr(CPUARMState *env, vaddr address, + case ARMMMUIdx_Stage1_E1: + case ARMMMUIdx_Stage1_E1_PAN: + case ARMMMUIdx_E2: +- if (arm_aa32_secure_pl1_0(env)) { +- ss = ARMSS_Secure; +- } else { +- ss = arm_security_space_below_el3(env); +- } ++ ss = arm_security_space_below_el3(env); + break; + case ARMMMUIdx_Stage2: + /* +diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c +index bab7822ef6..f03977b4b0 100644 +--- a/target/arm/tcg/hflags.c ++++ b/target/arm/tcg/hflags.c +@@ -198,10 +198,6 @@ static CPUARMTBFlags rebuild_hflags_a32(CPUARMState *env, int fp_el, + DP_TBFLAG_A32(flags, SME_TRAP_NONSTREAMING, 1); + } + +- if (arm_aa32_secure_pl1_0(env)) { +- DP_TBFLAG_A32(flags, S_PL1_0, 1); +- } +- + return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); + } + +diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c +index 4684e7eb6e..bc2d64e883 100644 +--- a/target/arm/tcg/translate-a64.c ++++ b/target/arm/tcg/translate-a64.c +@@ -11979,7 +11979,7 @@ static void aarch64_tr_init_disas_context(DisasContextBase *dcbase, + dc->tbii = EX_TBFLAG_A64(tb_flags, TBII); + dc->tbid = EX_TBFLAG_A64(tb_flags, TBID); + dc->tcma = EX_TBFLAG_A64(tb_flags, TCMA); +- dc->current_el = arm_mmu_idx_to_el(dc->mmu_idx, false); ++ dc->current_el = arm_mmu_idx_to_el(dc->mmu_idx); + #if !defined(CONFIG_USER_ONLY) + dc->user = (dc->current_el == 0); + #endif +diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c +index e2748ff2bb..c5bc691d92 100644 +--- a/target/arm/tcg/translate.c ++++ b/target/arm/tcg/translate.c +@@ -7546,6 +7546,10 @@ static void arm_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) + + core_mmu_idx = EX_TBFLAG_ANY(tb_flags, MMUIDX); + dc->mmu_idx = core_to_arm_mmu_idx(env, core_mmu_idx); ++ dc->current_el = arm_mmu_idx_to_el(dc->mmu_idx); ++#if !defined(CONFIG_USER_ONLY) ++ dc->user = (dc->current_el == 0); ++#endif + dc->fp_excp_el = EX_TBFLAG_ANY(tb_flags, FPEXC_EL); + dc->align_mem = EX_TBFLAG_ANY(tb_flags, ALIGN_MEM); + dc->pstate_il = EX_TBFLAG_ANY(tb_flags, PSTATE__IL); +@@ -7576,12 +7580,7 @@ static void arm_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) + } + dc->sme_trap_nonstreaming = + EX_TBFLAG_A32(tb_flags, SME_TRAP_NONSTREAMING); +- dc->s_pl1_0 = EX_TBFLAG_A32(tb_flags, S_PL1_0); + } +- dc->current_el = arm_mmu_idx_to_el(dc->mmu_idx, dc->s_pl1_0); +-#if !defined(CONFIG_USER_ONLY) +- dc->user = (dc->current_el == 0); +-#endif + dc->lse2 = false; /* applies only to aarch64 */ + dc->cp_regs = cpu->cp_regs; + dc->features = env->features; +diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h +index 3f0e9ceaa3..01c217f4a4 100644 +--- a/target/arm/tcg/translate.h ++++ b/target/arm/tcg/translate.h +@@ -165,8 +165,6 @@ typedef struct DisasContext { + uint8_t gm_blocksize; + /* True if the current insn_start has been updated. */ + bool insn_start_updated; +- /* True if this is the AArch32 Secure PL1&0 translation regime */ +- bool s_pl1_0; + /* Bottom two bits of XScale c15_cpar coprocessor access control reg */ + int c15_cpar; + /* Offset from VNCR_EL2 when FEAT_NV2 redirects this reg to memory */ +-- +2.45.0 + diff --git a/package/qemu/0003-target-arm-Add-new-MMU-indexes-for-AArch32-Secure-PL.patch b/package/qemu/0003-target-arm-Add-new-MMU-indexes-for-AArch32-Secure-PL.patch new file mode 100644 index 00000000000..5fec180ea14 --- /dev/null +++ b/package/qemu/0003-target-arm-Add-new-MMU-indexes-for-AArch32-Secure-PL.patch @@ -0,0 +1,380 @@ +From 92e9bf227bab81becb9115c6bf0cdd0458c1f870 Mon Sep 17 00:00:00 2001 +From: Peter Maydell +Date: Fri, 1 Nov 2024 14:28:45 +0000 +Subject: [PATCH] target/arm: Add new MMU indexes for AArch32 Secure PL1&0 + +Our current usage of MMU indexes when EL3 is AArch32 is confused. +Architecturally, when EL3 is AArch32, all Secure code runs under the +Secure PL1&0 translation regime: + * code at EL3, which might be Mon, or SVC, or any of the + other privileged modes (PL1) + * code at EL0 (Secure PL0) + +This is different from when EL3 is AArch64, in which case EL3 is its +own translation regime, and EL1 and EL0 (whether AArch32 or AArch64) +have their own regime. + +We claimed to be mapping Secure PL1 to our ARMMMUIdx_EL3, but didn't +do anything special about Secure PL0, which meant it used the same +ARMMMUIdx_EL10_0 that NonSecure PL0 does. This resulted in a bug +where arm_sctlr() incorrectly picked the NonSecure SCTLR as the +controlling register when in Secure PL0, which meant we were +spuriously generating alignment faults because we were looking at the +wrong SCTLR control bits. + +The use of ARMMMUIdx_EL3 for Secure PL1 also resulted in the bug that +we wouldn't honour the PAN bit for Secure PL1, because there's no +equivalent _PAN mmu index for it. + +Fix this by adding two new MMU indexes: + * ARMMMUIdx_E30_0 is for Secure PL0 + * ARMMMUIdx_E30_3_PAN is for Secure PL1 when PAN is enabled +The existing ARMMMUIdx_E3 is used to mean "Secure PL1 without PAN" +(and would be named ARMMMUIdx_E30_3 in an AArch32-centric scheme). + +These extra two indexes bring us up to the maximum of 16 that the +core code can currently support. + +This commit: + * adds the new MMU index handling to the various places + where we deal in MMU index values + * adds assertions that we aren't AArch32 EL3 in a couple of + places that currently use the E10 indexes, to document why + they don't also need to handle the E30 indexes + * documents in a comment why regime_has_2_ranges() doesn't need + updating + +Notes for backporting: this commit depends on the preceding revert of +4c2c04746932; that revert and this commit should probably be +backported to everywhere that we originally backported 4c2c04746932. + +Cc: qemu-stable@nongnu.org +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2326 +Signed-off-by: Peter Maydell +Upstream-Status: Pending +Upstream: https://patchew.org/QEMU/20241101142845.1712482-1-peter.maydell@linaro.org +See: https://gitlab.com/qemu-project/qemu/-/issues/2588#note_2189338512 +Signed-off-by: Romain Naour +--- + target/arm/cpu.h | 31 ++++++++++++++++++------------- + target/arm/helper.c | 38 ++++++++++++++++++++++++++++++++++---- + target/arm/internals.h | 16 ++++++++++++++-- + target/arm/ptw.c | 4 ++++ + target/arm/tcg/op_helper.c | 14 +++++++++++++- + target/arm/tcg/translate.c | 3 +++ + 6 files changed, 86 insertions(+), 20 deletions(-) + +diff --git a/target/arm/cpu.h b/target/arm/cpu.h +index 216774f5d3..28fac238a5 100644 +--- a/target/arm/cpu.h ++++ b/target/arm/cpu.h +@@ -2784,8 +2784,7 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync); + * + NonSecure PL1 & 0 stage 1 + * + NonSecure PL1 & 0 stage 2 + * + NonSecure PL2 +- * + Secure PL0 +- * + Secure PL1 ++ * + Secure PL1 & 0 + * (reminder: for 32 bit EL3, Secure PL1 is *EL3*, not EL1.) + * + * For QEMU, an mmu_idx is not quite the same as a translation regime because: +@@ -2820,19 +2819,21 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync); + * + * This gives us the following list of cases: + * +- * EL0 EL1&0 stage 1+2 (aka NS PL0) +- * EL1 EL1&0 stage 1+2 (aka NS PL1) +- * EL1 EL1&0 stage 1+2 +PAN ++ * EL0 EL1&0 stage 1+2 (aka NS PL0 PL1&0 stage 1+2) ++ * EL1 EL1&0 stage 1+2 (aka NS PL1 PL1&0 stage 1+2) ++ * EL1 EL1&0 stage 1+2 +PAN (aka NS PL1 P1&0 stage 1+2 +PAN) + * EL0 EL2&0 + * EL2 EL2&0 + * EL2 EL2&0 +PAN + * EL2 (aka NS PL2) +- * EL3 (aka S PL1) ++ * EL3 (aka AArch32 S PL1 PL1&0) ++ * AArch32 S PL0 PL1&0 (we call this EL30_0) ++ * AArch32 S PL1 PL1&0 +PAN (we call this EL30_3_PAN) + * Stage2 Secure + * Stage2 NonSecure + * plus one TLB per Physical address space: S, NS, Realm, Root + * +- * for a total of 14 different mmu_idx. ++ * for a total of 16 different mmu_idx. + * + * R profile CPUs have an MPU, but can use the same set of MMU indexes + * as A profile. They only need to distinguish EL0 and EL1 (and +@@ -2896,6 +2897,8 @@ typedef enum ARMMMUIdx { + ARMMMUIdx_E20_2_PAN = 5 | ARM_MMU_IDX_A, + ARMMMUIdx_E2 = 6 | ARM_MMU_IDX_A, + ARMMMUIdx_E3 = 7 | ARM_MMU_IDX_A, ++ ARMMMUIdx_E30_0 = 8 | ARM_MMU_IDX_A, ++ ARMMMUIdx_E30_3_PAN = 9 | ARM_MMU_IDX_A, + + /* + * Used for second stage of an S12 page table walk, or for descriptor +@@ -2903,14 +2906,14 @@ typedef enum ARMMMUIdx { + * are in use simultaneously for SecureEL2: the security state for + * the S2 ptw is selected by the NS bit from the S1 ptw. + */ +- ARMMMUIdx_Stage2_S = 8 | ARM_MMU_IDX_A, +- ARMMMUIdx_Stage2 = 9 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Stage2_S = 10 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Stage2 = 11 | ARM_MMU_IDX_A, + + /* TLBs with 1-1 mapping to the physical address spaces. */ +- ARMMMUIdx_Phys_S = 10 | ARM_MMU_IDX_A, +- ARMMMUIdx_Phys_NS = 11 | ARM_MMU_IDX_A, +- ARMMMUIdx_Phys_Root = 12 | ARM_MMU_IDX_A, +- ARMMMUIdx_Phys_Realm = 13 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Phys_S = 12 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Phys_NS = 13 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Phys_Root = 14 | ARM_MMU_IDX_A, ++ ARMMMUIdx_Phys_Realm = 15 | ARM_MMU_IDX_A, + + /* + * These are not allocated TLBs and are used only for AT system +@@ -2949,6 +2952,8 @@ typedef enum ARMMMUIdxBit { + TO_CORE_BIT(E20_2), + TO_CORE_BIT(E20_2_PAN), + TO_CORE_BIT(E3), ++ TO_CORE_BIT(E30_0), ++ TO_CORE_BIT(E30_3_PAN), + TO_CORE_BIT(Stage2), + TO_CORE_BIT(Stage2_S), + +diff --git a/target/arm/helper.c b/target/arm/helper.c +index 8fb4b474e8..2b6d0bff8c 100644 +--- a/target/arm/helper.c ++++ b/target/arm/helper.c +@@ -444,6 +444,9 @@ static int alle1_tlbmask(CPUARMState *env) + * Note that the 'ALL' scope must invalidate both stage 1 and + * stage 2 translations, whereas most other scopes only invalidate + * stage 1 translations. ++ * ++ * For AArch32 this is only used for TLBIALLNSNH and VTTBR ++ * writes, so only needs to apply to NS PL1&0, not S PL1&0. + */ + return (ARMMMUIdxBit_E10_1 | + ARMMMUIdxBit_E10_1_PAN | +@@ -3775,7 +3778,11 @@ static void ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) + /* stage 1 current state PL1: ATS1CPR, ATS1CPW, ATS1CPRP, ATS1CPWP */ + switch (el) { + case 3: +- mmu_idx = ARMMMUIdx_E3; ++ if (ri->crm == 9 && arm_pan_enabled(env)) { ++ mmu_idx = ARMMMUIdx_E30_3_PAN; ++ } else { ++ mmu_idx = ARMMMUIdx_E3; ++ } + break; + case 2: + g_assert(ss != ARMSS_Secure); /* ARMv8.4-SecEL2 is 64-bit only */ +@@ -3795,7 +3802,7 @@ static void ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) + /* stage 1 current state PL0: ATS1CUR, ATS1CUW */ + switch (el) { + case 3: +- mmu_idx = ARMMMUIdx_E10_0; ++ mmu_idx = ARMMMUIdx_E30_0; + break; + case 2: + g_assert(ss != ARMSS_Secure); /* ARMv8.4-SecEL2 is 64-bit only */ +@@ -4905,11 +4912,14 @@ static int vae1_tlbmask(CPUARMState *env) + uint64_t hcr = arm_hcr_el2_eff(env); + uint16_t mask; + ++ assert(arm_feature(env, ARM_FEATURE_AARCH64)); ++ + if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) { + mask = ARMMMUIdxBit_E20_2 | + ARMMMUIdxBit_E20_2_PAN | + ARMMMUIdxBit_E20_0; + } else { ++ /* This is AArch64 only, so we don't need to touch the EL30_x TLBs */ + mask = ARMMMUIdxBit_E10_1 | + ARMMMUIdxBit_E10_1_PAN | + ARMMMUIdxBit_E10_0; +@@ -4948,6 +4958,8 @@ static int vae1_tlbbits(CPUARMState *env, uint64_t addr) + uint64_t hcr = arm_hcr_el2_eff(env); + ARMMMUIdx mmu_idx; + ++ assert(arm_feature(env, ARM_FEATURE_AARCH64)); ++ + /* Only the regime of the mmu_idx below is significant. */ + if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) { + mmu_idx = ARMMMUIdx_E20_0; +@@ -11861,10 +11873,20 @@ void arm_cpu_do_interrupt(CPUState *cs) + + uint64_t arm_sctlr(CPUARMState *env, int el) + { +- /* Only EL0 needs to be adjusted for EL1&0 or EL2&0. */ ++ /* Only EL0 needs to be adjusted for EL1&0 or EL2&0 or EL3&0 */ + if (el == 0) { + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, 0); +- el = mmu_idx == ARMMMUIdx_E20_0 ? 2 : 1; ++ switch (mmu_idx) { ++ case ARMMMUIdx_E20_0: ++ el = 2; ++ break; ++ case ARMMMUIdx_E30_0: ++ el = 3; ++ break; ++ default: ++ el = 1; ++ break; ++ } + } + return env->cp15.sctlr_el[el]; + } +@@ -12532,6 +12554,7 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) + switch (mmu_idx) { + case ARMMMUIdx_E10_0: + case ARMMMUIdx_E20_0: ++ case ARMMMUIdx_E30_0: + return 0; + case ARMMMUIdx_E10_1: + case ARMMMUIdx_E10_1_PAN: +@@ -12541,6 +12564,7 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) + case ARMMMUIdx_E20_2_PAN: + return 2; + case ARMMMUIdx_E3: ++ case ARMMMUIdx_E30_3_PAN: + return 3; + default: + g_assert_not_reached(); +@@ -12569,6 +12593,9 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) + hcr = arm_hcr_el2_eff(env); + if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) { + idx = ARMMMUIdx_E20_0; ++ } else if (arm_is_secure_below_el3(env) && ++ !arm_el_is_aa64(env, 3)) { ++ idx = ARMMMUIdx_E30_0; + } else { + idx = ARMMMUIdx_E10_0; + } +@@ -12593,6 +12620,9 @@ ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) + } + break; + case 3: ++ if (!arm_el_is_aa64(env, 3) && arm_pan_enabled(env)) { ++ return ARMMMUIdx_E30_3_PAN; ++ } + return ARMMMUIdx_E3; + default: + g_assert_not_reached(); +diff --git a/target/arm/internals.h b/target/arm/internals.h +index 47624318c2..a3fa6e91d5 100644 +--- a/target/arm/internals.h ++++ b/target/arm/internals.h +@@ -852,7 +852,16 @@ static inline void arm_call_el_change_hook(ARMCPU *cpu) + } + } + +-/* Return true if this address translation regime has two ranges. */ ++/* ++ * Return true if this address translation regime has two ranges. ++ * Note that this will not return the correct answer for AArch32 ++ * Secure PL1&0 (i.e. mmu indexes E3, E30_0, E30_3_PAN), but it is ++ * never called from a context where EL3 can be AArch32. (The ++ * correct return value for ARMMMUIdx_E3 would be different for ++ * that case, so we can't just make the function return the ++ * correct value anyway; we would need an extra "bool e3_is_aarch32" ++ * argument which all the current callsites would pass as 'false'.) ++ */ + static inline bool regime_has_2_ranges(ARMMMUIdx mmu_idx) + { + switch (mmu_idx) { +@@ -877,6 +886,7 @@ static inline bool regime_is_pan(CPUARMState *env, ARMMMUIdx mmu_idx) + case ARMMMUIdx_Stage1_E1_PAN: + case ARMMMUIdx_E10_1_PAN: + case ARMMMUIdx_E20_2_PAN: ++ case ARMMMUIdx_E30_3_PAN: + return true; + default: + return false; +@@ -900,10 +910,11 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) + case ARMMMUIdx_E2: + return 2; + case ARMMMUIdx_E3: ++ case ARMMMUIdx_E30_0: ++ case ARMMMUIdx_E30_3_PAN: + return 3; + case ARMMMUIdx_E10_0: + case ARMMMUIdx_Stage1_E0: +- return arm_el_is_aa64(env, 3) || !arm_is_secure_below_el3(env) ? 1 : 3; + case ARMMMUIdx_Stage1_E1: + case ARMMMUIdx_Stage1_E1_PAN: + case ARMMMUIdx_E10_1: +@@ -926,6 +937,7 @@ static inline bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx) + { + switch (mmu_idx) { + case ARMMMUIdx_E20_0: ++ case ARMMMUIdx_E30_0: + case ARMMMUIdx_Stage1_E0: + case ARMMMUIdx_MUser: + case ARMMMUIdx_MSUser: +diff --git a/target/arm/ptw.c b/target/arm/ptw.c +index 20ab736793..65d7b07bc5 100644 +--- a/target/arm/ptw.c ++++ b/target/arm/ptw.c +@@ -265,6 +265,8 @@ static bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx, + case ARMMMUIdx_E20_2_PAN: + case ARMMMUIdx_E2: + case ARMMMUIdx_E3: ++ case ARMMMUIdx_E30_0: ++ case ARMMMUIdx_E30_3_PAN: + break; + + case ARMMMUIdx_Phys_S: +@@ -3604,6 +3606,8 @@ bool get_phys_addr(CPUARMState *env, vaddr address, + ss = ARMSS_Secure; + break; + case ARMMMUIdx_E3: ++ case ARMMMUIdx_E30_0: ++ case ARMMMUIdx_E30_3_PAN: + if (arm_feature(env, ARM_FEATURE_AARCH64) && + cpu_isar_feature(aa64_rme, env_archcpu(env))) { + ss = ARMSS_Root; +diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c +index c083e5cfb8..1ecb465988 100644 +--- a/target/arm/tcg/op_helper.c ++++ b/target/arm/tcg/op_helper.c +@@ -912,7 +912,19 @@ void HELPER(tidcp_el0)(CPUARMState *env, uint32_t syndrome) + { + /* See arm_sctlr(), but we also need the sctlr el. */ + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, 0); +- int target_el = mmu_idx == ARMMMUIdx_E20_0 ? 2 : 1; ++ int target_el; ++ ++ switch (mmu_idx) { ++ case ARMMMUIdx_E20_0: ++ target_el = 2; ++ break; ++ case ARMMMUIdx_E30_0: ++ target_el = 3; ++ break; ++ default: ++ target_el = 1; ++ break; ++ } + + /* + * The bit is not valid unless the target el is aa64, but since the +diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c +index c5bc691d92..9ee761fc64 100644 +--- a/target/arm/tcg/translate.c ++++ b/target/arm/tcg/translate.c +@@ -228,6 +228,9 @@ static inline int get_a32_user_mem_index(DisasContext *s) + */ + switch (s->mmu_idx) { + case ARMMMUIdx_E3: ++ case ARMMMUIdx_E30_0: ++ case ARMMMUIdx_E30_3_PAN: ++ return arm_to_core_mmu_idx(ARMMMUIdx_E30_0); + case ARMMMUIdx_E2: /* this one is UNPREDICTABLE */ + case ARMMMUIdx_E10_0: + case ARMMMUIdx_E10_1: +-- +2.45.0 + diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 608e4d429dd..2d15ab1ea9c 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -252,11 +252,6 @@ config BR2_PACKAGE_QEMU_TARGET_MIPSN32EL 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 diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 8dd0c7d11b0..4db114490a4 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -9,7 +9,6 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_microblazebe default y if BR2_mips default y if BR2_mipsel - default y if BR2_nios2 default y if BR2_or1k default y if BR2_powerpc default y if BR2_powerpc64 diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 419dd0d1b3b..169fe05068e 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6 qemu-9.0.2.tar.xz +sha256 816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834 qemu-9.1.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 1814ce475d7..9ad085ea8e2 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 9.0.2 +QEMU_VERSION = 9.1.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_SELINUX_MODULES = qemu virt @@ -63,7 +63,6 @@ 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 @@ -104,7 +103,6 @@ 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 diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash index 5c664356c03..67efd675cc2 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.hash +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e431dd726c4aa1db558931d80b318149abdf71fec6e39de9d5aa33399df1fb1 qoriq-fm-ucode-LSDK-21.08.tar.gz -sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 NXP-Binary-EULA.txt +sha256 c994367c74dd2ff6cd70ea269cf1bc775c5f4e11294a8db414491ce6c2eb9dc3 qoriq-fm-ucode-lf-6.6.23-2.0.0.tar.gz +sha256 7a223031d76339df0e4e5a94d193a270fb9963d42b577aa42fe130a4657f3e17 LICENSE diff --git a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk index 5dfdf1e8f8f..84360533eb1 100644 --- a/package/qoriq-fm-ucode/qoriq-fm-ucode.mk +++ b/package/qoriq-fm-ucode/qoriq-fm-ucode.mk @@ -4,10 +4,10 @@ # ################################################################################ -QORIQ_FM_UCODE_VERSION = LSDK-21.08 +QORIQ_FM_UCODE_VERSION = lf-6.6.23-2.0.0 QORIQ_FM_UCODE_SITE = $(call github,nxp-qoriq,qoriq-fm-ucode,$(QORIQ_FM_UCODE_VERSION)) QORIQ_FM_UCODE_LICENSE = NXP Binary EULA -QORIQ_FM_UCODE_LICENSE_FILES = NXP-Binary-EULA.txt +QORIQ_FM_UCODE_LICENSE_FILES = LICENSE QORIQ_FM_UCODE_INSTALL_IMAGES = YES QORIQ_FM_UCODE_INSTALL_TARGET = NO diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 2a887d57d45..1f664842f5e 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f199c10e50bd18d7bed0d60f5b68194240dea4f1aa164cec98332723727a4796 qoriq-rcw-LSDK-21.08.tar.gz +sha256 52dfb95a3d8e811609dd8a982a5c6f3ba88fac096ea8448a27b571b7c25e3a83 qoriq-rcw-lf-6.6.23-2.0.0.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index b9c9e99222b..c6cfe59a562 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,7 +4,7 @@ # ################################################################################ -QORIQ_RCW_VERSION = LSDK-21.08 +QORIQ_RCW_VERSION = lf-6.6.23-2.0.0 QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 29c1c25c7fd..c5a1a702d3a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -44,11 +44,13 @@ menuconfig BR2_PACKAGE_QT6 if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6charts/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6mqtt/Config.in" source "package/qt6/qt6opcua/Config.in" +source "package/qt6/qt6scxml/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host index dfe7865c571..fa5c39cce10 100644 --- a/package/qt6/Config.in.host +++ b/package/qt6/Config.in.host @@ -1,5 +1,6 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in.host" +source "package/qt6/qt6tools/Config.in.host" endif diff --git a/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch b/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch deleted file mode 100644 index a6778ce107f..00000000000 --- a/package/qt6/qt6base/0001-fix-CVE-2024-39936.patch +++ /dev/null @@ -1,247 +0,0 @@ -From fc1b8814f38c7d925d4590e9bdb16a02ca824025 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= -Date: Tue, 25 Jun 2024 17:09:35 +0200 -Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be - responded to - -We have the encrypted() signal that lets users do extra checks on the -established connection. It is emitted as BlockingQueued, so the HTTP -thread stalls until it is done emitting. Users can potentially call -abort() on the QNetworkReply at that point, which is passed as a Queued -call back to the HTTP thread. That means that any currently queued -signal emission will be processed before the abort() call is processed. - -In the case of HTTP2 it is a little special since it is multiplexed and -the code is built to start requests as they are available. This means -that, while the code worked fine for HTTP1, since one connection only -has one request, it is not working for HTTP2, since we try to send more -requests in-between the encrypted() signal and the abort() call. - -This patch changes the code to delay any communication until the -encrypted() signal has been emitted and processed, for HTTP2 only. -It's done by adding a few booleans, both to know that we have to return -early and so we can keep track of what events arose and what we need to -resume once enough time has passed that any abort() call must have been -processed. - -Fixes: QTBUG-126610 -Pick-to: 6.5 6.2 5.15 5.12 -Change-Id: Ic25a600c278203256e35f541026f34a8783235ae -Reviewed-by: Marc Mutz -Reviewed-by: Volker Hilsheimer -(cherry picked from commit b1e75376cc3adfc7da5502a277dfe9711f3e0536) -Reviewed-by: Qt Cherry-pick Bot -(cherry picked from commit 0fb43e4395da34d561814242a0186999e4956e28) - -Upstream: https://github.com/qt/qtbase/commit/2b1e36e183ce75c224305c7a94457b92f7a5cf58 -Signed-off-by: Roy Kollen Svendsen ---- - src/network/access/qhttp2protocolhandler.cpp | 6 +-- - .../access/qhttpnetworkconnectionchannel.cpp | 48 ++++++++++++++++++- - .../access/qhttpnetworkconnectionchannel_p.h | 6 +++ - tests/auto/network/access/http2/tst_http2.cpp | 44 +++++++++++++++++ - 4 files changed, 99 insertions(+), 5 deletions(-) - -diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp -index 0abd99b9bc..3631b13dc8 100644 ---- a/src/network/access/qhttp2protocolhandler.cpp -+++ b/src/network/access/qhttp2protocolhandler.cpp -@@ -303,12 +303,12 @@ bool QHttp2ProtocolHandler::sendRequest() - } - } - -- if (!prefaceSent && !sendClientPreface()) -- return false; -- - if (!requests.size()) - return true; - -+ if (!prefaceSent && !sendClientPreface()) -+ return false; -+ - m_channel->state = QHttpNetworkConnectionChannel::WritingState; - // Check what was promised/pushed, maybe we do not have to send a request - // and have a response already? -diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp -index 6766989690..1e4161d1fd 100644 ---- a/src/network/access/qhttpnetworkconnectionchannel.cpp -+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp -@@ -209,6 +209,10 @@ void QHttpNetworkConnectionChannel::abort() - bool QHttpNetworkConnectionChannel::sendRequest() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeSendRequest = true; -+ return false; // this return value is unused -+ } - return protocolHandler->sendRequest(); - } - -@@ -221,21 +225,28 @@ bool QHttpNetworkConnectionChannel::sendRequest() - void QHttpNetworkConnectionChannel::sendRequestDelayed() - { - QMetaObject::invokeMethod(this, [this] { -- Q_ASSERT(protocolHandler); - if (reply) -- protocolHandler->sendRequest(); -+ sendRequest(); - }, Qt::ConnectionType::QueuedConnection); - } - - void QHttpNetworkConnectionChannel::_q_receiveReply() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeReceiveReply = true; -+ return; -+ } - protocolHandler->_q_receiveReply(); - } - - void QHttpNetworkConnectionChannel::_q_readyRead() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeReadyRead = true; -+ return; -+ } - protocolHandler->_q_readyRead(); - } - -@@ -1239,7 +1250,18 @@ void QHttpNetworkConnectionChannel::_q_encrypted() - if (!h2RequestsToSend.isEmpty()) { - // Similar to HTTP/1.1 counterpart below: - const auto &pair = std::as_const(h2RequestsToSend).first(); -+ waitingForPotentialAbort = true; - emit pair.second->encrypted(); -+ -+ // We don't send or handle any received data until any effects from -+ // emitting encrypted() have been processed. This is necessary -+ // because the user may have called abort(). We may also abort the -+ // whole connection if the request has been aborted and there is -+ // no more requests to send. -+ QMetaObject::invokeMethod(this, -+ &QHttpNetworkConnectionChannel::checkAndResumeCommunication, -+ Qt::QueuedConnection); -+ - // In case our peer has sent us its settings (window size, max concurrent streams etc.) - // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection). - } -@@ -1257,6 +1279,28 @@ void QHttpNetworkConnectionChannel::_q_encrypted() - QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection); - } - -+ -+void QHttpNetworkConnectionChannel::checkAndResumeCommunication() -+{ -+ Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 -+ || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct); -+ -+ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond -+ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any -+ // effects from emitting encrypted() have been processed. -+ // This function is called after encrypted() was emitted, so check for changes. -+ -+ if (!reply && h2RequestsToSend.isEmpty()) -+ abort(); -+ waitingForPotentialAbort = false; -+ if (needInvokeReadyRead) -+ _q_readyRead(); -+ if (needInvokeReceiveReply) -+ _q_receiveReply(); -+ if (needInvokeSendRequest) -+ sendRequest(); -+} -+ - void QHttpNetworkConnectionChannel::requeueHttp2Requests() - { - const auto h2RequestsToSendCopy = std::exchange(h2RequestsToSend, {}); -diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h -index c42290feca..061f20fd42 100644 ---- a/src/network/access/qhttpnetworkconnectionchannel_p.h -+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h -@@ -74,6 +74,10 @@ public: - QAbstractSocket *socket; - bool ssl; - bool isInitialized; -+ bool waitingForPotentialAbort = false; -+ bool needInvokeReceiveReply = false; -+ bool needInvokeReadyRead = false; -+ bool needInvokeSendRequest = false; - ChannelState state; - QHttpNetworkRequest request; // current request, only used for HTTP - QHttpNetworkReply *reply; // current reply for this request, only used for HTTP -@@ -146,6 +150,8 @@ public: - void closeAndResendCurrentRequest(); - void resendCurrentRequest(); - -+ void checkAndResumeCommunication(); -+ - bool isSocketBusy() const; - bool isSocketWriting() const; - bool isSocketWaiting() const; -diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp -index 00efbc9832..c02e7b7b5b 100644 ---- a/tests/auto/network/access/http2/tst_http2.cpp -+++ b/tests/auto/network/access/http2/tst_http2.cpp -@@ -106,6 +106,8 @@ private slots: - - void duplicateRequestsWithAborts(); - -+ void abortOnEncrypted(); -+ - protected slots: - // Slots to listen to our in-process server: - void serverStarted(quint16 port); -@@ -1479,6 +1481,48 @@ void tst_Http2::duplicateRequestsWithAborts() - QCOMPARE(finishedCount, ExpectedSuccessfulRequests); - } - -+void tst_Http2::abortOnEncrypted() -+{ -+#if !QT_CONFIG(ssl) -+ QSKIP("TLS support is needed for this test"); -+#else -+ clearHTTP2State(); -+ serverPort = 0; -+ -+ ServerPtr targetServer(newServer(defaultServerSettings, H2Type::h2Direct)); -+ -+ QMetaObject::invokeMethod(targetServer.data(), "startServer", Qt::QueuedConnection); -+ runEventLoop(); -+ -+ nRequests = 1; -+ nSentRequests = 0; -+ -+ const auto url = requestUrl(H2Type::h2Direct); -+ QNetworkRequest request(url); -+ request.setAttribute(QNetworkRequest::Http2DirectAttribute, true); -+ -+ std::unique_ptr reply{manager->get(request)}; -+ reply->ignoreSslErrors(); -+ connect(reply.get(), &QNetworkReply::encrypted, reply.get(), [reply = reply.get()](){ -+ reply->abort(); -+ }); -+ connect(reply.get(), &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError); -+ -+ runEventLoop(); -+ STOP_ON_FAILURE -+ -+ QCOMPARE(nRequests, 0); -+ QCOMPARE(reply->error(), QNetworkReply::OperationCanceledError); -+ -+ const bool res = QTest::qWaitFor( -+ [this, server = targetServer.get()]() { -+ return serverGotSettingsACK || prefaceOK || nSentRequests > 0; -+ }, -+ 500); -+ QVERIFY(!res); -+#endif // QT_CONFIG(ssl) -+} -+ - void tst_Http2::serverStarted(quint16 port) - { - serverPort = port; --- -2.46.0 - diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 5b64bfef4ed..f316d85a284 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -10,9 +10,6 @@ QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz QT6BASE_CPE_ID_VENDOR = qt QT6BASE_CPE_ID_PRODUCT = qt -# 0001-fix-CVE-2024-39936.patch -QT6BASE_IGNORE_CVES += CVE-2024-39936 - QT6BASE_CMAKE_BACKEND = ninja QT6BASE_LICENSE = \ diff --git a/package/qt6/qt6charts/Config.in b/package/qt6/qt6charts/Config.in new file mode 100644 index 00000000000..cf44ce71693 --- /dev/null +++ b/package/qt6/qt6charts/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_QT6CHARTS + bool "qt6charts" + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This package corresponds the Qt Charts module: + + https://doc.qt.io/qt-6/qtcharts-index.html diff --git a/package/qt6/qt6charts/qt6charts.hash b/package/qt6/qt6charts/qt6charts.hash new file mode 100644 index 00000000000..fbeb580f299 --- /dev/null +++ b/package/qt6/qt6charts/qt6charts.hash @@ -0,0 +1,5 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtcharts-everywhere-src-6.7.3.tar.xz.sha256 +sha256 07ea63a550e6bcfa4a9c38056f7aa524357305572268fe26f6063d83e4233659 qtcharts-everywhere-src-6.7.3.tar.xz + +# Hashes for license files +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt diff --git a/package/qt6/qt6charts/qt6charts.mk b/package/qt6/qt6charts/qt6charts.mk new file mode 100644 index 00000000000..133c4154de1 --- /dev/null +++ b/package/qt6/qt6charts/qt6charts.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# qt6charts +# +################################################################################ + +QT6CHARTS_VERSION = $(QT6_VERSION) +QT6CHARTS_SITE = $(QT6_SITE) +QT6CHARTS_SOURCE = qtcharts-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6CHARTS_VERSION).tar.xz +QT6CHARTS_INSTALL_STAGING = YES +QT6CHARTS_SUPPORTS_IN_SOURCE_BUILD = NO +QT6CHARTS_CMAKE_BACKEND = ninja +QT6CHARTS_LICENSE = GPL-3.0 +QT6CHARTS_LICENSE_FILES = LICENSES/GPL-3.0-only.txt + +QT6CHARTS_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6CHARTS_DEPENDENCIES = qt6base + +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6CHARTS_DEPENDENCIES += qt6declarative +endif + +$(eval $(cmake-package)) diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash index 006b49e4b1e..473b9b6bafa 100644 --- a/package/qt6/qt6declarative/qt6declarative.hash +++ b/package/qt6/qt6declarative/qt6declarative.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz.sha256 -sha256 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999 qtdeclarative-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtdeclarative-everywhere-src-6.7.3.tar.xz.sha256 +sha256 937b70e441abf5bc4e50d44d26610e2714a28514acf3885cd36116cd610b9875 qtdeclarative-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash index 7266474428c..e328cac5e4a 100644 --- a/package/qt6/qt6languageserver/qt6languageserver.hash +++ b/package/qt6/qt6languageserver/qt6languageserver.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtlanguageserver-everywhere-src-6.7.2.tar.xz.sha256 -sha256 b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 qtlanguageserver-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtlanguageserver-everywhere-src-6.7.3.tar.xz.sha256 +sha256 c56d3872428503d9e49bfc6fa1023332f035ffd711d39e904e50cd6bb1f9df8f qtlanguageserver-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash index 67ae6d0de38..bc2dc684475 100644 --- a/package/qt6/qt6mqtt/qt6mqtt.hash +++ b/package/qt6/qt6mqtt/qt6mqtt.hash @@ -1,6 +1,7 @@ -sha256 be2d3f12378a8e2a103c328201b1e308f8c6c09bd752322592b3164cebba5bde qt6mqtt-6.7.2-git4.tar.gz +# Locally computed +sha256 0a80d52cf349b61e0c012f1aa692639ac958de46d8a76cdb99af7b6067cf5c46 qt6mqtt-6.7.3-git4.tar.gz -# Hashes for license files: +# Hashes for license files sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt diff --git a/package/qt6/qt6opcua/Config.in b/package/qt6/qt6opcua/Config.in index 68b73f7c50d..9b5359dd4c0 100644 --- a/package/qt6/qt6opcua/Config.in +++ b/package/qt6/qt6opcua/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_QT6OPCUA bool "qt6opcua" select BR2_PACKAGE_QT6BASE_NETWORK - # qt6opcuda needs host-qt6opcua, and host-qt6opcua needs + # qt6opcua needs host-qt6opcua, and host-qt6opcua needs # network support in qt6base. select BR2_PACKAGE_HOST_QT6BASE_NETWORK diff --git a/package/qt6/qt6opcua/qt6opcua.hash b/package/qt6/qt6opcua/qt6opcua.hash index cf54bef98e6..8bb89abd58b 100644 --- a/package/qt6/qt6opcua/qt6opcua.hash +++ b/package/qt6/qt6opcua/qt6opcua.hash @@ -1,6 +1,7 @@ -sha256 653597e2926ddb512f078bab1e5d2a059202ba1bc1f68ff0b4a0e053ab1272b2 qt6opcua-6.7.2-git4.tar.gz +# Locally computed +sha256 09b5e525ad1a61b537b826f049b8725ab3b783bcaf3010a58361f73ff4df1cdb qt6opcua-6.7.3-git4.tar.gz -# Hashes for license files: +# 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 diff --git a/package/qt6/qt6scxml/Config.in b/package/qt6/qt6scxml/Config.in new file mode 100644 index 00000000000..66c2dc2206e --- /dev/null +++ b/package/qt6/qt6scxml/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_QT6SCXML + bool "qt6scxml" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package provides two related state machine modules: + + * StateMachine: provides classes for creating and executing + state graphs. + + https://doc.qt.io/qt-6/qtstatemachine-index.html + + * Scxml: provides functionality to create state machines + from SCXML files. + + https://doc.qt.io/qt-6/qtscxml-index.html diff --git a/package/qt6/qt6scxml/qt6scxml.hash b/package/qt6/qt6scxml/qt6scxml.hash new file mode 100644 index 00000000000..f5e8b075a5d --- /dev/null +++ b/package/qt6/qt6scxml/qt6scxml.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtscxml-everywhere-src-6.7.3.tar.xz.sha256 +sha256 608febeb0dafb6fbf559e064dee779ab799441ed804267b534705ea5077eeda3 qtscxml-everywhere-src-6.7.3.tar.xz + +# 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/qt6scxml/qt6scxml.mk b/package/qt6/qt6scxml/qt6scxml.mk new file mode 100644 index 00000000000..29e0c752f87 --- /dev/null +++ b/package/qt6/qt6scxml/qt6scxml.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# qt6scxml +# +################################################################################ + +QT6SCXML_VERSION = $(QT6_VERSION) +QT6SCXML_SITE = $(QT6_SITE) +QT6SCXML_SOURCE = qtscxml-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SCXML_VERSION).tar.xz +QT6SCXML_INSTALL_STAGING = YES +QT6SCXML_SUPPORTS_IN_SOURCE_BUILD = NO +QT6SCXML_CMAKE_BACKEND = ninja + +QT6SCXML_LICENSE = \ + BSD-3-Clause (buildsystem, examples, snippets) \ + GFDL-1.3-no-invariants (docs), \ + GPL-2.0 or GPL-3.0 or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GPL-3.0 (tests) + +QT6SCXML_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 + +QT6SCXML_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SCXML_DEPENDENCIES = \ + host-qt6scxml \ + qt6base + +HOST_QT6SCXML_DEPENDENCIES = \ + host-qt6base + +# When we have support for qt6declarative in target qt6scxml, we also +# need it in the host qt6scxml. +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +QT6SCXML_DEPENDENCIES += qt6declarative +HOST_QT6SCXML_DEPENDENCIES += host-qt6declarative +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash index 9cb423c90f1..d7965614243 100644 --- a/package/qt6/qt6shadertools/qt6shadertools.hash +++ b/package/qt6/qt6shadertools/qt6shadertools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtshadertools-everywhere-src-6.7.2.tar.xz.sha256 -sha256 edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 qtshadertools-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtshadertools-everywhere-src-6.7.3.tar.xz.sha256 +sha256 74e512798c7ddbda354a2d8d975211454bbabb47afb7e598892067a5828c0995 qtshadertools-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in index 5f52c5644fd..1828e5f0432 100644 --- a/package/qt6/qt6tools/Config.in +++ b/package/qt6/qt6tools/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_QT6TOOLS bool "qt6tools" + # The Qt Network module is required select BR2_PACKAGE_QT6BASE_NETWORK - # qt6tools needs host-qt6tools, and host-qt6tools needs - # network support in qt6base. In addition, we also need - # host-qt6base with Sql support to build the qhelpgenerator - # tool, if target support for Sql is present - select BR2_PACKAGE_HOST_QT6BASE_NETWORK - select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL + select BR2_PACKAGE_HOST_QT6TOOLS help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt6/qt6tools/Config.in.host b/package/qt6/qt6tools/Config.in.host new file mode 100644 index 00000000000..7a6f8a5176e --- /dev/null +++ b/package/qt6/qt6tools/Config.in.host @@ -0,0 +1,25 @@ +config BR2_PACKAGE_HOST_QT6TOOLS + bool "host qt6tools" + # The Qt Qt Network module is required + select BR2_PACKAGE_HOST_QT6BASE_NETWORK + # Requires the Qt Sql module to build the qhelpgenerator + # tool, if target support for Sql is present + select BR2_PACKAGE_HOST_QT6BASE_SQL if BR2_PACKAGE_QT6BASE_SQL + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Tools provides tools facilitate the development + and design of applications. + + https://github.com/qt/qttools + +if BR2_PACKAGE_HOST_QT6TOOLS + +config BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS + bool "host linguist tools" + help + Translate Qt C++ and Qt Quick applications into local + languages. + +endif diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash index 622df4a00f5..dba38b28959 100644 --- a/package/qt6/qt6tools/qt6tools.hash +++ b/package/qt6/qt6tools/qt6tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz.sha256 -sha256 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a qttools-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qttools-everywhere-src-6.7.3.tar.xz.sha256 +sha256 f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f qttools-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk index 12b6667baee..b063f088879 100644 --- a/package/qt6/qt6tools/qt6tools.mk +++ b/package/qt6/qt6tools/qt6tools.mk @@ -47,5 +47,17 @@ HOST_QT6TOOLS_CONF_OPTS = \ HOST_QT6TOOLS_DEPENDENCIES = host-qt6base +ifeq ($(BR2_PACKAGE_HOST_QT6TOOLS_LINGUIST_TOOLS),y) +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=ON +# When we have qt6declarative for the target, we need to build the +# linguist tool with host-qt6declarative support so that it handles +# QML/JS files +ifeq ($(BR2_PACKAGE_QT6DECLARATIVE),y) +HOST_QT6TOOLS_DEPENDENCIES += host-qt6declarative +endif +else +HOST_QT6TOOLS_CONF_OPTS += -DFEATURE_linguist=OFF +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash index f34eb11e9ea..3f568755ed8 100644 --- a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz.sha256 -sha256 320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz.sha256 +sha256 1a872104e212c048ada47d28ea8bb2e0ab0637663a3b085989349e249f1423d9 qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash index 3d0ded7bec2..a1fdb649b2c 100644 --- a/package/qt6/qt6wayland/qt6wayland.hash +++ b/package/qt6/qt6wayland/qt6wayland.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz.sha256 -sha256 a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b qtwayland-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwayland-everywhere-src-6.7.3.tar.xz.sha256 +sha256 e326c7ceb628f503bfc20577d5d2df9690ee10db08eb940cb80c759a6972b2b5 qtwayland-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash index 5dfeeef01da..d9cfe8e173f 100644 --- a/package/qt6/qt6websockets/qt6websockets.hash +++ b/package/qt6/qt6websockets/qt6websockets.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.2/submodules/qtwebsockets-everywhere-src-6.7.2.tar.xz.sha256 -sha256 5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f qtwebsockets-everywhere-src-6.7.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/qtwebsockets-everywhere-src-6.7.3.tar.xz.sha256 +sha256 ba03007db7ee68a5bc3e3bd1d71e11f3e1f84e470bcb8c54cd7c01bbe1c5990e qtwebsockets-everywhere-src-6.7.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index e745923b87b..2bd9da1392c 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -29,7 +29,7 @@ define QUICKJS_INSTALL_STAGING_CMDS EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ DESTDIR=$(STAGING_DIR) \ STRIP=/bin/true \ - prefix=/usr \ + PREFIX=/usr \ install endef @@ -39,7 +39,7 @@ define QUICKJS_INSTALL_TARGET_CMDS EXTRA_LIBS="$(QUICKJS_EXTRA_LIBS)" \ DESTDIR=$(TARGET_DIR) \ STRIP=/bin/true \ - prefix=/usr \ + PREFIX=/usr \ install endef diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch index 29a9311651b..fe2614d35e1 100644 --- a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -1,4 +1,4 @@ -From acd175aa53af1f1b8422bf1f1fe57eafc710cdca Mon Sep 17 00:00:00 2001 +From d580bf031011d1e1e022ab1e1024f7cc5939f956 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 2 Dec 2016 23:09:44 +0100 Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS @@ -10,22 +10,22 @@ Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 Signed-off-by: Thomas Petazzoni [Rebased on 9324fd7] Signed-off-by: Peter Seiderer -[Rebased on 20221215-105525-0-g1afa26c5] -Signed-off-by: Fiona Klute +[Rebased on 20240926-102326-0-g82d8755] +Signed-off-by: Fiona Klute (WIWA) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index dc78cfe..c9d4910 100755 +index d2f7585..9812d6d 100755 --- a/Makefile +++ b/Makefile -@@ -1,7 +1,7 @@ - PKG_VER=$(shell grep rpiboot debian/changelog | head -n1 | sed 's/.*(\(.*\)).*/\1/g') - GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") - rpiboot: main.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h -- $(CC) -Wall -Wextra -g -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -+ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ $< `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" $(LDFLAGS) +@@ -3,7 +3,7 @@ GIT_VER=$(shell git rev-parse HEAD 2>/dev/null | cut -c1-8 || echo "") + INSTALL_PREFIX?=/usr + + rpiboot: main.c bootfiles.c decode_duid.c msd/bootcode.h msd/start.h msd/bootcode4.h msd/start4.h +- $(CC) -Wall -Wextra -g -o $@ main.c bootfiles.c decode_duid.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ++ $(CC) -Wall -Wextra -g $(CFLAGS) -o $@ main.c bootfiles.c decode_duid.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(LDFLAGS) %.h: %.bin ./bin2c ./bin2c $< $@ diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash index 830ead82431..413fe88f03b 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2f02dbe9a88e9dfad5f05e513e1f30afd47b1575820f7c3b09665dfefc45bbaa raspberrypi-usbboot-20221215-105525.tar.gz +sha256 2ce52a9f1de1aab39daa10fa487c55d20d34f679d11b1a1743d0ef81ffb3c726 raspberrypi-usbboot-20240926-102326-git4.tar.gz # License files sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk index 24a1f6d906f..3135741e9be 100644 --- a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -4,9 +4,9 @@ # ################################################################################ -RASPBERRYPI_USBBOOT_VERSION = 20221215-105525 -RASPBERRYPI_USBBOOT_SITE = \ - $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) +RASPBERRYPI_USBBOOT_VERSION = 20240926-102326 +RASPBERRYPI_USBBOOT_SITE = https://github.com/raspberrypi/usbboot.git +RASPBERRYPI_USBBOOT_SITE_METHOD = git RASPBERRYPI_USBBOOT_LICENSE = Apache-2.0 RASPBERRYPI_USBBOOT_LICENSE_FILES = LICENSE diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 391d89a8f65..f3ab0a0be95 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 ef82ee452939c03a24fd40649afa96497f3cec965994e6c9c0d94239b640bc10 rauc-1.11.3.tar.xz +sha256 96681e119af8b6b9bb30e856a831e5a5b3292e9a5959d26ffa274b5135bc5031 rauc-1.12.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 7239d84cc74..475aee5d895 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.3 +RAUC_VERSION = 1.12 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index 0f28b5609f7..82d0ee784c5 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 05e111f560b7c5bef1a208880a3d94eb2e7f1ad484bf916a81780d2fde5d3dcc rdma-core-52.0.tar.gz +sha256 2c842d80964e6c24994cef33508f26bcb06042b70643115a9d28619dc2b96f42 rdma-core-54.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 3ad3ad59546..20b89abedfb 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 52.0 +RDMA_CORE_VERSION = 54.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index 70d1acc9afd..5e876d4a439 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 c89cd3b2e5d99765cc24536fd8e76de83951ad23e05472350328b5a4f8bee410 refpolicy-2.20231002.tar.bz2 +sha256 7ed41f4f45189b9ee9706da8ac357eccc103651b56daabaddb54c436e8117cf9 refpolicy-2.20240226.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index fb1c213b840..74ccb796245 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -23,7 +23,7 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20231002 +REFPOLICY_VERSION = 2.20240226 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_$(subst .,_,$(REFPOLICY_VERSION)) endif diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 5b86afdcc02..34847f28f19 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8f8aa2c6c66bcc6d91c6edd63913e5d738de6428928f27d1019d89c31cf347b1 restorecond-3.6.tar.gz +sha256 4192595c08c775ff540f5ab850885ce11b132a4a4e29b65f20e751dd0a69d31f restorecond-3.7.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 93495d8b7fc..4624b9204dd 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.6 +RESTORECOND_VERSION = 3.7 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = LICENSE diff --git a/package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch b/package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch deleted file mode 100644 index 29ba72be4f0..00000000000 --- a/package/rp-pppoe/0001-src-pppoe.h-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bbf5b2759cff0c65b47fd6dbe5fe7341f205ad03 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 11 Dec 2021 22:03:16 +0100 -Subject: [PATCH] src/pppoe.h: fix build with musl libc - -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_ether.h include below libc netinet/if_ether.h. That -fixes the following build failure: - -In file included from pppoe.h:133, - from debug.c:19: -/home/giuliobenetti/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/netinet/if_ether.h:116:8: error: redefinition of 'struct ethhdr' - 116 | struct ethhdr { - | ^~~~~~ -In file included from pppoe.h:121, - from debug.c:19: -/home/giuliobenetti/autobuild/run/instance-0/output-1/host/riscv64-buildroot-linux-musl/sysroot/usr/include/linux/if_ether.h:163:8: note: originally defined here - 163 | struct ethhdr { - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/ccca18fcbcde65cb6784f5559eac68ca17ab14a3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/dfskoll/rp-pppoe/pull/4] ---- - src/pppoe.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/pppoe.h b/src/pppoe.h -index 4780092..2b08111 100644 ---- a/src/pppoe.h -+++ b/src/pppoe.h -@@ -117,10 +117,6 @@ typedef unsigned long UINT32_t; - #error Could not find a 32-bit integer type - #endif - --#ifdef HAVE_LINUX_IF_ETHER_H --#include --#endif -- - #include - - #ifdef HAVE_NETINET_IF_ETHER_H -@@ -134,6 +130,10 @@ typedef unsigned long UINT32_t; - #endif - #endif - -+#ifdef HAVE_LINUX_IF_ETHER_H -+#include -+#endif -+ - - - /* Ethernet frame types according to RFC 2516 */ --- -2.33.0 - diff --git a/package/rp-pppoe/rp-pppoe.hash b/package/rp-pppoe/rp-pppoe.hash index c883322d703..97bb61eaf8b 100644 --- a/package/rp-pppoe/rp-pppoe.hash +++ b/package/rp-pppoe/rp-pppoe.hash @@ -1,4 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 b1f318bc7e4e5b0fd8a8e23e8803f5e6e43165245a5a10a7162a92a6cf17829a rp-pppoe-3.15.tar.gz # Locally computed -sha256 464006ba771074f4022db14f58a29a0b447b6fdde9529cf0331be396b6279162 doc/LICENSE +sha256 17d45712778f2bf6b0859ff610a3dacd24bc4462e9f53bb1466d47af391701d3 rp-pppoe-4.0.tar.gz +sha256 d2767e7ffc6dc9477812f6238551fe4b29a889df6f23c3922e7b9cec92bc278d doc/LICENSE diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 75f2290442b..98325e7d49d 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -4,8 +4,8 @@ # ################################################################################ -RP_PPPOE_VERSION = 3.15 -RP_PPPOE_SITE = https://downloads.uls.co.za/rp-pppoe +RP_PPPOE_VERSION = 4.0 +RP_PPPOE_SITE = $(call github,dfskoll,rp-pppoe,$(RP_PPPOE_VERSION)) RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE RP_PPPOE_CPE_ID_VALID = YES @@ -13,8 +13,6 @@ RP_PPPOE_CPE_ID_VALID = YES RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff -RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \ - pppoe-status pppoe-stop RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION) RP_PPPOE_CONF_OPTS = --disable-debugging @@ -30,14 +28,9 @@ RP_PPPOE_CONF_ENV = \ PPPD_H=$(PPPD_DIR)/pppd/pppd.h define RP_PPPOE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/configs/pppoe.conf \ - $(TARGET_DIR)/etc/ppp/pppoe.conf for ff in $(RP_PPPOE_TARGET_FILES); do \ $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \ done - for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \ - $(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \ - done endef $(eval $(autotools-package)) diff --git a/package/rpcbind/rpcbind.hash b/package/rpcbind/rpcbind.hash index b5f117db54d..45bd3941993 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 f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e rpcbind-1.2.7.tar.bz2 sha256 2b9477d2f4ab277b29702958f0058546edc120aae4b5fb8b8d1a9652104e1ba3 COPYING diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 2c158213ad3..e553f540669 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -4,8 +4,8 @@ # ################################################################################ -RPCBIND_VERSION = 1.2.6 -RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) +RPCBIND_VERSION = 1.2.7 +RPCBIND_SITE = https://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash index 265e4c42495..ee6c50dee0b 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 490ca6fa0c81451f2472b4aa85796a876790f2e212bf0882e3bb7caf5c47e2c3 rpi-rgb-led-matrix-a56338db0f003d5236f2ce98c73a591d64a70852.tar.gz +sha256 9a6da5b0ad730883a5fa18afc59b1297b4b05eb581c2c14ae50a3583296a4bed rpi-rgb-led-matrix-f55736f7595bc028451658996eedea9742688bbc.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk index 499fb408c2a..593bc96b5d3 100644 --- a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -4,7 +4,8 @@ # ################################################################################ -RPI_RGB_LED_MATRIX_VERSION = a56338db0f003d5236f2ce98c73a591d64a70852 +# When updating the version, please also update python-rgbmatrix +RPI_RGB_LED_MATRIX_VERSION = f55736f7595bc028451658996eedea9742688bbc RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING diff --git a/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch b/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch deleted file mode 100644 index 9e5af9c1486..00000000000 --- a/package/rrdtool/0001-Fix-BUILD_DATE-in-rrdtool-help-output.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= -Date: Wed, 23 Mar 2022 17:58:45 +0100 -Subject: [PATCH] Fix BUILD_DATE in rrdtool help output - -- This is a followup to #1102 -- Fixes segfault when running "rrdtool --help" -- Change DATE_FMT to the same date format as the __DATE__ macro [1]: - mmm dd yyyy - -[1] https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html - -Upstream: https://github.com/oetiker/rrdtool-1.x/commit/e59f703bbcc0af949ee365206426b6394c340c6f - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 2 +- - src/rrd_tool.c | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4d2345855..5169b0d49 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -695,7 +695,7 @@ AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built}) - - # Use reproducible build date and time - if test "$SOURCE_DATE_EPOCH"; then -- DATE_FMT="%d %b %Y %H:%M:%S" -+ DATE_FMT="%b %d %Y %H:%M:%S" - BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT") - AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"], [Use reproducible build date]) - fi -diff --git a/src/rrd_tool.c b/src/rrd_tool.c -index 930d08272..cc6119d9a 100644 ---- a/src/rrd_tool.c -+++ b/src/rrd_tool.c -@@ -45,11 +45,19 @@ static void PrintUsage( - char *cmd) - { - -+#ifdef BUILD_DATE -+ const char *help_main = -+ N_("RRDtool %s" -+ " Copyright by Tobias Oetiker \n" -+ " Compiled %s\n\n" -+ "Usage: rrdtool [options] command command_options\n"); -+#else - const char *help_main = - N_("RRDtool %s" - " Copyright by Tobias Oetiker \n" - " Compiled %s %s\n\n" - "Usage: rrdtool [options] command command_options\n"); -+#endif - - const char *help_list = - N_ diff --git a/package/rrdtool/0002-Constify-argv-fix-warnings.patch b/package/rrdtool/0002-Constify-argv-fix-warnings.patch deleted file mode 100644 index e41e729a0e6..00000000000 --- a/package/rrdtool/0002-Constify-argv-fix-warnings.patch +++ /dev/null @@ -1,1586 +0,0 @@ -From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20Such=C3=A1nek?= -Date: Fri, 5 Jan 2024 15:31:48 +0100 -Subject: [PATCH] Constify argv, fix warnings. (#1242) - -* Fix perl warnings - - - cast POPs to void to avoid unused value warning - - declare functions that don't set RETVAL as returning void - -Signed-off-by: Michal Suchanek - -* Constify argv - -rrd has no business modifying the string pointed to by passed agrv, and -as far as gcc can see it does indeed not modify them because it compiles -with const argv. - -This fixes warnings when passing const strings into rrd, and avoids the -need to duplicate all strings in the tcl bindings. - -This fixes warnings like these: -[ 3s] prog/sensord/rrd.c: In function 'rrdInit': -[ 3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] -[ 3s] 302 | ret = rrd_create(argc, (char**) argv); -[ 3s] | ^ -[ 3s] prog/sensord/rrd.c: In function 'rrdUpdate': -[ 3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] -[ 3s] 458 | if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { -[ 3s] | ^ - -Signed-off-by: Michal Suchanek - -* tcl: Do not duplicate const strings - ---------- - -Signed-off-by: Michal Suchanek - -Upstream: https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075 - -Signed-off-by: Bernd Kuhls ---- - CHANGES | 3 ++ - bindings/lua/rrdlua.c | 25 +++++----- - bindings/perl-shared/RRDs.xs | 36 +++++++------- - bindings/python/rrdtoolmodule.c | 38 +++++++-------- - bindings/ruby/main.c | 10 ++-- - bindings/tcl/tclrrd.c | 84 ++++++++------------------------- - src/optparse.c | 14 +++--- - src/optparse.h | 6 +-- - src/rrd.h | 38 +++++++-------- - src/rrd_cgi.c | 24 +++++----- - src/rrd_create.c | 2 +- - src/rrd_daemon.c | 12 ++--- - src/rrd_dump.c | 4 +- - src/rrd_fetch.c | 2 +- - src/rrd_first.c | 2 +- - src/rrd_flushcached.c | 2 +- - src/rrd_graph.c | 6 +-- - src/rrd_graph.h | 4 +- - src/rrd_graph_helper.c | 2 +- - src/rrd_info.c | 2 +- - src/rrd_last.c | 2 +- - src/rrd_lastupdate.c | 2 +- - src/rrd_list.c | 6 +-- - src/rrd_modify.c | 2 +- - src/rrd_modify.h | 2 +- - src/rrd_resize.c | 4 +- - src/rrd_restore.c | 2 +- - src/rrd_tool.c | 26 +++++----- - src/rrd_tune.c | 2 +- - src/rrd_update.c | 4 +- - src/rrd_xport.c | 2 +- - src/rrdupdate.c | 7 +-- - 32 files changed, 168 insertions(+), 209 deletions(-) - -diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c -index d1a700641..2095c3b5b 100644 ---- a/bindings/lua/rrdlua.c -+++ b/bindings/lua/rrdlua.c -@@ -37,8 +37,8 @@ - extern void rrd_freemem(void *mem); - - extern int luaopen_rrd (lua_State * L); --typedef int (*RRD_FUNCTION)(int, char **); --typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **); -+typedef int (*RRD_FUNCTION)(int, const char **); -+typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **); - - /**********************************************************/ - -@@ -49,9 +49,9 @@ static void reset_rrd_state(void) - rrd_clear_error(); - } - --static char **make_argv(const char *cmd, lua_State * L) -+static const char **make_argv(const char *cmd, lua_State * L) - { -- char **argv; -+ const char **argv; - int i; - int argc = lua_gettop(L) + 1; - -@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L) - luaL_error(L, "Can't allocate memory for arguments array", cmd); - - /* fprintf(stderr, "Args:\n"); */ -- argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */ -- /* functions don't expect (const * char) */ -+ argv[0] = cmd; - /* fprintf(stderr, "%s\n", argv[0]); */ - for (i=1; i - #include "../../src/rrd_tool.h" - #include "../../src/rrd_format.h" -+#include "../../src/unused.h" - - /* support pre-8.4 tcl */ - -@@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit( - * Hence, we need to do some preparation before - * calling the rrd library functions. - */ --static char **getopt_init( -+static const char **getopt_init( - int argc, - CONST84 char *argv[]) - { -- char **argv2; -+ const char **argv2; - int i; - - argv2 = calloc(argc, sizeof(char *)); - for (i = 0; i < argc; i++) { -- argv2[i] = strdup(argv[i]); -+ argv2[i] = argv[i]; - } - return argv2; - } - - static void getopt_cleanup( -- int argc, -- char **argv2) -+ int UNUSED(argc), -+ const char **argv2) - { -- int i; -- -- for (i = 0; i < argc; i++) { -- if (argv2[i] != NULL) { -- free(argv2[i]); -- } -- } -- free(argv2); -+ free((void *)argv2); - } - - static void getopt_free_element( -- char *argv2[], -+ const char *argv2[], - int argn) - { - if (argv2[argn] != NULL) { -- free(argv2[argn]); - argv2[argn] = NULL; - } - } - - static void getopt_squieeze( - int *argc, -- char *argv2[]) -+ const char *argv2[]) - { - int i, null_i = 0, argc_tmp = *argc; - -@@ -104,7 +97,7 @@ static int Rrd_Create( - CONST84 char *argv[]) - { - int argv_i; -- char **argv2; -+ const char **argv2; - char *parsetime_error = NULL; - time_t last_up = time(NULL) - 10; - long int long_tmp; -@@ -295,7 +288,7 @@ static int Rrd_Flushcached( - return TCL_ERROR; - } - -- rrd_flushcached(argc, (char**)argv); -+ rrd_flushcached(argc, argv); - - if (rrd_test_error()) { - Tcl_AppendResult(interp, "RRD Error: ", -@@ -380,7 +373,7 @@ static int Rrd_Update( - CONST84 char *argv[]) - { - int argv_i; -- char **argv2, *template = NULL; -+ const char **argv2, *template = NULL; - - argv2 = getopt_init(argc, argv); - -@@ -391,16 +384,10 @@ static int Rrd_Update( - Tcl_AppendResult(interp, "RRD Error: option '", - argv2[argv_i - 1], "' needs an argument", - (char *) NULL); -- if (template != NULL) { -- free(template); -- } - getopt_cleanup(argc, argv2); - return TCL_ERROR; - } -- if (template != NULL) { -- free(template); -- } -- template = strdup(argv2[argv_i]); -+ template = argv2[argv_i]; - getopt_free_element(argv2, argv_i - 1); - getopt_free_element(argv2, argv_i); - } else if (!strcmp(argv2[argv_i], "--")) { -@@ -409,9 +396,6 @@ static int Rrd_Update( - } else if (argv2[argv_i][0] == '-') { - Tcl_AppendResult(interp, "RRD Error: unknown option '", - argv2[argv_i], "'", (char *) NULL); -- if (template != NULL) { -- free(template); -- } - getopt_cleanup(argc, argv2); - return TCL_ERROR; - } -@@ -422,18 +406,12 @@ static int Rrd_Update( - if (argc < 2) { - Tcl_AppendResult(interp, "RRD Error: needs rrd filename", - (char *) NULL); -- if (template != NULL) { -- free(template); -- } - getopt_cleanup(argc, argv2); - return TCL_ERROR; - } - - rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2); - -- if (template != NULL) { -- free(template); -- } - getopt_cleanup(argc, argv2); - - if (rrd_test_error()) { -@@ -454,7 +432,6 @@ static int Rrd_Info( - { - int status = TCL_OK; - rrd_info_t *data; -- char **argv2; - - /* TODO: support for rrdcached */ - if (argc != 2) { -@@ -463,9 +440,7 @@ static int Rrd_Info( - return TCL_ERROR; - } - -- argv2 = getopt_init(argc, argv); -- -- data = rrd_info_r(argv2[1]); -+ data = rrd_info_r(argv[1]); - - if (data) { - Tcl_SetObjResult(interp, convert_info(data)); -@@ -477,7 +452,6 @@ static int Rrd_Info( - status = TCL_ERROR; - } - -- getopt_cleanup(argc, argv2); - return status; - } - -@@ -488,7 +462,6 @@ static int Rrd_Lastupdate( - CONST84 char *argv[]) - { - time_t last_update; -- char **argv2; - char **ds_namv; - char **last_ds; - char s[30]; -@@ -502,8 +475,7 @@ static int Rrd_Lastupdate( - return TCL_ERROR; - } - -- argv2 = getopt_init(argc, argv); -- if (rrd_lastupdate_r(argv2[1], &last_update, -+ if (rrd_lastupdate_r(argv[1], &last_update, - &ds_cnt, &ds_namv, &last_ds) == 0) { - listPtr = Tcl_GetObjResult(interp); - for (i = 0; i < ds_cnt; i++) { -@@ -527,7 +499,6 @@ static int Rrd_Lastupdate( - free(ds_namv); - } - } -- getopt_cleanup(argc, argv2); - return TCL_OK; - } - -@@ -543,10 +514,8 @@ static int Rrd_Fetch( - char **ds_namv; - Tcl_Obj *listPtr; - char s[30]; -- char **argv2; - -- argv2 = getopt_init(argc, argv); -- if (rrd_fetch(argc, argv2, &start, &end, &step, -+ if (rrd_fetch(argc, argv, &start, &end, &step, - &ds_cnt, &ds_namv, &data) != -1) { - datai = data; - listPtr = Tcl_GetObjResult(interp); -@@ -562,7 +531,6 @@ static int Rrd_Fetch( - free(ds_namv); - free(data); - } -- getopt_cleanup(argc, argv2); - - if (rrd_test_error()) { - Tcl_AppendResult(interp, "RRD Error: ", -@@ -590,7 +558,7 @@ static int Rrd_Graph( - int rc, xsize, ysize; - double ymin, ymax; - char dimensions[50]; -- char **argv2; -+ const char **argv2; - CONST84 char *save; - - /* -@@ -692,11 +660,7 @@ static int Rrd_Tune( - int argc, - CONST84 char *argv[]) - { -- char **argv2; -- -- argv2 = getopt_init(argc, argv); -- rrd_tune(argc, argv2); -- getopt_cleanup(argc, argv2); -+ rrd_tune(argc, argv); - - if (rrd_test_error()) { - Tcl_AppendResult(interp, "RRD Error: ", -@@ -716,11 +680,7 @@ static int Rrd_Resize( - int argc, - CONST84 char *argv[]) - { -- char **argv2; -- -- argv2 = getopt_init(argc, argv); -- rrd_resize(argc, argv2); -- getopt_cleanup(argc, argv2); -+ rrd_resize(argc, argv); - - if (rrd_test_error()) { - Tcl_AppendResult(interp, "RRD Error: ", -@@ -740,11 +700,7 @@ static int Rrd_Restore( - int argc, - CONST84 char *argv[]) - { -- char **argv2; -- -- argv2 = getopt_init(argc, argv); -- rrd_restore(argc, argv2); -- getopt_cleanup(argc, argv2); -+ rrd_restore(argc, argv); - - if (rrd_test_error()) { - Tcl_AppendResult(interp, "RRD Error: ", -diff --git a/src/optparse.c b/src/optparse.c -index 9040ba8b2..79a3efe11 100644 ---- a/src/optparse.c -+++ b/src/optparse.c -@@ -10,7 +10,7 @@ - #define options_argv(i) \ - ((i) < options->argc ? options->argv[i] : NULL) - --void optparse_init(struct optparse *options, int argc, char **argv) -+void optparse_init(struct optparse *options, int argc, const char **argv) - { - options->argv = argv; - options->argc = argc; -@@ -42,7 +42,7 @@ is_longopt(const char *arg) - static void - permute(struct optparse *options, int index) - { -- char *nonoption = options->argv[index]; -+ const char *nonoption = options->argv[index]; - for (int i = index; i < options->optind - 1; i++) - options->argv[i] = options->argv[i + 1]; - options->argv[options->optind - 1] = nonoption; -@@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring) - options->errmsg[0] = '\0'; - options->optopt = 0; - options->optarg = NULL; -- char *option = options_argv(options->optind); -+ const char *option = options_argv(options->optind); - if (option == NULL) { - return -1; - } else if (is_dashdash(option)) { -@@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring) - option += options->subopt + 1; - options->optopt = option[0]; - int type = argtype(optstring, option[0]); -- char *next = options_argv(options->optind + 1); -+ const char *next = options_argv(options->optind + 1); - switch (type) { - case -1: - opterror(options, "invalid option -- '%c'", option[0]); -@@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring) - return 0; - } - --char *optparse_arg(struct optparse *options) -+const char *optparse_arg(struct optparse *options) - { - options->subopt = 0; -- char *option = options->argv[options->optind]; -+ const char *option = options->argv[options->optind]; - if (option != NULL) - options->optind++; - return option; -@@ -222,7 +222,7 @@ optparse_long(struct optparse *options, - int *longindex) - { - // printf("%i < %i\n",options->optind,options->argc); -- char *option = options_argv(options->optind); -+ const char *option = options_argv(options->optind); - if (option == NULL) { - return -1; - } else if (is_dashdash(option)) { -diff --git a/src/optparse.h b/src/optparse.h -index c4b0ec19c..7a0bb3885 100644 ---- a/src/optparse.h -+++ b/src/optparse.h -@@ -44,7 +44,7 @@ - */ - - struct optparse { -- char **argv; -+ const char **argv; - int argc; - int permute; - int optind; -@@ -65,7 +65,7 @@ struct optparse_long { - /** - * Initializes the parser state. - */ --void optparse_init(struct optparse *options, int argc, char **argv); -+void optparse_init(struct optparse *options, int argc, const char **argv); - - /** - * Read the next option in the argv array. -@@ -98,6 +98,6 @@ optparse_long(struct optparse *options, - * subcommand returned by optparse_arg(). This function allows you to - * ignore the value of optind. - */ --char *optparse_arg(struct optparse *options); -+const char *optparse_arg(struct optparse *options); - - #endif -diff --git a/src/rrd.h b/src/rrd.h -index 184887ccc..b40f9a449 100644 ---- a/src/rrd.h -+++ b/src/rrd.h -@@ -155,10 +155,10 @@ extern "C" { - /* main function blocks */ - int rrd_create( - int, -- char **); -+ const char **); - rrd_info_t *rrd_info( - int, -- char **); -+ const char **); - rrd_info_t *rrd_info_push( - rrd_info_t *, - char *, -@@ -170,19 +170,19 @@ extern "C" { - rrd_info_t *); - char *rrd_list( - int, -- char **); -+ const char **); - char *rrd_list_r( - int, -- char *dirname); -+ const char *dirname); - int rrd_update( - int, -- char **); -+ const char **); - rrd_info_t *rrd_update_v( - int, -- char **); -+ const char **); - int rrd_graph( - int, -- char **, -+ const char **, - char ***, - int *, - int *, -@@ -191,11 +191,11 @@ extern "C" { - double *); - rrd_info_t *rrd_graph_v( - int, -- char **); -+ const char **); - - int rrd_fetch( - int, -- char **, -+ const char **, - time_t *, - time_t *, - unsigned long *, -@@ -204,32 +204,32 @@ extern "C" { - rrd_value_t **); - int rrd_restore( - int, -- char **); -+ const char **); - int rrd_dump( - int, -- char **); -+ const char **); - int rrd_tune( - int, -- char **); -+ const char **); - time_t rrd_last( - int, -- char **); -+ const char **); - int rrd_lastupdate( - int argc, -- char **argv); -+ const char **argv); - time_t rrd_first( - int, -- char **); -+ const char **); - int rrd_resize( - int, -- char **); -+ const char **); - char *rrd_strversion( - void); - double rrd_version( - void); - int rrd_xport( - int, -- char **, -+ const char **, - int *, - time_t *, - time_t *, -@@ -239,7 +239,7 @@ extern "C" { - rrd_value_t **); - int rrd_flushcached( - int argc, -- char **argv); -+ const char **argv); - - void rrd_freemem( - void *mem); -@@ -323,7 +323,7 @@ extern "C" { - const char **argv); - int rrd_dump_opt_r( - const char *filename, -- char *outname, -+ const char *outname, - int opt_noheader); - int rrd_dump_r( - const char *filename, -diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c -index b82c310db..14a4f511a 100644 ---- a/src/rrd_cgi.c -+++ b/src/rrd_cgi.c -@@ -102,7 +102,7 @@ static char *rrdstrip( - static char *scanargs( - char *line, - int *argc, -- char ***args); -+ const char ***args); - - /* format at-time specified times using strftime */ - static char *printstrftime( -@@ -317,7 +317,7 @@ static const char *putvar( - } - - /* expand those RRD:* directives that can be used recursively */ --static char *rrd_expand_vars( -+static const char *rrd_expand_vars( - char *buffer) - { - int i; -@@ -434,7 +434,7 @@ static int readfile( - - int main( - int argc, -- char *argv[]) -+ const char *argv[]) - { - char *buffer; - long i; -@@ -926,7 +926,7 @@ static char *drawgraph( - } - calfree(); - if (rrd_graph -- (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, -+ (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, - &ymax) != -1) { - return stralloc(calcpr[0]); - } else { -@@ -973,7 +973,7 @@ static char *printtimelast( - /* not raising argc in step with args - 1 since the last argument - will be used below for strftime */ - -- last = rrd_last(argc, (char **) args - 1); -+ last = rrd_last(argc, args - 1); - if (rrd_test_error()) { - char err[4096]; - -@@ -1027,7 +1027,7 @@ static char *printtimenow( - static char *scanargs( - char *line, - int *argument_count, -- char ***arguments) -+ const char ***arguments) - { - char *getP; /* read cursor */ - char *putP; /* write cursor */ -@@ -1039,8 +1039,8 @@ static char *scanargs( - - /* local array of arguments while parsing */ - int argc = 1; -- char **argv; -- char **argv_tmp; /* temp variable for realloc() */ -+ const char **argv; -+ const char **argv_tmp; /* temp variable for realloc() */ - - #ifdef DEBUG_PARSER - printf("<-- scanargs(%s) -->\n", line); -@@ -1051,7 +1051,7 @@ static char *scanargs( - - /* create initial argument array of char pointers */ - argsz = 32; -- argv = (char **) malloc(argsz * sizeof(char *)); -+ argv = malloc(argsz * sizeof(char *)); - if (!argv) { - return NULL; - } -@@ -1146,7 +1146,7 @@ static char *scanargs( - if (argc == argsz - 2) { - /* resize argument array */ - argsz *= 2; -- argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *)); -+ argv_tmp = rrd_realloc(argv, argsz * sizeof(char *)); - if (*argv_tmp == NULL) { - return NULL; - } -@@ -1213,7 +1213,7 @@ static int parse( - /* the name of the vairable ... */ - char *val; - long valln; -- char **args; -+ const char **args; - char *end; - long end_offset; - int argc; -@@ -1264,7 +1264,7 @@ static int parse( - /* make sure we do not shrink the mallocd block */ - size_t newbufsize = i + strlen(end) + valln + 1; - -- *buf = (char *) rrd_realloc(*buf, newbufsize); -+ *buf = rrd_realloc(*buf, newbufsize); - - if (*buf == NULL) { - perror("Realoc buf:"); -diff --git a/src/rrd_create.c b/src/rrd_create.c -index f9bad0866..919b4195a 100644 ---- a/src/rrd_create.c -+++ b/src/rrd_create.c -@@ -76,7 +76,7 @@ static void parseGENERIC_DS( - - int rrd_create( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"start", 'b', OPTPARSE_REQUIRED}, -diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c -index 751798aa1..21c38a11d 100644 ---- a/src/rrd_daemon.c -+++ b/src/rrd_daemon.c -@@ -1877,7 +1877,7 @@ static int handle_request_tune( - HANDLER_PROTO) - { /* {{{ */ - int status; -- char** argv = NULL; -+ const char** argv = NULL; - int argc, argc_tmp; - char* i; - int rc; -@@ -1916,7 +1916,7 @@ static int handle_request_tune( - goto done; - } - -- if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) { -+ if ((argv = malloc(argc * sizeof(char*))) == NULL) { - rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM)); - goto done; - } -@@ -1927,7 +1927,7 @@ static int handle_request_tune( - argc_tmp += 1; - } - -- status = rrd_tune_r(file, argc, (const char **)argv); -+ status = rrd_tune_r(file, argc, argv); - if (status != 0) { - rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error()); - goto done; -@@ -1935,7 +1935,7 @@ static int handle_request_tune( - rc = send_response(sock, RESP_OK, "Success\n"); - done: - free(file); -- free(argv); -+ free((void *)argv); - return rc; - } - -@@ -4505,7 +4505,7 @@ static int cleanup( - - static int read_options( - int argc, -- char **argv) -+ const char **argv) - { /* {{{ */ - struct optparse_long longopts[] = { - {NULL, 'a', OPTPARSE_REQUIRED}, -@@ -5050,7 +5050,7 @@ static int read_options( - - int main( - int argc, -- char **argv) -+ const char **argv) - { - int status; - -diff --git a/src/rrd_dump.c b/src/rrd_dump.c -index a4490d594..c58e0ee4a 100644 ---- a/src/rrd_dump.c -+++ b/src/rrd_dump.c -@@ -497,7 +497,7 @@ static size_t rrd_dump_opt_cb_fileout( - - int rrd_dump_opt_r( - const char *filename, -- char *outname, -+ const char *outname, - int opt_noheader) - { - FILE *out_file; -@@ -543,7 +543,7 @@ int rrd_dump_r( - - int rrd_dump( - int argc, -- char **argv) -+ const char **argv) - { - int opt; - struct optparse_long longopts[] = { -diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c -index c739bfc45..54780f19b 100644 ---- a/src/rrd_fetch.c -+++ b/src/rrd_fetch.c -@@ -61,7 +61,7 @@ - - int rrd_fetch( - int argc, -- char **argv, -+ const char **argv, - time_t *start, - time_t *end, /* which time frame do you want ? - * will be changed to represent reality */ -diff --git a/src/rrd_first.c b/src/rrd_first.c -index a696c5c38..f3dde5404 100644 ---- a/src/rrd_first.c -+++ b/src/rrd_first.c -@@ -13,7 +13,7 @@ - - time_t rrd_first( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"rraindex", 129, OPTPARSE_REQUIRED}, -diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c -index 090bca749..3bf6cd29d 100644 ---- a/src/rrd_flushcached.c -+++ b/src/rrd_flushcached.c -@@ -22,7 +22,7 @@ - #include "rrd_tool.h" - #include "rrd_client.h" - --int rrd_flushcached (int argc, char **argv) -+int rrd_flushcached (int argc, const char **argv) - { - struct optparse_long longopts[] = { - {"daemon", 'd', OPTPARSE_REQUIRED}, -diff --git a/src/rrd_graph.c b/src/rrd_graph.c -index b32d45085..46511e9a3 100644 ---- a/src/rrd_graph.c -+++ b/src/rrd_graph.c -@@ -4607,7 +4607,7 @@ int scan_for_col( - /* Now just a wrapper around rrd_graph_v */ - int rrd_graph( - int argc, -- char **argv, -+ const char **argv, - char ***prdata, - int *xsize, - int *ysize, -@@ -4690,7 +4690,7 @@ int rrd_graph( - - rrd_info_t *rrd_graph_v( - int argc, -- char **argv) -+ const char **argv) - { - image_desc_t im; - rrd_info_t *grinfo; -@@ -4953,7 +4953,7 @@ void rrd_graph_init( - - void rrd_graph_options( - int argc, -- char *argv[], -+ const char **argv, - struct optparse *poptions, - image_desc_t *im) - { -diff --git a/src/rrd_graph.h b/src/rrd_graph.h -index 4df32ec66..083cf3800 100644 ---- a/src/rrd_graph.h -+++ b/src/rrd_graph.h -@@ -473,12 +473,12 @@ void time_clean( - - void rrd_graph_options( - int, -- char **, -+ const char **, - struct optparse *, - image_desc_t *); - void rrd_graph_script( - int, -- char **, -+ const char **, - image_desc_t *const, - int); - int rrd_graph_color( -diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c -index 99cdefa65..ba90e1a6c 100644 ---- a/src/rrd_graph_helper.c -+++ b/src/rrd_graph_helper.c -@@ -1952,7 +1952,7 @@ static int parse_xport( - - void rrd_graph_script( - int argc, -- char *argv[], -+ const char **argv, - image_desc_t *const im, - int optno) - { -diff --git a/src/rrd_info.c b/src/rrd_info.c -index c0c6f68c7..eb0d4e4de 100644 ---- a/src/rrd_info.c -+++ b/src/rrd_info.c -@@ -82,7 +82,7 @@ rrd_info_t - - rrd_info_t *rrd_info( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"daemon", 'd', OPTPARSE_REQUIRED}, -diff --git a/src/rrd_last.c b/src/rrd_last.c -index 026a1e828..1aae72512 100644 ---- a/src/rrd_last.c -+++ b/src/rrd_last.c -@@ -11,7 +11,7 @@ - - time_t rrd_last( - int argc, -- char **argv) -+ const char **argv) - { - char *opt_daemon = NULL; - time_t lastupdate; -diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c -index ab30dcf67..4f7f4770e 100644 ---- a/src/rrd_lastupdate.c -+++ b/src/rrd_lastupdate.c -@@ -14,7 +14,7 @@ - #include "rrd_client.h" - #include - --int rrd_lastupdate (int argc, char **argv) -+int rrd_lastupdate (int argc, const char **argv) - { - struct optparse_long longopts[] = { - {"daemon", 'd', OPTPARSE_REQUIRED}, -diff --git a/src/rrd_list.c b/src/rrd_list.c -index e743b9b7d..6e96220ea 100644 ---- a/src/rrd_list.c -+++ b/src/rrd_list.c -@@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string) - return (char *)&(string[index]); - } - --static char *rrd_list_rec(int recursive, char *root, char *dirname) -+static char *rrd_list_rec(int recursive, const char *root, const char *dirname) - { - #define SANE_ASPRINTF2(_dest_str, _format, ...) \ - if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ -@@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname) - return out; - } - --char *rrd_list_r(int recursive, char *dirname) -+char *rrd_list_r(int recursive, const char *dirname) - { - #define SANE_ASPRINTF(_dest_str, _format, ...) \ - if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ -@@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname) - return rrd_list_rec(recursive, dirname, dirname); - } - --char *rrd_list(int argc, char **argv) -+char *rrd_list(int argc, const char **argv) - { - char *opt_daemon = NULL; - int status; -diff --git a/src/rrd_modify.c b/src/rrd_modify.c -index a2b07f640..70ac9e77f 100644 ---- a/src/rrd_modify.c -+++ b/src/rrd_modify.c -@@ -1297,7 +1297,7 @@ static int add_rras(const rrd_t *in, rrd_t *out, const int *ds_map, - } - - int handle_modify(const rrd_t *in, const char *outfilename, -- int argc, char **argv, int optidx, -+ int argc, const char **argv, int optidx, - int newstep) { - // parse add/remove options - int rc = -1; -diff --git a/src/rrd_modify.h b/src/rrd_modify.h -index 52d8789be..64a39926e 100644 ---- a/src/rrd_modify.h -+++ b/src/rrd_modify.h -@@ -28,7 +28,7 @@ typedef struct { - } rra_mod_op_t; - - int handle_modify(const rrd_t *in, const char *outfilename, -- int argc, char **argv, int optind, -+ int argc, const char **argv, int optind, - int newstep); - - typedef union { -diff --git a/src/rrd_resize.c b/src/rrd_resize.c -index fb75d81ff..742e6d141 100644 ---- a/src/rrd_resize.c -+++ b/src/rrd_resize.c -@@ -12,9 +12,9 @@ - - int rrd_resize( - int argc, -- char **argv) -+ const char **argv) - { -- char *infilename, outfilename[11] = "resize.rrd"; -+ const char *infilename, outfilename[11] = "resize.rrd"; - rrd_t rrdold, rrdnew; - rrd_value_t buffer; - int version; -diff --git a/src/rrd_restore.c b/src/rrd_restore.c -index 85d481e0c..ebef5efe8 100644 ---- a/src/rrd_restore.c -+++ b/src/rrd_restore.c -@@ -1378,7 +1378,7 @@ int write_file( - - int rrd_restore( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"range-check", 'r', OPTPARSE_NONE}, -diff --git a/src/rrd_tool.c b/src/rrd_tool.c -index cc6119d9a..56321ee1a 100644 ---- a/src/rrd_tool.c -+++ b/src/rrd_tool.c -@@ -22,16 +22,16 @@ - - - static void PrintUsage( -- char *cmd); -+ const char *cmd); - static int CountArgs( - char *aLine); - static int CreateArgs( -+ const char *, - char *, -- char *, -- char **); -+ const char **); - static int HandleInputLine( - int, -- char **, -+ const char **, - FILE *); - int RemoteMode = 0; - int ChangeRoot = 0; -@@ -42,7 +42,7 @@ int ChangeRoot = 0; - - - static void PrintUsage( -- char *cmd) -+ const char *cmd) - { - - #ifdef BUILD_DATE -@@ -443,11 +443,11 @@ static char *fgetslong( - - int main( - int argc, -- char *argv[]) -+ const char *argv[]) - { -- char **myargv; -+ const char **myargv; - char *aLine; -- char *firstdir = ""; -+ const char *firstdir = ""; - - #ifdef MUST_DISABLE_SIGFPE - signal(SIGFPE, SIG_IGN); -@@ -526,7 +526,7 @@ int main( - printf("ERROR: not enough arguments\n"); - continue; - } -- if ((myargv = (char **) malloc((argc + 1) * -+ if ((myargv = malloc((argc + 1) * - sizeof(char *))) == NULL) { - perror("malloc"); - exit(1); -@@ -572,7 +572,7 @@ int main( - resolving them portably is not really simple. */ - static int HandleInputLine( - int argc, -- char **argv, -+ const char **argv, - FILE * out) - { - #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) -@@ -887,12 +887,12 @@ static int CountArgs( - * CreateArgs - take a string (aLine) and tokenize - */ - static int CreateArgs( -- char *pName, -+ const char *pName, - char *aLine, -- char **argv) -+ const char **argv) - { - char *getP, *putP; -- char **pargv = argv; -+ const char **pargv = argv; - char Quote = 0; - int inArg = 0; - int len; -diff --git a/src/rrd_tune.c b/src/rrd_tune.c -index 198817f37..dd3f3f7cb 100644 ---- a/src/rrd_tune.c -+++ b/src/rrd_tune.c -@@ -71,7 +71,7 @@ static int set_hwsmootharg( - - int rrd_tune( - int argc, -- char **argv) -+ const char **argv) - { - char *opt_daemon = NULL; - const char *in_filename = NULL; -diff --git a/src/rrd_update.c b/src/rrd_update.c -index fbbe2820a..bb9a0602c 100644 ---- a/src/rrd_update.c -+++ b/src/rrd_update.c -@@ -299,7 +299,7 @@ static void initialize_time( - - rrd_info_t *rrd_update_v( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"template", 't', OPTPARSE_REQUIRED}, -@@ -674,7 +674,7 @@ static int rrd_template_update(const char *filename, /* {{{ */ - - int rrd_update( - int argc, -- char **argv) -+ const char **argv) - { - struct optparse_long longopts[] = { - {"template", 't', OPTPARSE_REQUIRED}, -diff --git a/src/rrd_xport.c b/src/rrd_xport.c -index d15d33dd9..93c02f926 100644 ---- a/src/rrd_xport.c -+++ b/src/rrd_xport.c -@@ -73,7 +73,7 @@ static int rrd_xport_format_addprints( - - int rrd_xport( - int argc, -- char **argv, -+ const char **argv, - int UNUSED(*xsize), - time_t *start, - time_t *end, /* which time frame do you want ? -diff --git a/src/rrdupdate.c b/src/rrdupdate.c -index cbbf48cc1..e368516c8 100644 ---- a/src/rrdupdate.c -+++ b/src/rrdupdate.c -@@ -20,19 +20,20 @@ int main( - int argc, - char **argv) - { -+ const char **cargv = (const char **)argv; - char *name=basename(argv[0]); - rrd_info_t *info; - - if (!strcmp(name, "rrdcreate")) { -- rrd_create(argc, argv); -+ rrd_create(argc, cargv); - } - else if (!strcmp(name, "rrdinfo")) { -- info=rrd_info(argc, argv); -+ info=rrd_info(argc, cargv); - rrd_info_print(info); - rrd_info_free(info); - } - else { -- rrd_update(argc, argv); -+ rrd_update(argc, cargv); - } - - if (rrd_test_error()) { diff --git a/package/rrdtool/rrdtool.hash b/package/rrdtool/rrdtool.hash index 1a6d18aea9a..1b16b8226ec 100644 --- a/package/rrdtool/rrdtool.hash +++ b/package/rrdtool/rrdtool.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 rrdtool-1.8.0.tar.gz +sha256 5e65385e51f4a7c4b42aa09566396c20e7e1a0a30c272d569ed029a81656e56b rrdtool-1.9.0.tar.gz sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index f0cffd01626..be300139924 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -RRDTOOL_VERSION = 1.8.0 +RRDTOOL_VERSION = 1.9.0 RRDTOOL_SITE = https://github.com/oetiker/rrdtool-1.x/releases/download/v$(RRDTOOL_VERSION) RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 3ba326191a2..3c23de83464 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_RSYSLOG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # modules - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE # Propagate the exact same dependency from libfastjson, # even though rsyslog already depends on threads for itself: depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS @@ -18,9 +17,20 @@ config BR2_PACKAGE_RSYSLOG http://www.rsyslog.com -comment "rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library" +if BR2_PACKAGE_RSYSLOG + +config BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS + bool "extra plugins" + default y + help + Enable rsyslog plugins that require external + dependencies. The different plugins will be automatically + enabled if their dependencies are enabled. + +endif # BR2_PACKAGE_RSYSLOG + +comment "rsyslog needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 212a1accead..9c523c58818 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 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz +sha256 b6be03c766df4cde314972c1c01cb74f3eacf8aec57066c0c12be0e079726eba rsyslog-8.2410.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index fac78795c27..69b32076f87 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2402.0 +RSYSLOG_VERSION = 8.2410.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 @@ -15,12 +15,15 @@ RSYSLOG_CPE_ID_VENDOR = rsyslog RSYSLOG_IGNORE_CVES += CVE-2015-3243 RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' + +ifeq ($(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),y) RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \ mail omprog omruleset omstdout omuxsock \ pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare +endif -ifeq ($(BR2_PACKAGE_LIBRELP),y) +ifeq ($(BR2_PACKAGE_LIBRELP)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += librelp RSYSLOG_PLUGINS += relp endif @@ -33,7 +36,7 @@ RSYSLOG_CONF_OPTS += \ --disable-mmkubernetes \ --disable-mmnormalize -ifeq ($(BR2_PACKAGE_LIBCURL),y) +ifeq ($(BR2_PACKAGE_LIBCURL)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libcurl RSYSLOG_CONF_OPTS += \ --enable-clickhouse \ @@ -52,35 +55,35 @@ RSYSLOG_CONF_OPTS += \ --disable-omhttpfs endif -ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) +ifeq ($(BR2_PACKAGE_CIVETWEB_LIB)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += apr-util civetweb RSYSLOG_CONF_OPTS += --enable-imhttp else RSYSLOG_CONF_OPTS += --disable-imhttp endif -ifeq ($(BR2_PACKAGE_CZMQ),y) +ifeq ($(BR2_PACKAGE_CZMQ)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += czmq RSYSLOG_CONF_OPTS += --enable-imczmq --enable-omczmq else RSYSLOG_CONF_OPTS += --disable-imczmq --disable-omczmq endif -ifeq ($(BR2_PACKAGE_GNUTLS),y) +ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls else RSYSLOG_CONF_OPTS += --disable-gnutls endif -ifeq ($(BR2_PACKAGE_HIREDIS),y) +ifeq ($(BR2_PACKAGE_HIREDIS)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += hiredis RSYSLOG_CONF_OPTS += --enable-omhiredis else RSYSLOG_CONF_OPTS += --disable-omhiredis endif -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libgcrypt RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config RSYSLOG_CONF_OPTS += --enable-libgcrypt @@ -88,21 +91,21 @@ else RSYSLOG_CONF_OPTS += --disable-libgcrypt endif -ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libmaxminddb RSYSLOG_CONF_OPTS += --enable-mmdblookup else RSYSLOG_CONF_OPTS += --disable-mmdblookup endif -ifeq ($(BR2_PACKAGE_LIBPCAP),y) +ifeq ($(BR2_PACKAGE_LIBPCAP)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += libpcap RSYSLOG_CONF_OPTS += --enable-impcap else RSYSLOG_CONF_OPTS += --disable-impcap endif -ifeq ($(BR2_PACKAGE_MARIADB),y) +ifeq ($(BR2_PACKAGE_MARIADB)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += mariadb RSYSLOG_CONF_OPTS += --enable-mysql RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config @@ -110,7 +113,7 @@ else RSYSLOG_CONF_OPTS += --disable-mysql endif -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ifeq ($(BR2_PACKAGE_POSTGRESQL)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += postgresql RSYSLOG_CONF_OPTS += --enable-pgsql RSYSLOG_CONF_ENV += ac_cv_prog_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config @@ -118,28 +121,28 @@ else RSYSLOG_CONF_OPTS += --disable-pgsql endif -ifeq ($(BR2_PACKAGE_QPID_PROTON),y) +ifeq ($(BR2_PACKAGE_QPID_PROTON)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += qpid-proton RSYSLOG_CONF_OPTS += --enable-omamqp1 else RSYSLOG_CONF_OPTS += --disable-omamqp1 endif -ifeq ($(BR2_PACKAGE_RABBITMQ_C),y) +ifeq ($(BR2_PACKAGE_RABBITMQ_C)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += rabbitmq-c RSYSLOG_CONF_OPTS += --enable-omrabbitmq else RSYSLOG_CONF_OPTS += --disable-omrabbitmq endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_DEPENDENCIES += util-linux RSYSLOG_CONF_OPTS += --enable-uuid else RSYSLOG_CONF_OPTS += --disable-uuid endif -ifeq ($(BR2_INIT_SYSTEMD),y) +ifeq ($(BR2_INIT_SYSTEMD)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_CONF_OPTS += \ --enable-imjournal \ --enable-omjournal \ @@ -151,7 +154,7 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif -ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y) +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS)$(BR2_PACKAGE_RSYSLOG_EXTRA_PLUGINS),yy) RSYSLOG_CONF_OPTS += --enable-libdbi RSYSLOG_DEPENDENCIES += libdbi-drivers else diff --git a/package/rtc-tools/rtc-tools.hash b/package/rtc-tools/rtc-tools.hash index a3f3bdcc118..edf65bf968e 100644 --- a/package/rtc-tools/rtc-tools.hash +++ b/package/rtc-tools/rtc-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68b6820aeb8132b3f034fb79cf761c4549373d67641afb05b58641f1d32bb69f rtc-tools-33ef4aa1c92b0c92a351284d93d1ac5570de9cc7-git4.tar.gz +sha256 bc5f025b9d326513f8f0cf3c5afee7d18fa0898b53312881a20f7c099b83f5ae rtc-tools-2022.02-git4.tar.gz sha256 7ae50a5344af14d6231aff6814632a220b3127da4099aea2c6070fd79c407c1a COPYING diff --git a/package/rtc-tools/rtc-tools.mk b/package/rtc-tools/rtc-tools.mk index 2882c88575d..546c3cd9ea1 100644 --- a/package/rtc-tools/rtc-tools.mk +++ b/package/rtc-tools/rtc-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTC_TOOLS_VERSION = 33ef4aa1c92b0c92a351284d93d1ac5570de9cc7 +RTC_TOOLS_VERSION = 2022.02 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 diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index fba2f7a1090..41c39f5cff8 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c04741129e815c30c51e509012d1a21e4f6d568c211921e6bc46e1adc3d4d4e1 rtl8821cu-0b505f382ea67bd8bdc9288ba5dbe7f4c9de33c0.tar.gz +sha256 9ccac108553e0ddc35e030539e23c2151fc038f21c12a241b4df13e0c171ba5f rtl8821cu-1597dfeda6cefd2e603fc7020ceca226d05fb108.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 39aea1d7a4c..faad054b3b9 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = 0b505f382ea67bd8bdc9288ba5dbe7f4c9de33c0 +RTL8821CU_VERSION = 1597dfeda6cefd2e603fc7020ceca226d05fb108 RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host index 78193cb499b..96b05d0a1fa 100644 --- a/package/runc/Config.in.host +++ b/package/runc/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RUNC bool "host runc" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 95d6c2ed198..711d7c61a2a 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12-go2.tar.gz +sha256 25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7 runc-1.2.0-go2.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 273509b860d..94b7b15900e 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.12 +RUNC_VERSION = 1.2.0 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 853a5305ec1..070a0b97795 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,70 +1,70 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 8e7a2d514ee469325e5a7d0a2f0cad313aecb4c3da134f3bf84f7901a809d566 rust-1.79.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 74a4b17c7b80b87d2e1f4fa83c8c0c5e920eee6d72fe570df97aa96d85fc25ec rust-1.79.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 a640336f90db45a00e35444afd5f38ec8a9035b4f1f7ae17fb5d9357d3483773 rust-1.79.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 dd5a1d8ec6c5810893388391f194b11876643d2add3918968ab1473bce9a2cc0 rust-1.79.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 40d7dd809c873f9462a35735c511d82ba0e46edb56c74e8da01ff3a002bef2aa rust-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 acfb935d96986b05d6f8071a75ecc62f404d64faa65b81b1bb025821cfd3507b rust-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 24aab3cef43b4d8319ad7976313cfcbd6942ebd7a1824d39707f5629dc615ba8 rust-1.79.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 ce552d6bf22a2544ea78647d98cb405d5089af58dbcaa4efea711bf8becd71c5 rust-1.79.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -sha256 519abf4757fbd8d7e3bb4e4cfdc362ded972c1d95f04675684df2d31e8c0899b rust-std-1.79.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-aarch64-unknown-linux-musl.tar.xz.sha256 -sha256 428bf4fb5a66e93c2e13a8cddae71e903559d8666c727f0d45ececc7da7d2404 rust-std-1.79.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -sha256 bae338708a07e26ac2f51c291478e33fb85fbff9632e2da2714f3d1a91c3773a rust-std-1.79.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 fa6f5f03b68faf9b4449266e4836bcae24027fba7a3822a48822d772fc76c064 rust-std-1.79.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-musleabi.tar.xz.sha256 -sha256 1ba19c8e7dae60c7ae3f406545b65eef4fa6de31f3dd2fe83e0bbd06ade2c536 rust-std-1.79.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -sha256 24fa88bf0aa867be686c7d26233949ae9dbadc10b1e9c6ed36930cabe48d69b3 rust-std-1.79.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -sha256 c2f906d1c9d130e06687eeea5ea50697485b321dd1a8e537200a52db508db361 rust-std-1.79.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -sha256 73f3bc406ce4bcd4d64b7101a07a82bfff0f3cf793ba071b04c250c1feb08a03 rust-std-1.79.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -sha256 af7707874d52823cce0323a4ae900ed34201eefab97f4781c8280bf33ecb68b7 rust-std-1.79.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -sha256 a17fde385e3f420f5f825e019b4739a469a4aece9071a7ff7b7ff3c8a0486245 rust-std-1.79.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -sha256 74957092140452f41f39eceaeb0490054181a36c4d2eec53ab3a611bd3c8c38f rust-std-1.79.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -sha256 344e2190418912eb4415ac38a819202fd05c51e2b8f926d42cf43f5121e479d2 rust-std-1.79.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-i586-unknown-linux-gnu.tar.xz.sha256 -sha256 9c38f2cd4c19196fcf113166237ab03512bf19ce5a7f13c3bfe0e5cc3317eb44 rust-std-1.79.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-i586-unknown-linux-musl.tar.xz.sha256 -sha256 a9ba68598744117d10fa074535bb48585d4f6ad77170cbcb43841a56dc76f5c7 rust-std-1.79.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-i686-unknown-linux-gnu.tar.xz.sha256 -sha256 158294f7c424ef75d84046b573f225c15d531745cc79d416a18c11aa8253830e rust-std-1.79.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-i686-unknown-linux-musl.tar.xz.sha256 -sha256 a0087ba6e159550aab8ff93390faec42e2687ec13908ab3e45946c2769aea00c rust-std-1.79.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -sha256 6aa2f351bc7dccb544781f4fecddb5ef67e05bb310c84e0106d968231384d9f4 rust-std-1.79.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -sha256 af95929af71494ee3e6988ead07204ea05b6f2b729cdb1ffcc26db75e47bf318 rust-std-1.79.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -sha256 3b5d53d70837d5ec942ec41a8da37ed932bbdc1e53f78dc54e218db458701588 rust-std-1.79.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -sha256 2b8af4060acb10f347c66a3477ae92151beba12192590ea40723dcf9b1f7f5b2 rust-std-1.79.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-s390x-unknown-linux-gnu.tar.xz.sha256 -sha256 d70e710a5138871e8d972f195ced9f7aa639ccef23a87fa03cc527d2b9c3cd36 rust-std-1.79.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -sha256 f7c7a73a8e5640f9d5aca6b26866b4da08cf3d3509ed1c4184309fb868acbff2 rust-std-1.79.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -sha256 2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108 rust-std-1.79.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.79.0-x86_64-unknown-linux-musl.tar.xz.sha256 -sha256 30b9418561e6a7c18396a259304d3ddb4ad9d262f0ed6f227e08d232b8b32e8c rust-std-1.79.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 99acf175be33bd96ac82d644125d0e2acc6962d61ee64851edc7d8ba3bd23ca4 rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 34669e600d6ee7744e59f5d4542e2a539a9b13f099a4533f19a46e32a0868053 rust-1.82.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 a32342217fb82167fffcaf0c7e44ac6e32ce5fa63dc3beb42439ab05f561a882 rust-1.82.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 0608a560ce266e8aafecc2b9908e3094f5ef1e135460b1f88aa614e5bf65aae4 rust-1.82.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 048f637a547522ba0081c5772fd3196dfcc2d0d24f442424f168b5d55f961537 rust-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 532190c3cdbdee9249bcde648b1c61b092bdd8885266ba9edd6df6824a454958 rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 71428fab3cf18cfe4b4486a11d292ec157fe8b0c904fb4fae34db6539144c286 rust-1.82.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 8a6bf24ca1fee2bd861590431c7954674191a0c0dfa0af4169731bc1459cf58a rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +sha256 1359ac1f3a123ae5da0ee9e47b98bb9e799578eefd9f347ff9bafd57a1d74a7f rust-std-1.82.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-aarch64-unknown-linux-musl.tar.xz.sha256 +sha256 a364a4b506865fbd56aac67e2b540a824cd9abda621bb38a8b678166d33b8ec2 rust-std-1.82.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +sha256 bec0b04e6e1e183fc21521e9cc2dc89be41c3ccacff3fb5ca48419b47af94fe1 rust-std-1.82.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 fa379cc69b23782cbaddf66025889bf5ca9c32ddb60766fe158b43cfe49a2b2b rust-std-1.82.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-musleabi.tar.xz.sha256 +sha256 cd5e1577c1772ba309d003c49a2df2f06ccbc1cd1bf3ee9c1cfada210979f26e rust-std-1.82.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +sha256 86f2242347c1cbae354cd0ff66c9bfe735f1b371c189aaf0157a3b55004590cb rust-std-1.82.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +sha256 e3c74773cf6f09a3cda1b64c3058f5a88abea0a98f172de895c0ecf7b7b760b2 rust-std-1.82.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +sha256 df0a3be0e71ca8aa8be4915f7142661af32411949a75c1729a314e6ab5c78b0b rust-std-1.82.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +sha256 4d692c1696ad49285a45bc5f636ce9c13ccb32b99ed14be428eaaf1e0cae6b33 rust-std-1.82.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +sha256 34d258a07c9051803786405731c05fb19f7980e13308acf4b16e8c836bd73ac8 rust-std-1.82.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +sha256 1e318fcff01379cf4459f02526309b1f086530004be4fb5e00988ce7b1d821f5 rust-std-1.82.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +sha256 bf93c79abc56bfcc3d48f2defcb0ca720405d01a50ba08d6d24830ae034bbc2d rust-std-1.82.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-i586-unknown-linux-gnu.tar.xz.sha256 +sha256 f56585c55664898c7484f4b7bd139770c99d7b4da6e56e4016f71cb053b1aee2 rust-std-1.82.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-i586-unknown-linux-musl.tar.xz.sha256 +sha256 711c03ffb5bb53fcc97278b015d1ea9f503ce826ba390855f576c0e3b77c4bdb rust-std-1.82.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-i686-unknown-linux-gnu.tar.xz.sha256 +sha256 c7ebb02b6ca349999b3b7dce768efaca5e0d9060f55397523e11a64cd10a9405 rust-std-1.82.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-i686-unknown-linux-musl.tar.xz.sha256 +sha256 3c5ee32afc4b83313832c7a78175c05a5e568e6053fde7e65e2a9b19ce104c10 rust-std-1.82.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +sha256 827989a42526206199025f764d08d7cd319fee58bf2e08dcaf75df9ead6f094e rust-std-1.82.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +sha256 cdfadb39f1325319de8152504413f34671ac09fa7ecb97f967c25ece3645bc5e rust-std-1.82.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +sha256 4954a44305622b8f68ca088138b9a69432e350336da1a415a282ce148beb340d rust-std-1.82.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +sha256 5649f9b4e107d6c5f72fb7f82cfe15370b80b8d983670602e02e0b615bc6dc88 rust-std-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-s390x-unknown-linux-gnu.tar.xz.sha256 +sha256 454b83668b57bdef28fc49aca8fd4c38e395b49011e653afdf3f9bb2dae8aa63 rust-std-1.82.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +sha256 87db52d782131a8817b76f65eefcae2c24a49b2a6f19ed9bd4699167305c22aa rust-std-1.82.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +sha256 2eca3d36f7928f877c334909f35fe202fbcecce109ccf3b439284c2cb7849594 rust-std-1.82.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz.sha256 +sha256 1c99a4c81f51b687ba55746c7d3f19b5b860fe4eff604d3c7d803e08c9cc89bb rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz # 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 1c9b0466b3f..c14ca7f88e2 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.79.0 +RUST_BIN_VERSION = 1.82.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 1a0fb0dec24..19af66e2d6a 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,8 +1,8 @@ # Generated with utils/update-rust # Do not edit manually -# From https://static.rust-lang.org/dist/rustc-1.79.0-src.tar.xz.sha256 -sha256 ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a rustc-1.79.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.82.0-src.tar.xz.sha256 +sha256 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210 rustc-1.82.0-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 9f644b71abd..29c03594d2a 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.79.0 +RUST_VERSION = 1.82.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -25,22 +25,6 @@ HOST_RUST_DEPENDENCIES = \ HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) -# Some vendor crates contain Cargo.toml.orig files. The associated -# .cargo-checksum.json file will contain a checksum for Cargo.toml.orig but -# support/scripts/apply-patches.sh will delete them. This will cause the build -# to fail, as Cargo will not be able to find the file and verify the checksum. -# So, remove all Cargo.toml.orig entries from the affected .cargo-checksum.json -# files -define HOST_RUST_EXCLUDE_ORIG_FILES - for file in $$(find $(@D) -name '*.orig'); do \ - crate=$$(dirname $${file}); \ - fn=$${crate}/.cargo-checksum.json; \ - sed -i -e 's/"Cargo.toml.orig":"[a-z0-9]\+",//g' $${fn}; \ - done -endef - -HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES - define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ diff --git a/package/s6-linux-utils/Config.in b/package/s6-linux-utils/Config.in index 43e6bb9144c..f716e852b92 100644 --- a/package/s6-linux-utils/Config.in +++ b/package/s6-linux-utils/Config.in @@ -7,3 +7,13 @@ config BR2_PACKAGE_S6_LINUX_UTILS system utilities. http://skarnet.org/software/s6-linux-utils/ + +if BR2_PACKAGE_S6_LINUX_UTILS + +config BR2_PACKAGE_S6_LINUX_UTILS_MULTICALL + bool "s6-linux-utils multicall binary" + help + Build s6-linux-utils as a multicall binary to save disk + space. + +endif diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index f83f47ac3e8..04e08c3d435 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -17,6 +17,7 @@ S6_LINUX_UTILS_CONF_OPTS = \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(if $(BR2_PACKAGE_S6_LINUX_UTILS_MULTICALL),--enable-multicall,) \ $(SHARED_STATIC_LIBS_OPTS) define S6_LINUX_UTILS_CONFIGURE_CMDS diff --git a/package/s6-portable-utils/Config.in b/package/s6-portable-utils/Config.in index 8521ecfa8a6..d4ecfcc38b2 100644 --- a/package/s6-portable-utils/Config.in +++ b/package/s6-portable-utils/Config.in @@ -10,3 +10,13 @@ config BR2_PACKAGE_S6_PORTABLE_UTILS they work everywhere. http://skarnet.org/software/s6-portable-utils/ + +if BR2_PACKAGE_S6_PORTABLE_UTILS + +config BR2_PACKAGE_S6_PORTABLE_UTILS_MULTICALL + bool "s6-portable-utils multicall binary" + help + Build s6-portable-utils as a multicall binary to save disk + space. + +endif diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index c40100b06c6..826750f387e 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -17,6 +17,7 @@ S6_PORTABLE_UTILS_CONF_OPTS = \ --with-dynlib=$(STAGING_DIR)/lib \ --with-lib=$(STAGING_DIR)/lib/skalibs \ $(if $(BR2_STATIC_LIBS),,--disable-allstatic) \ + $(if $(BR2_PACKAGE_S6_PORTABLE_UTILS_MULTICALL),--enable-multicall,) \ $(SHARED_STATIC_LIBS_OPTS) define S6_PORTABLE_UTILS_CONFIGURE_CMDS diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 2c867a03bfe..cf97560e549 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.20.5.tar.asc -sha256 0697a8a57ff8b268cc268d508ee4f9ec86fd82350e84eba47a709242b71f6962 samba-4.20.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.20.6.tar.asc +sha256 8fe37f9e7817b6583fa55a0a15568b8e6be8875513741312ef805484b102ccf7 samba-4.20.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4cece4b4774..e5b348a3b7b 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.20.5 +SAMBA4_VERSION = 4.20.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES diff --git a/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch b/package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch similarity index 73% rename from package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch rename to package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch index ef82cd3e76d..4a8a55dcec9 100644 --- a/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch +++ b/package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch @@ -1,4 +1,4 @@ -From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001 +From fd002bd3ab730a0976dc000477f7dd9e162c0269 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 @@ -9,30 +9,31 @@ 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] +[Julien: rebase on top of 5.0.0] Signed-off-by: Julien Olivain --- - Makefile.in | 4 ---- - 1 file changed, 4 deletions(-) + Makefile.in | 5 ----- + 1 file changed, 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 26ec404..3efbbfd 100644 +index 92f434a..860ecd7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -83,12 +83,9 @@ screen: $(OFILES) - $(OPTIONS) $(CFLAGS) $< +@@ -77,12 +77,8 @@ tests/test-%: tests/test-%.c %.o tests/mallocmock.o tests/macros.h tests/signatu + $(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ $*.o tests/mallocmock.o - install_bin: .version screen installdirs + install_bin: 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 +-# 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 +@@ -107,7 +103,6 @@ installdirs: + uninstall: rm -f $(DESTDIR)$(bindir)/$(SCREEN) rm -f $(DESTDIR)$(bindir)/screen - -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen @@ -40,5 +41,5 @@ index 26ec404..3efbbfd 100644 cd doc; $(MAKE) uninstall -- -2.41.0 +2.46.2 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 deleted file mode 100644 index ab002701d7e..00000000000 --- a/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch +++ /dev/null @@ -1,133 +0,0 @@ -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/0003-Change-binary-permission-flags-even-if-chown-fails.patch b/package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch similarity index 73% rename from package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch rename to package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch index bc3f676af3c..406a6dab5d1 100644 --- a/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch +++ b/package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch @@ -1,4 +1,4 @@ -From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001 +From c348717c7f13efc2c26723670c4d520985eb41f7 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 @@ -8,25 +8,26 @@ 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] +[Julien: rebase on top of 5.0.0] 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 +index 860ecd7..5bb5ed8 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -84,7 +84,8 @@ screen: $(OFILES) +@@ -78,7 +78,8 @@ tests/test-%: tests/test-%.c %.o tests/mallocmock.o tests/macros.h tests/signatu - install_bin: .version screen installdirs + install_bin: 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) + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -- -2.41.0 +2.46.2 diff --git a/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch b/package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch similarity index 81% rename from package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch rename to package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch index 15795874ae2..14f4dd66569 100644 --- a/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch +++ b/package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch @@ -1,4 +1,4 @@ -From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001 +From 4baa4ff25a583456d781e553604a79c51a46bd53 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 @@ -8,21 +8,21 @@ If a packager runs "make install SCREEN=screen", do not create Signed-off-by: Maarten ter Huurne [Julien: rebase on top of 4.9.1] +[Julien: rebase on top of 5.0.0] 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 +index 5bb5ed8..d03129e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen installdirs +@@ -80,8 +80,10 @@ install_bin: 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 @@ -30,5 +30,5 @@ index 0315fde..4718f08 100644 ############################################################################### -- -2.41.0 +2.46.2 diff --git a/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch new file mode 100644 index 00000000000..5a7deb7d1d4 --- /dev/null +++ b/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch @@ -0,0 +1,251 @@ +From 50041d75d59e7343f1fd45bec5bd0c92b47e0a8e 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] +[Julien: rebase on top of 5.0.0, renamed all occurences of sched.h] +Signed-off-by: Julien Olivain +--- + Makefile.in | 66 ++++++++++++++++++++--------------------- + canvas.h | 2 +- + sched.h => eventqueue.h | 0 + sched.c | 2 +- + screen.h | 2 +- + window.h | 2 +- + winmsg.c | 2 +- + 7 files changed, 38 insertions(+), 38 deletions(-) + rename sched.h => eventqueue.h (100%) + +diff --git a/Makefile.in b/Makefile.in +index d03129e..69ffe60 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -165,116 +165,116 @@ depend.in: $(CFILES) term.h + ############################################################################### + + ### Dependencies: +-screen.o: screen.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++screen.o: screen.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h \ + fileio.h mark.h attacher.h encoding.h help.h misc.h process.h socket.h \ + termcap.h tty.h utmp.h +-ansi.o: ansi.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++ansi.o: ansi.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h \ + fileio.h help.h mark.h misc.h process.h resize.h +-fileio.o: fileio.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++fileio.o: fileio.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h fileio.h misc.h process.h winmsgbuf.h termcap.h encoding.h +-mark.o: mark.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++mark.o: mark.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h fileio.h mark.h process.h winmsgbuf.h search.h +-misc.o: misc.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++misc.o: misc.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h +-resize.o: resize.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++resize.o: resize.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h process.h winmsgbuf.h resize.h telnet.h +-socket.o: socket.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++socket.o: socket.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h fileio.h list_generic.h misc.h process.h \ + winmsgbuf.h resize.h socket.h termcap.h tty.h utmp.h +-search.o: search.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++search.o: search.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h mark.h input.h +-tty.o: tty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \ ++tty.o: tty.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h layer.h \ + term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h \ + fileio.h misc.h pty.h telnet.h tty.h + term.o: term.c term.h +-window.o: window.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++window.o: window.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h help.h \ + input.h mark.h misc.h process.h pty.h resize.h telnet.h termcap.h tty.h \ + utmp.h +-utmp.o: utmp.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++utmp.o: utmp.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h tty.h utmp.h +-help.o: help.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++help.o: help.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h list_generic.h process.h winmsgbuf.h +-termcap.o: termcap.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++termcap.o: termcap.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h misc.h process.h winmsgbuf.h resize.h termcap.h +-input.o: input.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++input.o: input.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h +-attacher.o: attacher.c config.h screen.h os.h ansi.h sched.h acls.h \ ++attacher.o: attacher.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h misc.h socket.h tty.h +-pty.o: pty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \ ++pty.o: pty.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h layer.h \ + term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h +-process.o: process.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++process.o: process.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h \ + fileio.h help.h input.h kmapdef.h list_generic.h mark.h misc.h process.h \ + resize.h search.h socket.h telnet.h termcap.h tty.h utmp.h +-display.o: display.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++display.o: display.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h mark.h \ + misc.h process.h pty.h resize.h termcap.h tty.h +-comm.o: comm.c config.h os.h screen.h ansi.h sched.h acls.h comm.h \ ++comm.o: comm.c config.h os.h screen.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h + kmapdef.o: kmapdef.c config.h +-acls.o: acls.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++acls.o: acls.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h mark.h misc.h process.h winmsgbuf.h +-logfile.o: logfile.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++logfile.o: logfile.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h +-layer.o: layer.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++layer.o: layer.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h mark.h tty.h +-winmsg.o: winmsg.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++winmsg.o: winmsg.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h \ + process.h mark.h +-winmsgbuf.o: winmsgbuf.c winmsgbuf.h screen.h os.h ansi.h sched.h acls.h \ ++winmsgbuf.o: winmsgbuf.c winmsgbuf.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h + winmsgcond.o: winmsgcond.c winmsgcond.h +-backtick.o: backtick.c backtick.h screen.h os.h ansi.h sched.h acls.h \ ++backtick.o: backtick.c backtick.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h fileio.h +-sched.o: sched.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++sched.o: sched.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h + telnet.o: telnet.c config.h comm.h +-encoding.o: encoding.c config.h screen.h os.h ansi.h sched.h acls.h \ ++encoding.o: encoding.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h encoding.h fileio.h +-canvas.o: canvas.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++canvas.o: canvas.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h help.h list_generic.h resize.h +-layout.o: layout.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++layout.o: layout.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h fileio.h misc.h process.h winmsgbuf.h resize.h +-viewport.o: viewport.c config.h screen.h os.h ansi.h sched.h acls.h \ ++viewport.o: viewport.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h +-list_display.o: list_display.c config.h screen.h os.h ansi.h sched.h \ ++list_display.o: list_display.c config.h screen.h os.h ansi.h eventqueue.h \ + acls.h comm.h layer.h term.h image.h canvas.h display.h layout.h \ + viewport.h window.h logfile.h list_generic.h misc.h +-list_generic.o: list_generic.c config.h screen.h os.h ansi.h sched.h \ ++list_generic.o: list_generic.c config.h screen.h os.h ansi.h eventqueue.h \ + acls.h comm.h layer.h term.h image.h canvas.h display.h layout.h \ + viewport.h window.h logfile.h input.h list_generic.h misc.h +-list_window.o: list_window.c config.h screen.h os.h ansi.h sched.h acls.h \ ++list_window.o: list_window.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h input.h \ + list_generic.h misc.h process.h +diff --git a/canvas.h b/canvas.h +index 8460d9a..ec5fdaa 100644 +--- a/canvas.h ++++ b/canvas.h +@@ -31,7 +31,7 @@ + #define SCREEN_CANVAS_H + + #include "layer.h" +-#include "sched.h" ++#include "eventqueue.h" + + #define SLICE_UNKN 0 + #define SLICE_VERT (1 << 0) +diff --git a/sched.h b/eventqueue.h +similarity index 100% +rename from sched.h +rename to eventqueue.h +diff --git a/sched.c b/sched.c +index 3618f11..dc59b11 100644 +--- a/sched.c ++++ b/sched.c +@@ -28,7 +28,7 @@ + + #include "config.h" + +-#include "sched.h" ++#include "eventqueue.h" + + #include + #include +diff --git a/screen.h b/screen.h +index 308c365..e39c2b1 100644 +--- a/screen.h ++++ b/screen.h +@@ -67,7 +67,7 @@ struct mode { + #include "ansi.h" + #include "image.h" + #include "layer.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "term.h" + #include "window.h" + +diff --git a/window.h b/window.h +index bc08c6c..294aa64 100644 +--- a/window.h ++++ b/window.h +@@ -35,7 +35,7 @@ + + #include "config.h" + +-#include "sched.h" ++#include "eventqueue.h" + #include "logfile.h" + #include "screen.h" + #include "layer.h" +diff --git a/winmsg.c b/winmsg.c +index 2418439..891a20a 100644 +--- a/winmsg.c ++++ b/winmsg.c +@@ -44,7 +44,7 @@ + #include "logfile.h" + #include "mark.h" + #include "process.h" +-#include "sched.h" ++#include "eventqueue.h" + + /* TODO: rid global variable (has been renamed to point this out; see commit + * history) */ +-- +2.46.2 + diff --git a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch deleted file mode 100644 index 24df05de8c4..00000000000 --- a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/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 088dfb340c9..00000000000 --- a/package/screen/0006-comm.h-now-depends-on-term.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index d46bf723b80..00000000000 --- a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - -comm.h is needed to build list_display.o and list_generic.o otherwise -parallel builds will sometimes fail - -Fixes: - - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc - - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378 - -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 7082a3e..cd363b7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -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 --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h - list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h - --- -2.41.0 - diff --git a/package/screen/Config.in b/package/screen/Config.in index 40cda77b500..81a9bbe4c39 100644 --- a/package/screen/Config.in +++ b/package/screen/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_SCREEN bool "screen" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C17 select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NCURSES help @@ -13,3 +15,8 @@ config BR2_PACKAGE_SCREEN multiple character sets). http://www.gnu.org/software/screen/ + +comment "screen needs a toolchain w/ wchar, gcc >= 8" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ef32eb0696b..208a9cb36df 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.9.1.tar.gz.sig -sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-5.0.0.tar.gz.sig +sha256 f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 screen-5.0.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 55fecb89bcc..9a64780a9ab 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.9.1 +SCREEN_VERSION = 5.0.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 96be214fd32..9cf1fee97e7 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 e2867d4cd26f9869c55216cc20ca7d10442491a0fbf256116ade99ec39426ec0 selinux-python-3.6.tar.gz +sha256 630b2ad50e017a06a81d4f94312bee85465a93cb050a7536c728055de9a41a2b selinux-python-3.7.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 84fc9cbc223..3ea461b37e4 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.6 +SELINUX_PYTHON_VERSION = 3.7 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = LICENSE diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index 5e7d698f3b1..296f7fe137b 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 eedb88f2b2124e538f2d614be063c0d9ac3eacc0c51a4da44500ca1ed1ba16f4 semodule-utils-3.6.tar.gz +sha256 db0641aeafefec46612c7c2ddd33ef1060bb721ce64842d2a96c33dddb5eb176 semodule-utils-3.7.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index b58f7535f11..c9d3af4509a 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.6 +SEMODULE_UTILS_VERSION = 3.7 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = LICENSE diff --git a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 67c306e99ca..67a7395c3c6 100644 --- a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -15,51 +15,50 @@ sedta and seinfoflow to require python3-networkx Signed-off-by: Antoine Tenart [Refreshed for 4.3.0] Signed-off-by: Adam Duskett -[Refreshed for 4.4.2] +[Refreshed for 4.5.1] +Signed-off-by: Adam Duskett --- - sedta | 3 ++- - seinfoflow | 5 +++-- - setools/__init__.py | 4 ++-- - setoolsgui/apol/dta.py | 2 +- - setoolsgui/apol/infoflow.py | 2 +- - tests/test_dta.py | 2 +- - tests/test_infoflow.py | 2 +- - 7 files changed, 11 insertions(+), 9 deletions(-) + sedta | 3 ++- + seinfoflow | 5 +++-- + setools/__init__.py | 2 +- + tests/test_dta.py | 2 +- + tests/test_infoflow.py | 2 +- + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sedta b/sedta -index ffd9ede..4c53825 100755 +index 9b580fc..bec89d4 100755 --- a/sedta +++ b/sedta -@@ -10,6 +10,7 @@ import logging - import signal +@@ -12,6 +12,7 @@ import warnings + import networkx as nx import setools +import setools.dta - def print_transition(trans: setools.DomainTransition) -> None: -@@ -104,7 +105,7 @@ else: + signal.signal(signal.SIGPIPE, signal.SIG_DFL) +@@ -68,7 +69,7 @@ else: try: p = setools.SELinuxPolicy(args.policy) -- g = setools.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude) -+ g = setools.dta.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude) +- g = setools.DomainTransitionAnalysis(p, exclude=args.exclude) ++ g = setools.dta.DomainTransitionAnalysis(p, exclude=args.exclude) - if args.shortest_path or args.all_paths: - if args.shortest_path: + pathnum: int = 0 + path: setools.DTAPath diff --git a/seinfoflow b/seinfoflow -index 5f4e764..a27b781 100755 +index b4ad328..61f1ef5 100755 --- a/seinfoflow +++ b/seinfoflow -@@ -5,6 +5,7 @@ - # +@@ -13,6 +13,7 @@ from typing import Dict, Optional + import networkx as nx import setools +import setools.infoflow - import argparse - import sys - import logging -@@ -94,8 +95,8 @@ elif args.booleans is not None: + + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + +@@ -104,8 +105,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) @@ -68,54 +67,23 @@ index 5f4e764..a27b781 100755 + g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude, + booleans=booleans) - if args.shortest_path or args.all_paths: - if args.shortest_path: + flownum: int = 0 + flow: setools.InfoFlowPath diff --git a/setools/__init__.py b/setools/__init__.py -index ad9b36a..2bde01b 100644 +index 1efd2cc..fe54ab2 100644 --- a/setools/__init__.py +++ b/setools/__init__.py -@@ -77,11 +77,11 @@ from .pcideviceconquery import PcideviceconQuery - from .devicetreeconquery import DevicetreeconQuery - - # Information Flow Analysis --from .infoflow import InfoFlowAnalysis -+# from .infoflow import InfoFlowAnalysis +@@ -81,7 +81,7 @@ from .infoflow import * from .permmap import PermissionMap, RuleWeight, Mapping # Domain Transition Analysis --from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition -+# from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition +-from .dta import * ++# from .dta import * # Policy difference from .diff import PolicyDifference -diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py -index a78d960..e71c70a 100644 ---- a/setoolsgui/apol/dta.py -+++ b/setoolsgui/apol/dta.py -@@ -11,7 +11,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread - from PyQt5.QtGui import QPalette, QTextCursor - from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem --from setools import DomainTransitionAnalysis -+from setools.dta import DomainTransitionAnalysis - - from ..logtosignal import LogHandlerToSignal - from .analysistab import AnalysisSection, AnalysisTab -diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py -index fb9b409..738f1b8 100644 ---- a/setoolsgui/apol/infoflow.py -+++ b/setoolsgui/apol/infoflow.py -@@ -13,7 +13,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread - from PyQt5.QtGui import QPalette, QTextCursor - from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem --from setools import InfoFlowAnalysis -+from setools.infoflow import InfoFlowAnalysis - from setools.exception import UnmappedClass, UnmappedPermission - - from ..logtosignal import LogHandlerToSignal diff --git a/tests/test_dta.py b/tests/test_dta.py -index 7f9bbc9..48338c5 100644 +index 2398b3f..b943bd6 100644 --- a/tests/test_dta.py +++ b/tests/test_dta.py @@ -5,7 +5,7 @@ @@ -128,7 +96,7 @@ index 7f9bbc9..48338c5 100644 from setools.exception import InvalidType from setools.policyrep import Type diff --git a/tests/test_infoflow.py b/tests/test_infoflow.py -index 5a8f745..e25993b 100644 +index ba2983f..9cd6ab3 100644 --- a/tests/test_infoflow.py +++ b/tests/test_infoflow.py @@ -5,7 +5,7 @@ @@ -141,5 +109,5 @@ index 5a8f745..e25993b 100644 from setools.exception import InvalidType from setools.permmap import PermissionMap -- -2.26.2 +2.46.0 diff --git a/package/setools/setools.hash b/package/setools/setools.hash index bb98231de96..26b893c09e7 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 92afeea2f2433cbb981ff47f6ce4e2485d9202b530842f7f5d95f905b2ddaea4 setools-4.4.4.tar.gz +sha256 3fc1d663bbe00e3e2c3f97b371ff55b468e70d7965908cfde35ccc8e55bb2491 setools-4.5.1.tar.gz sha256 0e58d74751e394f39748c7b7b4039d6a883b5def9711160668ba962b52e69e01 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 1ffc2852d29..81ae11d004f 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SETOOLS_VERSION = 4.4.4 +SETOOLS_VERSION = 4.5.1 SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 1d83272cecb..7155baff079 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ # Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc # with key 66D0387DB85D320F8408166DB175CFA98F192AF2 -sha256 bb5f70639a0581f9d626f227ce45b31ac137daa7c451c0f672ce14f2731a96ee shadow-4.15.1.tar.xz +sha256 b78e3921a95d53282a38e90628880624736bf6235e36eea50c50835f59a3530b shadow-4.16.0.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 59771b91821..f0a2b57b4d2 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.15.1 +SHADOW_VERSION = 4.16.0 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index f542ee79acb..dfa7ef3a34a 100644 --- a/package/shapelib/shapelib.hash +++ b/package/shapelib/shapelib.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4 shapelib-1.6.0.tar.gz +sha256 5da90a60e25440f108f4e8e95732bfa83ede13c8e0c2bcf80ae41006cc8ebc20 shapelib-1.6.1.tar.gz sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 LICENSE-LGPL -sha256 67f1348ec73ef6343f0dbb3fa0612c321da4073e1ee68ffc99fcd3f2d2a65813 LICENSE-MIT +sha256 3f46082162242563bf4f43b091871cb19064bc5a398c6d2b024f6b64c6710516 LICENSE-MIT sha256 15e1205bb007d4d7821f7b1cc461ba8d051647e86dbc9baf1bb6f68b10588eeb web/license.html diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index a36a65f80e1..f7c3056844a 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAPELIB_VERSION = 1.6.0 +SHAPELIB_VERSION = 1.6.1 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 SHAPELIB_LICENSE_FILES = LICENSE-LGPL LICENSE-MIT web/license.html diff --git a/package/simple-mail/Config.in b/package/simple-mail/Config.in index 681a8410db3..fd82a224d33 100644 --- a/package/simple-mail/Config.in +++ b/package/simple-mail/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_SIMPLE_MAIL bool "simple-mail" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_NETWORK + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_NETWORK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_NETWORK if BR2_PACKAGE_QT6 select BR2_PACKAGE_OPENSSL help An SMTP library written in C++ for Qt. diff --git a/package/simple-mail/simple-mail.hash b/package/simple-mail/simple-mail.hash index 67d6caff877..4de1525b539 100644 --- a/package/simple-mail/simple-mail.hash +++ b/package/simple-mail/simple-mail.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 2026f2017662508b0f25da72694f1dd13ab3ccf82c0454f7c40f8a6cc450c410 simple-mail-2.3.0.tar.gz +sha256 f93e93843d11da5c4ec44225eba46ccb3e9710fd594a27b966901745429ed4f4 simple-mail-3.0.0.tar.gz # Hash for license file sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c LICENSE diff --git a/package/simple-mail/simple-mail.mk b/package/simple-mail/simple-mail.mk index 68484f79b0b..82bea45f21a 100644 --- a/package/simple-mail/simple-mail.mk +++ b/package/simple-mail/simple-mail.mk @@ -4,12 +4,17 @@ # ################################################################################ -SIMPLE_MAIL_VERSION = 2.3.0 +SIMPLE_MAIL_VERSION = 3.0.0 SIMPLE_MAIL_SITE = $(call github,cutelyst,simple-mail,v$(SIMPLE_MAIL_VERSION)) SIMPLE_MAIL_INSTALL_STAGING = YES SIMPLE_MAIL_LICENSE = LGPL-2.1+ SIMPLE_MAIL_LICENSE_FILES = LICENSE -SIMPLE_MAIL_DEPENDENCIES = qt5base SIMPLE_MAIL_CONF_OPTS = -DBUILD_DEMOS=OFF +ifeq ($(BR2_PACKAGE_QT5BASE),y) +SIMPLE_MAIL_DEPENDENCIES += qt5base +else ifeq ($(BR2_PACKAGE_QT6BASE),y) +SIMPLE_MAIL_DEPENDENCIES += qt6base +SIMPLE_MAIL_CONF_OPTS += -DQT_VERSION_MAJOR=6 +endif $(eval $(cmake-package)) diff --git a/package/sispmctl/sispmctl.hash b/package/sispmctl/sispmctl.hash index f6cff1910b6..8ffa173470f 100644 --- a/package/sispmctl/sispmctl.hash +++ b/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 74b94a3710046b15070c7311f0cacb81554c86b4227719cc2733cb96c7052578 sispmctl-4.11.tar.gz +sha256 e757863a4838da6e1ca72a57adc5aca6fc47ffbddc72a69052d8abd743d57082 sispmctl-4.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk index df397938457..4302c0ab899 100644 --- a/package/sispmctl/sispmctl.mk +++ b/package/sispmctl/sispmctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SISPMCTL_VERSION = 4.11 +SISPMCTL_VERSION = 4.12 SISPMCTL_SITE = https://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 1bb39711915..dc754f12448 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -23,7 +23,7 @@ define HOST_SKELETON_INSTALL_CMDS $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ - (*64) ln -snf lib $(HOST_DIR)/lib64;; \ + (*64|s390x) ln -snf lib $(HOST_DIR)/lib64;; \ (*) ln -snf lib $(HOST_DIR)/lib32;; \ esac endef diff --git a/package/skopeo/Config.in.host b/package/skopeo/Config.in.host index b3a1c155f74..1c1c8f3ebe0 100644 --- a/package/skopeo/Config.in.host +++ b/package/skopeo/Config.in.host @@ -1,6 +1,8 @@ config BR2_PACKAGE_HOST_SKOPEO bool "host skopeo" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS + select BR2_PACKAGE_HOST_GO help skopeo is a command line utility that performs various operations on container images and image repositories. diff --git a/package/skopeo/skopeo.hash b/package/skopeo/skopeo.hash index d40585d52f4..c523dea46aa 100644 --- a/package/skopeo/skopeo.hash +++ b/package/skopeo/skopeo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d skopeo-1.13.3-go2.tar.gz +sha256 9402e71f3fba979d0c0509240b963847bfeda2eac60be83eb5a628fd67d098e6 skopeo-1.16.1-go2.tar.gz sha256 716a8b80635c394681e652823e1e42e411ad2d254e1f202403422d74f4b0b106 LICENSE diff --git a/package/skopeo/skopeo.mk b/package/skopeo/skopeo.mk index 58631629b38..9859d774d4b 100644 --- a/package/skopeo/skopeo.mk +++ b/package/skopeo/skopeo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SKOPEO_VERSION = 1.13.3 +SKOPEO_VERSION = 1.16.1 SKOPEO_SITE = $(call github,containers,skopeo,v$(SKOPEO_VERSION)) SKOPEO_LICENSE = Apache-2.0 diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash index 3f7abdee5a0..930e6aca58c 100644 --- a/package/slirp/slirp.hash +++ b/package/slirp/slirp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 358ce8b6ea59ec9deac937cc754f0115b992839e7b0cddf30ffb8f77dc21da82 libslirp-v4.7.0.tar.bz2 +sha256 1c2e3d30e41a055ed41f9d0b3234d0d143bc28f5ad84bb101413f830844df757 libslirp-v4.8.0.tar.bz2 sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 2ad71f13d9d..6d44df8d7e2 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP_VERSION = 4.7.0 +SLIRP_VERSION = 4.8.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 diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash index e310da1af2f..1a6a6570660 100644 --- a/package/slirp4netns/slirp4netns.hash +++ b/package/slirp4netns/slirp4netns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 acce648fab8fe5f113c41a8fd6d20177708519b4ddaa60f845e1998a17b22ca5 slirp4netns-1.2.3.tar.gz +sha256 a3b7c7b593b279c46d25a48b583371ab762968e98b6a46457d8d52a755852eb9 slirp4netns-1.3.1.tar.gz sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index 7fa992af6dd..ce8ea34f2ec 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP4NETNS_VERSION = 1.2.3 +SLIRP4NETNS_VERSION = 1.3.1 SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) SLIRP4NETNS_LICENSE = GPL-2.0 SLIRP4NETNS_LICENSE_FILES = COPYING diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 16d841769d3..69e569a5489 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b spdlog-1.14.1.tar.gz +sha256 9962648c9b4f1a7bbc76fd8d9172555bad1871fdb14ff4f842ef87949682caa5 spdlog-1.15.0.tar.gz sha256 4ccecab18d1ff0b61174fe3d6c430541625d3ddb865b0d5887db296f883c76e7 LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index 6b24357697a..3f69f9a6d3a 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.14.1 +SPDLOG_VERSION = 1.15.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index e9017c48554..ba2c0956d82 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 sqlite-autoconf-3460100.tar.gz +sha256 83eb21a6f6a649f506df8bd3aab85a08f7556ceed5dbd8dea743ea003fc3a957 sqlite-autoconf-3470000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 614b4b8ed22..e6d681e5013 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.46.1 -SQLITE_TAR_VERSION = 3460100 +SQLITE_VERSION = 3.47.0 +SQLITE_TAR_VERSION = 3470000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2024 SQLITE_LICENSE = blessing diff --git a/package/sqlitecpp/sqlitecpp.hash b/package/sqlitecpp/sqlitecpp.hash index 1269abf61fe..3ed6a3c40a1 100644 --- a/package/sqlitecpp/sqlitecpp.hash +++ b/package/sqlitecpp/sqlitecpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 71f990f9fb4b004533b6859ce40729af823b87fe691dd99ca084a7fd40db54b9 sqlitecpp-3.3.1.tar.gz -sha256 635de1440f6064c6ca9ca325c163d4d0771e783c6d77783d9470eaf56e346c67 LICENSE.txt +sha256 5aa8eda130d0689bd5ed9b2074714c2dbc610f710483c61ba6cf944cebfe03af sqlitecpp-3.3.2.tar.gz +sha256 ecb10f021c51e9fd1dabaebd8a8e977934d47d9e3c74094f333060be2d6e023b LICENSE.txt diff --git a/package/sqlitecpp/sqlitecpp.mk b/package/sqlitecpp/sqlitecpp.mk index 5571d325c3e..1cf8281997c 100644 --- a/package/sqlitecpp/sqlitecpp.mk +++ b/package/sqlitecpp/sqlitecpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITECPP_VERSION = 3.3.1 +SQLITECPP_VERSION = 3.3.2 SQLITECPP_SITE = $(call github,SRombauts,SQLiteCpp,$(SQLITECPP_VERSION)) SQLITECPP_LICENSE = MIT SQLITECPP_LICENSE_FILES = LICENSE.txt diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index 6f831f2919e..4c1e0c18a14 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,4 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha256 f9e8e114e34265194ffff0c2a2806a6fdc998449192749c4ef60b0a5302101af stellarium-24.2.tar.xz +sha256 03dad30f4031bdc2d200146e7c587249ea75dbdb88c8ae13632829aac5540b08 stellarium-24.3.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index abbfe72aad5..51b16887427 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLARIUM_VERSION = 24.2 +STELLARIUM_VERSION = 24.3 STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ diff --git a/package/strace/strace.hash b/package/strace/strace.hash index dcaf1ad5d43..e167f9d20a4 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/6.10/strace-6.10.tar.xz.asc -sha256 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07 strace-6.10.tar.xz +# https://strace.io/files/6.11/strace-6.11.tar.xz.asc +sha256 83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5 strace-6.11.tar.xz sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 34a154357f6..367a44da6e9 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.10 +STRACE_VERSION = 6.11 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ diff --git a/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch b/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch deleted file mode 100644 index f1f4ab56369..00000000000 --- a/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 142c3b2414f0adfb13b59dea993054a0daa6cd52 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 4 May 2024 10:04:20 +0200 -Subject: [PATCH] stress-sock.c: fix build without SO_ZEROCOPY - -uclibc-ng defines MSG_ZEROCOPY but not SO_ZEROCOPY resulting in the -following build failure since version 0.17.04 and -https://github.com/ColinIanKing/stress-ng/commit/2ad8aff9bc1ab822cf615c72712c6031a8f60bbd: - -stress-sock.c: In function 'stress_sock_client': -stress-sock.c:656:35: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? - 656 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { - | ^~~~~~~~~~~ - | MSG_ZEROCOPY -stress-sock.c:656:35: note: each undeclared identifier is reported only once for each function it appears in -CC stress-sockfd.c -stress-sock.c: In function 'stress_sock_server': -stress-sock.c:1060:34: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'? - 1060 | if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) { - | ^~~~~~~~~~~ - | MSG_ZEROCOPY - -Fixes: - - http://autobuild.buildroot.org/results/bcff31bd9820cf0b95f8d8c6de44fd4ab8e2f065 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/ColinIanKing/stress-ng/commit/142c3b2414f0adfb13b59dea993054a0daa6cd52 ---- - stress-sock.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/stress-sock.c b/stress-sock.c -index 253730168..880530d04 100644 ---- a/stress-sock.c -+++ b/stress-sock.c -@@ -649,7 +649,7 @@ retry: - args->name, errno, strerror(errno)); - goto free_controls; - } --#if defined(MSG_ZEROCOPY) -+#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY) - if (sock_zerocopy) { - int so_zerocopy = 1; - -@@ -1053,7 +1053,7 @@ static int OPTIMIZE3 stress_sock_server( - goto die; - } - --#if defined(MSG_ZEROCOPY) -+#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY) - if (sock_zerocopy) { - int so_zerocopy = 1; - --- -2.43.0 - diff --git a/package/stress-ng/0002-core-sched.c-fix-uclibc-ng-build.patch b/package/stress-ng/0002-core-sched.c-fix-uclibc-ng-build.patch deleted file mode 100644 index c9c4e226039..00000000000 --- a/package/stress-ng/0002-core-sched.c-fix-uclibc-ng-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f8dc9f790251562c3a4635edd29d7674298cd5f7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 4 May 2024 17:52:32 +0200 -Subject: [PATCH] core-sched.c: fix uclibc-ng build - -Since version 0.17.02 and commit -e75ecbc8994e94b9e151b1191c1888bd2821fe72, sched.h is not included before -including core-shim.h. The issue is that core-shim.h defines its own -sched_priority parameter in shim_sched_attr. When sched.h is included -after core-shim.h, the build will fail because __sched_priority will not -be found: - -In file included from core-sched.c:25: -core-sched.c: In function 'stress_set_sched': -core-sched.c:170:22: error: 'struct shim_sched_attr' has no member named '__sched_priority'; did you mean 'sched_priority'? - 170 | attr.sched_priority = (unsigned int)sched_priority; - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/d7d38dbb10f7f188da8dccc44a84a3c46a720bed - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/ColinIanKing/stress-ng/commit/f8dc9f790251562c3a4635edd29d7674298cd5f7 ---- - core-shim.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core-shim.h b/core-shim.h -index bed4cf2f6..475aac512 100644 ---- a/core-shim.h -+++ b/core-shim.h -@@ -23,6 +23,8 @@ - #include - #endif - -+#include -+ - /* - * BeagleBoneBlack with 4.1.15 kernel does not - * define the following, these should be defined diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 918c3db1947..30bb4d10c8f 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_STRESS_NG # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + depends on BR2_TOOLCHAIN_HAS_THREADS # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 depends on !BR2_arc @@ -15,8 +16,8 @@ config BR2_PACKAGE_STRESS_NG https://github.com/ColinIanKing/stress-ng -comment "stress-ng needs a toolchain w/ headers >= 3.3" +comment "stress-ng needs a toolchain w/ threads, headers >= 3.3" depends on !BR2_nios2 && !BR2_arc depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 1f704809de8..a945fdc14ac 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b0bc1495adce6c7a1f82d53f363682b243d6d7e93a06be7f94c9559c0a311a6f stress-ng-0.17.07.tar.gz +sha256 b0ac75b68bb804fd3276fcb235f1b0a9567090ebd887b2ed0f8a3203f9545e11 stress-ng-0.18.05.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 488a998cb81..bf092b0782f 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.17.07 +STRESS_NG_VERSION = 0.18.05 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index ed8cf0ae31d..f6b16fc8a2a 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.13.tar.bz2.md5 -md5 9ada6be0c89846fb7ded1787a17cfbb2 strongswan-5.9.13.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.14.tar.bz2.md5 +md5 21ca3fc7c18456405d03b77266ba630a strongswan-5.9.14.tar.bz2 # Calculated based on the hash above -sha256 56e30effb578fd9426d8457e3b76c8c3728cd8a5589594b55649b2719308ba55 strongswan-5.9.13.tar.bz2 +sha256 728027ddda4cb34c67c4cec97d3ddb8c274edfbabdaeecf7e74693b54fc33678 strongswan-5.9.14.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 57cadd3a0c3..823b58555d3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.13 +STRONGSWAN_VERSION = 5.9.14 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 2710e9e3f3c..5950e9dccf2 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.14.3.tar.bz2.sha512 -sha512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 subversion-1.14.3.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.5.tar.bz2.sha512 +sha512 e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321 subversion-1.14.5.tar.bz2 # Locally calculated sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index bc0b9b45ab9..b3daf013f05 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.14.3 +SUBVERSION_VERSION = 1.14.5 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 diff --git a/package/superiotool/Config.in b/package/superiotool/Config.in new file mode 100644 index 00000000000..e27ac99bf0c --- /dev/null +++ b/package/superiotool/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_SUPERIOTOOL + bool "superiotool" + depends on BR2_x86_64 || BR2_i386 + select BR2_PACKAGE_PCIUTILS + help + Super I/O detection tool. + + https://www.coreboot.org/Superiotool diff --git a/package/superiotool/superiotool.hash b/package/superiotool/superiotool.hash new file mode 100644 index 00000000000..985e54b2a28 --- /dev/null +++ b/package/superiotool/superiotool.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e22afdbac40068ba687fd975f03f6b958599a32e70f539d9d0c74d16a63d7cea coreboot-24.05.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 util/superiotool/COPYING diff --git a/package/superiotool/superiotool.mk b/package/superiotool/superiotool.mk new file mode 100644 index 00000000000..a73be1d6e7e --- /dev/null +++ b/package/superiotool/superiotool.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# superiotool +# +################################################################################ + +SUPERIOTOOL_VERSION = 24.05 +SUPERIOTOOL_SOURCE = coreboot-$(SUPERIOTOOL_VERSION).tar.xz +SUPERIOTOOL_SITE = https://coreboot.org/releases +SUPERIOTOOL_SUBDIR = util/superiotool +SUPERIOTOOL_LICENSE = GPL-2.0+ +SUPERIOTOOL_LICENSE_FILES = util/superiotool/COPYING +SUPERIOTOOL_DEPENDENCIES = pciutils + +SUPERIOTOOL_CFLAGS = \ + $(TARGET_CFLAGS) \ + -I$(@D)/src/commonlib/bsd/include \ + -DPCI_SUPPORT \ + -DSUPERIOTOOL_VERSION=\\\"$(SUPERIOTOOL_VERSION)\\\" + +SUPERIOTOOL_CONFIGURE_OPTS = \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(SUPERIOTOOL_CFLAGS)" + +define SUPERIOTOOL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(SUPERIOTOOL_CONFIGURE_OPTS) \ + -C $(@D)/$(SUPERIOTOOL_SUBDIR) superiotool +endef + +define SUPERIOTOOL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(SUPERIOTOOL_CONFIGURE_OPTS) \ + -C $(@D)/$(SUPERIOTOOL_SUBDIR) install \ + PREFIX=/usr DESTDIR="$(TARGET_DIR)" +endef + +$(eval $(generic-package)) diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash index 98611ffcda3..20278cfb8d8 100644 --- a/package/swipl/swipl.hash +++ b/package/swipl/swipl.hash @@ -1,4 +1,4 @@ # From https://www.swi-prolog.org/download/stable -sha256 0cb9b80b9922be8165cbac384ebe050d94553e72cf7aebfc980b4395ff01d05d swipl-9.2.6.tar.gz +sha256 b331637a57c913c49edcfcb10ddcf6c031278ce93d2411d54542778531abb5c7 swipl-9.2.8.tar.gz # Locally calculated sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk index 595f5e975b3..ef9aedcd2d9 100644 --- a/package/swipl/swipl.mk +++ b/package/swipl/swipl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWIPL_VERSION = 9.2.6 +SWIPL_VERSION = 9.2.8 SWIPL_SITE = https://www.swi-prolog.org/download/stable/src SWIPL_LICENSE = BSD-2-Clause SWIPL_LICENSE_FILES = LICENSE diff --git a/package/sysprof/0001-build-reduce-GLib-requirement.patch b/package/sysprof/0001-build-reduce-GLib-requirement.patch new file mode 100644 index 00000000000..fb83e210fee --- /dev/null +++ b/package/sysprof/0001-build-reduce-GLib-requirement.patch @@ -0,0 +1,30 @@ +From c34fba6fe5c3ecd2028461a4317bd2916e2a09d7 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Mon, 16 Sep 2024 09:48:15 -0700 +Subject: [PATCH] build: reduce GLib requirement + +This is kept lower so that you can build without GTK on older systems. + +Related: https://gitlab.gnome.org/GNOME/sysprof/-/commit/530b4a9d121c8659148c36ce67f2ce415443baa5#note_2223853 +Signed-off-by: Adrian Perez de Castro +Upstream: https://gitlab.gnome.org/GNOME/sysprof/-/commit/e5382d1b8cae4d829751938ce39c2e5fbc419064 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 63a31894..696b87be 100644 +--- a/meson.build ++++ b/meson.build +@@ -45,7 +45,7 @@ need_libsysprof = (need_gtk or + get_option('tests')) + + dex_req = '0.6' +-glib_req = '2.80.0' ++glib_req = '2.76.0' + gtk_req = '4.15' + polkit_req = '0.105' + +-- +2.46.2 + diff --git a/package/sysprof/sysprof.hash b/package/sysprof/sysprof.hash index f21e7621e14..ca025674a7c 100644 --- a/package/sysprof/sysprof.hash +++ b/package/sysprof/sysprof.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/sysprof/46/sysprof-46.0.sha256sum -sha256 73aa7e75ebab3e4e0946a05a723df7e6ee4249e3b9e884dba35500aba2a1d176 sysprof-46.0.tar.xz +# From https://download.gnome.org/sources/sysprof/47/sysprof-47.0.sha256sum +sha256 7424c629434660654288c04248998c357d1ce87ee1559fd44df1980992ef5df5 sysprof-47.0.tar.xz # License files sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk index 8e69a7044e9..81c0a4a6ee5 100644 --- a/package/sysprof/sysprof.mk +++ b/package/sysprof/sysprof.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSPROF_VERSION_MAJOR = 46 +SYSPROF_VERSION_MAJOR = 47 SYSPROF_VERSION = $(SYSPROF_VERSION_MAJOR).0 SYSPROF_SOURCE = sysprof-$(SYSPROF_VERSION).tar.xz SYSPROF_SITE = https://download.gnome.org/sources/sysprof/$(SYSPROF_VERSION_MAJOR) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index d9545e9db04..9a5386c7dcc 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -113,6 +113,7 @@ config BR2_PACKAGE_SYSTEMD_BOOT bool "systemd-boot" depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_GNU_EFI + select BR2_PACKAGE_SYSTEMD_EFI help systemd-boot is a simple UEFI boot manager which executes configured EFI images. The default entry is selected by a @@ -161,6 +162,9 @@ config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH default "x64" if BR2_x86_64 depends on BR2_PACKAGE_SYSTEMD_BOOT +config BR2_PACKAGE_SYSTEMD_EFI + bool "enable EFI support" + config BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE bool "enable journal remote tools" select BR2_PACKAGE_LIBCURL diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 87a8285b8aa..bf70a3d187e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -647,7 +647,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) SYSTEMD_INSTALL_IMAGES = YES SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools -SYSTEMD_CONF_OPTS += -Defi=true -Dbootloader=enabled +SYSTEMD_CONF_OPTS += -Dbootloader=enabled SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) define SYSTEMD_INSTALL_BOOT_FILES @@ -660,9 +660,15 @@ define SYSTEMD_INSTALL_BOOT_FILES endef else -SYSTEMD_CONF_OPTS += -Defi=false -Dbootloader=disabled +SYSTEMD_CONF_OPTS += -Dbootloader=disabled endif # BR2_PACKAGE_SYSTEMD_BOOT == y +ifeq ($(BR2_PACKAGE_SYSTEMD_EFI),y) +SYSTEMD_CONF_OPTS += -Defi=true +else +SYSTEMD_CONF_OPTS += -Defi=false +endif + SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) diff --git a/package/tailscale/Config.in b/package/tailscale/Config.in new file mode 100644 index 00000000000..c81a7134ee2 --- /dev/null +++ b/package/tailscale/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_TAILSCALE + bool "tailscale" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO + help + The easiest, most secure way to use WireGuard and 2FA. + + https://github.com/tailscale/tailscale diff --git a/package/tailscale/tailscale.hash b/package/tailscale/tailscale.hash new file mode 100644 index 00000000000..a5492684a14 --- /dev/null +++ b/package/tailscale/tailscale.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 46b68067a8b91f0e32ea8c23c292b9eb6675fac4c7bba5471a1f787bc3ad7412 tailscale-1.76.1-go2.tar.gz +sha256 d1ee1c7947d4b2c1963ea214d5324f1d4c89f2f1d0f0224889b4dfb868dad725 LICENSE diff --git a/package/tailscale/tailscale.mk b/package/tailscale/tailscale.mk new file mode 100644 index 00000000000..91290ba4a3b --- /dev/null +++ b/package/tailscale/tailscale.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# tailscale +# +################################################################################ + +TAILSCALE_VERSION = 1.76.1 +TAILSCALE_SITE = $(call github,tailscale,tailscale,v$(TAILSCALE_VERSION)) +TAILSCALE_LICENSE = BSD-3-Clause +TAILSCALE_LICENSE_FILES = LICENSE +TAILSCALE_GOMOD = tailscale.com +TAILSCALE_BUILD_TARGETS = cmd/tailscale cmd/tailscaled +TAILSCALE_INSTALL_BINS = tailscale tailscaled +TAILSCALE_LDFLAGS = \ + -X tailscale.com/version.longStamp=$(TAILSCALE_VERSION) \ + -X tailscale.com/version.shortStamp=$(TAILSCALE_VERSION) + +define TAILSCALE_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) +endef + +$(eval $(golang-package)) diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index 85efbfa4ecd..25879c27808 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d35c50063b254a561d567926fe8e5280206f6144c12f3f82e832f87392b67510 tbtools-0.4.1-cargo2.tar.gz +sha256 6ec94630bc4e1afec1342cfd635d1c7da7d82f6c5f00adac61d164505c2a0717 tbtools-0.4.2-cargo2.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index baba0e8a3b4..13b2ee65f90 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.4.1 +TBTOOLS_VERSION = 0.4.2 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index cc998d82d6f..e90334c7837 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -15,7 +15,7 @@ TCF_AGENT_DEPENDENCIES = util-linux TCF_AGENT_SUBDIR = agent # there is not much purpose for the shared lib, -# if wont be used (unmodifed) outside the tcf-agent application +# it will not be used (unmodified) outside the tcf-agent application TCF_AGENT_CONF_OPTS = \ -DBUILD_SHARED_LIBS=OFF \ -DTCF_MACHINE=$(call qstrip,$(BR2_PACKAGE_TCF_AGENT_ARCH)) diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash index 9e1f8fcaf51..d67a7c4e741 100644 --- a/package/tcl/tcl.hash +++ b/package/tcl/tcl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66 tcl8.6.14-src.tar.gz +sha256 861e159753f2e2fbd6ec1484103715b0be56be3357522b858d3cbb5f893ffef1 tcl8.6.15-src.tar.gz sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16 license.terms diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 8968f0f2625..0cd242a2e98 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -5,7 +5,7 @@ ################################################################################ TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).14 +TCL_VERSION = $(TCL_VERSION_MAJOR).15 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) TCL_LICENSE = TCL diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1a22889851c..b29ac06060d 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.3.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.5.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz +sha256 8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb tcpdump-4.99.5.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 91643e7beaa..f4086ef1248 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.4 +TCPDUMP_VERSION = 4.99.5 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 41c8498bec1..35b116685f2 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 141afc12b34a14bb691a939b4b122db0d51bd38feda7f41696822bacea7710c7 tesseract-ocr-5.3.4.tar.gz +sha256 c4bc2a81c12a472f445b7c2fb4705a08bd643ef467f51ec84f0e148bd368051b tesseract-ocr-5.4.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index 0bc90f48710..b2cefcf2a0b 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.3.4 +TESSERACT_OCR_VERSION = 5.4.1 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 diff --git a/package/ti-sgx-demos/Config.in b/package/ti-sgx-demos/Config.in index ec7b8e6038f..f45ccd8d01b 100644 --- a/package/ti-sgx-demos/Config.in +++ b/package/ti-sgx-demos/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_TI_SGX_DEMOS depends on BR2_PACKAGE_TI_SGX_UM help These SGX powervr demo applications from Imagination - Technologies are availabe as binaries only. The binaries + Technologies are available as binaries only. The binaries are compiled for the TI SGX implementation. https://git.ti.com/cgit/graphics/img-pvr-sdk diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index ba81c74c7e2..08d981661e6 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff2019f734566f73af0a8041db50f7f1d0ad6967f7e2e7d796d388cd38c0b5bb timescaledb-2.15.0.tar.gz +sha256 b2fcc29e9975b88c5323aefb062346326694c391d52af46186f5a5ad09136d47 timescaledb-2.17.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index d6c81642341..c9dda672820 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.15.0 +TIMESCALEDB_VERSION = 2.17.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE diff --git a/package/tinyinit/Config.in b/package/tinyinit/Config.in new file mode 100644 index 00000000000..c780ed3cac3 --- /dev/null +++ b/package/tinyinit/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_TINYINIT + bool "tinyinit" + depends on BR2_INIT_TINYINIT + help + A Linux tiny initialization script suitable for resource + limited systems, which can be used as an alternative to the + one provided by Busybox. diff --git a/board/canaan/k210-soc/rootfs_overlay/sbin/init b/package/tinyinit/init old mode 100755 new mode 100644 similarity index 75% rename from board/canaan/k210-soc/rootfs_overlay/sbin/init rename to package/tinyinit/init index d4bf53d4523..fbcb481010c --- a/board/canaan/k210-soc/rootfs_overlay/sbin/init +++ b/package/tinyinit/init @@ -11,7 +11,7 @@ # 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 +if [ "${devmnt}" -eq 0 ]; then /bin/mount -t devtmpfs devtmpfs /dev fi @@ -28,14 +28,5 @@ 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/package/tinyinit/tinyinit.mk b/package/tinyinit/tinyinit.mk new file mode 100644 index 00000000000..ac1f0f736e3 --- /dev/null +++ b/package/tinyinit/tinyinit.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# tinyinit +# +################################################################################ + +define TINYINIT_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(TINYINIT_PKGDIR)/init $(TARGET_DIR)/sbin/init + # Downside: In non-initramfs systems the symlink isn't used/needed + (cd $(TARGET_DIR); ln -sf /sbin/init init) +endef + +$(eval $(generic-package)) diff --git a/package/tk/tk.hash b/package/tk/tk.hash index aee03a152e1..77195582cfa 100644 --- a/package/tk/tk.hash +++ b/package/tk/tk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94 tk8.6.14-src.tar.gz +sha256 550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec tk8.6.15-src.tar.gz sha256 2cde822b93ca16ae535c954b7dfe658b4ad10df2a193628d1b358f1765e8b198 license.terms diff --git a/package/tk/tk.mk b/package/tk/tk.mk index c8dd7bc32c1..3efabd5ec4b 100644 --- a/package/tk/tk.mk +++ b/package/tk/tk.mk @@ -5,7 +5,7 @@ ################################################################################ TK_VERSION_MAJOR = 8.6 -TK_VERSION = $(TK_VERSION_MAJOR).14 +TK_VERSION = $(TK_VERSION_MAJOR).15 TK_SOURCE = tk$(TK_VERSION)-src.tar.gz TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION) TK_LICENSE = TCL diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index b76d16e71e9..e1f65c384d0 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -17,7 +17,7 @@ TPM2_TSS_DEPENDENCIES = openssl host-pkgconf TPM2_TSS_AUTORECONF = YES # systemd-sysusers and systemd-tmpfiles are only used at install time -# to trigger the creation of users adn tmpfiles, which we do not care +# to trigger the creation of users and tmpfiles, which we do not care # about at build time. groupadd, useradd, and setfacl are used in the # fallback path when systemd-sysusers or systemd-tmpfiles are missing # and their failure is ignored anyway. diff --git a/package/transmission/S92transmission b/package/transmission/S92transmission index 85ff40ec16d..1c24c16d986 100644 --- a/package/transmission/S92transmission +++ b/package/transmission/S92transmission @@ -16,11 +16,11 @@ # http://trac.transmissionbt.com/wiki/ConfigFiles # For a guide on how set the preferences, visit: # http://trac.transmissionbt.com/wiki/EditConfigFiles -# For the available environement variables, visit: +# For the available environment variables, visit: # http://trac.transmissionbt.com/wiki/EnvironmentVariables # # The name of the user that should run Transmission. -# It's RECOMENDED to run Transmission in it's own user, +# It's RECOMMENDED to run Transmission in it's own user, # by default, this is set to 'transmission'. # For the sake of security you shouldn't set a password # on this user diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 871fc9ca014..3f86b3ff3b9 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 192cf8d181eb03cbf18e4fd4beb16edf89ef34aa25bc1c73c891bc904342aade tvheadend-078a822cf548b37bc474475fa57e48e9604090ee.tar.gz +sha256 f31cf06dcc40313e9b77331827201e74ed75c4d18156394581ca1a4ae55aa888 tvheadend-26ec161fb3c903f8b0d0be8b54d1b67c596fb829.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index ee82ecb1e65..812ab4e9ab1 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 078a822cf548b37bc474475fa57e48e9604090ee +TVHEADEND_VERSION = 26ec161fb3c903f8b0d0be8b54d1b67c596fb829 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index d353bc4410f..3f84ec4f876 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html -sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz +# https://lists.iana.org/hyperkitty/list/tz-announce@iana.org/thread/IZ7AO6WRE3W3TWBL5IR6PMQUL433BQIE/ +sha512 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193 tzdata2024b.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index e3672052771..ba53ae7c385 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2024a +TZDATA_VERSION = 2024b TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch b/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch deleted file mode 100644 index 5a12231b429..00000000000 --- a/package/uclibc/0001-mips64-time64-for-n32-ABI-breaks-a-lot-of-tests-disa.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd01754e21da71706af07f3e56eade66fc9164fb Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 16 Aug 2024 16:59:28 +0200 -Subject: [PATCH] mips64: time64 for n32 ABI breaks a lot of tests, disable it - for now - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=dd01754e21da71706af07f3e56eade66fc9164fb ---- - extra/Configs/Config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index 454b6ddb8..86bd20d76 100644 ---- a/extra/Configs/Config.in -+++ b/extra/Configs/Config.in -@@ -1032,7 +1032,7 @@ config UCLIBC_USE_TIME64 - TARGET_i386 || \ - TARGET_m68k || \ - TARGET_microblaze || \ -- (TARGET_mips && !CONFIG_MIPS_N64_ABI) || \ -+ (TARGET_mips && !(CONFIG_MIPS_N64_ABI || CONFIG_MIPS_N32_ABI)) || \ - TARGET_or1k || \ - TARGET_powerpc || \ - TARGET_riscv32 || \ --- -2.30.2 - diff --git a/package/uclibc/0001-mips64n32-time64-Select-correct-_dl_fstat-impl.patch b/package/uclibc/0001-mips64n32-time64-Select-correct-_dl_fstat-impl.patch new file mode 100644 index 00000000000..c27e606b898 --- /dev/null +++ b/package/uclibc/0001-mips64n32-time64-Select-correct-_dl_fstat-impl.patch @@ -0,0 +1,34 @@ +From 0dedba1051d781bfb3dd3b50101aa0e880cb6cde Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Sat, 7 Sep 2024 10:48:47 +0300 +Subject: [PATCH] mips64n32, time64: Select correct _dl_fstat impl + +With time64 enabled we have to use statx() instead of stat() or fstat() +If the _dl_fstat implementation isn't selected correctly +we can have multiple errors inside dynamic linker +during startup of the system and of the almost every process +Add sparc exclusion like in other places inside this header + +Signed-off-by: Dmitry Chestnykh +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=0dedba1051d781bfb3dd3b50101aa0e880cb6cde +--- + ldso/include/dl-syscall.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h +index 180d03012..c143b8d45 100644 +--- a/ldso/include/dl-syscall.h ++++ b/ldso/include/dl-syscall.h +@@ -168,7 +168,7 @@ static __always_inline int _dl_stat(const char *file_name, + #if defined __NR_fstat64 && !defined __NR_fstat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) + # define __NR__dl_fstat __NR_fstat64 + static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) +-#elif defined __NR_fstat ++#elif defined __NR_fstat && !defined __UCLIBC_USE_TIME64__ || defined(__sparc__) + # define __NR__dl_fstat __NR_fstat + static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) + #elif defined __NR_statx && defined __UCLIBC_HAVE_STATX__ +-- +2.30.2 + diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 73ddd5ef581..4c360809c3a 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -78,7 +78,7 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" - depends on BR2_USE_MMU + depends on BR2_USE_MMU || ((BR2_arm || BR2_armeb) && BR2_BINFMT_FDPIC) select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index de834bac4f2..600d72ce7ba 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -57,6 +57,13 @@ UCLIBC_LOCALES = \ endif # noMMU binary formats +ifeq ($(BR2_BINFMT_FDPIC),y) +define UCLIBC_BINFMT_CONFIG + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) + $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) + $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) +endef +endif ifeq ($(BR2_BINFMT_FLAT),y) define UCLIBC_BINFMT_CONFIG $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT) diff --git a/package/uefisettings/Config.in b/package/uefisettings/Config.in new file mode 100644 index 00000000000..469738d1150 --- /dev/null +++ b/package/uefisettings/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_UEFISETTINGS + bool "uefisettings" + depends on BR2_ARCH_IS_64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + The tool to read/get/extract and write/change/modify + BIOS/UEFI settings from Linux terminal. + + https://github.com/linuxboot/uefisettings diff --git a/package/uefisettings/uefisettings.hash b/package/uefisettings/uefisettings.hash new file mode 100644 index 00000000000..505b5de5665 --- /dev/null +++ b/package/uefisettings/uefisettings.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5d4d6f771e615df9fee3d531c85dad9946ed793fc0a0e636dee1d342780f7863 uefisettings-f90aed759b9c2217bea336e37ab5282616ece390-cargo2.tar.gz +sha256 acc0b83e151985bb943d35ac37e7522fef28d707af9a4829678e92baa409aaf1 LICENSE diff --git a/package/uefisettings/uefisettings.mk b/package/uefisettings/uefisettings.mk new file mode 100644 index 00000000000..0559b1c5043 --- /dev/null +++ b/package/uefisettings/uefisettings.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# uefisettings +# +################################################################################ + +UEFISETTINGS_VERSION = f90aed759b9c2217bea336e37ab5282616ece390 +UEFISETTINGS_SITE = $(call github,linuxboot,uefisettings,$(UEFISETTINGS_VERSION)) +UEFISETTINGS_LICENSE = BSD-3-Clause +UEFISETTINGS_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch deleted file mode 100644 index acf720a15d6..00000000000 --- a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 3 Jan 2023 23:04:52 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include for uint8_t. - -``` -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type - 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; - | ^~~~~~~~ -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? - +++ |+#include - 1 | // -``` - -Signed-off-by: Sam James - -Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 -Signed-off-by: Fabrice Fontaine ---- - host/include/uhd/cal/database.hpp | 1 + - host/include/uhd/rfnoc/defaults.hpp | 1 + - host/include/uhd/types/eeprom.hpp | 1 + - host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + - host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + - host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + - host/lib/utils/serial_number.cpp | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp -index b6abbb6df7..9d47febedd 100644 ---- a/host/include/uhd/cal/database.hpp -+++ b/host/include/uhd/cal/database.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp -index aa7778aacf..6c878a8d70 100644 ---- a/host/include/uhd/rfnoc/defaults.hpp -+++ b/host/include/uhd/rfnoc/defaults.hpp -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - - namespace uhd { namespace rfnoc { -diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp -index 3a7605d3cb..420440aa64 100644 ---- a/host/include/uhd/types/eeprom.hpp -+++ b/host/include/uhd/types/eeprom.hpp -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp -index e49f49f785..ce95623de2 100644 ---- a/host/include/uhd/usrp/zbx_tune_map_item.hpp -+++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp -@@ -6,6 +6,7 @@ - - #pragma once - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -index 99f2b910c6..99f5a4933f 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -index 591d02d305..1577e02d9e 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp -index 61296a9139..c07730e24d 100644 ---- a/host/lib/utils/serial_number.cpp -+++ b/host/lib/utils/serial_number.cpp -@@ -5,6 +5,7 @@ - // - - #include -+#include - #include - #include - diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 2ccfe3ccb88..58bf91c1df2 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -1,9 +1,9 @@ -comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 5" +comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 7" 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_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 comment "uhd needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 @@ -17,7 +17,7 @@ config BR2_PACKAGE_UHD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # boost-math + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_CHRONO @@ -37,24 +37,16 @@ if BR2_PACKAGE_UHD config BR2_PACKAGE_UHD_B100 bool "b100 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B100 support -comment "B100 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_B200 bool "b200 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B200 support -comment "B200 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_E300 bool "E300 support" select BR2_PACKAGE_UHD_MPMD @@ -115,24 +107,16 @@ config BR2_PACKAGE_UHD_PYTHON config BR2_PACKAGE_UHD_USB bool "USB support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help enable UHD USB support -comment "USB support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_USRP1 bool "USRP1 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable USRP1 support -comment "USRP1 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_USRP2 bool "USRP2 support" help diff --git a/package/uhd/uhd.hash b/package/uhd/uhd.hash index 3af1bc9251b..3282da2ec7d 100644 --- a/package/uhd/uhd.hash +++ b/package/uhd/uhd.hash @@ -1,5 +1,5 @@ # Locally calculated: -sha256 8695800d593c58b557cbf9905b02bbf65a74ca68674e8c8c8c28bb6e203635ad uhd-4.3.0.0.tar.gz +sha256 afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10 uhd-4.7.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 a9d711acd4b..52ea06a3948 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHD_VERSION = 4.3.0.0 +UHD_VERSION = 4.7.0.0 UHD_SITE = $(call github,EttusResearch,uhd,v$(UHD_VERSION)) UHD_LICENSE = GPL-3.0+, LGPL-3.0+ (fpga/usrp3) UHD_LICENSE_FILES = LICENSE.md host/LICENSE fpga/usrp3/LICENSE.md diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index 8a4581b84ce..a7e4c1c242e 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d4452252f7862f7a45dd9c62f2ea7cd3a57ab5f5ab0e54a857d4c695699bbba3 uhubctl-2.5.0.tar.gz -sha256 5eb09049fafa91347386daf769223ba2ee6914cb26ab95b86854ad6edea49b5d LICENSE +sha256 56ca15ddf96d39ab0bf8ee12d3daca13cea45af01bcd5a9732ffcc01664fdfa2 uhubctl-2.6.0.tar.gz +sha256 80b933f8dfea8230f65744d303895ac724240f79ec89cc34a21cc2beba754967 LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index f9815409ae6..284e27a60c5 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHUBCTL_VERSION = 2.5.0 +UHUBCTL_VERSION = 2.6.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE COPYING diff --git a/package/umtprd/0001-Fix-output_dir-make-dependency.patch b/package/umtprd/0001-Fix-output_dir-make-dependency.patch deleted file mode 100644 index fcbca6b000e..00000000000 --- a/package/umtprd/0001-Fix-output_dir-make-dependency.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index 7cd75619abb..f682dd6d84f 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1de40511c1dd4618719cff2058dfe68a595f1b9284c80afa89d6d1a1c80aec29 umtprd-1.6.2.tar.gz +sha256 e0b3c308016595a5d956eaaa086d3bfe4c9af2270857181695338df9affb3574 umtprd-1.6.8.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index c5e0ee512ed..1f1f6bcd232 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,13 +4,13 @@ # ################################################################################ -UMTPRD_VERSION = 1.6.2 +UMTPRD_VERSION = 1.6.8 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE define UMTPRD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef define UMTPRD_INSTALL_TARGET_CMDS diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 8677cb4d4eb..c63311139bb 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -18,18 +18,11 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --enable-tfo-client \ --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr -# uClibc-ng does not have MSG_FASTOPEN -# so TCP Fast Open client mode disabled for it -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -UNBOUND_CONF_OPTS += --disable-tfo-client -else -UNBOUND_CONF_OPTS += --enable-tfo-client -endif - ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) UNBOUND_CONF_OPTS += --with-pthreads else diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index 577e08efbad..2be63012816 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,9 @@ -# https://spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz.sha256sum -sha256 4ba6faa02c0ae6deeb4c53883d66ab54b3a5899bead42ce4ded9568b9a7dc46e usbredir-0.13.0.tar.xz +# Hash from: +# https://www.spice-space.org/download/usbredir/usbredir-0.14.0.tar.xz.sha256sum +# After checking pgp signature: +# https://www.spice-space.org/download/usbredir/usbredir-0.14.0.tar.xz.sig +# with key 206D3B352F566F3B0E6572E997D9123DE37A484F +sha256 924dfb5c78328fae45a4c93a01bc83bb72c1310abeed119109255627a8baa332 usbredir-0.14.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 325e7313aa4..aefe51b6c4d 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,9 +4,9 @@ # ################################################################################ -USBREDIR_VERSION = 0.13.0 +USBREDIR_VERSION = 0.14.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz -USBREDIR_SITE = http://spice-space.org/download/usbredir +USBREDIR_SITE = https://www.spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) USBREDIR_LICENSE_FILES = COPYING.LIB USBREDIR_INSTALL_STAGING = YES diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index 2c863543f67..7527b6e63a6 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 a6a25ffdcf9103e38d7a44732aca17073f4e602b92e4ae55625231a82702e05b usbutils-017.tar.xz +sha256 83f68b59b58547589c00266e82671864627593ab4362d8c807f50eea923cad93 usbutils-018.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 c2073df3b3d..48301fbb9fd 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 017 +USBUTILS_VERSION = 018 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev @@ -20,4 +20,4 @@ endef USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/ustreamer/0001-src-libs-types.h-include-sys-types.h.patch b/package/ustreamer/0001-src-libs-types.h-include-sys-types.h.patch deleted file mode 100644 index 82fe596963a..00000000000 --- a/package/ustreamer/0001-src-libs-types.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6c24c9ea610e7cc0e47d1e7124697098d5ef365e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 May 2024 19:56:49 +0200 -Subject: [PATCH] src/libs/types.h: include sys/types.h (#273) - -Include sys/types.h to avoid the following uclibc build failure since -version 5.52 and -https://github.com/pikvm/ustreamer/commit/2d6716aa4762151f0fb1b900d3cd3295d328cab6: - -In file included from libs/base64.h:25, - from libs/base64.c:23: -libs/types.h:30:9: error: unknown type name 'ssize_t' - 30 | typedef ssize_t sz; - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/24498049d7beb4afaaf9f9a0c2fc0bcd26a3ee04 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/pikvm/ustreamer/commit/6c24c9ea610e7cc0e47d1e7124697098d5ef365e ---- - src/libs/types.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libs/types.h b/src/libs/types.h -index 54e42325..b35bbaea 100644 ---- a/src/libs/types.h -+++ b/src/libs/types.h -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - - typedef long long sll; diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash index 7c70f0195f2..7a03b21b865 100644 --- a/package/ustreamer/ustreamer.hash +++ b/package/ustreamer/ustreamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 80ab01eeaa81c7d8e9c7f62304287d176fd729cb12ca5adb2e181b5a3da79216 ustreamer-6.11.tar.gz +sha256 88ac5e99c56729fecba2cf7f63b690a126dcaef420e2cce9c25c66c55c097f64 ustreamer-6.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk index 5b73e387d6b..29448270833 100644 --- a/package/ustreamer/ustreamer.mk +++ b/package/ustreamer/ustreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -USTREAMER_VERSION = 6.11 +USTREAMER_VERSION = 6.16 USTREAMER_SITE = $(call github,pikvm,ustreamer,v$(USTREAMER_VERSION)) USTREAMER_LICENSE = GPL-3.0+ USTREAMER_LICENSE_FILES = LICENSE diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 1f5dacec2fe..a168abe7201 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -220,13 +220,15 @@ config BR2_PACKAGE_UTIL_LINUX_LSFD bool "lsfd" depends on BR2_USE_MMU # libsmartcols depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + depends on !BR2_TOOLCHAIN_USES_UCLIBC # process_vm_readv select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS help List file descriptors (modern replacement for lsof) -comment "lsfd needs a toolchain w/ headers >= 3.19" +comment "lsfd needs a musl or glibc toolchain w/ headers >= 3.19" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 \ + || BR2_TOOLCHAIN_USES_UCLIBC config BR2_PACKAGE_UTIL_LINUX_LSLOGINS bool "lslogins" diff --git a/package/util-linux/util-linux-libs/util-linux-libs.mk b/package/util-linux/util-linux-libs/util-linux-libs.mk index 0337e7e13a2..9340d5ae4f3 100644 --- a/package/util-linux/util-linux-libs/util-linux-libs.mk +++ b/package/util-linux/util-linux-libs/util-linux-libs.mk @@ -26,9 +26,13 @@ UTIL_LINUX_LIBS_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(TARGET_NLS_DEPENDENCIES) +# --disable-year2038: tells the configure script to not abort if the +# system is not Y2038 compliant. util-linux-libs will support year2038 +# if the system is compliant even with this option passed UTIL_LINUX_LIBS_CONF_OPTS += \ --disable-rpath \ - --disable-makeinstall-chown + --disable-makeinstall-chown \ + --disable-year2038 UTIL_LINUX_LIBS_LINK_LIBS = $(TARGET_NLS_LIBS) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index d47f47fdbae..317efebcbff 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,9 +1,10 @@ -# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/sha256sums.asc +sha256 d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 util-linux-2.40.2.tar.xz # License files, locally calculated -sha256 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 README.licensing +sha256 27f25514040a401b2ceb7057eae1f46cedb1666664b519b5be7e0960d1b35164 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later +sha256 8555341619542abb48c102afd954e42d4478e5be16ad3d5af7b0ff71009e7348 Documentation/licenses/COPYING.MIT diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 11c3f5912eb..70237cdcfec 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.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 +UTIL_LINUX_VERSION_MAJOR = 2.40 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 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) @@ -21,13 +21,15 @@ UTIL_LINUX_LICENSE = \ LGPL-2.1+ (libblkid, libfdisk, libmount), \ BSD-3-Clause (libuuid), \ BSD-2-Clause (xxhash), \ - ISC (rfkill) + ISC (rfkill) \ + MIT (hardlink, flock) UTIL_LINUX_LICENSE_FILES = README.licensing \ Documentation/licenses/COPYING.BSD-3-Clause \ Documentation/licenses/COPYING.BSD-4-Clause-UC \ Documentation/licenses/COPYING.GPL-2.0-or-later \ Documentation/licenses/COPYING.ISC \ - Documentation/licenses/COPYING.LGPL-2.1-or-later + Documentation/licenses/COPYING.LGPL-2.1-or-later \ + Documentation/licenses/COPYING.MIT UTIL_LINUX_CPE_ID_VENDOR = kernel @@ -40,9 +42,13 @@ UTIL_LINUX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs) \ $(TARGET_NLS_DEPENDENCIES) +# --disable-year2038: tells the configure script to not abort if the +# system is not Y2038 compliant. util-linux will support year2038 if +# the system is compliant even with this option passed UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ - --disable-makeinstall-chown + --disable-makeinstall-chown \ + --disable-year2038 UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) @@ -226,6 +232,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --disable-chfn-chsh \ --disable-chmem \ --disable-ipcmk \ + --disable-liblastlog2 \ --disable-login \ --disable-lsfd \ --disable-lslogins \ diff --git a/package/v4l2loopback/v4l2loopback.hash b/package/v4l2loopback/v4l2loopback.hash index d897fd48ffd..c7fb226addc 100644 --- a/package/v4l2loopback/v4l2loopback.hash +++ b/package/v4l2loopback/v4l2loopback.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e0782b8abe8f2235e2734f725dc1533a0729e674c4b7834921ade43b9f04939b v4l2loopback-0.12.7.tar.gz +sha256 1e57e1e382d7451aa2a88d63cc9f146eab1f425b90e76104d4c3d73127e34771 v4l2loopback-0.13.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 50a168fcab7..0e1d20c0cc9 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -4,7 +4,7 @@ # ################################################################################ -V4L2LOOPBACK_VERSION = 0.12.7 +V4L2LOOPBACK_VERSION = 0.13.2 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING @@ -24,6 +24,7 @@ define V4L2LOOPBACK_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_MEDIA_SUPPORT) $(call KCONFIG_ENABLE_OPT,CONFIG_I2C) $(call KCONFIG_ENABLE_OPT,CONFIG_VIDEO_DEV) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEDIA_CAMERA_SUPPORT) endef $(eval $(kernel-module)) diff --git a/package/vdr-plugin-vnsiserver/Config.in b/package/vdr-plugin-vnsiserver/Config.in index 0a0ab8d3760..7100b2432cb 100644 --- a/package/vdr-plugin-vnsiserver/Config.in +++ b/package/vdr-plugin-vnsiserver/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_VDR_PLUGIN_VNSISERVER depends on BR2_PACKAGE_VDR help VDR plugin to handle KODI clients. - The vdr-plugin-vnsiserver is able to handle serveral KODI + The vdr-plugin-vnsiserver is able to handle several KODI clients connecting via the VNSI addon. https://github.com/FernetMenta/vdr-plugin-vnsiserver diff --git a/package/vim/Config.in b/package/vim/Config.in index 1469be8dbed..16cf35e1b46 100644 --- a/package/vim/Config.in +++ b/package/vim/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_VIM_RUNTIME bool "install runtime" default y help - Install VIM runtime (syntax highlighing + macros). + Install VIM runtime (syntax highlighting + macros). This option adds about 11MB of data to /usr/share/ endif diff --git a/package/volk/volk.hash b/package/volk/volk.hash index 8047a68bab2..3a363f0357f 100644 --- a/package/volk/volk.hash +++ b/package/volk/volk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88fd80638a3683f23a8cae6c551a8cfe9ea55735c701846f3eeeeeea8a14f6a3 volk-3.0.0.tar.xz +sha256 ce62f645c2ee3ef8b38f923de78ef4df9a1b7696d618f57781955803ee29bab3 volk-3.1.2.tar.xz sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING diff --git a/package/volk/volk.mk b/package/volk/volk.mk index 67475d5c907..396f4e6e8b5 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,7 +4,7 @@ # ################################################################################ -VOLK_VERSION = 3.0.0 +VOLK_VERSION = 3.1.2 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz VOLK_LICENSE = LGPL-3.0+ diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index e297667f4c8..83c14e88239 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ad4999f6c346053d93e9e600a69162c52759b1db3aa9a09ef4e9d2d8ffb2d167 vue-router-4.4.0.tgz +sha256 7f114198b1efb7635c281cb191948f6ed1cecfa9a9e9be2c14d5356cd624eb60 vue-router-4.4.5.tgz sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index fb352fd1bdc..7de4864d3f6 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.4.0 +VUEJS_ROUTER_VERSION = 4.4.5 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 a4011d80005..127d6201a34 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 01cb6ef41fdf1e2c1944bce553c254e216f507ed20ec1bd993766bf9554caf0f vue-3.4.31.tgz +sha256 ca13a1928f3c57c6b84f64c84c066e410f91c4f3c25ae61f5fce1557210b9927 vue-3.5.12.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index e8a21c8c2fb..f2b5168c9fa 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.4.31 +VUEJS_VERSION = 3.5.12 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 8a4035ed4ee..f7c085513a5 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-May/043636.html +# From https://lists.freedesktop.org/archives/wayland-devel/2024-August/043760.html sha256 864fb2a8399e2d0ec39d56e9d9b753c093775beadc6022ce81f441929a81e5ed wayland-1.23.1.tar.xz -sha512 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 wayland-1.23.0.tar.xz +sha512 818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a wayland-1.23.1.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index 5553647da61..bb5ceabb9c4 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -3,7 +3,7 @@ # wayland # ################################################################################ -# reglinux - (update) + WAYLAND_VERSION = 1.23.1 WAYLAND_SITE = https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 8ee90dda1ca..dca62cf0f86 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,11 +16,11 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, NPTL, dynamic library, gcc >= 10, 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_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_LIBGTK3 @@ -139,4 +139,9 @@ config BR2_PACKAGE_WEBKITGTK_WEBDRIVER Enable support for WebDriver. This will build and install the WebKitWebDriver program in the target. +config BR2_PACKAGE_WEBKITGTK_MINIBROWSER + bool "MiniBrowser" + help + Example browser application included with WebKitGTK. + endif diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 468fefab0ef..ecdb3c788c4 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -47,7 +47,7 @@ WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=ON \ -DENABLE_WEB_AUDIO=ON \ -DENABLE_WEB_CODECS=ON -WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base +WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-bad gst1-plugins-base else WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ @@ -61,6 +61,16 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_WEBKITGTK_MINIBROWSER),y) +define WEBKITGTK_INSTALL_MINIBROWSER_SYMLINK + ln -sf ../libexec/webkit2gtk-4.1/MiniBrowser $(TARGET_DIR)/usr/bin/MiniBrowser +endef +WEBKITGTK_POST_INSTALL_TARGET_HOOKS += WEBKITGTK_INSTALL_MINIBROWSER_SYMLINK +WEBKITGTK_CONF_OPTS += -DENABLE_MINIBROWSER=ON +else +WEBKITGTK_CONF_OPTS += -DENABLE_MINIBROWSER=OFF +endif + ifeq ($(BR2_PACKAGE_LCMS2),y) WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON WEBKITGTK_DEPENDENCIES += lcms2 @@ -82,6 +92,13 @@ else WEBKITGTK_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WEBKITGTK_CONF_OPTS += -DUSE_LIBDRM=ON +WEBKITGTK_DEPENDENCIES += libdrm +else +WEBKITGTK_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBJXL),y) WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON WEBKITGTK_DEPENDENCIES += libjxl diff --git a/package/webp/webp.hash b/package/webp/webp.hash index adc543059b6..d579356a7c5 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 libwebp-1.3.2.tar.gz +sha256 61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5 libwebp-1.4.0.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 33cb4bd5072..a4d030948b7 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.3.2 +WEBP_VERSION = 1.4.0 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz WEBP_SITE = http://downloads.webmproject.org/releases/webp WEBP_LICENSE = BSD-3-Clause diff --git a/package/weston/Config.in b/package/weston/Config.in index d55c4564258..89bcaa4aa08 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -17,6 +17,7 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBDISPLAY_INFO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD # Runtime dependency diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 62322ac639e..35fe608e205 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2024-June/043655.html -sha256 27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093 weston-13.0.3.tar.xz -sha512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb weston-13.0.3.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-October/043858.html +sha256 a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3 weston-14.0.1.tar.xz +sha512 2d782f98f28b39b990acecfc885f62ab34c9cdd22ef06b09c5d8df792112c47b365f89c2bf05d871e36ddfb4c49aa7e6d05ff60fe67a2657727162e4f564a412 weston-14.0.1.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 9292ba14b65..7d431320736 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 13.0.3 +WESTON_VERSION = 14.0.1 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -13,7 +13,8 @@ WESTON_CPE_ID_VENDOR = wayland WESTON_INSTALL_STAGING = YES WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng udev cairo libinput libdrm seatd + libxkbcommon pixman libpng udev cairo libinput libdisplay-info libdrm \ + seatd WESTON_CONF_OPTS = \ -Ddoc=false \ diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 75c3a913dc0..da71b49d094 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,8 +1,8 @@ -# From https://lists.gnu.org/archive/html/bug-wget/2023-05/msg00004.html -sha1 42384273c1937458c9db3766a5509afa636a2f00 wget-1.21.4.tar.lz +# From https://lists.gnu.org/archive/html/bug-wget/2024-11/msg00002.html +sha1 ca79e61fbf1d32133f60ef7c7d476b250b6da423 wget-1.25.0.tar.lz # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.4.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.25.0.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 3683619a5f50edcbccb1720a79006fa37bf9b9a255a8c5b48048bc3c7a874bd9 wget-1.21.4.tar.lz +sha256 19225cc756b0a088fc81148dc6a40a0c8f329af7fd8483f1c7b2fe50f4e08a1f wget-1.25.0.tar.lz # Locally calculated sha256 f7dc7522e7e1be9227f3dc8de8b39a4d1d2471968c893af15f00c1a2076a0eec COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index d2d30879614..e3143647d73 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.4 +WGET_VERSION = 1.25.0 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf diff --git a/package/wilc-firmware/Config.in b/package/wilc-firmware/Config.in index 72a9c73206d..813a75ecf2a 100644 --- a/package/wilc-firmware/Config.in +++ b/package/wilc-firmware/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_WILC1000_FIRMWARE These binary blobs are provided directly from Microchip. Ideally, the firmware version should match driver version. - Generally, the latest firmware would be acceptible regardless + Generally, the latest firmware would be acceptable regardless of driver version. These will be installed to /lib/firmware/mchp/ @@ -26,7 +26,7 @@ config BR2_PACKAGE_WILC3000_FIRMWARE These binary blobs are provided directly from Microchip. Ideally, the firmware version should match driver version. - Generally, the latest firmware would be acceptible regardless + Generally, the latest firmware would be acceptable regardless of driver version. These will be installed to /lib/firmware/mchp/ diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 756859c8442..61de6db80fd 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,8 @@ +# From: +# https://dl.winehq.org/wine/source/9.x/sha512sums.asc +sha512 530219c6a337f2996eac92d644ab603528b82cc6136cc37c1e6aa736d418f33c6f4b0d54f3537b04bceaf4487d84abcf926a2f5e9536ed4e966c4fe63c5b6ddd wine-9.19.tar.xz # Locally calculated after checking pgp signature -sha256 6ec8fb6f2c72d576cb11f52b2f8d59af64404802154651d122b98466d91dc847 wine-8.0.2.tar.xz +sha256 2c13a0c3f31f25a54d415d86785a1ad46ef8a07ae973b6b699345a45206ac015 wine-9.19.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE +sha256 51433d87540ee2f30e3cff986e00e1477880002bf993106a13775ed60d4e0af4 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index f47922dc70a..6b1ba19b0bc 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 8.0.2 +WINE_VERSION = 9.19 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/8.0 +WINE_SITE = https://dl.winehq.org/wine/source/9.x WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -62,6 +62,13 @@ else WINE_CONF_OPTS += --without-dbus endif +ifeq ($(BR2_PACKAGE_FFMPEG),y) +WINE_CONF_OPTS += --with-ffmpeg +WINE_DEPENDENCIES += ffmpeg +else +WINE_CONF_OPTS += --without-ffmpeg +endif + ifeq ($(BR2_PACKAGE_FONTCONFIG),y) WINE_CONF_OPTS += --with-fontconfig WINE_DEPENDENCIES += fontconfig @@ -137,6 +144,13 @@ else WINE_CONF_OPTS += --without-osmesa endif +ifeq ($(BR2_PACKAGE_PCSC_LITE),y) +WINE_CONF_OPTS += --with-pcsclite +WINE_DEPENDENCIES += pcsc-lite +else +WINE_CONF_OPTS += --without-pcsclite +endif + ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) WINE_CONF_OPTS += --with-pulse WINE_DEPENDENCIES += pulseaudio @@ -173,6 +187,13 @@ else WINE_CONF_OPTS += --without-udev endif +ifeq ($(BR2_PACKAGE_WAYLAND),y) +WINE_CONF_OPTS += --with-wayland +WINE_DEPENDENCIES += wayland +else +WINE_CONF_OPTS += --without-wayland +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) WINE_CONF_OPTS += --with-x WINE_DEPENDENCIES += xlib_libX11 @@ -201,6 +222,13 @@ else WINE_CONF_OPTS += --without-xshape --without-xshm endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +WINE_CONF_OPTS += --with-xfixes +WINE_DEPENDENCIES += xlib_libXfixes +else +WINE_CONF_OPTS += --without-xfixes +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) WINE_CONF_OPTS += --with-xinput --with-xinput2 WINE_DEPENDENCIES += xlib_libXi @@ -272,6 +300,7 @@ HOST_WINE_CONF_OPTS += \ --without-coreaudio \ --without-cups \ --without-dbus \ + --without-ffmpeg \ --without-fontconfig \ --without-gphoto \ --without-gnutls \ @@ -285,15 +314,19 @@ HOST_WINE_CONF_OPTS += \ --without-osmesa \ --without-oss \ --without-pcap \ + --without-pcsclite \ --without-pulse \ --without-sane \ --without-sdl \ + --without-udev \ --without-usb \ --without-v4l2 \ --without-vulkan \ + --without-wayland \ --without-x \ --without-xcomposite \ --without-xcursor \ + --without-xfixes \ --without-xinerama \ --without-xinput \ --without-xinput2 \ diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 69f61a87aec..4fff54383df 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -13,6 +13,8 @@ WIREPLUMBER_DEPENDENCIES = host-pkgconf pipewire libglib2 lua WIREPLUMBER_CONF_OPTS = \ -Ddoc=disabled \ + -Dtests=false \ + -Delogind=disabled \ -Dsystem-lua=true \ -Dsystem-lua-version= diff --git a/package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch b/package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch deleted file mode 100644 index edf24fc6d02..00000000000 --- a/package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 33270f56477542dedf978e660cf8d08464f28797 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 26 Nov 2021 17:45:23 +0100 -Subject: [PATCH] cmake: lemon: wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} if needed - -Wipe CMAKE_{EXE_LINKER_FLAGS,SYSROOT} when LEMON_C_COMPILER is set to -avoid a build failure when cross-compiling (e.g. with buildroot) - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/wireshark/wireshark/-/merge_requests/5224] ---- - tools/lemon/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt -index 8742aa9fc9..7a9263fe0d 100644 ---- a/tools/lemon/CMakeLists.txt -+++ b/tools/lemon/CMakeLists.txt -@@ -12,6 +12,8 @@ add_executable(lemon lemon.c) - if(DEFINED LEMON_C_COMPILER) - set(CMAKE_C_COMPILER "${LEMON_C_COMPILER}") - set(CMAKE_C_FLAGS "") -+ set(CMAKE_EXE_LINKER_FLAGS "") -+ set(CMAKE_SYSROOT "") - endif() - - # To keep lemon.c as close to upstream as possible, deliberately ignore --- -2.33.0 - diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 6610eb7781a..642bc5866d3 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.12.txt -sha1 e00d90769995bf786b05c05bdd9a2c6c8e372e70 wireshark-4.0.12.tar.xz -sha256 e4e3d618ba11e159fb163f0dc4716a8b72a065aafd1111db9405332552a5a115 wireshark-4.0.12.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.2.9.txt +sha1 d1abbe110451dab9e57c9ee1fe0892e0d6a7d515 wireshark-4.2.9.tar.xz +sha256 62c2b6652d7f9a50668867bd57b21609c9a9b6950f26e7f30a24b2de0e72ded3 wireshark-4.2.9.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 3759f9bf941..bade68f2586 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.12 +WIRESHARK_VERSION = 4.2.9 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -40,7 +40,7 @@ WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF endif ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) -WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON +WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON -DUSE_qt6=OFF WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools else WIRESHARK_CONF_OPTS += -DBUILD_wireshark=OFF diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 984959f6799..aef8731341b 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -126,18 +126,29 @@ ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),) WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WPS endif +# WPA3 configurations: +# - CONFIG_DPP: Easy Connect (Device Provisioning Protocol - DPP R1 & R2) +# - CONFIG_SAE: Simultaneous Authentication of Equals (SAE), WPA3-Personal +# - CONFIG_SAE_PK: SAE Public Key, WPA3-Personal +# - CONFIG_OWE: Opportunistic Wireless Encryption (OWE) +# - CONFIG_SUITEB: WPA3-Enterprise +# - CONFIG_SUITEB192: WPA3-Enterprise (SuiteB 192 bits security) ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA3),y) WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_DPP \ CONFIG_SAE \ CONFIG_SAE_PK \ - CONFIG_OWE + CONFIG_OWE \ + CONFIG_SUITEB \ + CONFIG_SUITEB192 else WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_DPP \ CONFIG_SAE \ CONFIG_SAE_PK \ - CONFIG_OWE + CONFIG_OWE \ + CONFIG_SUITEB \ + CONFIG_SUITEB192 endif # Try to use openssl if it's already available diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 8016367058f..512f7ea672b 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,11 +16,11 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, NPTL, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 @@ -35,7 +35,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on !BR2_BINFMT_FLAT # icu depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy 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 db0bbbaf65f..616566f9abb 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -19,7 +19,7 @@ XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -# configure doesn't look for drm headers in the appropiate place, so help it +# configure doesn't look for drm headers in the appropriate place, so help it # libdrm is only useful with udev for KMS ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XDRIVER_XF86_VIDEO_QXL_CONF_ENV += REQUIRED_MODULES=libdrm diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index 16889b45594..01d6c19ad67 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2023-November/010009.html -sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a xapian-core-1.4.24.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2024-July/010052.html +sha256 9e6a7903806966d16ce220b49377c9c8fad667c8f0ffcb23a3442946269363a7 xapian-core-1.4.26.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 33c36a5a26a..76775712885 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.24 +XAPIAN_VERSION = 1.4.26 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index f61a6a91aec..93d4bc05ceb 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.5 -sha256 061dcfaf8a0650e5fd9d5432dfe88bda749ea0d079dc136304bfecfbce0661fb xdg-dbus-proxy-0.1.5.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.6 +sha256 131bf59fce7c7ee7ecbc5d9106d6750f4f597bfe609966573240f7e4952973a1 xdg-dbus-proxy-0.1.6.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 2e8c054386e..0e92946915a 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.5 +XDG_DBUS_PROXY_VERSION = 0.1.6 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 diff --git a/package/xen/Config.in b/package/xen/Config.in index af6acd35309..577066666dc 100644 --- a/package/xen/Config.in +++ b/package/xen/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_XEN config BR2_PACKAGE_XEN_HYPERVISOR bool "Xen hypervisor" help - The Xen binaries are avaliable in /usr/lib/xen/ See + The Xen binaries are available in /usr/lib/xen/ See http://wiki.xenproject.org/wiki/Getting_Started for using the Xen hypervisor. diff --git a/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch b/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch deleted file mode 100644 index e4addea8565..00000000000 --- a/package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch +++ /dev/null @@ -1,1721 +0,0 @@ -From 8acdbd718b7828b5d8903a6254b2fa198b866491 Mon Sep 17 00:00:00 2001 -From: Florian Bezdeka -Date: Thu, 12 Nov 2020 11:45:28 +0000 -Subject: [PATCH] lib/boilerplate/iniparser: Allow building with GCC 10.2 - 2020101 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Updating to upstream revision f858275f7f307eecba84c2f5429483f9f28007f8. -Upstream repository is located at [1]. - -The reason for updating was the following compiler error when trying -to compile with GCC 10.2 10.2.1 20201016. As it turned out the problem -was already addressed upstream: - -iniparser/iniparser.c: In function ‘iniparser_load’: -iniparser/iniparser.c:616:13: error: ‘sprintf’ arguments 3, 4 may -overlap destination object ‘buf’ [-Werror=restrict] - 616 | sprintf(tmp, "%s:%s", section, key); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -I reviewed especially the API changes. Most of them are cleanups only -but two things should be pointed out: - - - The type of the size field of struct _dictionary_ changed from int - to ssize_t. The only user of this struct is - lib/analogy/calibration.c which uses this structure for internal - things only. It is never exposed to any public API so updating is - OK and fully backward compatible. - - - dictionary_new changed its signature - from dictionary_new(int size) - to dictionary_new(size_t size). - This function is not part of any public API. So updating does not - break backward compatibility. - -[1] https://github.com/ndevilla/iniparser - -Signed-off-by: Florian Bezdeka -Signed-off-by: Jan Kiszka - -[Retrieved from: -https://gitlab.denx.de/Xenomai/xenomai/-/commit/8acdbd718b7828b5d8903a6254b2fa198b866491] -Signed-off-by: Fabrice Fontaine ---- - lib/boilerplate/iniparser/dictionary.c | 409 ++++++++++---------- - lib/boilerplate/iniparser/dictionary.h | 43 ++- - lib/boilerplate/iniparser/iniparser.c | 491 +++++++++++++++++-------- - lib/boilerplate/iniparser/iniparser.h | 131 +++++-- - 4 files changed, 646 insertions(+), 428 deletions(-) - -diff --git a/lib/boilerplate/iniparser/dictionary.c b/lib/boilerplate/iniparser/dictionary.c -index 5299b77ed..cb7ccd49e 100644 ---- a/lib/boilerplate/iniparser/dictionary.c -+++ b/lib/boilerplate/iniparser/dictionary.c -@@ -1,10 +1,8 @@ - /*-------------------------------------------------------------------------*/ - /** -- @file dictionary.c -- @author N. Devillard -- @date Sep 2007 -- @version $Revision: 1.27 $ -- @brief Implements a dictionary for string variables. -+ @file dictionary.c -+ @author N. Devillard -+ @brief Implements a dictionary for string variables. - - This module implements a simple dictionary object, i.e. a list - of string/string associations. This object is useful to store e.g. -@@ -12,12 +10,8 @@ - */ - /*--------------------------------------------------------------------------*/ - --/* -- $Id: dictionary.c,v 1.27 2007-11-23 21:39:18 ndevilla Exp $ -- $Revision: 1.27 $ --*/ - /*--------------------------------------------------------------------------- -- Includes -+ Includes - ---------------------------------------------------------------------------*/ - #include "dictionary.h" - -@@ -27,33 +21,18 @@ - #include - - /** Maximum value size for integers and doubles. */ --#define MAXVALSZ 1024 -+#define MAXVALSZ 1024 - - /** Minimal allocated number of entries in a dictionary */ --#define DICTMINSZ 128 -+#define DICTMINSZ 128 - - /** Invalid key token */ - #define DICT_INVALID_KEY ((char*)-1) - - /*--------------------------------------------------------------------------- -- Private functions -+ Private functions - ---------------------------------------------------------------------------*/ - --/* Doubles the allocated size associated to a pointer */ --/* 'size' is the current allocated size. */ --static void * mem_double(void * ptr, int size) --{ -- void * newptr ; -- -- newptr = calloc(2*size, 1); -- if (newptr==NULL) { -- return NULL ; -- } -- memcpy(newptr, ptr, size); -- free(ptr); -- return newptr ; --} -- - /*-------------------------------------------------------------------------*/ - /** - @brief Duplicate a string -@@ -67,23 +46,68 @@ static void * mem_double(void * ptr, int size) - static char * xstrdup(const char * s) - { - char * t ; -+ size_t len ; - if (!s) - return NULL ; -- t = malloc(strlen(s)+1) ; -+ -+ len = strlen(s) + 1 ; -+ t = (char*) malloc(len) ; - if (t) { -- strcpy(t,s); -+ memcpy(t, s, len) ; - } - return t ; - } - -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Double the size of the dictionary -+ @param d Dictionary to grow -+ @return This function returns non-zero in case of failure -+ */ -+/*--------------------------------------------------------------------------*/ -+static int dictionary_grow(dictionary * d) -+{ -+ char ** new_val ; -+ char ** new_key ; -+ unsigned * new_hash ; -+ -+ new_val = (char**) calloc(d->size * 2, sizeof *d->val); -+ new_key = (char**) calloc(d->size * 2, sizeof *d->key); -+ new_hash = (unsigned*) calloc(d->size * 2, sizeof *d->hash); -+ if (!new_val || !new_key || !new_hash) { -+ /* An allocation failed, leave the dictionary unchanged */ -+ if (new_val) -+ free(new_val); -+ if (new_key) -+ free(new_key); -+ if (new_hash) -+ free(new_hash); -+ return -1 ; -+ } -+ /* Initialize the newly allocated space */ -+ memcpy(new_val, d->val, d->size * sizeof(char *)); -+ memcpy(new_key, d->key, d->size * sizeof(char *)); -+ memcpy(new_hash, d->hash, d->size * sizeof(unsigned)); -+ /* Delete previous data */ -+ free(d->val); -+ free(d->key); -+ free(d->hash); -+ /* Actually update the dictionary */ -+ d->size *= 2 ; -+ d->val = new_val; -+ d->key = new_key; -+ d->hash = new_hash; -+ return 0 ; -+} -+ - /*--------------------------------------------------------------------------- -- Function codes -+ Function codes - ---------------------------------------------------------------------------*/ - /*-------------------------------------------------------------------------*/ - /** -- @brief Compute the hash key for a string. -- @param key Character string to use for key. -- @return 1 unsigned int on at least 32 bits. -+ @brief Compute the hash key for a string. -+ @param key Character string to use for key. -+ @return 1 unsigned int on at least 32 bits. - - This hash function has been taken from an Article in Dr Dobbs Journal. - This is normally a collision-free function, distributing keys evenly. -@@ -93,84 +117,88 @@ static char * xstrdup(const char * s) - /*--------------------------------------------------------------------------*/ - unsigned dictionary_hash(const char * key) - { -- int len ; -- unsigned hash ; -- int i ; -- -- len = strlen(key); -- for (hash=0, i=0 ; i>6) ; -- } -- hash += (hash <<3); -- hash ^= (hash >>11); -- hash += (hash <<15); -- return hash ; -+ size_t len ; -+ unsigned hash ; -+ size_t i ; -+ -+ if (!key) -+ return 0 ; -+ -+ len = strlen(key); -+ for (hash=0, i=0 ; i>6) ; -+ } -+ hash += (hash <<3); -+ hash ^= (hash >>11); -+ hash += (hash <<15); -+ return hash ; - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Create a new dictionary object. -- @param size Optional initial size of the dictionary. -- @return 1 newly allocated dictionary objet. -+ @brief Create a new dictionary object. -+ @param size Optional initial size of the dictionary. -+ @return 1 newly allocated dictionary objet. - - This function allocates a new dictionary object of given size and returns - it. If you do not know in advance (roughly) the number of entries in the - dictionary, give size=0. - */ --/*--------------------------------------------------------------------------*/ --dictionary * dictionary_new(int size) -+/*-------------------------------------------------------------------------*/ -+dictionary * dictionary_new(size_t size) - { -- dictionary * d ; -- -- /* If no size was specified, allocate space for DICTMINSZ */ -- if (sizesize = size ; -- d->val = (char **)calloc(size, sizeof(char*)); -- d->key = (char **)calloc(size, sizeof(char*)); -- d->hash = (unsigned int *)calloc(size, sizeof(unsigned)); -- return d ; -+ dictionary * d ; -+ -+ /* If no size was specified, allocate space for DICTMINSZ */ -+ if (sizesize = size ; -+ d->val = (char**) calloc(size, sizeof *d->val); -+ d->key = (char**) calloc(size, sizeof *d->key); -+ d->hash = (unsigned*) calloc(size, sizeof *d->hash); -+ } -+ return d ; - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Delete a dictionary object -- @param d dictionary object to deallocate. -- @return void -+ @brief Delete a dictionary object -+ @param d dictionary object to deallocate. -+ @return void - - Deallocate a dictionary object and all memory associated to it. - */ - /*--------------------------------------------------------------------------*/ - void dictionary_del(dictionary * d) - { -- int i ; -- -- if (d==NULL) return ; -- for (i=0 ; isize ; i++) { -- if (d->key[i]!=NULL) -- free(d->key[i]); -- if (d->val[i]!=NULL) -- free(d->val[i]); -- } -- free(d->val); -- free(d->key); -- free(d->hash); -- free(d); -- return ; -+ ssize_t i ; -+ -+ if (d==NULL) return ; -+ for (i=0 ; isize ; i++) { -+ if (d->key[i]!=NULL) -+ free(d->key[i]); -+ if (d->val[i]!=NULL) -+ free(d->val[i]); -+ } -+ free(d->val); -+ free(d->key); -+ free(d->hash); -+ free(d); -+ return ; - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Get a value from a dictionary. -- @param d dictionary object to search. -- @param key Key to look for in the dictionary. -+ @brief Get a value from a dictionary. -+ @param d dictionary object to search. -+ @param key Key to look for in the dictionary. - @param def Default value to return if key not found. -- @return 1 pointer to internally allocated character string. -+ @return 1 pointer to internally allocated character string. - - This function locates a key in a dictionary and returns a pointer to its - value, or the passed 'def' pointer if no such key can be found in -@@ -178,24 +206,24 @@ void dictionary_del(dictionary * d) - dictionary object, you should not try to free it or modify it. - */ - /*--------------------------------------------------------------------------*/ --const char * dictionary_get(dictionary * d, const char * key, const char * def) -+const char * dictionary_get(const dictionary * d, const char * key, const char * def) - { -- unsigned hash ; -- int i ; -+ unsigned hash ; -+ ssize_t i ; - -- hash = dictionary_hash(key); -- for (i=0 ; isize ; i++) { -+ hash = dictionary_hash(key); -+ for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - /* Compare hash */ -- if (hash==d->hash[i]) { -+ if (hash==d->hash[i]) { - /* Compare string, to avoid hash collisions */ - if (!strcmp(key, d->key[i])) { -- return d->val[i] ; -- } -- } -- } -- return def ; -+ return d->val[i] ; -+ } -+ } -+ } -+ return def ; - } - - /*-------------------------------------------------------------------------*/ -@@ -226,66 +254,57 @@ const char * dictionary_get(dictionary * d, const char * key, const char * def) - /*--------------------------------------------------------------------------*/ - int dictionary_set(dictionary * d, const char * key, const char * val) - { -- int i ; -- unsigned hash ; -- -- if (d==NULL || key==NULL) return -1 ; -- -- /* Compute hash for this key */ -- hash = dictionary_hash(key) ; -- /* Find if value is already in dictionary */ -- if (d->n>0) { -- for (i=0 ; isize ; i++) { -+ ssize_t i ; -+ unsigned hash ; -+ -+ if (d==NULL || key==NULL) return -1 ; -+ -+ /* Compute hash for this key */ -+ hash = dictionary_hash(key) ; -+ /* Find if value is already in dictionary */ -+ if (d->n>0) { -+ for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; -- if (hash==d->hash[i]) { /* Same hash value */ -- if (!strcmp(key, d->key[i])) { /* Same key */ -- /* Found a value: modify and return */ -- if (d->val[i]!=NULL) -- free(d->val[i]); -- d->val[i] = val ? xstrdup(val) : NULL ; -+ if (hash==d->hash[i]) { /* Same hash value */ -+ if (!strcmp(key, d->key[i])) { /* Same key */ -+ /* Found a value: modify and return */ -+ if (d->val[i]!=NULL) -+ free(d->val[i]); -+ d->val[i] = (val ? xstrdup(val) : NULL); - /* Value has been modified: return */ -- return 0 ; -- } -- } -- } -- } -- /* Add a new value */ -- /* See if dictionary needs to grow */ -- if (d->n==d->size) { -- -- /* Reached maximum size: reallocate dictionary */ -- d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ; -- d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ; -- d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ; -- if ((d->val==NULL) || (d->key==NULL) || (d->hash==NULL)) { -- /* Cannot grow dictionary */ -- return -1 ; -+ return 0 ; -+ } -+ } - } -- /* Double size */ -- d->size *= 2 ; -- } -+ } -+ /* Add a new value */ -+ /* See if dictionary needs to grow */ -+ if (d->n==d->size) { -+ /* Reached maximum size: reallocate dictionary */ -+ if (dictionary_grow(d) != 0) -+ return -1; -+ } - -- /* Insert key in the first empty slot */ -- for (i=0 ; isize ; i++) { -- if (d->key[i]==NULL) { -- /* Add key here */ -- break ; -- } -+ /* Insert key in the first empty slot. Start at d->n and wrap at -+ d->size. Because d->n < d->size this will necessarily -+ terminate. */ -+ for (i=d->n ; d->key[i] ; ) { -+ if(++i == d->size) i = 0; - } -- /* Copy key */ -- d->key[i] = xstrdup(key); -- d->val[i] = val ? xstrdup(val) : NULL ; -- d->hash[i] = hash; -- d->n ++ ; -- return 0 ; -+ /* Copy key */ -+ d->key[i] = xstrdup(key); -+ d->val[i] = (val ? xstrdup(val) : NULL) ; -+ d->hash[i] = hash; -+ d->n ++ ; -+ return 0 ; - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Delete a key in a dictionary -- @param d dictionary object to modify. -- @param key Key to remove. -+ @brief Delete a key in a dictionary -+ @param d dictionary object to modify. -+ @param key Key to remove. - @return void - - This function deletes a key in a dictionary. Nothing is done if the -@@ -294,26 +313,26 @@ int dictionary_set(dictionary * d, const char * key, const char * val) - /*--------------------------------------------------------------------------*/ - void dictionary_unset(dictionary * d, const char * key) - { -- unsigned hash ; -- int i ; -+ unsigned hash ; -+ ssize_t i ; - -- if (key == NULL) { -- return; -- } -+ if (key == NULL || d == NULL) { -+ return; -+ } - -- hash = dictionary_hash(key); -- for (i=0 ; isize ; i++) { -+ hash = dictionary_hash(key); -+ for (i=0 ; isize ; i++) { - if (d->key[i]==NULL) - continue ; - /* Compare hash */ -- if (hash==d->hash[i]) { -+ if (hash==d->hash[i]) { - /* Compare string, to avoid hash collisions */ - if (!strcmp(key, d->key[i])) { - /* Found key */ - break ; -- } -- } -- } -+ } -+ } -+ } - if (i>=d->size) - /* Key not found */ - return ; -@@ -331,75 +350,31 @@ void dictionary_unset(dictionary * d, const char * key) - - /*-------------------------------------------------------------------------*/ - /** -- @brief Dump a dictionary to an opened file pointer. -- @param d Dictionary to dump -- @param out Opened file pointer. -- @return void -+ @brief Dump a dictionary to an opened file pointer. -+ @param d Dictionary to dump -+ @param f Opened file pointer. -+ @return void - - Dumps a dictionary onto an opened file pointer. Key pairs are printed out - as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as - output file pointers. - */ - /*--------------------------------------------------------------------------*/ --void dictionary_dump(dictionary * d, FILE * out) -+void dictionary_dump(const dictionary * d, FILE * out) - { -- int i ; -- -- if (d==NULL || out==NULL) return ; -- if (d->n<1) { -- fprintf(out, "empty dictionary\n"); -- return ; -- } -- for (i=0 ; isize ; i++) { -+ ssize_t i ; -+ -+ if (d==NULL || out==NULL) return ; -+ if (d->n<1) { -+ fprintf(out, "empty dictionary\n"); -+ return ; -+ } -+ for (i=0 ; isize ; i++) { - if (d->key[i]) { - fprintf(out, "%20s\t[%s]\n", - d->key[i], - d->val[i] ? d->val[i] : "UNDEF"); - } -- } -- return ; --} -- -- --/* Test code */ --#ifdef TESTDIC --#define NVALS 20000 --int main(int argc, char *argv[]) --{ -- dictionary * d ; -- char * val ; -- int i ; -- char cval[90] ; -- -- /* Allocate dictionary */ -- printf("allocating...\n"); -- d = dictionary_new(0); -- -- /* Set values in dictionary */ -- printf("setting %d values...\n", NVALS); -- for (i=0 ; in != 0) { -- printf("error deleting values\n"); - } -- printf("deallocating...\n"); -- dictionary_del(d); -- return 0 ; -+ return ; - } --#endif --/* vim: set ts=4 et sw=4 tw=75 */ -diff --git a/lib/boilerplate/iniparser/dictionary.h b/lib/boilerplate/iniparser/dictionary.h -index fa4dcb727..d04b6ce71 100644 ---- a/lib/boilerplate/iniparser/dictionary.h -+++ b/lib/boilerplate/iniparser/dictionary.h -@@ -3,8 +3,6 @@ - /** - @file dictionary.h - @author N. Devillard -- @date Sep 2007 -- @version $Revision: 1.12 $ - @brief Implements a dictionary for string variables. - - This module implements a simple dictionary object, i.e. a list -@@ -13,18 +11,11 @@ - */ - /*--------------------------------------------------------------------------*/ - --/* -- $Id: dictionary.h,v 1.12 2007-11-23 21:37:00 ndevilla Exp $ -- $Author: ndevilla $ -- $Date: 2007-11-23 21:37:00 $ -- $Revision: 1.12 $ --*/ -- - #ifndef _DICTIONARY_H_ - #define _DICTIONARY_H_ - - /*--------------------------------------------------------------------------- -- Includes -+ Includes - ---------------------------------------------------------------------------*/ - - #include -@@ -32,14 +23,18 @@ - #include - #include - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /*--------------------------------------------------------------------------- -- New types -+ New types - ---------------------------------------------------------------------------*/ - - - /*-------------------------------------------------------------------------*/ - /** -- @brief Dictionary object -+ @brief Dictionary object - - This object contains a list of string/string associations. Each - association is identified by a unique string key. Looking up values -@@ -48,16 +43,16 @@ - */ - /*-------------------------------------------------------------------------*/ - typedef struct _dictionary_ { -- int n ; /** Number of entries in dictionary */ -- int size ; /** Storage size */ -- char ** val ; /** List of string values */ -- char ** key ; /** List of string keys */ -- unsigned * hash ; /** List of hash values for keys */ -+ int n ; /** Number of entries in dictionary */ -+ ssize_t size ; /** Storage size */ -+ char ** val ; /** List of string values */ -+ char ** key ; /** List of string keys */ -+ unsigned * hash ; /** List of hash values for keys */ - } dictionary ; - - - /*--------------------------------------------------------------------------- -- Function prototypes -+ Function prototypes - ---------------------------------------------------------------------------*/ - - /*-------------------------------------------------------------------------*/ -@@ -85,7 +80,7 @@ unsigned dictionary_hash(const char * key); - dictionary, give size=0. - */ - /*--------------------------------------------------------------------------*/ --dictionary * dictionary_new(int size); -+dictionary * dictionary_new(size_t size); - - /*-------------------------------------------------------------------------*/ - /** -@@ -112,7 +107,7 @@ void dictionary_del(dictionary * vd); - dictionary object, you should not try to free it or modify it. - */ - /*--------------------------------------------------------------------------*/ --const char * dictionary_get(dictionary * d, const char * key, const char * def); -+const char * dictionary_get(const dictionary * d, const char * key, const char * def); - - - /*-------------------------------------------------------------------------*/ -@@ -161,7 +156,7 @@ void dictionary_unset(dictionary * d, const char * key); - /** - @brief Dump a dictionary to an opened file pointer. - @param d Dictionary to dump -- @param out Opened file pointer. -+ @param f Opened file pointer. - @return void - - Dumps a dictionary onto an opened file pointer. Key pairs are printed out -@@ -169,6 +164,10 @@ void dictionary_unset(dictionary * d, const char * key); - output file pointers. - */ - /*--------------------------------------------------------------------------*/ --void dictionary_dump(dictionary * d, FILE * out); -+void dictionary_dump(const dictionary * d, FILE * out); -+ -+#ifdef __cplusplus -+} -+#endif - - #endif -diff --git a/lib/boilerplate/iniparser/iniparser.c b/lib/boilerplate/iniparser/iniparser.c -index 5b2094a00..f1d165896 100644 ---- a/lib/boilerplate/iniparser/iniparser.c -+++ b/lib/boilerplate/iniparser/iniparser.c -@@ -3,19 +3,12 @@ - /** - @file iniparser.c - @author N. Devillard -- @date Sep 2007 -- @version 3.0 - @brief Parser for ini files. - */ - /*--------------------------------------------------------------------------*/ --/* -- $Id: iniparser.c,v 2.18 2008-01-03 18:35:39 ndevilla Exp $ -- $Revision: 2.18 $ -- $Date: 2008-01-03 18:35:39 $ --*/ - /*---------------------------- Includes ------------------------------------*/ - #include --#include -+#include - #include "iniparser.h" - - /*---------------------------- Defines -------------------------------------*/ -@@ -39,65 +32,115 @@ typedef enum _line_status_ { - - /*-------------------------------------------------------------------------*/ - /** -- @brief Convert a string to lowercase. -- @param s String to convert. -- @return ptr to statically allocated string. -- -- This function returns a pointer to a statically allocated string -- containing a lowercased version of the input string. Do not free -- or modify the returned string! Since the returned string is statically -- allocated, it will be modified at each function call (not re-entrant). -+ @brief Convert a string to lowercase. -+ @param in String to convert. -+ @param out Output buffer. -+ @param len Size of the out buffer. -+ @return ptr to the out buffer or NULL if an error occured. -+ -+ This function convert a string into lowercase. -+ At most len - 1 elements of the input string will be converted. - */ - /*--------------------------------------------------------------------------*/ -- --static char strbuf[ASCIILINESZ+1]; -- --static char * strlwc(const char * s) -+static const char * strlwc(const char * in, char *out, unsigned len) - { -- int i ; -+ unsigned i ; - -- if (s==NULL) return NULL ; -- memset(strbuf, 0, ASCIILINESZ+1); -+ if (in==NULL || out == NULL || len==0) return NULL ; - i=0 ; -- while (s[i] && i s) { -+ if (!isspace((int)*(last-1))) -+ break ; -+ last -- ; -+ } -+ *last = (char)0; -+ -+ memmove(dest,s,last - s + 1); -+ return last - s; -+} -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Default error callback for iniparser: wraps `fprintf(stderr, ...)`. -+ */ -+/*--------------------------------------------------------------------------*/ -+static int default_error_callback(const char *format, ...) -+{ -+ int ret; -+ va_list argptr; -+ va_start(argptr, format); -+ ret = vfprintf(stderr, format, argptr); -+ va_end(argptr); -+ return ret; - } - -+static int (*iniparser_error_callback)(const char*, ...) = default_error_callback; -+ - /*-------------------------------------------------------------------------*/ - /** -- @brief Remove blanks at the beginning and the end of a string. -- @param s String to parse. -- @return ptr to statically allocated string. -- -- This function returns a pointer to a statically allocated string, -- which is identical to the input string, except that all blank -- characters at the end and the beg. of the string have been removed. -- Do not free or modify the returned string! Since the returned string -- is statically allocated, it will be modified at each function call -- (not re-entrant). -+ @brief Configure a function to receive the error messages. -+ @param errback Function to call. -+ -+ By default, the error will be printed on stderr. If a null pointer is passed -+ as errback the error callback will be switched back to default. - */ - /*--------------------------------------------------------------------------*/ --static char * strstrip(const char * s) -+void iniparser_set_error_callback(int (*errback)(const char *, ...)) - { -- char * last ; -- -- if (s==NULL) return NULL ; -- -- while (isspace((int)*s) && *s) s++; -- memset(strbuf, 0, ASCIILINESZ+1); -- strcpy(strbuf, s); -- last = strbuf + strlen(strbuf); -- while (last > strbuf) { -- if (!isspace((int)*(last-1))) -- break ; -- last -- ; -- } -- *last = (char)0; -- return (char*)strbuf ; -+ if (errback) { -+ iniparser_error_callback = errback; -+ } else { -+ iniparser_error_callback = default_error_callback; -+ } - } - - /*-------------------------------------------------------------------------*/ -@@ -118,7 +161,7 @@ static char * strstrip(const char * s) - This function returns -1 in case of error. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_getnsec(dictionary * d) -+int iniparser_getnsec(const dictionary * d) - { - int i ; - int nsec ; -@@ -149,7 +192,7 @@ int iniparser_getnsec(dictionary * d) - This function returns NULL in case of error. - */ - /*--------------------------------------------------------------------------*/ --const char * iniparser_getsecname(dictionary * d, int n) -+const char * iniparser_getsecname(const dictionary * d, int n) - { - int i ; - int foundsec ; -@@ -184,7 +227,7 @@ const char * iniparser_getsecname(dictionary * d, int n) - purposes mostly. - */ - /*--------------------------------------------------------------------------*/ --void iniparser_dump(dictionary * d, FILE * f) -+void iniparser_dump(const dictionary * d, FILE * f) - { - int i ; - -@@ -212,13 +255,11 @@ void iniparser_dump(dictionary * d, FILE * f) - It is Ok to specify @c stderr or @c stdout as output files. - */ - /*--------------------------------------------------------------------------*/ --void iniparser_dump_ini(dictionary * d, FILE * f) -+void iniparser_dump_ini(const dictionary * d, FILE * f) - { -- int i, j ; -- char keym[ASCIILINESZ+1]; -- int nsec ; -- const char * secname ; -- int seclen ; -+ int i ; -+ int nsec ; -+ const char * secname ; - - if (d==NULL || f==NULL) return ; - -@@ -234,24 +275,126 @@ void iniparser_dump_ini(dictionary * d, FILE * f) - } - for (i=0 ; isize ; j++) { -- if (d->key[j]==NULL) -- continue ; -- if (!strncmp(d->key[j], keym, seclen+1)) { -- fprintf(f, -- "%-30s = %s\n", -- d->key[j]+seclen+1, -- d->val[j] ? d->val[j] : ""); -- } -+ iniparser_dumpsection_ini(d, secname, f); -+ } -+ fprintf(f, "\n"); -+ return ; -+} -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Save a dictionary section to a loadable ini file -+ @param d Dictionary to dump -+ @param s Section name of dictionary to dump -+ @param f Opened file pointer to dump to -+ @return void -+ -+ This function dumps a given section of a given dictionary into a loadable ini -+ file. It is Ok to specify @c stderr or @c stdout as output files. -+ */ -+/*--------------------------------------------------------------------------*/ -+void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f) -+{ -+ int j ; -+ char keym[ASCIILINESZ+1]; -+ int seclen ; -+ -+ if (d==NULL || f==NULL) return ; -+ if (! iniparser_find_entry(d, s)) return ; -+ -+ seclen = (int)strlen(s); -+ fprintf(f, "\n[%s]\n", s); -+ sprintf(keym, "%s:", s); -+ for (j=0 ; jsize ; j++) { -+ if (d->key[j]==NULL) -+ continue ; -+ if (!strncmp(d->key[j], keym, seclen+1)) { -+ fprintf(f, -+ "%-30s = %s\n", -+ d->key[j]+seclen+1, -+ d->val[j] ? d->val[j] : ""); - } - } - fprintf(f, "\n"); - return ; - } - -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the number of keys in a section of a dictionary. -+ @param d Dictionary to examine -+ @param s Section name of dictionary to examine -+ @return Number of keys in section -+ */ -+/*--------------------------------------------------------------------------*/ -+int iniparser_getsecnkeys(const dictionary * d, const char * s) -+{ -+ int seclen, nkeys ; -+ char keym[ASCIILINESZ+1]; -+ int j ; -+ -+ nkeys = 0; -+ -+ if (d==NULL) return nkeys; -+ if (! iniparser_find_entry(d, s)) return nkeys; -+ -+ seclen = (int)strlen(s); -+ strlwc(s, keym, sizeof(keym)); -+ keym[seclen] = ':'; -+ -+ for (j=0 ; jsize ; j++) { -+ if (d->key[j]==NULL) -+ continue ; -+ if (!strncmp(d->key[j], keym, seclen+1)) -+ nkeys++; -+ } -+ -+ return nkeys; -+ -+} -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the number of keys in a section of a dictionary. -+ @param d Dictionary to examine -+ @param s Section name of dictionary to examine -+ @param keys Already allocated array to store the keys in -+ @return The pointer passed as `keys` argument or NULL in case of error -+ -+ This function queries a dictionary and finds all keys in a given section. -+ The keys argument should be an array of pointers which size has been -+ determined by calling `iniparser_getsecnkeys` function prior to this one. -+ -+ Each pointer in the returned char pointer-to-pointer is pointing to -+ a string allocated in the dictionary; do not free or modify them. -+ */ -+/*--------------------------------------------------------------------------*/ -+const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys) -+{ -+ int i, j, seclen ; -+ char keym[ASCIILINESZ+1]; -+ -+ if (d==NULL || keys==NULL) return NULL; -+ if (! iniparser_find_entry(d, s)) return NULL; -+ -+ seclen = (int)strlen(s); -+ strlwc(s, keym, sizeof(keym)); -+ keym[seclen] = ':'; -+ -+ i = 0; -+ -+ for (j=0 ; jsize ; j++) { -+ if (d->key[j]==NULL) -+ continue ; -+ if (!strncmp(d->key[j], keym, seclen+1)) { -+ keys[i] = d->key[j]; -+ i++; -+ } -+ } -+ -+ return keys; -+} -+ - /*-------------------------------------------------------------------------*/ - /** - @brief Get the string associated to a key -@@ -267,24 +410,27 @@ void iniparser_dump_ini(dictionary * d, FILE * f) - the dictionary, do not free or modify it. - */ - /*--------------------------------------------------------------------------*/ --const char * iniparser_getstring(dictionary * d, const char * key, const char * def) -+const char * iniparser_getstring(const dictionary * d, const char * key, const char * def) - { -- char * lc_key ; -+ const char * lc_key ; -+ const char * sval ; -+ char tmp_str[ASCIILINESZ+1]; - - if (d==NULL || key==NULL) - return def ; - -- lc_key = strlwc(key); -- return dictionary_get(d, lc_key, def); -+ lc_key = strlwc(key, tmp_str, sizeof(tmp_str)); -+ sval = dictionary_get(d, lc_key, def); -+ return sval ; - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Get the string associated to a key, convert to an int -+ @brief Get the string associated to a key, convert to an long int - @param d Dictionary to search - @param key Key string to look for - @param notfound Value to return in case of error -- @return integer -+ @return long integer - - This function queries a dictionary for a key. A key as read from an - ini file is given as "section:key". If the key cannot be found, -@@ -305,13 +451,46 @@ const char * iniparser_getstring(dictionary * d, const char * key, const char * - Credits: Thanks to A. Becker for suggesting strtol() - */ - /*--------------------------------------------------------------------------*/ --int iniparser_getint(dictionary * d, const char * key, int notfound) -+long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound) - { -- const char * str ; -+ const char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); - if (str==INI_INVALID_KEY) return notfound ; -- return (int)strtol(str, NULL, 0); -+ return strtol(str, NULL, 0); -+} -+ -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the string associated to a key, convert to an int -+ @param d Dictionary to search -+ @param key Key string to look for -+ @param notfound Value to return in case of error -+ @return integer -+ -+ This function queries a dictionary for a key. A key as read from an -+ ini file is given as "section:key". If the key cannot be found, -+ the notfound value is returned. -+ -+ Supported values for integers include the usual C notation -+ so decimal, octal (starting with 0) and hexadecimal (starting with 0x) -+ are supported. Examples: -+ -+ "42" -> 42 -+ "042" -> 34 (octal -> decimal) -+ "0x42" -> 66 (hexa -> decimal) -+ -+ Warning: the conversion may overflow in various ways. Conversion is -+ totally outsourced to strtol(), see the associated man page for overflow -+ handling. -+ -+ Credits: Thanks to A. Becker for suggesting strtol() -+ */ -+/*--------------------------------------------------------------------------*/ -+int iniparser_getint(const dictionary * d, const char * key, int notfound) -+{ -+ return (int)iniparser_getlongint(d, key, notfound); - } - - /*-------------------------------------------------------------------------*/ -@@ -327,9 +506,9 @@ int iniparser_getint(dictionary * d, const char * key, int notfound) - the notfound value is returned. - */ - /*--------------------------------------------------------------------------*/ --double iniparser_getdouble(dictionary * d, const char * key, double notfound) -+double iniparser_getdouble(const dictionary * d, const char * key, double notfound) - { -- const char * str ; -+ const char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); - if (str==INI_INVALID_KEY) return notfound ; -@@ -368,10 +547,10 @@ double iniparser_getdouble(dictionary * d, const char * key, double notfound) - necessarily have to be 0 or 1. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_getboolean(dictionary * d, const char * key, int notfound) -+int iniparser_getboolean(const dictionary * d, const char * key, int notfound) - { -- const char * c ; -- int ret ; -+ int ret ; -+ const char * c ; - - c = iniparser_getstring(d, key, INI_INVALID_KEY); - if (c==INI_INVALID_KEY) return notfound ; -@@ -397,10 +576,7 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound) - of querying for the presence of sections in a dictionary. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_find_entry( -- dictionary * ini, -- const char * entry --) -+int iniparser_find_entry(const dictionary * ini, const char * entry) - { - int found=0 ; - if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) { -@@ -418,13 +594,14 @@ int iniparser_find_entry( - @return int 0 if Ok, -1 otherwise. - - If the given entry can be found in the dictionary, it is modified to -- contain the provided value. If it cannot be found, -1 is returned. -+ contain the provided value. If it cannot be found, the entry is created. - It is Ok to set val to NULL. - */ - /*--------------------------------------------------------------------------*/ - int iniparser_set(dictionary * ini, const char * entry, const char * val) - { -- return dictionary_set(ini, strlwc(entry), val) ; -+ char tmp_str[ASCIILINESZ+1]; -+ return dictionary_set(ini, strlwc(entry, tmp_str, sizeof(tmp_str)), val) ; - } - - /*-------------------------------------------------------------------------*/ -@@ -439,12 +616,13 @@ int iniparser_set(dictionary * ini, const char * entry, const char * val) - /*--------------------------------------------------------------------------*/ - void iniparser_unset(dictionary * ini, const char * entry) - { -- dictionary_unset(ini, strlwc(entry)); -+ char tmp_str[ASCIILINESZ+1]; -+ dictionary_unset(ini, strlwc(entry, tmp_str, sizeof(tmp_str))); - } - - /*-------------------------------------------------------------------------*/ - /** -- @brief Load a single line from an INI file -+ @brief Load a single line from an INI file - @param input_line Input line, may be concatenated multi-line input - @param section Output space to store section - @param key Output space to store key -@@ -457,34 +635,39 @@ static line_status iniparser_line( - char * section, - char * key, - char * value) --{ -+{ - line_status sta ; -- char line[ASCIILINESZ+1]; -- int len ; -+ char * line = NULL; -+ size_t len ; - -- strcpy(line, strstrip(input_line)); -- len = (int)strlen(line); -+ line = xstrdup(input_line); -+ len = strstrip(line); - - sta = LINE_UNPROCESSED ; - if (len<1) { - /* Empty line */ - sta = LINE_EMPTY ; -- } else if (line[0]=='#') { -+ } else if (line[0]=='#' || line[0]==';') { - /* Comment line */ -- sta = LINE_COMMENT ; -+ sta = LINE_COMMENT ; - } else if (line[0]=='[' && line[len-1]==']') { - /* Section name */ - sscanf(line, "[%[^]]", section); -- strcpy(section, strstrip(section)); -- strcpy(section, strlwc(section)); -+ strstrip(section); -+ strlwc(section, section, len); - sta = LINE_SECTION ; - } else if (sscanf (line, "%[^=] = \"%[^\"]\"", key, value) == 2 -- || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2 -- || sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { -- /* Usual key=value, with or without comments */ -- strcpy(key, strstrip(key)); -- strcpy(key, strlwc(key)); -- strcpy(value, strstrip(value)); -+ || sscanf (line, "%[^=] = '%[^\']'", key, value) == 2) { -+ /* Usual key=value with quotes, with or without comments */ -+ strstrip(key); -+ strlwc(key, key, len); -+ /* Don't strip spaces from values surrounded with quotes */ -+ sta = LINE_VALUE ; -+ } else if (sscanf (line, "%[^=] = %[^;#]", key, value) == 2) { -+ /* Usual key=value without quotes, with or without comments */ -+ strstrip(key); -+ strlwc(key, key, len); -+ strstrip(value); - /* - * sscanf cannot handle '' or "" as empty values - * this is done here -@@ -501,14 +684,16 @@ static line_status iniparser_line( - * key=; - * key=# - */ -- strcpy(key, strstrip(key)); -- strcpy(key, strlwc(key)); -+ strstrip(key); -+ strlwc(key, key, len); - value[0]=0 ; - sta = LINE_VALUE ; - } else { - /* Generate syntax error */ - sta = LINE_ERROR ; - } -+ -+ free(line); - return sta ; - } - -@@ -528,44 +713,33 @@ static line_status iniparser_line( - /*--------------------------------------------------------------------------*/ - dictionary * iniparser_load(const char * ininame) - { -- char *buf; - FILE * in ; - -- char *line; -- char *section; -- char *key; -- char *tmp; -- char *val; -+ char line [ASCIILINESZ+1] ; -+ char section [ASCIILINESZ+1] ; -+ char key [ASCIILINESZ+1] ; -+ char tmp [(ASCIILINESZ * 2) + 2] ; -+ char val [ASCIILINESZ+1] ; - - int last=0 ; - int len ; - int lineno=0 ; - int errs=0; -- int ret; -+ int mem_err=0; - - dictionary * dict ; - -- if ((in=fopen(ininame, "r"))==NULL) -+ if ((in=fopen(ininame, "r"))==NULL) { -+ iniparser_error_callback("iniparser: cannot open %s\n", ininame); - return NULL ; -+ } - - dict = dictionary_new(0) ; - if (!dict) { - fclose(in); -- errno = ENOMEM; - return NULL ; - } - -- buf = malloc((ASCIILINESZ+1) * 5); -- if (buf == NULL) { -- errno = -ENOMEM; -- return NULL; -- } -- line = buf; -- section = line + ASCIILINESZ + 1; -- key = section + ASCIILINESZ + 1; -- tmp = key + ASCIILINESZ + 1; -- val = tmp + ASCIILINESZ + 1; -- - memset(line, 0, ASCIILINESZ); - memset(section, 0, ASCIILINESZ); - memset(key, 0, ASCIILINESZ); -@@ -575,18 +749,16 @@ dictionary * iniparser_load(const char * ininame) - while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { - lineno++ ; - len = (int)strlen(line)-1; -+ if (len<=0) -+ continue; - /* Safety check against buffer overflows */ -- if (last > 0 && line[len]!='\n') { --#if 0 -- warning(anon_scope, -- "iniparser: input line too long in %s (%d)\n", -- ininame, -- lineno); --#endif -+ if (line[len]!='\n' && !feof(in)) { -+ iniparser_error_callback( -+ "iniparser: input line too long in %s (%d)\n", -+ ininame, -+ lineno); - dictionary_del(dict); - fclose(in); -- free(buf); -- errno = EINVAL; - return NULL ; - } - /* Get rid of \n and spaces at end of line */ -@@ -595,8 +767,11 @@ dictionary * iniparser_load(const char * ininame) - line[len]=0 ; - len-- ; - } -+ if (len < 0) { /* Line was entirely \n and/or spaces */ -+ len = 0; -+ } - /* Detect multi-line */ -- if (len >= 0 && line[len]=='\\') { -+ if (line[len]=='\\') { - /* Multi-line value */ - last=len ; - continue ; -@@ -609,24 +784,20 @@ dictionary * iniparser_load(const char * ininame) - break ; - - case LINE_SECTION: -- errs = dictionary_set(dict, section, NULL); -+ mem_err = dictionary_set(dict, section, NULL); - break ; - - case LINE_VALUE: - sprintf(tmp, "%s:%s", section, key); -- errs = dictionary_set(dict, tmp, val) ; -+ mem_err = dictionary_set(dict, tmp, val); - break ; - -- case LINE_ERROR: --#if 0 -- printf("iniparser: syntax error in %s (%d):\n", -- ininame, -- lineno); -- printf( "-> %s\n", line); -- --#endif -- -- ret = EINVAL; -+ case LINE_ERROR: -+ iniparser_error_callback( -+ "iniparser: syntax error in %s (%d):\n-> %s\n", -+ ininame, -+ lineno, -+ line); - errs++ ; - break; - -@@ -635,18 +806,16 @@ dictionary * iniparser_load(const char * ininame) - } - memset(line, 0, ASCIILINESZ); - last=0; -- if (errs<0) { -- ret = ENOMEM; -+ if (mem_err<0) { -+ iniparser_error_callback("iniparser: memory allocation failure\n"); - break ; - } - } -- fclose(in); -- free(buf); - if (errs) { - dictionary_del(dict); - dict = NULL ; -- errno = ret; - } -+ fclose(in); - return dict ; - } - -@@ -665,5 +834,3 @@ void iniparser_freedict(dictionary * d) - { - dictionary_del(d); - } -- --/* vim: set ts=4 et sw=4 tw=75 */ -diff --git a/lib/boilerplate/iniparser/iniparser.h b/lib/boilerplate/iniparser/iniparser.h -index d454cef34..37ff7b71b 100644 ---- a/lib/boilerplate/iniparser/iniparser.h -+++ b/lib/boilerplate/iniparser/iniparser.h -@@ -3,22 +3,15 @@ - /** - @file iniparser.h - @author N. Devillard -- @date Sep 2007 -- @version 3.0 - @brief Parser for ini files. - */ - /*--------------------------------------------------------------------------*/ - --/* -- $Id: iniparser.h,v 1.24 2007-11-23 21:38:19 ndevilla Exp $ -- $Revision: 1.24 $ --*/ -- - #ifndef _INIPARSER_H_ - #define _INIPARSER_H_ - - /*--------------------------------------------------------------------------- -- Includes -+ Includes - ---------------------------------------------------------------------------*/ - - #include -@@ -34,12 +27,21 @@ - - #include "dictionary.h" - --/*--------------------------------------------------------------------------- -- Macros -- ---------------------------------------------------------------------------*/ --/** For backwards compatibility only */ --#define iniparser_getstr(d, k) iniparser_getstring(d, k, NULL) --#define iniparser_setstr iniparser_setstring -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Configure a function to receive the error messages. -+ @param errback Function to call. -+ -+ By default, the error will be printed on stderr. If a null pointer is passed -+ as errback the error callback will be switched back to default. -+ */ -+/*--------------------------------------------------------------------------*/ -+ -+void iniparser_set_error_callback(int (*errback)(const char *, ...)); - - /*-------------------------------------------------------------------------*/ - /** -@@ -60,7 +62,7 @@ - */ - /*--------------------------------------------------------------------------*/ - --int iniparser_getnsec(dictionary * d); -+int iniparser_getnsec(const dictionary * d); - - - /*-------------------------------------------------------------------------*/ -@@ -78,7 +80,7 @@ int iniparser_getnsec(dictionary * d); - */ - /*--------------------------------------------------------------------------*/ - --const char * iniparser_getsecname(dictionary * d, int n); -+const char * iniparser_getsecname(const dictionary * d, int n); - - - /*-------------------------------------------------------------------------*/ -@@ -93,7 +95,22 @@ const char * iniparser_getsecname(dictionary * d, int n); - */ - /*--------------------------------------------------------------------------*/ - --void iniparser_dump_ini(dictionary * d, FILE * f); -+void iniparser_dump_ini(const dictionary * d, FILE * f); -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Save a dictionary section to a loadable ini file -+ @param d Dictionary to dump -+ @param s Section name of dictionary to dump -+ @param f Opened file pointer to dump to -+ @return void -+ -+ This function dumps a given section of a given dictionary into a loadable ini -+ file. It is Ok to specify @c stderr or @c stdout as output files. -+ */ -+/*--------------------------------------------------------------------------*/ -+ -+void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f); - - /*-------------------------------------------------------------------------*/ - /** -@@ -108,7 +125,36 @@ void iniparser_dump_ini(dictionary * d, FILE * f); - purposes mostly. - */ - /*--------------------------------------------------------------------------*/ --void iniparser_dump(dictionary * d, FILE * f); -+void iniparser_dump(const dictionary * d, FILE * f); -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the number of keys in a section of a dictionary. -+ @param d Dictionary to examine -+ @param s Section name of dictionary to examine -+ @return Number of keys in section -+ */ -+/*--------------------------------------------------------------------------*/ -+int iniparser_getsecnkeys(const dictionary * d, const char * s); -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the number of keys in a section of a dictionary. -+ @param d Dictionary to examine -+ @param s Section name of dictionary to examine -+ @param keys Already allocated array to store the keys in -+ @return The pointer passed as `keys` argument or NULL in case of error -+ -+ This function queries a dictionary and finds all keys in a given section. -+ The keys argument should be an array of pointers which size has been -+ determined by calling `iniparser_getsecnkeys` function prior to this one. -+ -+ Each pointer in the returned char pointer-to-pointer is pointing to -+ a string allocated in the dictionary; do not free or modify them. -+ */ -+/*--------------------------------------------------------------------------*/ -+const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys); -+ - - /*-------------------------------------------------------------------------*/ - /** -@@ -125,7 +171,7 @@ void iniparser_dump(dictionary * d, FILE * f); - the dictionary, do not free or modify it. - */ - /*--------------------------------------------------------------------------*/ --const char * iniparser_getstring(dictionary * d, const char * key, const char * def); -+const char * iniparser_getstring(const dictionary * d, const char * key, const char * def); - - /*-------------------------------------------------------------------------*/ - /** -@@ -154,7 +200,35 @@ const char * iniparser_getstring(dictionary * d, const char * key, const char * - Credits: Thanks to A. Becker for suggesting strtol() - */ - /*--------------------------------------------------------------------------*/ --int iniparser_getint(dictionary * d, const char * key, int notfound); -+int iniparser_getint(const dictionary * d, const char * key, int notfound); -+ -+/*-------------------------------------------------------------------------*/ -+/** -+ @brief Get the string associated to a key, convert to an long int -+ @param d Dictionary to search -+ @param key Key string to look for -+ @param notfound Value to return in case of error -+ @return integer -+ -+ This function queries a dictionary for a key. A key as read from an -+ ini file is given as "section:key". If the key cannot be found, -+ the notfound value is returned. -+ -+ Supported values for integers include the usual C notation -+ so decimal, octal (starting with 0) and hexadecimal (starting with 0x) -+ are supported. Examples: -+ -+ - "42" -> 42 -+ - "042" -> 34 (octal -> decimal) -+ - "0x42" -> 66 (hexa -> decimal) -+ -+ Warning: the conversion may overflow in various ways. Conversion is -+ totally outsourced to strtol(), see the associated man page for overflow -+ handling. -+ */ -+/*--------------------------------------------------------------------------*/ -+long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound); -+ - - /*-------------------------------------------------------------------------*/ - /** -@@ -169,7 +243,7 @@ int iniparser_getint(dictionary * d, const char * key, int notfound); - the notfound value is returned. - */ - /*--------------------------------------------------------------------------*/ --double iniparser_getdouble(dictionary * d, const char * key, double notfound); -+double iniparser_getdouble(const dictionary * d, const char * key, double notfound); - - /*-------------------------------------------------------------------------*/ - /** -@@ -203,7 +277,7 @@ double iniparser_getdouble(dictionary * d, const char * key, double notfound); - necessarily have to be 0 or 1. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_getboolean(dictionary * d, const char * key, int notfound); -+int iniparser_getboolean(const dictionary * d, const char * key, int notfound); - - - /*-------------------------------------------------------------------------*/ -@@ -212,17 +286,16 @@ int iniparser_getboolean(dictionary * d, const char * key, int notfound); - @param ini Dictionary to modify. - @param entry Entry to modify (entry name) - @param val New value to associate to the entry. -- @return int 0 if Ok, -1 otherwise. -+ @return int 0 if Ok, -1 otherwise. - - If the given entry can be found in the dictionary, it is modified to -- contain the provided value. If it cannot be found, -1 is returned. -+ contain the provided value. If it cannot be found, the entry is created. - It is Ok to set val to NULL. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_setstring(dictionary * ini, const char * entry, const char * val); -- - int iniparser_set(dictionary * ini, const char * entry, const char * val); - -+ - /*-------------------------------------------------------------------------*/ - /** - @brief Delete an entry in a dictionary -@@ -247,7 +320,7 @@ void iniparser_unset(dictionary * ini, const char * entry); - of querying for the presence of sections in a dictionary. - */ - /*--------------------------------------------------------------------------*/ --int iniparser_find_entry(dictionary * ini, const char * entry) ; -+int iniparser_find_entry(const dictionary * ini, const char * entry) ; - - /*-------------------------------------------------------------------------*/ - /** -@@ -278,4 +351,8 @@ dictionary * iniparser_load(const char * ininame); - /*--------------------------------------------------------------------------*/ - void iniparser_freedict(dictionary * d); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif --- -GitLab - diff --git a/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch b/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch deleted file mode 100644 index 0a817503b6c..00000000000 --- a/package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 702697cafcec735e55f075594a2990204c8ea17d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 10 Aug 2021 18:01:48 +0200 -Subject: [PATCH] Add --disable-{demo,testsuite} options -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Allow the user to disable demo and testsuite to avoid the following -build failures on arc and riscv32: - -latency.c: In function 'display': -latency.c:326:21: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'time_t' {aka 'long long int'} [-Werror=format=] - 326 | ("RTT| %.2ld:%.2ld:%.2ld (%s, %Ld us period, " - | ~~~~^ - | | - | long int - | %.2lld - 327 | "priority %d)\n", dt / 3600, - | ~~~~~~~~~ - | | - | time_t {aka long long int} - -altency.c: In function ‘display’: -altency.c:262:21: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘time_t’ {aka ‘long long int’} [-Werror=format=] - 262 | ("RTT| %.2ld:%.2ld:%.2ld (%s, %Ld us period, " - | ~~~~^ - | | - | long int - | %.2lld - 263 | "priority %d)\n", dt / 3600, - | ~~~~~~~~~ - | | - | time_t {aka long long int} - -Fixes: - - http://autobuild.buildroot.org/results/448efe22e8fe058a1b354a3c124874e30b9ce138 - -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 12 ++++++++++-- - configure.ac | 12 ++++++++++++ - 2 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 891e53f66..604644277 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,9 +6,17 @@ SUBDIRS = \ - config \ - include \ - scripts \ -- testsuite \ -- utils \ -+ utils -+ -+if XENO_ENABLE_DEMO -+SUBDIRS += \ - demo -+endif -+ -+if XENO_ENABLE_TESTSUITE -+SUBDIRS += \ -+ testsuite -+endif - - EXTRA_DIST = kernel debian - -diff --git a/configure.ac b/configure.ac -index bd5fd5ba9..29dfd16e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,6 +200,18 @@ test \! x$debug_mode = x && AC_DEFINE(CONFIG_XENO_DEBUG,1,[config]) - AM_CONDITIONAL(XENO_DEBUG_FULL,[test x$debug_mode = xfull]) - test x$debug_mode = xfull && AC_DEFINE(CONFIG_XENO_DEBUG_FULL,1,[config]) - -+dnl Demo (default: on) -+ -+AC_ARG_ENABLE(demo, -+ AS_HELP_STRING([--disable-demo], [Disable demo])) -+AM_CONDITIONAL(XENO_ENABLE_DEMO,[test x$enable_demo != xno]) -+ -+dnl Testsuite (default: on) -+ -+AC_ARG_ENABLE(testsuite, -+ AS_HELP_STRING([--disable-testsuite], [Disable testsuite])) -+AM_CONDITIONAL(XENO_ENABLE_TESTSUITE,[test x$enable_testsuite != xno]) -+ - dnl Low resolution clock (default: off) - - unset lores_clock --- -2.30.2 - diff --git a/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch b/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch deleted file mode 100644 index 0c39a4ecf7a..00000000000 --- a/package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 627d488db3aa71406e32d4d8934629e8b0f35905 Mon Sep 17 00:00:00 2001 -From: Jan Kiszka -Date: Sat, 16 Oct 2021 15:46:33 +0200 -Subject: [PATCH] lib/{cobalt,copperplate}: Use valid addresses for - pthread_setspecific - -glibx 2.34 and newer annotated pthread_setspecific in a way that gcc-11 -complains about non-NULL pointers that are outside of what is considered -valid. So use dummy addresses instead. namely the related pthread keys. -Those pointers will never be dereferenced in both use cases. - -See also https://sourceware.org/bugzilla/show_bug.cgi?id=28458. - -Reported-by: Vitaly Chikunov -Signed-off-by: Jan Kiszka - -[Retrieved from: -https://source.denx.de/Xenomai/xenomai/-/commit/627d488db3aa71406e32d4d8934629e8b0f35905] -Signed-off-by: Fabrice Fontaine ---- - include/copperplate/threadobj.h | 6 +++++- - lib/cobalt/printf.c | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h -index 7e6904f4c..c8363415b 100644 ---- a/include/copperplate/threadobj.h -+++ b/include/copperplate/threadobj.h -@@ -173,7 +173,11 @@ void threadobj_save_timeout(struct threadobj_corespec *corespec, - #define __THREAD_M_SPARE6 (1 << 22) - #define __THREAD_M_SPARE7 (1 << 23) - --#define THREADOBJ_IRQCONTEXT ((struct threadobj *)-2UL) -+/* -+ * We need to use a valid address here. The object will never be dereferenced -+ * when it is identified as IRQ context, so the pthread key itself is fine. -+ */ -+#define THREADOBJ_IRQCONTEXT ((struct threadobj *)&threadobj_tskey) - - struct traceobj; - struct syncobj; -diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c -index 8982ddc93..0aa5940c6 100644 ---- a/lib/cobalt/printf.c -+++ b/lib/cobalt/printf.c -@@ -729,7 +729,7 @@ done: - pthread_cond_init(&printer_wakeup, NULL); - spawn_printer_thread(); - /* We just need a non-zero TSD to trigger the dtor upon unwinding. */ -- pthread_setspecific(cleanup_key, (void *)1); -+ pthread_setspecific(cleanup_key, &cleanup_key); - - atexit(rt_print_flush_buffers); - } --- -GitLab - diff --git a/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch b/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch deleted file mode 100644 index a144c4ece35..00000000000 --- a/package/xenomai/3.0.10/0005-testsuite-latency-Use-corresponding-pclose-for-popen.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6fe6b75bef4b4bb9723b12f0e9ebfd9877e00a44 Mon Sep 17 00:00:00 2001 -From: Jan Kiszka -Date: Sat, 16 Oct 2021 19:52:28 +0200 -Subject: [PATCH] testsuite/latency: Use corresponding pclose for popen - -Was found by latest gcc-11 and -Werror=mismatched-dealloc. - -Signed-off-by: Jan Kiszka -Signed-off-by: Dario Binacchi -Upstream: https://source.denx.de/Xenomai/xenomai/-/commit/6fe6b75bef4b4bb9723b12f0e9ebfd9877e00a44 ---- - testsuite/latency/latency.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testsuite/latency/latency.c b/testsuite/latency/latency.c -index a0e6f4826084..6cd3a28b44f6 100644 ---- a/testsuite/latency/latency.c -+++ b/testsuite/latency/latency.c -@@ -412,7 +412,7 @@ static void dump_histo_gnuplot(int32_t *histogram, time_t duration) - fputs(buf, ofp); - } - -- fclose(ifp); -+ pclose(ifp); - - dump_data: - for (n = 0; n < histogram_size && histogram[n] == 0; n++) --- -2.43.0 - diff --git a/package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch b/package/xenomai/3.2.5/0001-lib-psos-task.c-fix-build-with-gcc-12.patch similarity index 100% rename from package/xenomai/3.0.10/0004-lib-psos-task.c-fix-build-with-gcc-12.patch rename to package/xenomai/3.2.5/0001-lib-psos-task.c-fix-build-with-gcc-12.patch diff --git a/package/xenomai/3.2.5/0002-smokey-fix-build-failure.patch b/package/xenomai/3.2.5/0002-smokey-fix-build-failure.patch new file mode 100644 index 00000000000..af898c2d4c6 --- /dev/null +++ b/package/xenomai/3.2.5/0002-smokey-fix-build-failure.patch @@ -0,0 +1,55 @@ +From eb5c49e4c0a1068363dc81f70ea2a65ad0f91c0f Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 14 Sep 2024 12:20:36 +0200 +Subject: [PATCH] smokey: fix build failure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch fixes the following building failure raised on bumping Xenomai +to version 3.2.5 in Buildroot: + +In file included from helpers.c:29: +../../include/smokey/smokey.h:258:39: error: unknown type name ‘bool’ + 258 | int smokey_modprobe(const char *name, bool silent); + | ^~~~ +../../include/smokey/smokey.h:27:1: note: ‘bool’ is defined in header ‘’; did you forget to ‘#include ’? + 26 | #include + +++ |+#include + 27 | +In file included from init.c:33: +../../include/smokey/smokey.h:258:39: error: unknown type name ‘bool’ + 258 | int smokey_modprobe(const char *name, bool silent); + | ^~~~ +../../include/smokey/smokey.h:26:1: note: ‘bool’ is defined in header ‘’; did you forget to ‘#include ’? + 25 | #include + +++ |+#include + 26 | #include +helpers.c:299:39: error: unknown type name ‘bool’ + 299 | int smokey_modprobe(const char *name, bool silent) + | ^~~~ +helpers.c:30:1: note: ‘bool’ is defined in header ‘’; did you forget to ‘#include ’? + 29 | #include + +++ |+#include + +Signed-off-by: Dario Binacchi +Upstream: https://lore.kernel.org/xenomai/20240914131026.1035993-1-dario.binacchi@amarulasolutions.com/T/#u +--- + include/smokey/smokey.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/smokey/smokey.h b/include/smokey/smokey.h +index cf9701966db8..45dd0dcd017b 100644 +--- a/include/smokey/smokey.h ++++ b/include/smokey/smokey.h +@@ -19,6 +19,7 @@ + #define _XENOMAI_SMOKEY_SMOKEY_H + + #include ++#include + #include + #include + #include +-- +2.43.0 + diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index d4983b084d1..13a273a960f 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -51,7 +51,7 @@ choice in the Linux Kernel -> Linux Kernel Extensions menu. config BR2_PACKAGE_XENOMAI_LATEST_VERSION - bool "Latest version (3.0.10)" + bool "Latest version (3.2.x)" config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION bool "Custom version" @@ -81,7 +81,7 @@ config BR2_PACKAGE_XENOMAI_REPOSITORY_VERSION config BR2_PACKAGE_XENOMAI_VERSION string - default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION + default "3.2.5" 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 diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash index 7a07f06155b..71966881f0f 100644 --- a/package/xenomai/xenomai.hash +++ b/package/xenomai/xenomai.hash @@ -1,5 +1,5 @@ # Locally computed; -sha256 080f893d6ab8e3065285fbb482695477a0502b9490dccd1f744cebaac94691e5 xenomai-3.0.10.tar.bz2 +sha256 ec47f07057ec3ff290c4ef3779cc8c680bb2c60cfd55e2e1a8cb254d7ad3cfad xenomai-3.2.5.tar.bz2 sha256 d37ebe86bf618942dad958927c44403f9b02fbebb3071a4a08408ccbdab5290f debian/copyright sha256 f3380321da72ff509bf6939aa80e6d02fd22268f5c705137b34c205b39bc63a0 include/COPYING sha256 d6b6d8ed1b12309085caf1cf775ea4acdad3288c7f7d993c2502bd19c87e4764 kernel/cobalt/COPYING diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 378e51ad3e2..fabd18fed0b 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -14,9 +14,9 @@ XENOMAI_SITE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_REPOSITORY)) XENOMAI_SITE_METHOD = git else XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 -XENOMAI_SITE = https://ftp.denx.de/pub/xenomai/xenomai/stable +XENOMAI_SITE = https://source.denx.de/Xenomai/xenomai/-/archive/v$(XENOMAI_VERSION) endif -# We're patching configure.ac +# The source archive does not have the autoconf/automake material generated. XENOMAI_AUTORECONF = YES # Exclude all from the hash check, but the latest version. diff --git a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch deleted file mode 100644 index 77bdc191270..00000000000 --- a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 94ae5db7d017480e103aa6f07cc86648b613d114 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 18 Dec 2016 15:37:27 +0100 -Subject: [PATCH] libxfs: do not try to run the crc32selftest - -Even though the crc32selftest is natively compiled (because it is to be -executed), it fails in cross-compilation as the host may lack the -required headers, like uuid/uuid.h (e.g. in a minimal environment). - -Moreover, running the crc32selftest natively is completely wrong, -because it passing on the host does not mean it would still pass n the -target (because endianness or bitness or alignment differences). - -So, just disable running the crc32selftest altogether. - -Note that there's a remaining bug-in-hiding, because the crc32 table -generator is natively built, but with the target CFLAGS. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: "Fabrice Fontaine" -[Update for 4.18.0: crc32 has been moved from libxfs to libfrog] -[Julien: rebased on v6.4.0] -Signed-off-by: Julien Olivain -Upstream: patch to be superseded by https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e51b89e657af7843d8c7aea3df49fe1f0f1d4ac2 ---- - libfrog/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfrog/Makefile b/libfrog/Makefile -index f292afe3..1d0d2083 100644 ---- a/libfrog/Makefile -+++ b/libfrog/Makefile -@@ -57,9 +57,9 @@ ifeq ($(HAVE_GETMNTENT),yes) - LCFLAGS += -DHAVE_GETMNTENT - endif - --LDIRT = gen_crc32table crc32table.h crc32selftest -+LDIRT = gen_crc32table crc32table.h - --default: crc32selftest ltdepend $(LTLIBRARY) -+default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c crc32defs.h - @echo " [CC] gen_crc32table" --- -2.45.2 - diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 8c73e149051..a86693419dd 100644 --- a/package/xfsprogs/xfsprogs.hash +++ b/package/xfsprogs/xfsprogs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc -sha256 c31868418bfbf49a3a9c47fc70cdffde9d96f4ff0051bd04a0881e6654648104 xfsprogs-6.4.0.tar.xz +sha256 dae3bb432196f7b183b2e6bd5dc44bf33edbd7d0e85bd37d25c235df81b8100a xfsprogs-6.11.0.tar.xz # Hash for license files sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index e657c8086da..0234b91d090 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -XFSPROGS_VERSION = 6.4.0 +XFSPROGS_VERSION = 6.11.0 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index d7fdbe0d0be..aa6676507a4 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5d76fb19190956c564b405119315bc93db4ed8062b251d5e96bed70c5fa8033c xmrig-6.21.3.tar.gz +sha256 34759ca9c1b2486ecb7b6bc267c76a6f365d401b2b6de6d667e0a13ae30882a2 xmrig-6.22.2.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index d01b0018178..75657407d74 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.3 +XMRIG_VERSION = 6.22.2 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 388a3a3cd4c..aec440c97a3 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8bc3d745ed08b7f3a9c0413c2635d0faf647362b41494d04edc98709b869deef xr819-xradio-3a1f77fb2db248b7d18d93b67b16e0d6c91db184.tar.gz +sha256 09cd694a9424e9fd61fbb323d52a9f721e0b2d364ccb40ed854a79bd927f5df2 xr819-xradio-180aafb14191c78c1529d5a28ca58c7c9dcf2c55.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8b576a347a4..8a76570693c 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 3a1f77fb2db248b7d18d93b67b16e0d6c91db184 +XR819_XRADIO_VERSION = 180aafb14191c78c1529d5a28ca58c7c9dcf2c55 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE diff --git a/package/xxhash/xxhash.hash b/package/xxhash/xxhash.hash index 216d07ddbdc..fb8e3841220 100644 --- a/package/xxhash/xxhash.hash +++ b/package/xxhash/xxhash.hash @@ -1,4 +1,4 @@ # locally computed -sha256 baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 xxhash-0.8.2.tar.gz +sha256 aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80 xxhash-0.8.3.tar.gz sha256 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 cli/COPYING diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index f16a7849661..51bf6ce8558 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -XXHASH_VERSION = 0.8.2 +XXHASH_VERSION = 0.8.3 XXHASH_SITE = $(call github,Cyan4973,xxHash,v$(XXHASH_VERSION)) XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 6012e1001b5..c403ea2be44 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://github.com/tukaani-project/xz/releases/download/v5.6.2/xz-5.6.2.tar.bz2.sig +# https://github.com/tukaani-project/xz/releases/download/v5.6.3/xz-5.6.3.tar.bz2.sig # using key 3690C240CE51B4670D30AD1C38EE757D69184620 Lasse Collin -sha256 e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171 xz-5.6.2.tar.bz2 +sha256 a95a49147b2dbb5487517acc0adcd77f9c2032cf00664eeae352405357d14a6c xz-5.6.3.tar.bz2 # Hash for license files sha256 ee3b35b82f7bb0ba5fd9f13ca34ebbe757a59c05bfde5ab9d50ff4188ed33396 COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 3329d302efa..b3f8c300263 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.6.2 +XZ_VERSION = 5.6.3 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES diff --git a/package/z3/z3.hash b/package/z3/z3.hash index df78fd8b7da..8514043594d 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 01bcc61c8362e37bb89fd2430f7e3385e86df7915019bd2ce45de9d9bd934502 z3-4.13.0.tar.gz +sha256 f59c9cf600ea57fb64ffeffbffd0f2d2b896854f339e846f48f069d23bc14ba0 z3-4.13.3.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index e436d48f270..16db30ac217 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.13.0 +Z3_VERSION = 4.13.3 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt 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 deleted file mode 100644 index ad6960f3291..00000000000 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ /dev/null @@ -1,71 +0,0 @@ -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: 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 -@@ -28,8 +28,9 @@ - #include "log.h" - #include "zbxcrypto.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 9ac668117da..4940f8ca8e2 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -10,9 +10,6 @@ config BR2_PACKAGE_ZABBIX https://zabbix.com -comment "zabbix need glibc" - depends on !BR2_TOOLCHAIN_USES_GLIBC - if BR2_PACKAGE_ZABBIX comment "zabbix server needs C++ and threads or wchar and dynamic libs" @@ -81,3 +78,6 @@ comment "zabbix web UI requires PHP" endif endif + +comment "zabbix need glibc" + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/zabbix/zabbix-agent.service b/package/zabbix/zabbix-agent.service index 8b4f45a4fc7..7e06636a2aa 100644 --- a/package/zabbix/zabbix-agent.service +++ b/package/zabbix/zabbix-agent.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/zabbix_agentd +ExecStart=/usr/sbin/zabbix_agentd -f ExecReload=/usr/sbin/zabbix_agentd -R config_cache_reload RuntimeDirectory=zabbix PIDFile=/run/zabbix/zabbix_agentd.pid diff --git a/package/zabbix/zabbix-server.service b/package/zabbix/zabbix-server.service index b8ba0d17072..52ed5df1ead 100644 --- a/package/zabbix/zabbix-server.service +++ b/package/zabbix/zabbix-server.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/zabbix_server +ExecStart=/usr/sbin/zabbix_server -f ExecReload=/usr/sbin/zabbix_server -R config_cache_reload RuntimeDirectory=zabbix PIDFile=/run/zabbix/zabbix_server.pid diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index bb6127e5ecf..b4b71db5c85 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz -sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README -sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING +sha256 215301b6e089a685a2fabcca17fc65e5766d42d2079174b65a1bf28df7679692 zabbix-7.0.5.tar.gz +sha256 0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 18fb01decac..318030214c8 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,12 +4,12 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 6.2 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 -ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/oldstable/$(ZABBIX_VERSION_MAJOR) +ZABBIX_VERSION_MAJOR = 7.0 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).5 +ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_SELINUX_MODULES = zabbix -ZABBIX_LICENSE = GPL-2.0+ -ZABBIX_LICENSE_FILES = README COPYING +ZABBIX_LICENSE = AGPL-3.0 +ZABBIX_LICENSE_FILES = COPYING ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES @@ -50,7 +50,7 @@ ZABBIX_CONF_OPTS += --without-libcurl endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr/bin/xml2-config +ZABBIX_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr ZABBIX_DEPENDENCIES += libxml2 else ZABBIX_CONF_OPTS += --without-libxml2 @@ -77,8 +77,10 @@ else ZABBIX_CONF_OPTS += --without-ssh2 endif -# Only one of openssl or gnutls should be enabled -ifeq ($(BR2_PACKAGE_OPENSSL),y) +# Only one of openssl or gnutls should be enabled. libressl is not +# supported, which is why we test BR2_PACKAGE_LIBOPENSSL, not +# BR2_PACKAGE_OPENSSL +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) ZABBIX_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr --without-gnutls ZABBIX_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch deleted file mode 100644 index 64972c4f570..00000000000 --- a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2ccefd4aff98cf355c7d13b3f92bb4d390dfa522 Mon Sep 17 00:00:00 2001 -From: Tino Reichardt -Date: Sun, 4 Aug 2024 11:58:13 +0200 -Subject: [PATCH] ZTS: small fix for SEEK_DATA/SEEK_HOLE tests - -Some libc's like uClibc lag the proper definition of SEEK_DATA -and SEEK_HOLE. Since we have only two files in ZTS which use -these definitons, let's define them by hand: - -``` -#ifndef SEEK_DATA -#define SEEK_DATA 3 -#endif -#ifndef SEEK_HOLE -#define SEEK_HOLE 4 -#endif -``` - -There should be no failures, because: -- FreeBSD has support for SEEK_DATA/SEEK_HOLE since FreeBSD 8 -- Linux has it since Linux 3.1 -- the libc will submit the parameters unchanged to the kernel - -Signed-off-by: Tino Reichardt -Signed-off-by: José Luis Salvador Rufo -Upstream: https://github.com/openzfs/zfs/commit/bd949b10bed3d99e3b40249d9c8d74a0b4304774 ---- - tests/zfs-tests/cmd/mmap_seek.c | 10 ++++++++++ - tests/zfs-tests/tests/functional/cp_files/seekflood.c | 7 +++++++ - 2 files changed, 17 insertions(+) - -diff --git a/tests/zfs-tests/cmd/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c -index 7be92d109565..2d250554a13f 100644 ---- a/tests/zfs-tests/cmd/mmap_seek.c -+++ b/tests/zfs-tests/cmd/mmap_seek.c -@@ -35,6 +35,16 @@ - #include - #endif - -+/* some older uClibc's lack the defines, so we'll manually define them */ -+#ifdef __UCLIBC__ -+#ifndef SEEK_DATA -+#define SEEK_DATA 3 -+#endif -+#ifndef SEEK_HOLE -+#define SEEK_HOLE 4 -+#endif -+#endif -+ - static void - seek_data(int fd, off_t offset, off_t expected) - { -diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c -index 02c2c8e6eca5..f832db85970d 100644 ---- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c -+++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c -@@ -36,6 +36,13 @@ - #include - #include - -+/* some older uClibc's lack the defines, so we'll manually define them */ -+#ifdef __UCLIBC__ -+#ifndef SEEK_DATA -+#define SEEK_DATA 3 -+#endif -+#endif -+ - #define DATASIZE (4096) - char data[DATASIZE]; - diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 9598aed992b..ce1e010d6d8 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,5 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.sha256.asc -sha256 2388cf6f29cd75e87d6d05e4858a09d419c4f883a658d51ef57796121cd08897 zfs-2.2.5.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.7/zfs-2.2.7.sha256.asc +sha256 b2b8e3bfabf2a6407a0132243726cb6762547a5bd095b1b1f37eaf2a9d8f7672 zfs-2.2.7.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 549f8641b92..b86214e751f 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.5 +ZFS_VERSION = 2.2.7 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch index cba7ed679e0..1eb1074c311 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -15,18 +15,18 @@ Signed-off-by: Martin Bark 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1b714a8..00d2c09 100644 +index 0087b459..4773a977 100644 --- a/Makefile +++ b/Makefile -@@ -615,7 +615,7 @@ INSTALL: ALL install date.1 +@@ -673,7 +673,7 @@ INSTALL: ALL install date.1 # Otherwise, use $(VERSION) unless it is "unknown" and there is already # a 'version' file, in which case reuse the existing 'version' contents # and append "-dirty" if the contents do not already end in "-dirty". -version: $(VERSION_DEPS) +version: { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ + V=$$(git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty) || \ -- 2.7.4 diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 80c96ed7934..124b724e6ef 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html -sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz +# https://lists.iana.org/hyperkitty/list/tz-announce@iana.org/thread/IZ7AO6WRE3W3TWBL5IR6PMQUL433BQIE/ +sha512 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026 tzcode2024b.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 8abcec93605..9382fa41875 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2024a +ZIC_VERSION = 2024b ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 diff --git a/support/dependencies/check-host-python3.sh b/support/dependencies/check-host-python3.sh index 17cafd28836..380b19ccf7e 100755 --- a/support/dependencies/check-host-python3.sh +++ b/support/dependencies/check-host-python3.sh @@ -7,8 +7,6 @@ version_min="$(echo ${1} | awk '{ split($1, v, "."); print v[1] v[2] }')" shift -# The host python interpreter is already checked by dependencies.sh but -# it only check if the version is at least 2.7. # We want to check the version number of the python3 interpreter even # if Buildroot is able to use any version but some packages may require # a more recent version. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index f48a99d7eba..add08ccae79 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.08.3' +RELEASE='2024.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index 43442212139..bd1beec9953 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -62,7 +62,7 @@ arches = { 'prefix': 'armeb', }, 'armv7m': { - 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7M'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7M', 'BR2_BINFMT_FLAT'], 'test_options': ['BR2_arm', 'BR2_cortex_m4'], 'prefix': 'arm', }, @@ -293,7 +293,7 @@ class Toolchain: @property def tarball_url(self): return os.path.join(BASE_URL, self.arch, "tarballs", - self.fname_prefix + ".tar.bz2") + self.fname_prefix + ".tar.xz") @property def hash_url(self): @@ -416,7 +416,7 @@ class Toolchain: def gen_mk(self, f): f.write("ifeq ($(%s),y)\n" % self.option_name) f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = %s\n" % self.version) - f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = %s--%s--%s-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2\n" % + f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = %s--%s--%s-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz\n" % (self.arch, self.libc, self.variant)) f.write("TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = %s\n" % os.path.join(BASE_URL, self.arch, "tarballs")) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 12d96415dac..1ae6232da81 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -37,6 +37,7 @@ def __init__(self, names): super(BRConfigTest, self).__init__(names) self.testname = self.__class__.__name__ self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) + self.config += '\nBR2_BACKUP_SITE=""\n' self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir) self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 5318577cda4..ef5be2a19e7 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -44,6 +44,7 @@ class Emulator(object): def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): self.qemu = None self.repl = None + self.builddir = builddir self.downloaddir = downloaddir self.logfile = infra.open_log_file(builddir, "run", logtofile) # We use elastic runners on the cloud to runs our tests. Those runners @@ -115,12 +116,21 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" self.logfile.write(f"> host loadavg: {ldavg_str}\n") self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") + self.logfile.write(f"> emulator using {qemu_cmd[0]} version:\n") + host_bin = os.path.join(self.builddir, "host", "bin") + br_path = host_bin + os.pathsep + os.environ["PATH"] + qemu_env = {"QEMU_AUDIO_DRV": "none", + "PATH": br_path} + pexpect.run(f"{qemu_cmd[0]} --version", + encoding='utf-8', + logfile=self.logfile, + env=qemu_env) self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', codec_errors='replace', - env={"QEMU_AUDIO_DRV": "none"}) + env=qemu_env) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile diff --git a/support/testing/run-tests b/support/testing/run-tests index 485811b7462..2f670c03b84 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -36,6 +36,8 @@ def main(): help='BR2_JLEVEL to use for each testcase') parser.add_argument('--timeout-multiplier', type=int, default=1, help='increase timeouts (useful for slow machines)') + parser.add_argument('-D', '--debug', action='store_true', + help='enable debug log') args = parser.parse_args() @@ -47,10 +49,15 @@ def main(): if args.list: print("List of tests") - nose2.discover(argv=[script_path, - "-s", test_dir, - "-v", - "--collect-only"], + nose2_args = [ + script_path, + "-s", test_dir, + "-v", + "--collect-only" + ] + if args.debug: + nose2_args += ["--log-level", "debug"] + nose2.discover(argv=nose2_args, plugins=["nose2.plugins.collect"]) return 0 @@ -125,6 +132,9 @@ def main(): "-s", test_dir, "-c", os.path.join(test_dir, "conf/unittest.cfg")] + if args.debug: + nose2_args += ["--log-level", "debug"] + if args.testname: nose2_args += args.testname diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 16fa10f8c90..54a59089dad 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -7,6 +7,7 @@ class TestEdk2(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n1=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -16,7 +17,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config" BR2_TARGET_EDK2=y @@ -25,21 +26,45 @@ class TestEdk2(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ + def __init__(self, names): + """Setup common test variables.""" + super(TestEdk2, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestEdk2. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n1", "-m", "512M", "-pflash", flash0, "-pflash", flash1, diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 5315fa23ba0..5cbc7fd22b3 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -58,6 +58,28 @@ class TestGrubi386EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_DOSFSTOOLS=y """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) + def __init__(self, names): + """Setup common test variables.""" + super(TestGrubi386EFI, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestGrubi386EFI. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "OVMF.fd") @@ -109,6 +131,28 @@ class TestGrubX8664EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_DOSFSTOOLS=y """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) + def __init__(self, names): + """Setup common test variables.""" + super(TestGrubX8664EFI, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestGrubX8664EFI. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "OVMF.fd") @@ -153,9 +197,33 @@ class TestGrubAArch64EFI(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=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 __init__(self, names): + """Setup common test variables.""" + super(TestGrubAArch64EFI, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestGrubAArch64EFI. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd") @@ -170,3 +238,75 @@ def test_run(self): cmd = "efivar -l" self.assertRunOk(cmd) + + +class TestGrubRiscV64EFI(infra.basetest.BRTest): + scripts = [ + "board/qemu/post-image.sh", + "board/qemu/riscv64-virt-efi/assemble-flash-images", + "support/scripts/genimage.sh" + ] + post_image_script = " ".join(scripts) + config = \ + f""" + BR2_riscv=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_ROOTFS_POST_IMAGE_SCRIPT="{post_image_script}" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/riscv64-virt-efi/genimage.cfg" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.59" + BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y + BR2_PACKAGE_EFIVAR=y + BR2_TARGET_ROOTFS_EXT2=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_EDK2=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_RISCV64_EFI=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y + """ + + def __init__(self, names): + """Setup common test variables.""" + super(TestGrubRiscV64EFI, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestGrubAArch64EFI. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + + def test_run(self): + disk = os.path.join(self.builddir, "images", "disk.img") + flash0 = os.path.join(self.builddir, "images", "RISCV_VIRT_CODE.fd") + flash1 = os.path.join(self.builddir, "images", "RISCV_VIRT_VARS.fd") + qemu_opts = [ + "-M", "virt,pflash0=pflash0,pflash1=pflash1,acpi=off", + "-blockdev", f"node-name=pflash0,driver=file,read-only=on,filename={flash0}", + "-blockdev", f"node-name=pflash1,driver=file,filename={flash1}", + "-drive", f"file={disk},format=raw,if=virtio" + ] + self.emulator.boot(arch="riscv64", options=qemu_opts) + self.emulator.login() + + cmd = "mount -t efivarfs none /sys/firmware/efi/efivars" + self.assertRunOk(cmd) + + cmd = "efivar -l" + self.assertRunOk(cmd) diff --git a/support/testing/tests/download/test_git.py b/support/testing/tests/download/test_git.py index ba52e03ef56..3cf98f6456a 100644 --- a/support/testing/tests/download/test_git.py +++ b/support/testing/tests/download/test_git.py @@ -7,10 +7,7 @@ class GitTestBase(infra.basetest.BRConfigTest): - config = \ - """ - BR2_BACKUP_SITE="" - """ + config = "" gitremotedir = infra.filepath("tests/download/git-remote") gitremote = None diff --git a/support/testing/tests/download/test_gitforge.py b/support/testing/tests/download/test_gitforge.py index e1ac35ec67b..477c365a345 100644 --- a/support/testing/tests/download/test_gitforge.py +++ b/support/testing/tests/download/test_gitforge.py @@ -5,10 +5,7 @@ class GitforgeTestBase(infra.basetest.BRConfigTest): - config = \ - """ - BR2_BACKUP_SITE="" - """ + config = "" def setUp(self): super(GitforgeTestBase, self).setUp() diff --git a/support/testing/tests/download/test_ssh.py b/support/testing/tests/download/test_ssh.py index 126002a355a..7d6ac3aaf79 100644 --- a/support/testing/tests/download/test_ssh.py +++ b/support/testing/tests/download/test_ssh.py @@ -7,9 +7,7 @@ class SSHTestBase(infra.basetest.BRConfigTest): - config = infra.basetest.MINIMAL_CONFIG + ''' -BR2_BACKUP_SITE="" -''' + config = infra.basetest.MINIMAL_CONFIG sshd_test_dir = infra.filepath("tests/download/sshd") sshd = None diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py index 3d08f2e8951..6f8ca06de38 100644 --- a/support/testing/tests/fs/test_iso9660.py +++ b/support/testing/tests/fs/test_iso9660.py @@ -135,6 +135,28 @@ class TestIso9660Grub2EFI(infra.basetest.BRTest): """.format(infra.filepath("conf/grub2-efi.cfg"), infra.filepath("conf/grub2.cfg")) + def __init__(self, names): + """Setup common test variables.""" + super(TestIso9660Grub2EFI, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestIso9660Grub2EFI. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): exit_code = test_mount_internal_external(self.emulator, self.builddir, internal=True, @@ -163,6 +185,28 @@ class TestIso9660Grub2Hybrid(infra.basetest.BRTest): """.format(infra.filepath("conf/grub2-efi.cfg"), infra.filepath("conf/grub2.cfg")) + def __init__(self, names): + """Setup common test variables.""" + super(TestIso9660Grub2Hybrid, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestIso9660Grub2Hybrid. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): exit_code = test_mount_internal_external(self.emulator, self.builddir, internal=True, diff --git a/support/testing/tests/package/sample_python_incremental.py b/support/testing/tests/package/sample_python_incremental.py index efab8b2067e..b6e2aa803c0 100644 --- a/support/testing/tests/package/sample_python_incremental.py +++ b/support/testing/tests/package/sample_python_incremental.py @@ -1,3 +1,3 @@ import incremental v = incremental.Version("package", 1, 2, 3, release_candidate=4) -assert(str(v) == "[package, version 1.2.3.rc4]") +assert(str(v) == "[package, version 1.2.3rc4]") diff --git a/support/testing/tests/package/sample_python_sdbus.py b/support/testing/tests/package/sample_python_sdbus.py new file mode 100644 index 00000000000..68131cede5f --- /dev/null +++ b/support/testing/tests/package/sample_python_sdbus.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python3 + +import sdbus +from sdbus_block.dbus_daemon import FreedesktopDbus + +s = FreedesktopDbus(sdbus.sd_bus_open_system()) + +props = s.properties_get_all_dict() + +print(props) + +# Check for a randomly chosen interface: +assert 'org.freedesktop.DBus.Monitoring' in props['interfaces'] diff --git a/support/testing/tests/package/sample_python_sdbus_networkmanager.py b/support/testing/tests/package/sample_python_sdbus_networkmanager.py new file mode 100644 index 00000000000..e15b63ce70a --- /dev/null +++ b/support/testing/tests/package/sample_python_sdbus_networkmanager.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python3 + +import sdbus + +from sdbus_block.networkmanager import ( + DeviceType, + NetworkManager, + NetworkDeviceGeneric +) + +sdbus.set_default_bus(sdbus.sd_bus_open_system()) + +nm = NetworkManager() +devices = [NetworkDeviceGeneric(d) for d in nm.get_devices()] + +print([d.interface for d in devices]) + +assert devices +# Check that we found at least the loopback interface: +assert [dev for dev in devices if dev.device_type == DeviceType.LOOPBACK] diff --git a/support/testing/tests/package/sample_python_twisted.py b/support/testing/tests/package/sample_python_twisted.py index 47d6c5debc7..ec5ce2a31c3 100644 --- a/support/testing/tests/package/sample_python_twisted.py +++ b/support/testing/tests/package/sample_python_twisted.py @@ -1,4 +1,6 @@ from twisted.internet import protocol, reactor, endpoints +from twisted.web.client import readBody # noqa: F401 +from twisted.web import xmlrpc, server # noqa: F401 class F(protocol.Factory): diff --git a/support/testing/tests/package/test_dosfstools.py b/support/testing/tests/package/test_dosfstools.py new file mode 100644 index 00000000000..f32ff81c015 --- /dev/null +++ b/support/testing/tests/package/test_dosfstools.py @@ -0,0 +1,106 @@ +import os +import subprocess + +import infra.basetest + + +class TestDosFsTools(infra.basetest.BRTest): + # This test needs a Kernel with vfat and NLS support. The vfat + # filesystem also needs character set conversion libraries, since + # its default encoding is CP850. + kern_frag = \ + infra.filepath("tests/package/test_dosfstools/linux-vfat.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.47" + 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="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_DOSFSTOOLS=y + BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y + BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y + BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y + BR2_SYSTEM_ENABLE_NLS=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y + """ + + def test_run(self): + # Prepare the disk image. + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", "bs=1M", "count=256"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + # Run the emulator with a blank drive. + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Variables for this test. + dev = "/dev/vda" + label = "BR_TEST" + mnt_pt = "/tmp/vfat" + data_file = f"{mnt_pt}/data.bin" + + # We create the vfat filesystem on our device. + self.assertRunOk(f"mkfs.vfat {dev}") + + # We set a label on this filesystem. + self.assertRunOk(f"fatlabel {dev} '{label}'") + + # We create a mount point and mount this filesystem. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We create a file with random data, to use this new + # filesystem a bit. + self.assertRunOk(f"dd if=/dev/urandom of={data_file} bs=1M count=10") + + # We compute the sha256 hash and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We unmount the filesystem. + self.assertRunOk(f"umount {mnt_pt}") + + # We run a filesystem check. Since we cleanly unmounted the + # filesystem, we are not expecting any repair. This is just to + # test the program works correctly. + self.assertRunOk(f"fsck.vfat -v {dev}") + + # We query the label and check it is the one we set at the + # beginning. + out, ret = self.emulator.run(f"fatlabel {dev}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], label) + + # We remount our filesystem. + self.assertRunOk(f"mount {dev} {mnt_pt}") + + # We should recompute the same sha256 hash as before, on the + # first data file we created at the beginning. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_dosfstools/linux-vfat.fragment b/support/testing/tests/package/test_dosfstools/linux-vfat.fragment new file mode 100644 index 00000000000..eb4d2e60448 --- /dev/null +++ b/support/testing/tests/package/test_dosfstools/linux-vfat.fragment @@ -0,0 +1,3 @@ +CONFIG_VFAT_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y diff --git a/support/testing/tests/package/test_dpdk.py b/support/testing/tests/package/test_dpdk.py new file mode 100644 index 00000000000..de2828298a1 --- /dev/null +++ b/support/testing/tests/package/test_dpdk.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestDPDK(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_nehalem=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_DPDK=y + BR2_PACKAGE_DPDK_TESTS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="300M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "bzImage") + self.emulator.boot(arch="x86_64", + kernel=kern, + kernel_cmdline=["root=/dev/vda", "console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "512M", + "-smp", "4", + "-device", "virtio-rng-pci", + "-drive", f"file={img},format=raw,if=virtio", + "-net", "nic,model=virtio", + "-net", "user"]) + self.emulator.login() + + # We run few DPDK test cases. + dpdk_tests = [ + "crc_autotest", + "threads_autotest", + "lcores_autotest" + ] + cmd = "dpdk-test --no-huge " + " ".join(dpdk_tests) + self.assertRunOk(cmd, timeout=30) diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index ef792136c22..4df13b60f9e 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -7,6 +7,7 @@ class TestFwts(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n1=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -26,7 +27,7 @@ class TestFwts(infra.basetest.BRTest): BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_PACKAGE_FWTS=y @@ -34,15 +35,39 @@ class TestFwts(infra.basetest.BRTest): BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y """ + def __init__(self, names): + """Setup common test variables.""" + super(TestFwts, self).__init__(names) + """All EDK2 releases <= edk2-stable202408 can't be fetched from git + anymore due to a missing git submodule as reported by [1]. + + Usually Buildroot fall-back using https://sources.buildroot.net + thanks to BR2_BACKUP_SITE where a backup of the generated archive + is available. But the BRConfigTest remove BR2_BACKUP_SITE default + value while generating the .config used by TestFwts. + + Replace the BR2_BACKUP_SITE override from BRConfigTest in order + to continue testing EDK2 package using the usual backup site. + + To be removed with the next EDK2 version bump using this commit + [2]. + + [1] https://github.com/tianocore/edk2/issues/6398 + [2] https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701 + """ + self.config = self.config.replace('BR2_BACKUP_SITE=""\n', '') + def test_run(self): hda = os.path.join(self.builddir, "images", "disk.img") flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n1", "-m", "512M", "-pflash", flash0, "-pflash", flash1, diff --git a/support/testing/tests/package/test_go.py b/support/testing/tests/package/test_go.py index 0b25fbc26d5..6ca436851b2 100644 --- a/support/testing/tests/package/test_go.py +++ b/support/testing/tests/package/test_go.py @@ -13,15 +13,29 @@ def login(self): self.emulator.login() +class TestGoBin(TestGoBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_HOST_GO=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_PACKAGE_FLANNEL=y + """ + + def test_run(self): + self.login() + self.assertRunOk("/opt/bin/flanneld -h") + + class TestGoSource(TestGoBase): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ BR2_TARGET_ROOTFS_CPIO=y BR2_PACKAGE_HOST_GO=y BR2_PACKAGE_HOST_GO_SRC=y - BR2_PACKAGE_TINIFIER=y + BR2_PACKAGE_FLANNEL=y """ def test_run(self): self.login() - self.assertRunOk("tinifier -h") + self.assertRunOk("/opt/bin/flanneld -h") diff --git a/support/testing/tests/package/test_oath_toolkit.py b/support/testing/tests/package/test_oath_toolkit.py new file mode 100644 index 00000000000..92c08456142 --- /dev/null +++ b/support/testing/tests/package/test_oath_toolkit.py @@ -0,0 +1,38 @@ +import os + +import infra.basetest + + +class TestOathToolKit(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_OATH_TOOLKIT=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("oathtool --version") + + # Test commands and expected results are coming from examples + # producing stable/reproducible outputs given in the oathtool + # manual page. See: + # https://www.nongnu.org/oath-toolkit/oathtool.1.html + + tests = [ + ("echo 00 | oathtool -", "328482"), + ("oathtool -c 5 3132333435363738393031323334353637383930", "254676"), + ("oathtool -w 10 3132333435363738393031323334353637383930 969429", "3"), + ("oathtool --totp --now \"2008-04-23 17:42:17 UTC\" 00", "974945") + ] + + for cmd, expected_out in tests: + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0, f"Failed to run '{cmd}'") + self.assertEqual(expected_out, out[0]) diff --git a/support/testing/tests/package/test_parted.py b/support/testing/tests/package/test_parted.py new file mode 100644 index 00000000000..ca585b7e021 --- /dev/null +++ b/support/testing/tests/package/test_parted.py @@ -0,0 +1,107 @@ +import os +import subprocess + +import infra.basetest + + +class TestParted(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_PARTED=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Prepare the disk image. + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", "bs=1M", "count=256"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + # Run the emulator with a drive. + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=[ + "-initrd", cpio_file, + "-drive", f"file={disk_file},format=raw"]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("parted --version") + + dev = "/dev/sda" + parted = f"parted {dev}" + + # We print the partition list of our drive. Since the drive is + # supposed to be blank, it should not have a partition table. + part_list_cmd = f"{parted} print list" + out, ret = self.emulator.run(part_list_cmd, timeout=10) + self.assertEqual(ret, 0) + self.assertIn("Partition Table: unknown", out) + + # We create a GPT partition table. + mklabel_cmd = f"{parted} mklabel gpt" + self.assertRunOk(mklabel_cmd, timeout=10) + + # We print again the partition list. We should now see our + # partition table. + out, ret = self.emulator.run(part_list_cmd, timeout=10) + self.assertEqual(ret, 0) + self.assertIn("Partition Table: gpt", out) + + # We create 3 partitions on our drive. + partitions = [ + "MyPart1 ext2 1MiB 25%", + "MyPart2 ext4 25% 50%", + "MyPart3 ext4 50% 100%" + ] + for part in partitions: + mkpart_cmd = f"{parted} mkpart {part}" + self.assertRunOk(mkpart_cmd, timeout=10) + + # We print again the list of partitions, this time in machine + # parseable format. We check we have our 3 partitions. + cmd = f"parted -m {dev} print list" + out, ret = self.emulator.run(cmd, timeout=10) + self.assertEqual(ret, 0) + for part in range(1, 4): + self.assertTrue(out[1+part].startswith(f"{part}:")) + self.assertTrue(out[1+part].endswith(f":MyPart{part}:;")) + + # We format our partitions. + self.assertRunOk(f"mkfs.ext2 {dev}1", timeout=10) + self.assertRunOk(f"mkfs.ext4 {dev}2", timeout=10) + self.assertRunOk(f"mkfs.ext4 {dev}3", timeout=10) + + # We create a random data file in the temporary directory. It + # will be the reference source file that will be copied later + # on each of our filesystems. + data_file = "data.bin" + cmd = f"dd if=/dev/urandom of=/tmp/{data_file} bs=1M count=10" + self.assertRunOk(cmd) + + # We compute the sha256 hash and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(f"( cd /tmp && {hash_cmd} )") + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # For each partition, we create a mount point directory, mount + # the filesystem, copy the reference data file in it, sync the + # filesystem, and compute the sha256 hash of the file. This + # sequence will exercise a bit the partitions and filesystems + # in read/write operations. + for part in range(1, 4): + self.assertRunOk(f"mkdir -p /tmp/MyPart{part}") + self.assertRunOk(f"mount {dev}{part} /tmp/MyPart{part}") + self.assertRunOk(f"cp /tmp/{data_file} /tmp/MyPart{part}/") + self.assertRunOk("sync") + out, ret = self.emulator.run(f"( cd /tmp/MyPart{part} && {hash_cmd} )") + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_pppd.py b/support/testing/tests/package/test_pppd.py new file mode 100644 index 00000000000..015f10f02d4 --- /dev/null +++ b/support/testing/tests/package/test_pppd.py @@ -0,0 +1,125 @@ +import os +import time + +import infra.basetest + + +class TestPppd(infra.basetest.BRTest): + # This test needs a Kernel with ppp support. + kern_frag = \ + infra.filepath("tests/package/test_pppd/linux-ppp.fragment") + # Our test config also enables socat and iproute2 used as + # supporting tools for this test. + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.57" + 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="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_PPPD=y + BR2_PACKAGE_SOCAT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", "-initrd", img]) + self.emulator.login() + + # We define our socat output log file. + socat_log = "/tmp/socat.log" + + # We define two PTY names we will use for this test. + pty0 = "/dev/ttyppp0" + pty1 = "/dev/ttyppp1" + + # We define two IP addresses. + local_ip = "192.168.12.34" + remote_ip = "10.20.30.40" + + # We define few parameters for our ping. + ping_count = 3 + ping_size = 32 + ping_payload = "aa" + + # We check the program can execute. + self.assertRunOk("pppd --version") + + # We create two PTYs connected to each other with socat. We + # will connect a pppd on each one to create connection end + # points. We also enable some debugging to print the content + # of packets forwarded by socat. We will use that to later + # validate data actually passed through this channel. Note: we + # start the command in a subshell to suppress the job control + # message, when this background process will be killed later + # in this test. + cmd = "( socat -d2 -x -lu" + cmd += f" PTY,link={pty0},rawer,b115200 PTY,link={pty1},rawer,b115200" + cmd += f" > {socat_log} 2>&1 & )" + self.assertRunOk(cmd) + + # We create a network namespace. We will use it to isolate one + # of the two pppd instances (our fake remote). We do so to + # make sure our network test will not use the default routes + # (or local loopback). This will make sure our communication + # data will go through our PPP link. + namespace = "remote-ppp" + self.assertRunOk(f"ip netns add {namespace}") + + # We start our (fake) remote pppd instance, in our netns. + cmd = f"ip netns exec {namespace} " + cmd += f"pppd noauth ifname ppp1 {pty1} {remote_ip}:{local_ip}" + self.assertRunOk(cmd) + + # We wait a bit for the pppd to settle... + time.sleep(3) + + # We start out local pppd instance, this time in the default + # network namespace. + cmd = f"pppd noauth ifname ppp0 {pty0} {local_ip}:{remote_ip}" + self.assertRunOk(cmd) + + # We wait again... + time.sleep(3) + + # We check we can ping our two IPs. The local IP is expected + # to go through the interface loopback (and not go through our + # PPP link). Only the remote IP ping is expected to go through + # our socat PTYs. + for ip in local_ip, remote_ip: + cmd = f"ping -c {ping_count} -s {ping_size} -p {ping_payload} {ip}" + self.assertRunOk(cmd) + + # We stop our pppd and socat processes. + self.assertRunOk("killall pppd") + self.assertRunOk("killall socat") + + # For debugging this test, it can be useful to print the socat + # log on the console. Uncomment this line, if needed. + # self.assertRunOk(f"cat {socat_log}") + + # The actual ping payload set with our payload_data is + # slightly smaller as the ping packet size, due other data + # written by the ping command. This is why we subtract 4 bytes + # to the size. + pattern = " ".join([ping_payload] * (ping_size - 4)) + # We count the number of packets with this payload transmitted + # through socat... + out, ret = self.emulator.run(f"grep -Fc '{pattern}' {socat_log}") + self.assertEqual(ret, 0) + # We check we have exactly twice our requested ping count (one + # for ICMP ECHO, one for the REPLY). + self.assertEqual(int(out[0]), ping_count * 2) diff --git a/support/testing/tests/package/test_pppd/linux-ppp.fragment b/support/testing/tests/package/test_pppd/linux-ppp.fragment new file mode 100644 index 00000000000..18bedc28312 --- /dev/null +++ b/support/testing/tests/package/test_pppd/linux-ppp.fragment @@ -0,0 +1,2 @@ +CONFIG_PPP=y +CONFIG_PPP_ASYNC=y diff --git a/support/testing/tests/package/test_python_scipy.py b/support/testing/tests/package/test_python_scipy.py index fb51f25d79b..608a3f6e874 100644 --- a/support/testing/tests/package/test_python_scipy.py +++ b/support/testing/tests/package/test_python_scipy.py @@ -5,8 +5,15 @@ class TestPythonPy3SciPy(TestPythonPackageBase): __test__ = True - config = TestPythonPackageBase.config + \ + # Need to use a different toolchain than the default due to + # missing Fortran support (required by python-scipy) in Bootlin + # stable toolchains 2024.05 + config = \ """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SCIPY=y BR2_TARGET_ROOTFS_EXT2=y diff --git a/support/testing/tests/package/test_python_sdbus.py b/support/testing/tests/package/test_python_sdbus.py new file mode 100644 index 00000000000..7163bbeed18 --- /dev/null +++ b/support/testing/tests/package/test_python_sdbus.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Sdbus(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_INIT_SYSTEMD=y + BR2_PACKAGE_PYTHON_SDBUS=y + """ + sample_scripts = ["tests/package/sample_python_sdbus.py"] diff --git a/support/testing/tests/package/test_python_sdbus_networkmanager.py b/support/testing/tests/package/test_python_sdbus_networkmanager.py new file mode 100644 index 00000000000..a3961ec54ff --- /dev/null +++ b/support/testing/tests/package/test_python_sdbus_networkmanager.py @@ -0,0 +1,15 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3SdbusNetworkmanager(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_INIT_SYSTEMD=y + BR2_PACKAGE_NETWORK_MANAGER=y + BR2_PACKAGE_PYTHON_SDBUS_NETWORKMANAGER=y + """ + sample_scripts = ["tests/package/sample_python_sdbus_networkmanager.py"] + + timeout = 30 diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 763125ca20c..8160cb60536 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -70,7 +70,6 @@ class TestRustVendoring(infra.basetest.BRConfigTest): BR2_PACKAGE_RIPGREP=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y - BR2_BACKUP_SITE="" """ def setUp(self): diff --git a/support/testing/tests/package/test_which.py b/support/testing/tests/package/test_which.py new file mode 100644 index 00000000000..38f528aa7f8 --- /dev/null +++ b/support/testing/tests/package/test_which.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestWhich(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_WHICH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # We check the program can run. This also checks we are using + # the actual GNU which, since the BusyBox implementation does + # not accept this option. + self.assertRunOk("which --version") + + # We check the primary usage is working. + out, ret = self.emulator.run("which sh") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "/bin/sh") + + alias_name = "buildoot_test_alias" + + # We check "which" returns an error when the program is not + # found. + _, ret = self.emulator.run(f"which {alias_name}") + self.assertNotEqual(ret, 0) + + # We define a shell alias. + alias_cmd = "/bin/true" + alias_def = f"{alias_name}='{alias_cmd}'" + self.assertRunOk(f"alias {alias_def}") + + # We check our alias definition actually works, just by + # invoking it (since it's aliased to "true"). + self.assertRunOk(alias_name) + + # We check "which" is able to read aliases from the shell. + cmd = f"alias | which -i {alias_name}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], alias_def) + self.assertEqual(out[1].strip(), alias_cmd) diff --git a/support/testing/tests/package/test_xvisor.py b/support/testing/tests/package/test_xvisor.py new file mode 100644 index 00000000000..b1b7d1a5e03 --- /dev/null +++ b/support/testing/tests/package/test_xvisor.py @@ -0,0 +1,131 @@ +import os +import re + +import infra.basetest + + +class TestXvisor(infra.basetest.BRTest): + # RISC-V 64bit is the "simplest" configuration to run + # Xvisor into QEmu. + config = \ + """ + BR2_riscv=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_XVISOR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_OPENSBI=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.5" + BR2_TARGET_OPENSBI_PLAT="generic" + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y + """ + xvisor_prompt = "XVisor# " + + def expect_xvisor_prompt(self, timeout=-1): + self.emulator.qemu.expect(self.xvisor_prompt, timeout=timeout) + + def run_xvisor_cmd(self, cmd, timeout=-1): + exit_code = 0 + if timeout != -1: + timeout *= self.emulator.timeout_multiplier + self.emulator.qemu.sendline(cmd) + self.expect_xvisor_prompt(timeout) + output = self.emulator.qemu.before.replace("\r\r", "\r").splitlines()[1:] + # Some Xvisor commands (like "sleep") might not + # produce any output + if len(output) > 0: + last_line = output[-1] + else: + last_line = "" + if last_line.startswith("Error:"): + match = re.search(last_line, r"code (-?\d)") + if match is None: + exit_code = -1 + else: + exit_code = int(match.group(1)) + + return output, exit_code + + def assertXvRunOk(self, cmd, timeout=-1): + out, exit_code = self.run_xvisor_cmd(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run xvisor command: {}\noutput was:\n{}".format( + cmd, ' '+'\n '.join(out)) + ) + + def test_run(self): + opensbi = os.path.join(self.builddir, "images", "fw_jump.bin") + xvisor = os.path.join(self.builddir, "images", "vmm.bin") + initrd = os.path.join(self.builddir, "images", "rootfs.cpio") + + self.emulator.boot(arch="riscv64", + kernel=xvisor, + options=["-M", "virt", "-cpu", "rv64", "-m", "256M", + "-bios", opensbi, "-initrd", initrd]) + + # There is no emulator.login(), since we start directly in + # Xvisor prompt. + self.expect_xvisor_prompt() + + # Check Xvisor version. + output, exit_code = self.run_xvisor_cmd("version") + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("Xvisor")) + + # Check a basic echo. + test_str = "Hello Buildroot!" + output, exit_code = self.run_xvisor_cmd("echo " + test_str) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), test_str) + + # Check a nonexisting command fails. + _, exit_code = self.run_xvisor_cmd("bad_command") + self.assertNotEqual(exit_code, 0) + + # Check an error of a valid command. + _, exit_code = self.run_xvisor_cmd("vfs ls /nodir") + self.assertNotEqual(exit_code, 0) + + # We mount the initrd... + self.assertXvRunOk("vfs mount initrd /") + + # Check we see an existing file/symlink "os-release" in + # "/etc", from our mounted initrd. + output, exit_code = self.run_xvisor_cmd("vfs ls /etc") + self.assertEqual(exit_code, 0) + self.assertIn("os-release", "\n".join(output)) + + # Check the word "Buildroot" is in the /etc/issue file. + output, exit_code = self.run_xvisor_cmd("vfs cat /etc/issue") + self.assertEqual(exit_code, 0) + self.assertIn("Buildroot", "\n".join(output)) + + # Check qemu is seen in host info. + output, exit_code = self.run_xvisor_cmd("host info") + self.assertEqual(exit_code, 0) + self.assertIn("qemu", "\n".join(output)) + + # Run a batch of status commands... + cmds = [ + "blockdev list", + "rbd list", + "module info 0", + "wallclock get_time", + "heap info", + "thread list", + "vcpu list", + "vcpu dumpreg 0", + "devtree node show /", + "host cpu info", + "host ram info", + "host resources", + "host bus_list", + "host bus_device_list platform" + ] + + for cmd in cmds: + self.assertXvRunOk(cmd) diff --git a/support/testing/tests/package/test_xxhash.py b/support/testing/tests/package/test_xxhash.py new file mode 100644 index 00000000000..00e0f245fca --- /dev/null +++ b/support/testing/tests/package/test_xxhash.py @@ -0,0 +1,35 @@ +import os + +import infra.basetest + + +class TestXxHash(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_XXHASH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + testfile = "data.bin" + + # Check we can run the program. + self.assertRunOk("xxhsum --version") + + # We create a test data file with random data. + cmd = f"dd if=/dev/urandom of={testfile} bs=1M count=1" + self.assertRunOk(cmd) + + # For the three hash sizes, we compute the xxhash and check + # the integrity of the file. + for hsize in [32, 64, 128]: + hashfile = f"{testfile}.xxh{hsize}" + self.assertRunOk(f"xxh{hsize}sum {testfile} | tee {hashfile}") + self.assertRunOk(f"xxh{hsize}sum -c {hashfile}") diff --git a/support/testing/tests/toolchain/test_external_arm.py b/support/testing/tests/toolchain/test_external_arm.py new file mode 100644 index 00000000000..1f8e5b4e565 --- /dev/null +++ b/support/testing/tests/toolchain/test_external_arm.py @@ -0,0 +1,41 @@ +from tests.toolchain.test_external import TestExternalToolchain + + +class TestExternalToolchainArmArm(TestExternalToolchain): + config = """ + BR2_arm=y + BR2_cortex_a8=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_ARM_ARM=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arm-none-linux-gnueabihf" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainArmAarch64(TestExternalToolchain): + config = """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64-none-linux-gnu" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainArmAarch64Be(TestExternalToolchain): + config = """ + BR2_aarch64_be=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "aarch64_be-none-linux-gnu" + + def test_run(self): + TestExternalToolchain.common_check(self) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 2ed69b9ff81..c137444cbca 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -2262,6 +2262,23 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinRiscv32ilp32dGlibcStable(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinRiscv32ilp32dMuslBleedingEdge(TestExternalToolchain): config = """ BR2_riscv=y @@ -2296,6 +2313,40 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinRiscv32ilp32dUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinRiscv32ilp32dUclibcStable(TestExternalToolchain): + config = """ + BR2_riscv=y + BR2_riscv_g=y + BR2_RISCV_32=y + BR2_RISCV_ABI_ILP32D=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "riscv32-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinRiscv64lp64dGlibcBleedingEdge(TestExternalToolchain): config = """ BR2_riscv=y @@ -2434,6 +2485,36 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13MuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13MuslStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_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 diff --git a/support/testing/tests/toolchain/test_external_synopsys.py b/support/testing/tests/toolchain/test_external_synopsys.py new file mode 100644 index 00000000000..19ed9f67b00 --- /dev/null +++ b/support/testing/tests/toolchain/test_external_synopsys.py @@ -0,0 +1,91 @@ +from tests.toolchain.test_external import TestExternalToolchain + + +class TestExternalToolchainSynopsysArc700LE(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_arc770d=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC700=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainSynopsysArc700BE(TestExternalToolchain): + config = """ + BR2_arceb=y + BR2_arc770d=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC700=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arceb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainSynopsysArcHSGlibcLE(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38_full=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_GLIBC=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainSynopsysArcHSGlibcBE(TestExternalToolchain): + config = """ + BR2_arceb=y + BR2_archs38_full=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_GLIBC=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arceb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainSynopsysArcHSuClibcLE(TestExternalToolchain): + config = """ + BR2_arcle=y + BR2_archs38_full=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_UCLIBC=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arc-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainSynopsysArcHSuClibcBE(TestExternalToolchain): + config = """ + BR2_arceb=y + BR2_archs38_full=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC=y + BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_UCLIBC=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "arceb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py index ffc01f6ce73..3ec4edeaddf 100644 --- a/support/testing/tests/utils/test_get_developers.py +++ b/support/testing/tests/utils/test_get_developers.py @@ -41,9 +41,9 @@ def test_run(self): # no args, with syntax error in the file developers = b'text3\n' out, err, rc = call_get_developers("./utils/get-developers", [], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("No action specified", out) - self.assertEqual(rc, 0) - self.assertEqual(len(err), 0) + self.assertIn("No action specified", "\n".join(err)) + self.assertEqual(rc, 2) + self.assertEqual(len(out), 0) # -v generating error, called from the main dir developers = b'text1\n' @@ -150,9 +150,9 @@ def test_run(self): # no args, with syntax error in the file developers = b'text3\n' out, err, rc = call_get_developers("./utils/get-developers", [], self.WITH_EMPTY_PATH, topdir, developers) - self.assertIn("No action specified", out) - self.assertEqual(rc, 0) - self.assertEqual(len(err), 0) + self.assertIn("No action specified", "\n".join(err)) + self.assertEqual(rc, 2) + self.assertEqual(len(out), 0) # patchfile from topdir and from elsewhere abs_path = infra.filepath("tests/utils/test_get_developers/") diff --git a/system/Config.in b/system/Config.in index 318c538ef1d..8f3579b7e02 100644 --- a/system/Config.in +++ b/system/Config.in @@ -87,6 +87,8 @@ choice prompt "Init system" default BR2_INIT_BUSYBOX +comment "General purpose" + config BR2_INIT_BUSYBOX bool "BusyBox" select BR2_PACKAGE_BUSYBOX @@ -145,8 +147,35 @@ comment "systemd highly recommends Linux >= 4.15" depends on BR2_INIT_SYSTEMD depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 +comment "Special purpose (read help)" + +config BR2_INIT_TINI + bool "tini" + depends on BR2_USE_MMU # tini + select BR2_PACKAGE_TINI + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT + help + Tini - A tiny but valid init for containers + + Tini is the simplest init you could think of. + + All Tini does is spawn a single child (Tini is meant to be run + in a container), and wait for it to exit all the while reaping + zombies and performing signal forwarding. + + https://github.com/krallin/tini + +config BR2_INIT_TINYINIT + bool "tiny init" + select BR2_PACKAGE_TINYINIT + select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT + help + A Linux tiny initialization script suitable for resource + limited systems, which can be used as an alternative to the + one provided by Busybox. + config BR2_INIT_NONE - bool "None" + bool "Custom (none)" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT help Buildroot will not install any init system. You will @@ -254,7 +283,7 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV bool "Dynamic using devtmpfs + eudev" depends on BR2_USE_WCHAR # eudev - depends on !BR2_STATIC_LIBS + depends on !BR2_STATIC_LIBS # eudev depends on BR2_USE_MMU # eudev select BR2_PACKAGE_EUDEV 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 1cee601a89a..d3c095b2b6a 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 13.2.rel1" + bool "Arm AArch64 BE 13.3.rel1" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash index a9830c43c32..f876465543a 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.hash @@ -1,2 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc -sha256 fe864b2b15127f58867a171cfcd639318609e734fbc8b78bb40258312a21a097 arm-gnu-toolchain-13.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc +sha256 55a2f073708c938ffe1d302859e5c3d6195b8bca3affa3d3aa6b2aafd79bf487 arm-gnu-toolchain-13.3.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk index 7771269b0d5..dd03635e71d 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 13.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 13.3.rel1 TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)/binrel TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 2565707def9..7f4fc61f2fb 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 13.2.rel1" + bool "Arm AArch64 13.3.rel1" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash index 9de90d4b06e..75478913b0c 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.hash @@ -1,2 +1,2 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc -sha256 12fcdf13a7430655229b20438a49e8566e26551ba08759922cdaf4695b0d4e23 arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 322f0b4482fc0d9fa0bb468134841f08d8c554c54ff5aa29a13a7a24bf7e1eb5 arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk index f9adda89214..b6c75ecf3fc 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/toolchain-external-arm-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 13.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 13.3.rel1 TOOLCHAIN_EXTERNAL_ARM_AARCH64_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)/binrel TOOLCHAIN_EXTERNAL_ARM_AARCH64_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index bee8d61164b..b110885a964 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -3,7 +3,7 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM - bool "Arm ARM 13.2.rel1" + bool "Arm ARM 13.3.rel1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON @@ -18,8 +18,8 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 13.2, - GDB 13, glibc 2.38, Binutils 2.41. It generates code + Arm toolchain for the ARM architecture. It uses GCC 13.3, + GDB 14, glibc 2.38, Binutils 2.42. It generates code that runs on all Cortex-A profile devices. The code generated uses the hard floating point calling convention, and uses the NEON FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash index e979e5f5080..6d4facfdad5 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.hash @@ -1,4 +1,4 @@ -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc -sha256 df0f4927a67d1fd366ff81e40bd8c385a9324fbdde60437a512d106215f257b3 arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz -# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc -sha256 8ad384bb328bccc44396d85c8f8113b7b8c5e11bcfef322e77cda3ebe7baadb5 arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 560267bdecf966b7a48467d0af6c81a85b906ef7b0a9b9dd91f506184b940281 arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 377d11ec2b55c55306d435d3f2e3760f92efafa649393d5b6778457b3c8af1ab arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz 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 5962121af6d..84e0e182764 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/toolchain-external-arm-arm.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 13.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 13.3.rel1 TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 7a9bffb5ae4..098e44fc369 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -10,7 +10,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS 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_arm && BR2_ARM_CPU_ARMV7M && BR2_BINFMT_FLAT default y if BR2_m68k_m68k default y if BR2_m68k_cf default y if BR2_microblazebe @@ -58,11 +58,11 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL choice prompt "Bootlin toolchain variant" config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE - bool "aarch64 glibc bleeding-edge 2024.02-1" + bool "aarch64 glibc bleeding-edge 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -83,14 +83,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE - bool "aarch64 glibc stable 2024.02-1" + bool "aarch64 glibc stable 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -108,11 +107,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE - bool "aarch64 musl bleeding-edge 2024.02-1" + bool "aarch64 musl bleeding-edge 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -133,14 +132,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE - bool "aarch64 musl stable 2024.02-1" + bool "aarch64 musl stable 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -157,10 +155,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE - bool "aarch64 uclibc bleeding-edge 2024.02-1" + bool "aarch64 uclibc bleeding-edge 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -182,15 +180,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE - bool "aarch64 uclibc stable 2024.02-1" + bool "aarch64 uclibc stable 2024.05-1" depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -207,11 +204,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE - bool "aarch64be glibc bleeding-edge 2024.02-1" + bool "aarch64be glibc bleeding-edge 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -232,14 +229,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE - bool "aarch64be glibc stable 2024.02-1" + bool "aarch64be glibc stable 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -257,11 +253,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE - bool "aarch64be musl bleeding-edge 2024.02-1" + bool "aarch64be musl bleeding-edge 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -282,14 +278,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE - bool "aarch64be musl stable 2024.02-1" + bool "aarch64be musl stable 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -306,10 +301,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE - bool "aarch64be uclibc bleeding-edge 2024.02-1" + bool "aarch64be uclibc bleeding-edge 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -331,15 +326,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE - bool "aarch64be uclibc stable 2024.02-1" + bool "aarch64be uclibc stable 2024.05-1" depends on BR2_aarch64_be - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -356,11 +350,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE - bool "arcle-750d uclibc bleeding-edge 2024.02-1" + bool "arcle-750d uclibc bleeding-edge 2024.05-1" depends on BR2_arcle depends on BR2_arc750d - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -381,7 +375,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 2024.02-1" + bool "arcle-750d uclibc stable 2024.05-1" depends on BR2_arcle depends on BR2_arc750d depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 @@ -390,7 +384,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -406,12 +399,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE - bool "arcle-hs38 glibc bleeding-edge 2024.02-1" + bool "arcle-hs38 glibc bleeding-edge 2024.05-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -431,15 +424,14 @@ 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 2023.11-1" + bool "arcle-hs38 glibc stable 2024.05-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -456,11 +448,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE - bool "arcle-hs38 uclibc bleeding-edge 2024.02-1" + bool "arcle-hs38 uclibc bleeding-edge 2024.05-1" depends on BR2_arcle depends on BR2_archs38 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -481,7 +473,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 2024.02-1" + bool "arcle-hs38 uclibc stable 2024.05-1" depends on BR2_arcle depends on BR2_archs38 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 @@ -490,7 +482,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -506,13 +497,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE - bool "armv5-eabi glibc bleeding-edge 2024.02-1" + bool "armv5-eabi glibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -533,16 +524,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE - bool "armv5-eabi glibc stable 2024.02-1" + bool "armv5-eabi glibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -560,13 +550,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE - bool "armv5-eabi musl bleeding-edge 2024.02-1" + bool "armv5-eabi musl bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -587,16 +577,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE - bool "armv5-eabi musl stable 2024.02-1" + bool "armv5-eabi musl stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -614,12 +603,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE - bool "armv5-eabi uclibc bleeding-edge 2024.02-1" + bool "armv5-eabi uclibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -641,17 +630,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE - bool "armv5-eabi uclibc stable 2024.02-1" + bool "armv5-eabi uclibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -668,13 +656,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv6-eabihf glibc bleeding-edge 2024.02-1" + bool "armv6-eabihf glibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -695,16 +683,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE - bool "armv6-eabihf glibc stable 2024.02-1" + bool "armv6-eabihf glibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -722,13 +709,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE - bool "armv6-eabihf musl bleeding-edge 2024.02-1" + bool "armv6-eabihf musl bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -749,16 +736,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE - bool "armv6-eabihf musl stable 2024.02-1" + bool "armv6-eabihf musl stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -776,12 +762,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv6-eabihf uclibc bleeding-edge 2024.02-1" + bool "armv6-eabihf uclibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -803,17 +789,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE - bool "armv6-eabihf uclibc stable 2024.02-1" + bool "armv6-eabihf uclibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -830,13 +815,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv7-eabihf glibc bleeding-edge 2024.02-1" + bool "armv7-eabihf glibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -857,16 +842,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE - bool "armv7-eabihf glibc stable 2024.02-1" + bool "armv7-eabihf glibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -884,13 +868,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armv7-eabihf musl bleeding-edge 2024.02-1" + bool "armv7-eabihf musl bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -911,16 +895,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE - bool "armv7-eabihf musl stable 2024.02-1" + bool "armv7-eabihf musl stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -938,12 +921,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv7-eabihf uclibc bleeding-edge 2024.02-1" + bool "armv7-eabihf uclibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -965,17 +948,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE - bool "armv7-eabihf uclibc stable 2024.02-1" + bool "armv7-eabihf uclibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -992,13 +974,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armebv7-eabihf glibc bleeding-edge 2024.02-1" + bool "armebv7-eabihf glibc bleeding-edge 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1019,16 +1001,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE - bool "armebv7-eabihf glibc stable 2024.02-1" + bool "armebv7-eabihf glibc stable 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1046,13 +1027,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armebv7-eabihf musl bleeding-edge 2024.02-1" + bool "armebv7-eabihf musl bleeding-edge 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1073,16 +1054,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE - bool "armebv7-eabihf musl stable 2024.02-1" + bool "armebv7-eabihf musl stable 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1100,12 +1080,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armebv7-eabihf uclibc bleeding-edge 2024.02-1" + bool "armebv7-eabihf uclibc bleeding-edge 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1127,17 +1107,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE - bool "armebv7-eabihf uclibc stable 2024.02-1" + bool "armebv7-eabihf uclibc stable 2024.05-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -1154,11 +1133,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE - bool "armv7m uclibc bleeding-edge 2024.02-1" + bool "armv7m uclibc bleeding-edge 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on BR2_BINFMT_FLAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1178,16 +1158,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 2024.02-1" + bool "armv7m uclibc stable 2024.05-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on BR2_BINFMT_FLAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -1202,11 +1182,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE - bool "m68k-68xxx glibc bleeding-edge 2024.02-1" + bool "m68k-68xxx glibc bleeding-edge 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1227,14 +1207,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE - bool "m68k-68xxx glibc stable 2024.02-1" + bool "m68k-68xxx glibc stable 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1252,11 +1231,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE - bool "m68k-68xxx musl bleeding-edge 2024.02-1" + bool "m68k-68xxx musl bleeding-edge 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1277,14 +1256,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE - bool "m68k-68xxx musl stable 2024.02-1" + bool "m68k-68xxx musl stable 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1302,10 +1280,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE - bool "m68k-68xxx uclibc bleeding-edge 2024.02-1" + bool "m68k-68xxx uclibc bleeding-edge 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1327,15 +1305,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE - bool "m68k-68xxx uclibc stable 2024.02-1" + bool "m68k-68xxx uclibc stable 2024.05-1" depends on BR2_m68k_m68k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -1352,10 +1329,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE - bool "m68k-coldfire uclibc bleeding-edge 2024.02-1" + bool "m68k-coldfire uclibc bleeding-edge 2024.05-1" depends on BR2_m68k_cf - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1375,15 +1352,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE - bool "m68k-coldfire uclibc stable 2024.02-1" + bool "m68k-coldfire uclibc stable 2024.05-1" depends on BR2_m68k_cf - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -1398,12 +1374,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE - bool "microblazebe glibc bleeding-edge 2024.02-1" + bool "microblazebe glibc bleeding-edge 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1421,12 +1397,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE - bool "microblazebe glibc stable 2024.02-1" + bool "microblazebe glibc stable 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1444,12 +1420,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE - bool "microblazebe musl bleeding-edge 2024.02-1" + bool "microblazebe musl bleeding-edge 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1467,12 +1443,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE - bool "microblazebe musl stable 2024.02-1" + bool "microblazebe musl stable 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1490,11 +1466,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE - bool "microblazebe uclibc bleeding-edge 2024.02-1" + bool "microblazebe uclibc bleeding-edge 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1514,11 +1490,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE - bool "microblazebe uclibc stable 2024.02-1" + bool "microblazebe uclibc stable 2024.05-1" depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1538,12 +1514,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE - bool "microblazeel glibc bleeding-edge 2024.02-1" + bool "microblazeel glibc bleeding-edge 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1561,12 +1537,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE - bool "microblazeel glibc stable 2024.02-1" + bool "microblazeel glibc stable 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1584,12 +1560,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE - bool "microblazeel musl bleeding-edge 2024.02-1" + bool "microblazeel musl bleeding-edge 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1607,12 +1583,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE - bool "microblazeel musl stable 2024.02-1" + bool "microblazeel musl stable 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_THREADS @@ -1630,11 +1606,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE - bool "microblazeel uclibc bleeding-edge 2024.02-1" + bool "microblazeel uclibc bleeding-edge 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1654,11 +1630,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE - bool "microblazeel uclibc stable 2024.02-1" + bool "microblazeel uclibc stable 2024.05-1" depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1678,13 +1654,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE - bool "mips32 glibc bleeding-edge 2024.02-1" + bool "mips32 glibc bleeding-edge 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1705,16 +1681,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE - bool "mips32 glibc stable 2024.02-1" + bool "mips32 glibc stable 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1732,13 +1707,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE - bool "mips32 musl bleeding-edge 2024.02-1" + bool "mips32 musl bleeding-edge 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1759,16 +1734,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE - bool "mips32 musl stable 2024.02-1" + bool "mips32 musl stable 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1785,12 +1759,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE - bool "mips32 uclibc bleeding-edge 2024.02-1" + bool "mips32 uclibc bleeding-edge 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1812,17 +1786,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE - bool "mips32 uclibc stable 2024.02-1" + bool "mips32 uclibc stable 2024.05-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -1839,13 +1812,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE - bool "mips32el glibc bleeding-edge 2024.02-1" + bool "mips32el glibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1866,16 +1839,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE - bool "mips32el glibc stable 2024.02-1" + bool "mips32el glibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1893,13 +1865,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE - bool "mips32el musl bleeding-edge 2024.02-1" + bool "mips32el musl bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1920,16 +1892,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE - bool "mips32el musl stable 2024.02-1" + bool "mips32el musl stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -1946,12 +1917,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE - bool "mips32el uclibc bleeding-edge 2024.02-1" + bool "mips32el uclibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1973,17 +1944,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE - bool "mips32el uclibc stable 2024.02-1" + bool "mips32el uclibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2000,13 +1970,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE - bool "mips32r5el glibc bleeding-edge 2024.02-1" + bool "mips32r5el glibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2027,16 +1997,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE - bool "mips32r5el glibc stable 2024.02-1" + bool "mips32r5el glibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2054,13 +2023,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE - bool "mips32r5el musl bleeding-edge 2024.02-1" + bool "mips32r5el musl bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2081,16 +2050,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE - bool "mips32r5el musl stable 2024.02-1" + bool "mips32r5el musl stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2108,12 +2076,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE - bool "mips32r5el uclibc bleeding-edge 2024.02-1" + bool "mips32r5el uclibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2135,17 +2103,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE - bool "mips32r5el uclibc stable 2024.02-1" + bool "mips32r5el uclibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2162,13 +2129,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE - bool "mips32r6el glibc bleeding-edge 2024.02-1" + bool "mips32r6el glibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2189,16 +2156,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE - bool "mips32r6el glibc stable 2024.02-1" + bool "mips32r6el glibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2216,13 +2182,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE - bool "mips32r6el musl bleeding-edge 2024.02-1" + bool "mips32r6el musl bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2243,16 +2209,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE - bool "mips32r6el musl stable 2024.02-1" + bool "mips32r6el musl stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2270,12 +2235,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE - bool "mips32r6el uclibc bleeding-edge 2024.02-1" + bool "mips32r6el uclibc bleeding-edge 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2297,17 +2262,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE - bool "mips32r6el uclibc stable 2024.02-1" + bool "mips32r6el uclibc stable 2024.05-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2324,14 +2288,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE - bool "mips64-n32 glibc bleeding-edge 2024.02-1" + bool "mips64-n32 glibc bleeding-edge 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2352,17 +2316,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE - bool "mips64-n32 glibc stable 2024.02-1" + bool "mips64-n32 glibc stable 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2380,14 +2343,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE - bool "mips64-n32 musl bleeding-edge 2024.02-1" + bool "mips64-n32 musl bleeding-edge 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2408,17 +2371,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE - bool "mips64-n32 musl stable 2024.02-1" + bool "mips64-n32 musl stable 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2436,13 +2398,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE - bool "mips64-n32 uclibc bleeding-edge 2024.02-1" + bool "mips64-n32 uclibc bleeding-edge 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2464,18 +2426,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE - bool "mips64-n32 uclibc stable 2024.02-1" + bool "mips64-n32 uclibc stable 2024.05-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2492,14 +2453,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64el-n32 glibc bleeding-edge 2024.02-1" + bool "mips64el-n32 glibc bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2520,17 +2481,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE - bool "mips64el-n32 glibc stable 2024.02-1" + bool "mips64el-n32 glibc stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2548,14 +2508,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE - bool "mips64el-n32 musl bleeding-edge 2024.02-1" + bool "mips64el-n32 musl bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2576,17 +2536,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE - bool "mips64el-n32 musl stable 2024.02-1" + bool "mips64el-n32 musl stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2604,13 +2563,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64el-n32 uclibc bleeding-edge 2024.02-1" + bool "mips64el-n32 uclibc bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2632,18 +2591,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE - bool "mips64el-n32 uclibc stable 2024.02-1" + bool "mips64el-n32 uclibc stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2660,14 +2618,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 glibc bleeding-edge 2024.02-1" + bool "mips64r6el-n32 glibc bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2688,17 +2646,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE - bool "mips64r6el-n32 glibc stable 2024.02-1" + bool "mips64r6el-n32 glibc stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2716,14 +2673,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE - bool "mips64r6el-n32 musl bleeding-edge 2024.02-1" + bool "mips64r6el-n32 musl bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2744,17 +2701,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE - bool "mips64r6el-n32 musl stable 2024.02-1" + bool "mips64r6el-n32 musl stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2772,13 +2728,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 uclibc bleeding-edge 2024.02-1" + bool "mips64r6el-n32 uclibc bleeding-edge 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -2800,18 +2756,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE - bool "mips64r6el-n32 uclibc stable 2024.02-1" + bool "mips64r6el-n32 uclibc stable 2024.05-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -2828,11 +2783,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE - bool "nios2 glibc bleeding-edge 2024.02-1" + bool "nios2 glibc bleeding-edge 2024.05-1" depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2853,14 +2808,13 @@ 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 2024.02-1" + bool "nios2 glibc stable 2024.05-1" depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2878,12 +2832,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE - bool "openrisc glibc bleeding-edge 2024.02-1" + bool "openrisc glibc bleeding-edge 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2904,15 +2858,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE - bool "openrisc glibc stable 2023.11-1" + bool "openrisc glibc stable 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2930,12 +2883,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2024.02-1" + bool "openrisc musl bleeding-edge 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -2956,15 +2909,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2024.02-1" + bool "openrisc musl stable 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -2981,11 +2933,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2024.02-1" + bool "openrisc uclibc bleeding-edge 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3007,16 +2959,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2024.02-1" + bool "openrisc uclibc stable 2024.05-1" depends on BR2_or1k - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -3033,12 +2984,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE - bool "powerpc-440fp glibc bleeding-edge 2024.02-1" + bool "powerpc-440fp glibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3059,15 +3010,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE - bool "powerpc-440fp glibc stable 2024.02-1" + bool "powerpc-440fp glibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3085,12 +3035,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE - bool "powerpc-440fp musl bleeding-edge 2024.02-1" + bool "powerpc-440fp musl bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3110,15 +3060,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE - bool "powerpc-440fp musl stable 2024.02-1" + bool "powerpc-440fp musl stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3135,11 +3084,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE - bool "powerpc-440fp uclibc bleeding-edge 2024.02-1" + bool "powerpc-440fp uclibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3161,16 +3110,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE - bool "powerpc-440fp uclibc stable 2024.02-1" + bool "powerpc-440fp uclibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -3187,12 +3135,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 glibc bleeding-edge 2024.02-1" + bool "powerpc-e300c3 glibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3213,15 +3161,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE - bool "powerpc-e300c3 glibc stable 2024.02-1" + bool "powerpc-e300c3 glibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3239,12 +3186,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE - bool "powerpc-e300c3 musl bleeding-edge 2024.02-1" + bool "powerpc-e300c3 musl bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3264,15 +3211,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE - bool "powerpc-e300c3 musl stable 2024.02-1" + bool "powerpc-e300c3 musl stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3289,11 +3235,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 uclibc bleeding-edge 2024.02-1" + bool "powerpc-e300c3 uclibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3315,16 +3261,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE - bool "powerpc-e300c3 uclibc stable 2024.02-1" + bool "powerpc-e300c3 uclibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -3341,12 +3286,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE - bool "powerpc-e500mc glibc bleeding-edge 2024.02-1" + bool "powerpc-e500mc glibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3367,15 +3312,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE - bool "powerpc-e500mc glibc stable 2024.02-1" + bool "powerpc-e500mc glibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3393,12 +3337,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE - bool "powerpc-e500mc musl bleeding-edge 2024.02-1" + bool "powerpc-e500mc musl bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3418,15 +3362,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE - bool "powerpc-e500mc musl stable 2024.02-1" + bool "powerpc-e500mc musl stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3443,11 +3386,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE - bool "powerpc-e500mc uclibc bleeding-edge 2024.02-1" + bool "powerpc-e500mc uclibc bleeding-edge 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -3469,16 +3412,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE - bool "powerpc-e500mc uclibc stable 2024.02-1" + bool "powerpc-e500mc uclibc stable 2024.05-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -3495,12 +3437,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e5500 glibc bleeding-edge 2024.02-1" + bool "powerpc64-e5500 glibc bleeding-edge 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3521,15 +3463,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE - bool "powerpc64-e5500 glibc stable 2024.02-1" + bool "powerpc64-e5500 glibc stable 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3547,12 +3488,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e6500 glibc bleeding-edge 2024.02-1" + bool "powerpc64-e6500 glibc bleeding-edge 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3573,15 +3514,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE - bool "powerpc64-e6500 glibc stable 2024.02-1" + bool "powerpc64-e6500 glibc stable 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3599,12 +3539,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE - bool "powerpc64-e6500 musl bleeding-edge 2024.02-1" + bool "powerpc64-e6500 musl bleeding-edge 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3625,15 +3565,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE - bool "powerpc64-e6500 musl stable 2024.02-1" + bool "powerpc64-e6500 musl stable 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3651,12 +3590,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64-power8 glibc bleeding-edge 2024.02-1" + bool "powerpc64-power8 glibc bleeding-edge 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3677,15 +3616,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE - bool "powerpc64-power8 glibc stable 2024.02-1" + bool "powerpc64-power8 glibc stable 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3703,12 +3641,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64-power8 musl bleeding-edge 2024.02-1" + bool "powerpc64-power8 musl bleeding-edge 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3729,15 +3667,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE - bool "powerpc64-power8 musl stable 2024.02-1" + bool "powerpc64-power8 musl stable 2024.05-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3755,12 +3692,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64le-power8 glibc bleeding-edge 2024.02-1" + bool "powerpc64le-power8 glibc bleeding-edge 2024.05-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3781,15 +3718,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE - bool "powerpc64le-power8 glibc stable 2024.02-1" + bool "powerpc64le-power8 glibc stable 2024.05-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3807,12 +3743,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64le-power8 musl bleeding-edge 2024.02-1" + bool "powerpc64le-power8 musl bleeding-edge 2024.05-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3833,15 +3769,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE - bool "powerpc64le-power8 musl stable 2024.02-1" + bool "powerpc64le-power8 musl stable 2024.05-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3859,14 +3794,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE - bool "riscv32-ilp32d glibc bleeding-edge 2024.02-1" + bool "riscv32-ilp32d glibc bleeding-edge 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3886,8 +3821,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE - bool "riscv32-ilp32d musl bleeding-edge 2024.02-1" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE + bool "riscv32-ilp32d glibc stable 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 @@ -3895,6 +3830,33 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the riscv32-ilp32d 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_RISCV32_ILP32D_MUSL_BLEEDING_EDGE + bool "riscv32-ilp32d musl bleeding-edge 2024.05-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3915,17 +3877,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE - bool "riscv32-ilp32d musl stable 2024.02-1" + bool "riscv32-ilp32d musl stable 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + 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 @@ -3942,15 +3903,70 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE + bool "riscv32-ilp32d uclibc bleeding-edge 2024.05-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + 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 riscv32-ilp32d 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_RISCV32_ILP32D_UCLIBC_STABLE + bool "riscv32-ilp32d uclibc stable 2024.05-1" + depends on BR2_riscv + depends on BR2_riscv_g + depends on BR2_RISCV_32 + depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + 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 riscv32-ilp32d 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_RISCV64_LP64D_GLIBC_BLEEDING_EDGE - bool "riscv64-lp64d glibc bleeding-edge 2024.02-1" + bool "riscv64-lp64d glibc bleeding-edge 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -3971,17 +3987,16 @@ 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 2023.11-1" + bool "riscv64-lp64d glibc stable 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -3999,14 +4014,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE - bool "riscv64-lp64d musl bleeding-edge 2024.02-1" + bool "riscv64-lp64d musl bleeding-edge 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4027,17 +4042,16 @@ 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 2023.11-1" + bool "riscv64-lp64d musl stable 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4055,14 +4069,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE - bool "riscv64-lp64d uclibc bleeding-edge 2024.02-1" + bool "riscv64-lp64d uclibc bleeding-edge 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4084,19 +4098,18 @@ 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 2023.11-1" + bool "riscv64-lp64d uclibc stable 2024.05-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4113,12 +4126,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE - bool "s390x-z13 glibc bleeding-edge 2024.02-1" + bool "s390x-z13 glibc bleeding-edge 2024.05-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4139,15 +4152,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE - bool "s390x-z13 glibc stable 2024.02-1" + bool "s390x-z13 glibc stable 2024.05-1" depends on BR2_s390x depends on BR2_s390x_z13 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4164,13 +4176,63 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE + bool "s390x-z13 musl bleeding-edge 2024.05-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the s390x-z13 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_S390X_Z13_MUSL_STABLE + bool "s390x-z13 musl stable 2024.05-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the s390x-z13 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_SH_SH4_GLIBC_BLEEDING_EDGE - bool "sh-sh4 glibc bleeding-edge 2024.02-1" + bool "sh-sh4 glibc bleeding-edge 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4191,15 +4253,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE - bool "sh-sh4 glibc stable 2024.02-1" + bool "sh-sh4 glibc stable 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4217,12 +4278,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE - bool "sh-sh4 musl bleeding-edge 2024.02-1" + bool "sh-sh4 musl bleeding-edge 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4243,15 +4304,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE - bool "sh-sh4 musl stable 2024.02-1" + bool "sh-sh4 musl stable 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4268,11 +4328,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE - bool "sh-sh4 uclibc bleeding-edge 2024.02-1" + bool "sh-sh4 uclibc bleeding-edge 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4294,16 +4354,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE - bool "sh-sh4 uclibc stable 2024.02-1" + bool "sh-sh4 uclibc stable 2024.05-1" depends on BR2_sh depends on BR2_sh4 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -4320,12 +4379,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE - bool "sh-sh4aeb glibc bleeding-edge 2024.02-1" + bool "sh-sh4aeb glibc bleeding-edge 2024.05-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4346,15 +4405,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE - bool "sh-sh4aeb glibc stable 2024.02-1" + bool "sh-sh4aeb glibc stable 2024.05-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4372,12 +4430,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE - bool "sh-sh4aeb musl bleeding-edge 2024.02-1" + bool "sh-sh4aeb musl bleeding-edge 2024.05-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4398,15 +4456,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE - bool "sh-sh4aeb musl stable 2024.02-1" + bool "sh-sh4aeb musl stable 2024.05-1" depends on BR2_sh depends on BR2_sh4aeb - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4423,12 +4480,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE - bool "sparc64 glibc bleeding-edge 2024.02-1" + bool "sparc64 glibc bleeding-edge 2024.05-1" depends on BR2_sparc64 depends on BR2_sparc_v9 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4449,15 +4506,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE - bool "sparc64 glibc stable 2024.02-1" + bool "sparc64 glibc stable 2024.05-1" depends on BR2_sparc64 depends on BR2_sparc_v9 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4475,12 +4531,12 @@ 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 2022.08-2" + bool "sparcv8 uclibc bleeding-edge 2024.05-1" depends on BR2_sparc depends on BR2_sparc_v8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_12 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP @@ -4501,16 +4557,15 @@ 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 2022.08-1" + bool "sparcv8 uclibc stable 2024.05-1" depends on BR2_sparc depends on BR2_sparc_v8 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -4527,14 +4582,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE - bool "x86-64 glibc bleeding-edge 2024.02-1" + bool "x86-64 glibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4555,17 +4610,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE - bool "x86-64 glibc stable 2024.02-1" + bool "x86-64 glibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4583,14 +4637,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE - bool "x86-64 musl bleeding-edge 2024.02-1" + bool "x86-64 musl bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4611,17 +4665,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE - bool "x86-64 musl stable 2024.02-1" + bool "x86-64 musl stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4638,13 +4691,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE - bool "x86-64 uclibc bleeding-edge 2024.02-1" + bool "x86-64 uclibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4666,18 +4719,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE - bool "x86-64 uclibc stable 2024.02-1" + bool "x86-64 uclibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -4694,7 +4746,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE - bool "x86-64-v2 glibc bleeding-edge 2024.02-1" + bool "x86-64-v2 glibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4703,9 +4755,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4726,7 +4778,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE - bool "x86-64-v2 glibc stable 2024.02-1" + bool "x86-64-v2 glibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4735,12 +4787,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4758,7 +4809,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE - bool "x86-64-v2 musl bleeding-edge 2024.02-1" + bool "x86-64-v2 musl bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4767,9 +4818,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4790,7 +4841,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE - bool "x86-64-v2 musl stable 2024.02-1" + bool "x86-64-v2 musl stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4799,12 +4850,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4821,7 +4871,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE - bool "x86-64-v2 uclibc bleeding-edge 2024.02-1" + bool "x86-64-v2 uclibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4830,8 +4880,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -4853,7 +4903,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE - bool "x86-64-v2 uclibc stable 2024.02-1" + bool "x86-64-v2 uclibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4862,13 +4912,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -4885,7 +4934,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE - bool "x86-64-v3 glibc bleeding-edge 2024.02-1" + bool "x86-64-v3 glibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4896,9 +4945,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4919,7 +4968,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE - bool "x86-64-v3 glibc stable 2024.02-1" + bool "x86-64-v3 glibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4930,12 +4979,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -4953,7 +5001,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE - bool "x86-64-v3 musl bleeding-edge 2024.02-1" + bool "x86-64-v3 musl bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4964,9 +5012,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -4987,7 +5035,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE - bool "x86-64-v3 musl stable 2024.02-1" + bool "x86-64-v3 musl stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4998,12 +5046,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5020,7 +5067,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE - bool "x86-64-v3 uclibc bleeding-edge 2024.02-1" + bool "x86-64-v3 uclibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5031,8 +5078,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5054,7 +5101,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE - bool "x86-64-v3 uclibc stable 2024.02-1" + bool "x86-64-v3 uclibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5065,13 +5112,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -5088,7 +5134,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE - bool "x86-64-v4 glibc bleeding-edge 2024.02-1" + bool "x86-64-v4 glibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5100,9 +5146,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5123,7 +5169,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE - bool "x86-64-v4 glibc stable 2024.02-1" + bool "x86-64-v4 glibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5135,12 +5181,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5158,7 +5203,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE - bool "x86-64-v4 musl bleeding-edge 2024.02-1" + bool "x86-64-v4 musl bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5170,9 +5215,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5193,7 +5238,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE - bool "x86-64-v4 musl stable 2024.02-1" + bool "x86-64-v4 musl stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5205,12 +5250,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5227,7 +5271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE - bool "x86-64-v4 uclibc bleeding-edge 2024.02-1" + bool "x86-64-v4 uclibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5239,8 +5283,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5262,7 +5306,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE - bool "x86-64-v4 uclibc stable 2024.02-1" + bool "x86-64-v4 uclibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5274,13 +5318,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -5297,7 +5340,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 glibc bleeding-edge 2024.02-1" + bool "x86-64-core-i7 glibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5306,9 +5349,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5329,7 +5372,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE - bool "x86-64-core-i7 glibc stable 2024.02-1" + bool "x86-64-core-i7 glibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5338,12 +5381,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5361,7 +5403,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE - bool "x86-64-core-i7 musl bleeding-edge 2024.02-1" + bool "x86-64-core-i7 musl bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5370,9 +5412,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5393,7 +5435,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE - bool "x86-64-core-i7 musl stable 2024.02-1" + bool "x86-64-core-i7 musl stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5402,12 +5444,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5425,7 +5466,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 uclibc bleeding-edge 2024.02-1" + bool "x86-64-core-i7 uclibc bleeding-edge 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5434,8 +5475,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5457,7 +5498,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE - bool "x86-64-core-i7 uclibc stable 2024.02-1" + bool "x86-64-core-i7 uclibc stable 2024.05-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5466,13 +5507,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -5489,16 +5529,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE - bool "x86-core2 glibc bleeding-edge 2024.02-1" + bool "x86-core2 glibc bleeding-edge 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5519,19 +5559,18 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE - bool "x86-core2 glibc stable 2024.02-1" + bool "x86-core2 glibc stable 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5549,16 +5588,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE - bool "x86-core2 musl bleeding-edge 2024.02-1" + bool "x86-core2 musl bleeding-edge 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5578,19 +5617,18 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE - bool "x86-core2 musl stable 2024.02-1" + bool "x86-core2 musl stable 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5606,15 +5644,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE - bool "x86-core2 uclibc bleeding-edge 2024.02-1" + bool "x86-core2 uclibc bleeding-edge 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5636,20 +5674,19 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE - bool "x86-core2 uclibc stable 2024.02-1" + bool "x86-core2 uclibc stable 2024.05-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -5666,7 +5703,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE - bool "x86-i686 glibc bleeding-edge 2024.02-1" + bool "x86-i686 glibc bleeding-edge 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5676,9 +5713,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5699,7 +5736,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE - bool "x86-i686 glibc stable 2024.02-1" + bool "x86-i686 glibc stable 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5709,12 +5746,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 @@ -5732,7 +5768,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE - bool "x86-i686 musl bleeding-edge 2024.02-1" + bool "x86-i686 musl bleeding-edge 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5742,9 +5778,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -5764,7 +5800,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE - bool "x86-i686 musl stable 2024.02-1" + bool "x86-i686 musl stable 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5774,12 +5810,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5795,7 +5830,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE - bool "x86-i686 uclibc bleeding-edge 2024.02-1" + bool "x86-i686 uclibc bleeding-edge 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5805,8 +5840,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5828,7 +5863,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE - bool "x86-i686 uclibc stable 2024.02-1" + bool "x86-i686 uclibc stable 2024.05-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5838,13 +5873,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -5861,12 +5895,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE - bool "xtensa-lx60 uclibc bleeding-edge 2024.02-1" + bool "xtensa-lx60 uclibc bleeding-edge 2024.05-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -5888,17 +5922,16 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE - bool "xtensa-lx60 uclibc stable 2024.02-1" + bool "xtensa-lx60 uclibc stable 2024.05-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 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 547e87b070f..adc42531cc1 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -1,432 +1,442 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2024.02-1.sha256 -sha256 09a5a8a59403e3df7a557014d0f9463e8e366c5431656252f0ce3fc00ecfc050 aarch64--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2024.02-1.sha256 -sha256 30a7a7e8f1c7165ca0c6ad6a11403e94ea65144a3c0181c2fa1f619ab972f26f aarch64--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2024.02-1.sha256 -sha256 d81e3517b69ebc49bec9e130952cd7c18fd0f84e992720e18e9cd02110c00296 aarch64--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2024.02-1.sha256 -sha256 aaa1a5c9212067de3618afbb8f3de4047d99fa1d23e5bc1452bab7fd3744df2e aarch64--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 225e3d9a1fd938e7779e357bc36d8639df8c413c4b31056292c83281677d184d aarch64--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2024.02-1.sha256 -sha256 de74a7fd974a5601418a60da645b433df6fd7773dda124a10d860c7f586e5a9d aarch64--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2024.02-1.sha256 -sha256 80cb37b022aa74c7329cef44336024fc5ca18c6193fdabfef01241153aba7f9d aarch64be--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2024.02-1.sha256 -sha256 aff4f324dd6318a66e94e512a0582c25f765b24e91e4e5576f7b917d585439e6 aarch64be--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2024.02-1.sha256 -sha256 c3ac7754efd3bf2968021ca7321edc8ea361ee3e071ed50b2d2d72c68d0a0de9 aarch64be--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2024.02-1.sha256 -sha256 143f57255fd8be375b3b16f4346a419968ba53fc839d6623752a4e9649809f21 aarch64be--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 0d25460ea796663839c0d023686fde91f248e19cbcc1c5eab1f6daa504bad019 aarch64be--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2024.02-1.sha256 -sha256 ea1f0195ce312417f7ef915a5c5c339893f48a20698f46b3ed183cf0f6b8faab aarch64be--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 a3a59cb25854ccb052035636e6d65c6ef3158182b69d23d2bd6c8a6e4284a052 arcle-750d--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2024.02-1.sha256 -sha256 315da85c124833e012565ec0c4cfdb8a334a302d21ab1f4b1289837035dcfa40 arcle-750d--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2024.02-1.sha256 -sha256 2bf7b934cf62035ebed6e999ecd0a9af815297151362e799472437bcca0498f9 arcle-hs38--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2023.11-1.sha256 -sha256 91c048fb79152969253a3bb96a9cd77c79c2ba5a3081d2da7cf103069661e303 arcle-hs38--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 2729a47b36989dc95346d31934dcb358f240075dc838c35ccac075f67322ab64 arcle-hs38--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2024.02-1.sha256 -sha256 9d0ef6443c7192e5ae5301e9c1cc22437224e404ed3232dd17fc042dd2e6b5b5 arcle-hs38--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2024.02-1.sha256 -sha256 8f6c0bd14479ced3814917a12cc8c0809fa5161c87da39b362a1ec8bc348e95c armv5-eabi--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2024.02-1.sha256 -sha256 9c43357d0eb79ba3f1aab8f020bdc673d24af0a44e2825c19eee2917308bc47e armv5-eabi--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2024.02-1.sha256 -sha256 8dac4ea5697a42a88bd1d7d91c3d57a20a7db6239857def3d7518c8e2330b5a4 armv5-eabi--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2024.02-1.sha256 -sha256 be82371ce785f28be097887fa43e6e63644c9226f12ca4c3f23e54792dba18e8 armv5-eabi--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 6333e0b6e5e1b40c92eb276fe6ecc713932b159df01df6e58d48285e4a9076b7 armv5-eabi--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2024.02-1.sha256 -sha256 68fba0cfb5af4136fe88fb451db9005ed2a8576509a9b1daf140eca5575460d5 armv5-eabi--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2024.02-1.sha256 -sha256 45aabb8a3b31bb28518680eb9bc91a7f9228bdb71c6473f7d3ba03754f3f8769 armv6-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2024.02-1.sha256 -sha256 e3d873f4be92438632da140c087bbd0025e406d138e7f5832d9481af1c9146ef armv6-eabihf--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2024.02-1.sha256 -sha256 04e7b5803f4f9984cab333570d537ce185d8a9892b95f2db7ba2e50c22e6b7bc armv6-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2024.02-1.sha256 -sha256 2d91a0a9fb4cff3046943307c70054507ec12c43eedbeb95eb597cfee2d3b58d armv6-eabihf--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 3fcc8fdf8eaa94ac48f3d8a51484904829c665a018d8a8ef8ae9491382f944f9 armv6-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2024.02-1.sha256 -sha256 cbd1de7ca4921e55c85a074ee2381996d07e2a5e378d3c3e6b86da587a0aa9fc armv6-eabihf--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2024.02-1.sha256 -sha256 db5178feac8a02f3dc6fab16448d0ca2835bc915ca0453f6aba6510b7dccfb5d armv7-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2024.02-1.sha256 -sha256 ec079d95388d5313f73e67fd32859ccbe2369f280d74aa103c40323c8cc6bd57 armv7-eabihf--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2024.02-1.sha256 -sha256 9c1cd34a2f488c01315ce4943a4b1ba59f92608cf902dfe3606eb1d1b2503e45 armv7-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2024.02-1.sha256 -sha256 88b5f04190e095969bd4fa5ffb4322181f2311b09e075d6ee13d74e88e7bff32 armv7-eabihf--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 900a2e383165cf6cc32c1e9271bce2d686702e6407058b7a196e49b812b8d05f armv7-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2024.02-1.sha256 -sha256 bfbd81e15f771f4dbf0537677f4338731faaaa6fc250efd5027ccbe347b1f3f1 armv7-eabihf--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2024.02-1.sha256 -sha256 76d31189aa2b52320a35757cb45920ae91303681e7e72601ce858082d7ed5120 armebv7-eabihf--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2024.02-1.sha256 -sha256 0075aee77819c918cf54c1d2cda3ccbea2e59ac93cbbc42706736b741d6d625e armebv7-eabihf--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2024.02-1.sha256 -sha256 2c142234299301d3871c6ec878eaefc08dd14785cb96e691e605d23c0a7d1f2e armebv7-eabihf--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2024.02-1.sha256 -sha256 6ee263a880819cf629f3ace5c2da9174ab19d1bdf4be59d9ffc6cc52b7693bc8 armebv7-eabihf--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 1fbb9bcdcc82c1dbb226dfe47c568d7f1d46676974aecbe46f711ef4b5939298 armebv7-eabihf--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2024.02-1.sha256 -sha256 fab1646eca9a5bf1ccd5fd95f26a48b9fa4cc24b70051140710f95bd8c3899ba armebv7-eabihf--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 eebbdae08ba9ae84f0eccf2154b7c295fa60c787f6767015ac2b2df113809cec armv7m--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2024.02-1.sha256 -sha256 b421fb864bcd3d7ad5e964d344b5790724e05642380784cef547e9c1f99282cd armv7m--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2024.02-1.sha256 -sha256 9943453b4afb89670c4de266a24d0406a2fb0c44cd030c50a86e2524c709ed01 m68k-68xxx--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2024.02-1.sha256 -sha256 bf6d5f67104787dedee69f565e180af91c9e2ee12b184eb29c4a91e1cfb41d13 m68k-68xxx--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2024.02-1.sha256 -sha256 510677f9ab05f6d8ac726459897d936064c4adcc5c5d2b6e9f52f7bab9677eac m68k-68xxx--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2024.02-1.sha256 -sha256 a4701199b74e5d242c5b61b3d23a03b4958b8d2c438c9744f7b6198ad78d8b5c m68k-68xxx--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 2e0727f0ba9549ccb8abd7f7bd3f1be13b516e20665e1da4a8106a247a7fd334 m68k-68xxx--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2024.02-1.sha256 -sha256 35ec4229ef7ae582ece4709b5906a9423c6f2284831a9b84ca13a5a5d98710c7 m68k-68xxx--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 1b742f3fc3eb62c6c6cd7c3a0436ec92d647270e6acd8295b295399c58f3e224 m68k-coldfire--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2024.02-1.sha256 -sha256 b2acfb9d72156c6cf0da98f50487d4cd437fd9018e85e861bb1d506b85d52fd4 m68k-coldfire--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2024.02-1.sha256 -sha256 22f742453af1c315ca9376e0bff1e5fd04fee72b3b6c037b7ac99750ec96afd4 microblazebe--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2024.02-1.sha256 -sha256 826cdbb09adca7544cd8d09a38958423f52655a8ce17ea95e4880348ea5ec594 microblazebe--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2024.02-1.sha256 -sha256 112e3496aa3e5e7515fe8d06060cae5e6a794cd2c82f7b0cfed40ee75775138c microblazebe--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2024.02-1.sha256 -sha256 627ccc508f29a9e4f881af97e0faf46fd5a7926f88dfc594a38d9063cb74db59 microblazebe--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 1f0101f66f0d8e1ff316bcb24ca0082ce58bc69724a15aa0d9a2fee5e1e70f2b microblazebe--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2024.02-1.sha256 -sha256 7f26818820b3a04c6e3e2ca268efc4b733fcba5a1a6568d4f4f243b8482b88fa microblazebe--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2024.02-1.sha256 -sha256 102d68fd19e0bf2b14d49e2a29317196ec63baa1cbcffcb0ebc3ffc158b31750 microblazeel--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2024.02-1.sha256 -sha256 0795f6ccb2584d51b378974c36532b1c994672694b1bca63953a162811b9fdcb microblazeel--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2024.02-1.sha256 -sha256 c35b0cd70231e307dc2573d876fd0d0efc3c9f32cc32e21e577228cefdbe1c9a microblazeel--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2024.02-1.sha256 -sha256 b9791b921fdb8c001949eaaccfa0746f142902d5df297455e1b9c4f029c1db93 microblazeel--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 fbeabfc16b10e61a37c2924d60290fcaab40ddfcb8314e20ea1461a4fb588eb4 microblazeel--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2024.02-1.sha256 -sha256 ce20fcbed964958860b1883a80a48829b3331d6a10abc7cff0522768707211b6 microblazeel--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2024.02-1.sha256 -sha256 aa990348607011c16eef583ab564fa7bef49a24141f247edb96f62970b3108fc mips32--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2024.02-1.sha256 -sha256 595cedbc0e70d5c939529ecc8d09c3a8eff63f77c3d0772b7ae306e1b3b5aef9 mips32--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2024.02-1.sha256 -sha256 1df8d93bdaca510993b2f189fea08c5a153a18bc6c54f3a6a833a5c7a26349df mips32--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2024.02-1.sha256 -sha256 a0fde56bf905b9057aed8688b8e60a93fcdca1097bcc4748f24b23e26c12f462 mips32--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 ee7a1fa00cae9b6b190b436537ad9f7c8eb2c86f72327de7b583c786e5cb6780 mips32--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2024.02-1.sha256 -sha256 3dcaeb45fb690b2d47426bae75adaa0c7042cbe9f5c774faf2d70c0174c88196 mips32--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2024.02-1.sha256 -sha256 6f3875119a362c76119fc75d52d191b4b9a7c23615a19aaa85ffae97c360fe14 mips32el--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2024.02-1.sha256 -sha256 d92f8531fd703bc7b25f3d70ffac49ee7536171c8d854967312e3c98d8641c57 mips32el--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2024.02-1.sha256 -sha256 e315f917711fb99783572485b8adbabd4f19cc035356cd30a0d628823ed6fd32 mips32el--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2024.02-1.sha256 -sha256 25c0b3217df1bf1a7bae2cc4f56cdeab9fec98b172bbf0b336b2e8fe41d3ee4e mips32el--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 43618ec1849db61dd55cb34e3aba28d741a713642b335dcef79687358cbcdf38 mips32el--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2024.02-1.sha256 -sha256 1e5cfcfe9f9cc7ab7abd843b8ae22fe959aa9c929dc3d4f353653899bb9771a1 mips32el--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2024.02-1.sha256 -sha256 6c0eb902af46dbbf069080755c9e16ad5e7f725f055a3e2b47d552f54a733ab9 mips32r5el--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2024.02-1.sha256 -sha256 375f1f5f42b0d6559111ca12acbc2622057cf2be7b30b99cb32b823a76d7bdf7 mips32r5el--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2024.02-1.sha256 -sha256 fb440165ff535234f88cdfd99c37cc96a3c349d2487f52b62bf879261cb6b837 mips32r5el--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2024.02-1.sha256 -sha256 c6b03bfb2f00476cc38b38f910c8a3884b8b77d7aecb307fdb6f06b18ff3456a mips32r5el--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 744d98a6c6eda7fd0ae50771680c6661439906469de9df1d5f1ff758ce1ddb52 mips32r5el--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2024.02-1.sha256 -sha256 89bed915ce8f2a7f09a0ae154a7a5435288f15de381c0ba5af4eee37cef81be3 mips32r5el--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2024.02-1.sha256 -sha256 c345005e9fedc78ace9c5478882f094769d056979f85f432ee763837407bdd09 mips32r6el--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2024.02-1.sha256 -sha256 64321a05be857085ca1e138942456f7adf0d75188684955d404651e9a7792029 mips32r6el--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2024.02-1.sha256 -sha256 c44ce7050fdb0a729fa42bd6f15238c95f8c2e3540dd703db1861c273399206f mips32r6el--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2024.02-1.sha256 -sha256 d25a9efb1bf06a845995de0bc5d24e8417ad538b8b68f12c02bc1b9aadabc9d7 mips32r6el--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 2a4296e6517a8dc18cdcc304c20834987c29bf994819209a1f30abff29761394 mips32r6el--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2024.02-1.sha256 -sha256 16ec7dddcafb4c8834aaa79317f78a180907f3ca2f82fc0d37703d47424fe684 mips32r6el--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2024.02-1.sha256 -sha256 f556d8fb16eeb8c31cc8edbcc4855d4eac15de4b10cc694e82690132022c835a mips64-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2024.02-1.sha256 -sha256 dae5bd6ff5a79b22b60a42834b98b1b81e5ed7445f477130fbfea9b081364b29 mips64-n32--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2024.02-1.sha256 -sha256 4e1bb50ff41b2e8f26c8c48217017abe16e251c3c9a453c1bbed3629939bb35a mips64-n32--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2024.02-1.sha256 -sha256 7c9400fec57e1d28ed59fb47e0f40bfb7c98781d8573a8fd5f98ea82cf88058f mips64-n32--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 a83df99f15d1507f39461ab6bcb09d3fc25c4df90fe4fa975bd23294dfed182d mips64-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2024.02-1.sha256 -sha256 7f6731cd454f98a503579b94822316d95ed1dd3afc6e325ecc5bbfa76065ca05 mips64-n32--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2024.02-1.sha256 -sha256 4a2651f656e84649bca3686960c8b40eb8ce193a60a3942e2b98895dc584717e mips64el-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2024.02-1.sha256 -sha256 138d29328daf5d08ced6b79214cbb3884f168ae90414022041e35dcd2bbb5943 mips64el-n32--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2024.02-1.sha256 -sha256 033ad6b1add333d9a7c969b987d51f7ebb3a0f819488ad287d5932afc0860825 mips64el-n32--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2024.02-1.sha256 -sha256 70c2a720c018bba0384e9aae147cfa706141b6918da11b09fbee16178473e769 mips64el-n32--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 dbb806a185f1770accdc54668435293966955f891b214c7ea33dfe2a836f5bf4 mips64el-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2024.02-1.sha256 -sha256 b7ca42af6258fa7204716f4145478f1510c6ff4c093a9efa70a03fcf757b25a6 mips64el-n32--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2024.02-1.sha256 -sha256 ec8635038743dc95e181963096a13cd9aa806ee1fa41251e54ff57bb092f762e mips64r6el-n32--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2024.02-1.sha256 -sha256 064bca63fa00ccf1c6982eb9b1d1d71f61096f2826b9134322e16a38b1317937 mips64r6el-n32--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2024.02-1.sha256 -sha256 931f2bace4d0264321ad5434d960c7180a85f0d25192bf951cc8223b7b0c96ff mips64r6el-n32--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2024.02-1.sha256 -sha256 fff80653c6814bd87522fbdef6b89de386a60ed53fa7fcfb35603d055f55a071 mips64r6el-n32--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 1674501dde087ee3160ae77f7940960e43839e83443f225e6d9745d41d3df118 mips64r6el-n32--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.02-1.sha256 -sha256 ff6c4296a50913ccf9a20a4270ff74ae6a35878b66140216b349a89a72e2cef4 mips64r6el-n32--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.02-1.sha256 -sha256 72ef91ac2c7f00a41449b7e87845bcb6a944ce9ed94b62e19652830ecab42a03 nios2--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.02-1.sha256 -sha256 0fb3b7204a80466e56da5a63683437ed0934617e7d6979ab0d140e3ca5440144 nios2--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.02-1.sha256 -sha256 7af2336389d5d64c48722d257fa7ad10e83ce1c25ac49aaa5fdcc70bd09220bf openrisc--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2023.11-1.sha256 -sha256 35eb515b554a8dcb60cae731aba49b9588cfec379f434d106de9a971015d7cf1 openrisc--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2024.02-1.sha256 -sha256 02abf22a8620893cc974038ac9401c2c74eb39f2a549a20939f460d694bf984c openrisc--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2024.02-1.sha256 -sha256 34dfd1fd3977792754eb03c5ef877045a476a52ffcecf18418bca81514ae0308 openrisc--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 2d9c293c1123c30e813414610a4d060bcdef6461c82e258d405011be38fda6f6 openrisc--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2024.02-1.sha256 -sha256 e885e4bdcc73eeda5a18689abecadbf6686518c049e9c785c7485d80ea74d3dd openrisc--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2024.02-1.sha256 -sha256 9e5601beacf2b4d96f7ed12851c722b8f83beaa9da8f7ae7734816fca2d4da1e powerpc-440fp--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2024.02-1.sha256 -sha256 8961f117690f91afa8dcca7ab875dacf1674480c0bf53548fec2d53932823a8b powerpc-440fp--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2024.02-1.sha256 -sha256 5abd9ec89e402a9de7bdadd595d39de9181f0d351573751c8499aaef93c0d441 powerpc-440fp--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2024.02-1.sha256 -sha256 20647de8d019a15a92126b0be5c24e16b61b92730c620b156e11989579dc3ea8 powerpc-440fp--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 2108261d7785cc2c1f81c7b62da5c4874fe6ae3eae8b9c704df4a8bc8a4d7624 powerpc-440fp--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2024.02-1.sha256 -sha256 2d47170edf21a2377261cd6fd0fe0fe552aefc5f5204b6299bdbc2af4f96317b powerpc-440fp--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2024.02-1.sha256 -sha256 f6c6f5d741d7f7798d5d9e3e859b063907ec3653436f752a70f0789c5d7accd5 powerpc-e300c3--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2024.02-1.sha256 -sha256 f780144616fa6e04f9f237df5ae08b1871f087204e7cd41ad2df06ee4fc3ed2f powerpc-e300c3--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2024.02-1.sha256 -sha256 f8c2aaacc7dd5922c7c719b35b92186ca86ede97ae955f753d7387f92943be64 powerpc-e300c3--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2024.02-1.sha256 -sha256 f29603df78b64381bf9d7c6128a7a6798320cbeb1779680511b8181a02d30c3b powerpc-e300c3--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 090f5a4f83bca5473166375e09bf234e2ea14406761a959ac08b89b02c696363 powerpc-e300c3--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2024.02-1.sha256 -sha256 03a688e3f3fffae1c441abc540dc8be9cf8e524e36efc52aa5bcbe9deeb356b9 powerpc-e300c3--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2024.02-1.sha256 -sha256 90b2cd8c0be088049ed0859eaf4cd09367327c54a956e8a3956083bd99fc96df powerpc-e500mc--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2024.02-1.sha256 -sha256 f1d8d2518ec5401c0a5f489bdb4087f082bf97b6803af0dfc30b82b25d02d8cb powerpc-e500mc--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2024.02-1.sha256 -sha256 81d63ff9c17d0089c477c769c4dea466c5bcf49624334d86963ae9fd474c6dff powerpc-e500mc--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2024.02-1.sha256 -sha256 049afaa48adcf1ef21562c004e695aeb08a152cb2f4dff39c35d6ea62e57a35b powerpc-e500mc--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 a34b562df36f65841a594864260001f203ad2dbb4e910d2dc7427153d465b208 powerpc-e500mc--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2024.02-1.sha256 -sha256 6028c4014ea1a0fd21b18284c1d02fe28167165e8065d9901d0361c03a9c6075 powerpc-e500mc--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2024.02-1.sha256 -sha256 762eda55a9eac9b079b1b2ad676f74b3ca74bd90382b08763ce2926be29b5898 powerpc64-e5500--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2024.02-1.sha256 -sha256 7062230408225e330705f0b076c9bbb5adab644790f3d3a2386477bcc917ff69 powerpc64-e5500--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2024.02-1.sha256 -sha256 58c29657c99c57f781ee6e4de91e889826ed063a64c7dc162cecbc639a8837e0 powerpc64-e6500--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2024.02-1.sha256 -sha256 5f4f605b2f3e94652ec94cb2f9880e719e6e61451026dc51fcf9c913152b60e9 powerpc64-e6500--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2024.02-1.sha256 -sha256 834aa216bec987f5ef04d9179bfea2efa850685e74bd153839873683ad112c4b powerpc64-e6500--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2024.02-1.sha256 -sha256 358af0323bb08ecebd9ec6d383333c13086a650968ae9cea8fdd5118dcbc2dc8 powerpc64-e6500--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2024.02-1.sha256 -sha256 c37381eef32ee54e4bd7794306647a8df6258c686e70d3ef4a61e58b3e49407a powerpc64-power8--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2024.02-1.sha256 -sha256 d451dde868287a5454c39dfc1d1fb888d054191756de9da982c0fe015223157b powerpc64-power8--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2024.02-1.sha256 -sha256 405c7d69aa6538aac7020f53dc414b4dfadd48e95a670e5dd3e70e33402e0a4f powerpc64-power8--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2024.02-1.sha256 -sha256 d73cc758c021163ba9672e0d0de527d45868649bed76eefd1af63a035d40226a powerpc64-power8--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2024.02-1.sha256 -sha256 f619d173a359c30ba71fa0a6bae26a71647b4f0d00d063564e0deeaeebd10c2b powerpc64le-power8--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2024.02-1.sha256 -sha256 1224e21a64d551fa0e50aa4e1a2b684c2a3e2a395244c3771e82e7d92201359b powerpc64le-power8--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2024.02-1.sha256 -sha256 5884756550dca096903f3430802d5ccccb1232aa600f8bc2dcc2f8fb8a7cfcc1 powerpc64le-power8--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2024.02-1.sha256 -sha256 66c3325c8cd22c78e6377d594745ca881227fd9858cea57ce84daadf3b61de04 powerpc64le-power8--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2024.02-1.sha256 -sha256 ae046c9e6616f6b33d82c0d581efb41c4c6428fa1c1345417c82533cc27fb86e riscv32-ilp32d--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--bleeding-edge-2024.02-1.sha256 -sha256 828e3409f995cc15e7038ede150d6fa8bc50a3d69ef2b98b79db7c935bab336c riscv32-ilp32d--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--stable-2024.02-1.sha256 -sha256 b758a7576b5ffb62a6453264df53a0b28d417d66fb17add5f8858987f28c0eb3 riscv32-ilp32d--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2024.02-1.sha256 -sha256 f815ecf9dd9b8f633b914e178e633095241bbd18d97b9bca05a66a5ca3990524 riscv64-lp64d--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2023.11-1.sha256 -sha256 80e84af7ebed4e8e52fc2d17994f7bcb2e7bdc069e2d1f1c4656977cd73d9d5d riscv64-lp64d--glibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2024.02-1.sha256 -sha256 81d567e395637fbc5878d1ee38f99592563ad13df8a2e15d7b6ca5afa9d6a35e riscv64-lp64d--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2023.11-1.sha256 -sha256 09522ec60b13766090acaa715402cb11edaa39217642fbd7315fbe37b6032275 riscv64-lp64d--musl--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 ea0a1e380a2e157e4541d4705a5ce744ee4109e732b185052a860ad5aabf509d riscv64-lp64d--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2023.11-1.sha256 -sha256 aebb6034d3512e3c29337c368dcf4a1e58756c725032d814047a3635178cb5ad riscv64-lp64d--uclibc--stable-2023.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2024.02-1.sha256 -sha256 2fa0e05c3c5e219e5456a15c284482604ab11a0a00aba4dbb82350fc60151208 s390x-z13--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2024.02-1.sha256 -sha256 485d6abeb924810228a6d7c6c503e5f724a049a6e14b150c888b33bb9970e14e s390x-z13--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2024.02-1.sha256 -sha256 413176d97f73a372d6ace57649e51b6132f2479fe26b113278055c922bac3f44 sh-sh4--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2024.02-1.sha256 -sha256 1519bf392ca9d29494976f5904d6d683dd74e739eccc09b4e3c90ddd65adadfb sh-sh4--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2024.02-1.sha256 -sha256 ad71172f0339ea267243af40f047797aa1cac4afdcebf4de93d66b11ed64cd8f sh-sh4--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2024.02-1.sha256 -sha256 5ab53c70013fd8f5c5409145f4faa60fdb115c54cb10fe4da07acd7588b46d7d sh-sh4--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 07a3e55f36b7d7718d369408022bd4795c98e79adacad56839ce3805a560f73d sh-sh4--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2024.02-1.sha256 -sha256 de811fc1f294fda4bec6c84131f9320277b87687e04a50200a02d9af3d743ebb sh-sh4--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2024.02-1.sha256 -sha256 182333d197803146d36df9186cb583ff482efbcf4d5ca1db4791ef7cbe17fa8c sh-sh4aeb--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2024.02-1.sha256 -sha256 821a749fe873457740204146b3f70b061ddb572fee6ad63ebbf5e1c5ca1bd608 sh-sh4aeb--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2024.02-1.sha256 -sha256 d2d69a26ce5cd0b4e6ce88789a65a0cdcc9b5c877887703f9277aa93bbd7f82c sh-sh4aeb--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2024.02-1.sha256 -sha256 3689491d91cdcb3579fc3105cb2b9a16e95e4c92d881602f0e0f254caf50d1d6 sh-sh4aeb--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2024.02-1.sha256 -sha256 7371c311b20412732451f445f1e28c8b4c8bdc8e164630b23065ba4bf8d483cd sparc64--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2024.02-1.sha256 -sha256 b5b8056b85cf24e548de8b66919b1ddf59f3ba77446d23abd86f18f094a06eee sparc64--glibc--stable-2024.02-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-2024.02-1.sha256 -sha256 7aac949737ebfb3f4bccc6a75af79d50cf1fadd9ffbdf21e26c1508dff67f23d x86-64--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2024.02-1.sha256 -sha256 19c8e5bc1395636aef1ce82b1fa7a520f12c8b4ea1b66ac2c80ec30dcf32925e x86-64--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2024.02-1.sha256 -sha256 91bd25e7a649e2f2aae93bebf58b4e9f57fae8daf8bf7e573975348e0bc38890 x86-64--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2024.02-1.sha256 -sha256 f54778c2e50c4aa990c4b74545bb7018dec12324b89f879981430f5411fd27db x86-64--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 0ebf73f28a369120b0d33ee6800b9b10cf36851cbed3bcad7828c61a7da69588 x86-64--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2024.02-1.sha256 -sha256 458d9de771c7c35ecd26de1d473b913bdeb01a78b22107f998dd93bacee0bc96 x86-64--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2024.02-1.sha256 -sha256 cefbe65c027b8a785088f7d690fc1eacef2cd39bd60c8a95cb09d666d6b98bb8 x86-64-v2--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2024.02-1.sha256 -sha256 772a44754d393b012cf0f04fc3ec6acf29461a352bbc44cd255d926db7e9a0f6 x86-64-v2--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2024.02-1.sha256 -sha256 893453ba045a2035c3b87a3619c9fdf1bc641395bd7c9c56ed59e9f8f7a90d8d x86-64-v2--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2024.02-1.sha256 -sha256 b5ec30e722386ea98f0e3ca3d6b3e082e6996fefedcc1b607811eb8451c22de0 x86-64-v2--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 15ffb204fa40aa53dcbf1dcacaf23599d70f8778e21d57cadfb89b98c4a7587f x86-64-v2--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2024.02-1.sha256 -sha256 3ff823a12ad3f668f6b3d8d596fe2d44236f1a24563b30ce72f9299ba73e0b14 x86-64-v2--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2024.02-1.sha256 -sha256 27bb18f261a412fa752f1c019ef4a9250653f16229f2ffb41eb584396787c68d x86-64-v3--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2024.02-1.sha256 -sha256 5d515f6e4b311d7636a3cf600cd02fde7d0beb0a2f143df4921ff5a61cbaebcb x86-64-v3--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2024.02-1.sha256 -sha256 5b5d89737faf3998fbd1590a26dc9bd6a56e400b7fd7c2c2065ba4b98bf839eb x86-64-v3--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2024.02-1.sha256 -sha256 45b0db10e82fd28ac930446679f5fbd6ce373ce63e8e3d88e4df1b7455c1b100 x86-64-v3--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 08cc939858ef3e4fef17dd7544ea15b6b8af1bc823ab6453479919c7aa2d669f x86-64-v3--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2024.02-1.sha256 -sha256 830b80a76fee9d1c4eac1b5d0351c3543bf2ebcc8f47de2163cbe85dec83143d x86-64-v3--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2024.02-1.sha256 -sha256 dd645f770d95dc0becc6216f3f32f87f6ffcc713ba3b6c53e96e8a3fcfc24e08 x86-64-v4--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2024.02-1.sha256 -sha256 ed68f8d487f52beb95e5ff80da01b959222f53e089728b63ce38b99f80b597ca x86-64-v4--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2024.02-1.sha256 -sha256 19b7633ce87c46ca5483149ef5b9e202bf245d8f099d4cc2ec6a1d986fa97827 x86-64-v4--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2024.02-1.sha256 -sha256 99468cdd4a77c5b28bdaebf7ee09c5cef2e5dd34335929f8fd5c2e661980c838 x86-64-v4--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 d6d72b9150b7f59cf060b63fae73f7656f58043e61c4f3c68478d15947268398 x86-64-v4--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2024.02-1.sha256 -sha256 ab29371356518583742bb99d6490805d86a7bbdd84d0a6c00fca84afa34cae52 x86-64-v4--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2024.02-1.sha256 -sha256 45cb05f2d1ff7f62131d172f90fae321753396ef477b549ca79a50fba48edba7 x86-64-core-i7--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2024.02-1.sha256 -sha256 ecaa610ca27b5b65bcd198fa9d71635f6cfbbc90e45fc930b40a50860ee054b9 x86-64-core-i7--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2024.02-1.sha256 -sha256 b6eb510561931a7d1c66afabfc1206731473a64fde41093474d6819e085e9d15 x86-64-core-i7--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2024.02-1.sha256 -sha256 19799b79a953b3356409ab8e17b48804e20dd0452f36b5bf707ae3a82d007fca x86-64-core-i7--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 ba8c70414f46649e3ea7196c01c911e91a75ac06b7136c21522ae3606025d6af x86-64-core-i7--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2024.02-1.sha256 -sha256 7af3cb11a74bd85878be6a0c7922ae4e71d843b49d3874ef2a0821f0f1c08681 x86-64-core-i7--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2024.02-1.sha256 -sha256 f28e0f3035b9fc8f5bd98b584b8d45cb15ae265a084592afdef37639a05c6e08 x86-core2--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2024.02-1.sha256 -sha256 4278f1d84b1ccf077de319a9ec9ba2feae282a38a2caeca31d67a24c6021454c x86-core2--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2024.02-1.sha256 -sha256 9a7654eaef4bb646b2deae602ae607d8cb47f574a54f97050380a3bd6792aefc x86-core2--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2024.02-1.sha256 -sha256 16efa5faa30893ec1d4e575ee1b33e782288a261a52911686c56f82e7d5eca44 x86-core2--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 5258405863b3bb7cfafefb9107c152e2dbb3d0565384999f41d8b3ab0c96df39 x86-core2--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2024.02-1.sha256 -sha256 453e8fb81e07093f6c37aa00e8f54768f9ab4ce1bdd38f3d4269c7b7c509fb1a x86-core2--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2024.02-1.sha256 -sha256 52df822a10c09469ab6231753f306b668163bfdfe492db209b3a06e3a4e7aa05 x86-i686--glibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2024.02-1.sha256 -sha256 3341c76890fa04873e0cf56b921a54e046d63d8ea8ecf16e82fb66a1b81a9695 x86-i686--glibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2024.02-1.sha256 -sha256 ace16afe9d7728a5210cc9cadc4bf80754f0dc449855e10501d9669f203fc932 x86-i686--musl--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2024.02-1.sha256 -sha256 e9cfe8d65170dde92759e0e425c425c15439190711fdd66999cdb6f5551653a3 x86-i686--musl--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 510ca03d4d8952bdc91ebc5ac3c9ab5019f519d174071e88f566ae9746098d29 x86-i686--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2024.02-1.sha256 -sha256 6ffa7ea5d610bfd25d16769130559be1fc1c00dd5b81ebc4ec25d05e5dcd26c2 x86-i686--uclibc--stable-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2024.02-1.sha256 -sha256 a97be06a34db230c0022d544efcf85bcd0b0d4dda86f820f0abbcab1b59d184f xtensa-lx60--uclibc--bleeding-edge-2024.02-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2024.02-1.sha256 -sha256 e871ce555353a025b86d905ea3f5131dfbf95340bcda706facad070d82b997c1 xtensa-lx60--uclibc--stable-2024.02-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2024.05-1.sha256 +sha256 4f64a9ecc2817db5a4cbf128fbd0162e9397cb2cf8316e005fc3fb3d16f097ae aarch64--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2024.05-1.sha256 +sha256 b0fad860eb94b503a56d66ca8b9ba06d2d4826943e37ebd1d7217423f6ea5bb2 aarch64--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2024.05-1.sha256 +sha256 7a2819d883ae1ddfc91b9ce325c972289d4aae0c692936e722120862a73021eb aarch64--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2024.05-1.sha256 +sha256 f847da1195325525f3f07eef045ef40c6b48464a37e0f7fea77360dfe0bc1aa1 aarch64--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 f5480ea84fc71d85361de9a0d89ff7e1a9b9640de86db76b4dec6dd099535cdc aarch64--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2024.05-1.sha256 +sha256 748de907a7b601490cbc6bdc816d31127fab6937c831b5c5d21d7f70decf15fe aarch64--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2024.05-1.sha256 +sha256 02f588c6900d33286b89db5a92e60fdf611a47da5d05c1ee644ba14e2630ffca aarch64be--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2024.05-1.sha256 +sha256 a44e4b4cc016aded66f00109c1c5f64f881a8b7effc60bae2e84a5936fd3b0e4 aarch64be--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2024.05-1.sha256 +sha256 af4ca347a5b1e725b0e0c7a4bccc9813005a3fbeb7d1127b4e5c4b07cc22eb5e aarch64be--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2024.05-1.sha256 +sha256 f31e16c451f151157069d9890f8f8fa759b1188293e083194b4e64867f0da216 aarch64be--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 45a00779ad073ef2edcb4d42db6e74b02e26de639a6f5d3060d42ce0d9160b52 aarch64be--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2024.05-1.sha256 +sha256 ef200bd2d5d4762a3f5844703d3c7ef683f15189a1a0fe3857c2eaa117fd45c7 aarch64be--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 18a630b725d97b9903f44d487292c891f4994f83334363d0311014664dc8230a arcle-750d--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2024.05-1.sha256 +sha256 74b2afe4f915708e81d9b595396ff82fbc841f698a0b78d778a52cf7be668081 arcle-750d--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2024.05-1.sha256 +sha256 ad0c27042c1ef42b1e7ea5a6b2a7e77a82d8ae137d08c2b95d7d4baea60b5472 arcle-hs38--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2024.05-1.sha256 +sha256 247f590dede487c76579aa6c5233f634c6525cf31430496ae6dcbd0e07e8dc5b arcle-hs38--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 38578d0503f123d3eb94afda435a7fa170337810c290e433f119f609856098a8 arcle-hs38--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2024.05-1.sha256 +sha256 982f6c2d3b161e8e07982f6fe846c18245d17b0ed602cddd64ad45c568c06b01 arcle-hs38--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2024.05-1.sha256 +sha256 1466a2c312a340d5314583c4ef3fbf955eaa0c16627712374e1f1d74d9a38505 armv5-eabi--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2024.05-1.sha256 +sha256 13f2bea0b06fe560fe60d199cd9d3fb1f20e2335bcc79b90c5130c3916a3ed92 armv5-eabi--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2024.05-1.sha256 +sha256 5261ae65d4e454cb9d16a25a6f93f615742a10c64fb7ce08b7ce776c388abbdd armv5-eabi--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2024.05-1.sha256 +sha256 9825d9a4515a92d2251aab3228ddbb6258440b0f952b95fcaa94653a4b29c71a armv5-eabi--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 5dba09b35b3d5cfd3c44b4429bca73f5d9d5eec591810148928b3ceb8ef688ed armv5-eabi--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2024.05-1.sha256 +sha256 c0c616d4f7d6702b8991f83a5a3777137f734e1eb610d4a20297eaef299ec59d armv5-eabi--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2024.05-1.sha256 +sha256 8c531910b5883352c39d84657c4a8052b67a318314273342890abec318159ead armv6-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2024.05-1.sha256 +sha256 2924afaa0d47e046339fe70bf526db5a19edaa58d87c6758a861ef41e2781368 armv6-eabihf--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2024.05-1.sha256 +sha256 aeba34ea164503511233566148ccfddba3932ffe13f9d22bfa1a3bf2a31c63f7 armv6-eabihf--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2024.05-1.sha256 +sha256 cc7444189685f9405636568a582395e4e2b95347f8be0e6d63ed4e2791ab9267 armv6-eabihf--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 ba481ea8b2631871cdddc9ff9600cca3e7f4bdd558602ba936563ddd58039f8f armv6-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2024.05-1.sha256 +sha256 38e3c482368c96f177c164ed098e7022f45adf83d8715cb2f74238a5a7c0622d armv6-eabihf--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2024.05-1.sha256 +sha256 10703f0184162ea6ebabb84696903154a8eb7b53175e76ccf5ca0a2294fc68ec armv7-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2024.05-1.sha256 +sha256 608263bc9dc3eadf0962ddb1165f1c2291001190f9927dee47d464e26374462c armv7-eabihf--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2024.05-1.sha256 +sha256 2a8274d28abd4779010dda6b54bfe0d259559181f99908440d39974f2619567a armv7-eabihf--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2024.05-1.sha256 +sha256 5b34157a4c9f53064002f12f57c42836cd551c591a4be6a99b3ee201add506aa armv7-eabihf--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 f36b736c6cea721e743b2a075285d7b4d65e3b20d3b5353503ebf1c5ee509d36 armv7-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2024.05-1.sha256 +sha256 eec6e21cf9d36ab2e8b9dbf4e26311d3d152927c72550bfe84872858e63bcaf4 armv7-eabihf--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2024.05-1.sha256 +sha256 664509d1a9abe7a01f6b2274aff9c9f26ec86bae42c601100dd7a2c5930d9d9c armebv7-eabihf--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2024.05-1.sha256 +sha256 50ca1e7c8bf78cdc941edf93d0a350d2c6b5b8024b582a57c7815f6e631ba43b armebv7-eabihf--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2024.05-1.sha256 +sha256 d8dc252c024a031524e56284bcea7b4706146d35fb6b04c5f0461f0bf7a31a8b armebv7-eabihf--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2024.05-1.sha256 +sha256 c804e2e963fc21db22a9d4611089e3b207937c63f95a87de62c4e789eff79a56 armebv7-eabihf--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 d81849ea8fe7f8eb4b306712435491479f380ce60e203a83f651df51de7d52e2 armebv7-eabihf--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2024.05-1.sha256 +sha256 7ad4a602c2055bc3e9b39e64fbef3c14e61b10605d1039db95a64b7efd1f6e7a armebv7-eabihf--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 fbab243d632e5dcaa56a9468e0a7f6afa52ebc15edb33f70a7060194cff66401 armv7m--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2024.05-1.sha256 +sha256 9891f5a43d1002a652353064e6543a1371c795938ecb595dd2f47a2d0ecc1e62 armv7m--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2024.05-1.sha256 +sha256 88d1e108412116778e01bd72f90c6bb06c97e3a846dcc061644eb2a18499dc93 m68k-68xxx--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2024.05-1.sha256 +sha256 77f22dcafc78cde84e6441bd450aa3edb628b8f36ef6c1a160c942f38b38e5ea m68k-68xxx--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2024.05-1.sha256 +sha256 f61aa3160dd75267a0b6018ca198f36ea99510f51d5a70eef8f2ac02d713abb3 m68k-68xxx--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2024.05-1.sha256 +sha256 4456ec5b09fba57222ec8c3b9cf4d19a118a5dc876a58939e7fd77033af80652 m68k-68xxx--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 9d7b25be2a49f2c059ede1bc87487e0d23251b0f7376e3db9b2c61f0841e9014 m68k-68xxx--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2024.05-1.sha256 +sha256 92b41ec8da2da233c65ce96ad9db5e849d0d687378c799f774df6efe7c8f0e28 m68k-68xxx--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 6ef31adc06bb53b0b9252bbf7cdc93c22f0d6838dc9f51a4dc6e0fe2016eceff m68k-coldfire--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2024.05-1.sha256 +sha256 370953f7c1e3bcf8b4e6849906991019f742fbde8532850aabd4eb3978e4a933 m68k-coldfire--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2024.05-1.sha256 +sha256 f8fe7afda005b6f3fc3a602c6d8d1e1d524b2ebb5452a736351994723a9faf72 microblazebe--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2024.05-1.sha256 +sha256 7a24a6cd76175d77134a0d02852204c548c9d2722e08ecc02ccf49f4c477792d microblazebe--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2024.05-1.sha256 +sha256 5e51c0576acc7043d74644fed43b10e0aa75c4025741edcdd3e636d528270973 microblazebe--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2024.05-1.sha256 +sha256 f1e0d9406fdb211c9f44b71d4d3b4b68ac5dec4e379b24ff8a488f7945b99dfe microblazebe--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 fb2a4dc7407699c36046f1fc0ff10833805dfb9c8aa4e2c30adcda45de7474f6 microblazebe--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2024.05-1.sha256 +sha256 17c6aa01b8421961b17eca4950cab8d292aa87d073f325525de1e77c5f7a5546 microblazebe--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2024.05-1.sha256 +sha256 686905d647c24fb1f95dedb95c4a764d263a577cce673ea629d87c1a8986e9c8 microblazeel--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2024.05-1.sha256 +sha256 2468c298089873e4d86026b84ca68e46b4802413639a55f2db1c6aba181d66d6 microblazeel--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2024.05-1.sha256 +sha256 ef1d35997bea684dfe5ee759b6668c309ee308956a3c82188402f5c42eba92db microblazeel--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2024.05-1.sha256 +sha256 72611e45e0a77eac21b04bfae70395b8bcfaf2c969fe51638db48a94ca9030f4 microblazeel--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 bdf72671801ff48b232f12f13de5f3aaf3180a8e93c680ab59a1023aac3ddfd7 microblazeel--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2024.05-1.sha256 +sha256 49657597e55aa7d771cb4546c1d37d7ab9408b426d8c45f1bf61d90a53322a65 microblazeel--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2024.05-1.sha256 +sha256 550803b9531b5a6c227329484c69e9d70ed08a29a456e9b941c5fe6b68f8258c mips32--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2024.05-1.sha256 +sha256 677402719c545e49eb71c3d27a5f495af38f60463b40ed705e24e43a9834c137 mips32--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2024.05-1.sha256 +sha256 28374e4431305b2d99bef9f706e1827390fc71848ce88d274a55c98674948bbf mips32--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2024.05-1.sha256 +sha256 f553aec760bfc9f452f1ab071b25b84fd36ed56ab4c75149b351144561b4e0b5 mips32--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 2080fffa0f9b4e9e8e994e855fd3560f3cc1daedfa8382b57138dc3e09c3b69f mips32--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2024.05-1.sha256 +sha256 52ed979092edad8100bc0275426e7eccadefa68b908ac35d18d29c385b30e12d mips32--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2024.05-1.sha256 +sha256 9dbfb7de343fef34e954989cd80ba8856baf771d8563c072cdba7b0a264a3389 mips32el--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2024.05-1.sha256 +sha256 d0139b6ade7f3b72a5f9c33814696af817661e826c9c501f6cefcab4ac684c8f mips32el--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2024.05-1.sha256 +sha256 bceda5815e975ff09530e5ba18d673ce4eccbfe42a2bb23c10dfd1a0ab54deb8 mips32el--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2024.05-1.sha256 +sha256 608b1b2434af563513df21ae0a6ab52af8a07b72a4bda760df946419cdd2645a mips32el--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 578d18e1ef57b4c616803ce21e6cd0b1d3599aeb017830554c01bb3e11c79a68 mips32el--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2024.05-1.sha256 +sha256 ae4400a934074a3b1b39fb7ec79fb535da4e65b668f2330ca14576d072f6b13e mips32el--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2024.05-1.sha256 +sha256 daff6281bea63185811e96d91bf23a79fef4d30ac2da0e9a115f78e9989eefa5 mips32r5el--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2024.05-1.sha256 +sha256 afb30c73afccebb84b146efc6c654aabd8b92185a26fb1ba357ac0a2ce5f7957 mips32r5el--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2024.05-1.sha256 +sha256 47f1291fa2a95e3ecc67fe4f410e4788bc65880bb1c5e465792c8376ee036448 mips32r5el--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2024.05-1.sha256 +sha256 6092b5d5e5f814e64038b205155016c3b1d10e3a3079478b4e1b0ab0b533c380 mips32r5el--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 98dcb8efe8f4897c6e7e6088238789c4f42593d4b08739cb7cb8dcd157765887 mips32r5el--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2024.05-1.sha256 +sha256 61b94dee2f60abd1e6698b283de6c5e2491cb5baf635d255addd5b4e7cc83afa mips32r5el--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2024.05-1.sha256 +sha256 0b374f870964ec8158beddf478beeec48a4ce09fa25a4a9c51c20a82839b3429 mips32r6el--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2024.05-1.sha256 +sha256 482cb60a8d0445b961fe1c5282826da9071f17ab37729b9c1c4ce7aabd014c7d mips32r6el--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2024.05-1.sha256 +sha256 19d6f280f4595a5fd0b43e16e9cd006163d94a96d4377399d93f5736716d79bc mips32r6el--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2024.05-1.sha256 +sha256 fd5b48ebbdd220b517f179f609bbd98895c65f3d152eadacc4137e51a9bbcd6f mips32r6el--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 adf63f7412d82e59de5bd19ea30068d205d7013c312af475d8b45656d20221ec mips32r6el--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2024.05-1.sha256 +sha256 b43c05fa3e3157b5cf3e45799dfbba5e305be16b5b80da98972e89de5d737658 mips32r6el--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2024.05-1.sha256 +sha256 d9d39286b9022dcd54dcabecfdc66e54cfc635a517128f005fd0ab1d2cfcc42d mips64-n32--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2024.05-1.sha256 +sha256 411d6e399455c032759f71ec0aaba004da4157f462d1192c2accbbff8827fd13 mips64-n32--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2024.05-1.sha256 +sha256 a07cacf4c88056ea612f64c50352e9fa2bb87766760fbae03577c50690f72d15 mips64-n32--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2024.05-1.sha256 +sha256 c058630e79b53333cca28ee1f34c3bb3b17bf03908a01f5c400a232d490d6a7a mips64-n32--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 8f571a7f93092743d1d2a59c6e88ed9096c0c44327f0e9b0b8eda97a2aa51c85 mips64-n32--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2024.05-1.sha256 +sha256 ac0aef32929d8521e8f7201b56d3e006d684e71f59b29b1d40d853d31b07f7f2 mips64-n32--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2024.05-1.sha256 +sha256 fb0a9e12ad0267691174a0c70fe604fe5527945d9997a7329b56e87241c49fcc mips64el-n32--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2024.05-1.sha256 +sha256 bc3035338f5874d1d6824fd75a9231d2a126e113b8d4e27f94c57be6795b97e0 mips64el-n32--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2024.05-1.sha256 +sha256 0525423b138f5e8e83babe591ffd8ea9aed6f34f20ee4af5e346479cad6f3dbf mips64el-n32--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2024.05-1.sha256 +sha256 d620b75ec5a05c0d76b132200e69c75c308c582696d616036d7b29dae21b730f mips64el-n32--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 f9afb690787968bb0365130fe5350ccdf2b2618e5ab658d696fab84bac4b09e4 mips64el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2024.05-1.sha256 +sha256 b1ce285a91107632ca5492f3e05d3488df314484f0ab8700f5fce5085fb271b4 mips64el-n32--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2024.05-1.sha256 +sha256 fd65b96514a6adf429b31dada2eeaae79a1eb00a21340998a24abe8420fcf06a mips64r6el-n32--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2024.05-1.sha256 +sha256 573721a0d53dacc34bf28f7f3e7e46fa79856e600cd515b270366ef7b900351e mips64r6el-n32--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2024.05-1.sha256 +sha256 e4353c990ea99fb5e39f9c64b6b92e614c0c6cd1760730334b6f2391aa10f3c6 mips64r6el-n32--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2024.05-1.sha256 +sha256 cce09fc456b592a993a7c8d182cdd1f04397a8160f176d9ac6799d8e2e09cef7 mips64r6el-n32--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 e12b6536fbacb624b0d938345fb29b202c8b174893d0d8fbefde46fbe727c729 mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.05-1.sha256 +sha256 a0db853f4c40d120d22e6762ca4bff64e0c3e3db74ab59950967917aeb9bf330 mips64r6el-n32--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.05-1.sha256 +sha256 5d034a538a8613ef324ae96f097c122ed99574ec8707e3274743e4d79efd374c nios2--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.05-1.sha256 +sha256 db7a12e0b22037f3aad01cd126b5f1bfe7dc514e37f8c484eb587b861f20fbcd nios2--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.05-1.sha256 +sha256 0de17cd13642f71f112d086c1df4b34670440ceb459478a0f3d55007945633ca openrisc--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2024.05-1.sha256 +sha256 a6e06a72285ca8dc9974f2060cb79aa85e0a1388553871a7c48785a077cbbe2f openrisc--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2024.05-1.sha256 +sha256 5765a9fd73d4b2fa8bb4fd0d94b8ee8b88307684182ed62e55e0775ecdcbf09c openrisc--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2024.05-1.sha256 +sha256 cdc2a9e3f69aa32df36580151d51d359e98147a604745f9927dc0314e5d7dd39 openrisc--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 e79e8c669368cc2dfbccb4f6080491b06e6d2d8851f73e0c849e066821ccbb06 openrisc--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2024.05-1.sha256 +sha256 51527b6a9e2063db756d836e250866783bcdfb40ab0f122d6d65c7401806cc44 openrisc--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2024.05-1.sha256 +sha256 58efcbb6133dcc070332b570ee491840c8cf386a75180e7bf56c403549d61699 powerpc-440fp--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2024.05-1.sha256 +sha256 ebf598b97cd9641bf5993aa3f78288272771ceee21053ced5ac53b1194ebedd3 powerpc-440fp--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2024.05-1.sha256 +sha256 6888a4800d59228fcbd2c843378357619b32b7b8265ebc3b57895e4e92ca1d70 powerpc-440fp--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2024.05-1.sha256 +sha256 54eb3b651655b426c81ea7453470510a62e97356418f4ca748a35a7c0d225b52 powerpc-440fp--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 f98de4013224c65ecf36b9733236a0beed62782e67e9c4a5259a188e73d8dead powerpc-440fp--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2024.05-1.sha256 +sha256 9ecebc59591b81e2d5b502b34ab29fcefd21f4c3343e7695beb2ee894d34dc3d powerpc-440fp--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2024.05-1.sha256 +sha256 2802aea45aab7231fe9301639beab9f632751edaf26cb49ede65ab45603f9807 powerpc-e300c3--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2024.05-1.sha256 +sha256 6c975a7293fde77a52f348124049645ee2ceee19e75ab6e0b2364043090a2dff powerpc-e300c3--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2024.05-1.sha256 +sha256 6689847112fdf6b1be5cd17cf351a1e85ec42a1034993e203efbba2fec011ca1 powerpc-e300c3--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2024.05-1.sha256 +sha256 60fb6b828e58b5548514fd65c50457d190791191d3a7dcec1fbf77f0028bc240 powerpc-e300c3--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 40ed47b662384ddc480c1cdaf3615d44956f51fc9c389688fe6054f3ebcb1f11 powerpc-e300c3--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2024.05-1.sha256 +sha256 45c3324fa19f66adc294bfb99c1ea45b1a1adafc2c2431c3ba1f56cd5588952a powerpc-e300c3--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2024.05-1.sha256 +sha256 86dab3468dd71a4a6677bdf75442297ff9a9e8deb6cd472846f6c73f09eefa16 powerpc-e500mc--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2024.05-1.sha256 +sha256 365e30fda99630e5bcf04c4913f905640025b90cc9d1a4b17cccfc729827d335 powerpc-e500mc--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2024.05-1.sha256 +sha256 4337db3eae7b0d10057e49f1c01f6ff539de1490d1dde3b1b692306b1cb41533 powerpc-e500mc--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2024.05-1.sha256 +sha256 3456bca0016d0c3855a644845aa627c25cd61ce763529a6bae712f8d6d9ddd8d powerpc-e500mc--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 774b1fb431e10c840529521ff2d8a80efaaf04d3d65698e60b3484e3ead85730 powerpc-e500mc--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2024.05-1.sha256 +sha256 e016795898f13326ee551aa0a21ee77e58e2749065136e162cb88e64aa21ff07 powerpc-e500mc--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2024.05-1.sha256 +sha256 1747006fec4219fa71ac77b98e6b404f9f030140a5f1295465e3ef4391d91687 powerpc64-e5500--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2024.05-1.sha256 +sha256 588b8d77fbc991c2f26b356349cfdcd08d89df0d88477c8adfa00c20d9031ad3 powerpc64-e5500--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2024.05-1.sha256 +sha256 904583088a1690e8e05c469202abf6df8fa719c55871b4a5dd240ba284240155 powerpc64-e6500--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2024.05-1.sha256 +sha256 dbc8d38479d0b80675cb410f3285d1f77044222c15e8547db59a53b38436b5de powerpc64-e6500--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2024.05-1.sha256 +sha256 61cbeafa30ff0ecd225f933892a1696b4bcf83abed49fee7ff6e963fcdb9063f powerpc64-e6500--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2024.05-1.sha256 +sha256 2ee53f50a60a36f99243d6d9a2c15a7ee1e15384d10773d7f98da941506f1fb5 powerpc64-e6500--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2024.05-1.sha256 +sha256 729c9a302bba3d03e1c834bf3ae8e080c63456d9eba8ecac4c8f481efea8b77e powerpc64-power8--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2024.05-1.sha256 +sha256 8dfeb7f1ec38e623c98c125539df6ccc7fad1c057b7ab36d65c2b6426c03b332 powerpc64-power8--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2024.05-1.sha256 +sha256 9cc19d57a1374afbd41624aaa968f01914f884e2fb303f73f90d6e94c23ba451 powerpc64-power8--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2024.05-1.sha256 +sha256 d5f928ed99dd4f7dae5c4b3d47c0f463a990b7744866d89ba82e08a7ee9f9a8a powerpc64-power8--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2024.05-1.sha256 +sha256 3b7382684dd77118498b5e502fd90af616c3f6006843d27f538881505cb4a4d7 powerpc64le-power8--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2024.05-1.sha256 +sha256 8133b74614f880eb8b76730efee77b8fd281c982bfa2791b72c5f836a529530d powerpc64le-power8--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2024.05-1.sha256 +sha256 8506103888d0ee23a2e3126083e4f05ef18399c7adeb4e68838f864435394409 powerpc64le-power8--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2024.05-1.sha256 +sha256 62f056b5993f6d1bf2d94a61d01e1d4aaa58906107db3af11ac882c989ed7c1d powerpc64le-power8--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2024.05-1.sha256 +sha256 944fb2719d8657f1c5ee359046caca25a2080fe3535e99cc9dca78c20973c6c8 riscv32-ilp32d--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--stable-2024.05-1.sha256 +sha256 00112418e6d4b0733019a673b682a39f1ce6300b9448cd840f1194aa4b064192 riscv32-ilp32d--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--bleeding-edge-2024.05-1.sha256 +sha256 deabdc08dc49bebe43e445c015b393cb38ecb806ad04d230da2a5c95ef9f2fda riscv32-ilp32d--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--musl--stable-2024.05-1.sha256 +sha256 bbf26ec29272814da1eb5eb97339ed36d2dda66655c4c3612951e3cfb2b842ec riscv32-ilp32d--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 7fb15b36e351bb1d749abec24eb62b106ada56b3483a910352e9a48e0e8138ee riscv32-ilp32d--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--uclibc--stable-2024.05-1.sha256 +sha256 4c74eb1062805f1e28ccc2aee7c006e55823a780eae84c81d5b58433361b4f11 riscv32-ilp32d--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2024.05-1.sha256 +sha256 a9e41a646d6757e47ab0539171bef54a6c0bf68f191210500875b386ea15444c riscv64-lp64d--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2024.05-1.sha256 +sha256 78e16f3def8b2ff3da09c16155f993ac7e4dc1791d0904ada03fcb2e04910aab riscv64-lp64d--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2024.05-1.sha256 +sha256 0acc030f695f48e29f03f25294ee5b6ebacc8ab93de5ed0c6988e9699c417510 riscv64-lp64d--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2024.05-1.sha256 +sha256 481c9353467f42d02edf9080954b3c14a75ff7c19ed9e8fbf9cfa67d028587d3 riscv64-lp64d--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 17d5745a3d063ebd94eb7172c2b10d0d157869e3fe46a8d27d0a4ec2da33b071 riscv64-lp64d--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2024.05-1.sha256 +sha256 1c336b0cc87a1c01a434b3666d4867f033c9f7844b0eb84887d32f309ba9ce6f riscv64-lp64d--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2024.05-1.sha256 +sha256 3f388a1549601fde95a084a439d8f514694d9819c2a75eaa678ac263b6ea5ccd s390x-z13--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2024.05-1.sha256 +sha256 b37ed02693a370f28434c34655c64bcb96dc0d428a92ddbc99feb5608bcf64a1 s390x-z13--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--bleeding-edge-2024.05-1.sha256 +sha256 9bbb6fc607a76c32964208ba2e2e0d09af4cd7f1d0b9511e524363e86147992d s390x-z13--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--musl--stable-2024.05-1.sha256 +sha256 9dc280763cb2b18ea9417ffaf7fee2e24c9833033e730108138179a9887ef299 s390x-z13--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2024.05-1.sha256 +sha256 f4e6c46deeee5301ea4782b5eb6705da5261b16afe40fcc342a1a7d2430e9061 sh-sh4--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2024.05-1.sha256 +sha256 6290f90417b194c467cf432d9c012d4321827160407c5b4664a443910a54c7d8 sh-sh4--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2024.05-1.sha256 +sha256 3d6b8fb7c21d83528617eaaec7e078e0eecbfb0c939ea7be5794c287735d644d sh-sh4--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2024.05-1.sha256 +sha256 acec95cc0b26cc82de58bd5aee7472511563cb0145ed2f74a72344070216cc39 sh-sh4--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 6b7a3e1048c7679c8ae9be113cd51a8be0b2816502f00bfd006a035753061700 sh-sh4--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2024.05-1.sha256 +sha256 3433820a3ca8296d5166fbe0d8bcc722536fa9d71b3631667bb5039a61fbc039 sh-sh4--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2024.05-1.sha256 +sha256 cb4d6abb85e3e86d6d0b285d2b4d7ad6ece6483835f8950742e17ff5a2967ee3 sh-sh4aeb--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2024.05-1.sha256 +sha256 07c14c3c9bdee411bd1d5c04cd2a1ff50dd98231f1fb648f5746b0d2fab81767 sh-sh4aeb--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2024.05-1.sha256 +sha256 1c10d7c73bc61076007bbab909400dfea9cb7c6f9c356c03ef2bbd996b8ba003 sh-sh4aeb--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2024.05-1.sha256 +sha256 ebcbbff459bdc76f9ee3627b8f8688d922192eafaf1890911d2c7454a4973aec sh-sh4aeb--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2024.05-1.sha256 +sha256 5bcbc1fb43b8f0240b2f2503c8dfa9a2efa38ea23d2a2f44df4acc5a1288ef9b sparc64--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2024.05-1.sha256 +sha256 29d1e6c0d45ab95edf33ff2ee77b27869669f476a23d76fef96f56f8d3cc6234 sparc64--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 c74944737263acbabdbf7b646aa41dd6c96336d2dbbefdeebbba9866e1374a0a sparcv8--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2024.05-1.sha256 +sha256 8ec2c84b84a13b854a13802537f0b04848056ebc65f6212202f6d8c8a78d4bc3 sparcv8--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2024.05-1.sha256 +sha256 bc7ce1172602a377b5444d09b349e7d9fa2662b7ca59a95b884a7ea18c4de7c7 x86-64--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2024.05-1.sha256 +sha256 932823ca9a3e067e7e2a29810a666d20c9cc5bb550de947f6879e38ace1aa955 x86-64--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2024.05-1.sha256 +sha256 2721cb2421ba1f9740a739247da9c12fbebbffeb131998719bc810d7319eb9b9 x86-64--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2024.05-1.sha256 +sha256 f3cf417d28e7df95bdab632ff837de66ac03145bd0e1dd78cc89aadfa6e31526 x86-64--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 80830735a18239dd644b6aefbecd24437cc593402120b6eba0ff8625306fff3c x86-64--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2024.05-1.sha256 +sha256 da3c9a340e5d4c5037f2bc3114d262c5a27e8224df5c9ca6dbf5c5b4740445b4 x86-64--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2024.05-1.sha256 +sha256 809974fbfa1231e87ce40a81c6b2f78dad0cf4b0a61a6e9480a1c453f3983471 x86-64-v2--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2024.05-1.sha256 +sha256 4db498b45f0a0d85d5810ffe2d9558225f73159d261bfc7d8c466893d2f1ca08 x86-64-v2--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2024.05-1.sha256 +sha256 93e59f4ec983bf600337fc624e292ed86942d6c8f59af34ed8300a45474665f8 x86-64-v2--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2024.05-1.sha256 +sha256 f3c84a280e6fce53bdc95de1ce697fb354c85a3739c5102198e0930961a5bcc4 x86-64-v2--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 36b00ba714a82b0840165ce5d77931660d7daf571290638504791a71022f3fe5 x86-64-v2--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2024.05-1.sha256 +sha256 ca1dda638c053ca8a0992f71d02f4ccb54513d523bc3b09ded0017368ac258bb x86-64-v2--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2024.05-1.sha256 +sha256 18dcd9bebbe8369ffa577dfeae3c3d6622a8b7c022a6f41ce70048c7d41ce518 x86-64-v3--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2024.05-1.sha256 +sha256 21e08661a702695bfb1fbcbdb4c671e4c8146db2daf92e23e38e501f227584af x86-64-v3--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2024.05-1.sha256 +sha256 d2470a0001c7a00906752e8523a940a696a1218da7e9dd7b62f8fca3f58fcdda x86-64-v3--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2024.05-1.sha256 +sha256 e7f7da14ff1378bb7ec2a4014fa4f4fdc07b089e248e50f60ce930fd9b9fbc0b x86-64-v3--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 565883663c3e1901c7f8059dc8b55219940ffb464dc815b35801a81597a9b1de x86-64-v3--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2024.05-1.sha256 +sha256 6bd8b7ad75da84eb0f4f9da277584e79906c0a24dfa30e908cc20847f37a23fd x86-64-v3--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2024.05-1.sha256 +sha256 5de99096e454f9fbbefd5e358ee926c1999912c7f154abb0dca081fc38474554 x86-64-v4--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2024.05-1.sha256 +sha256 b546f055275d333c689dd9e0c05ae63b5b5419b5e79a5784dea898cae8d2e093 x86-64-v4--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2024.05-1.sha256 +sha256 f58bea6df4ab87cad5dcfe95f64a57365bd44a7624f19fb463762de1b41bf452 x86-64-v4--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2024.05-1.sha256 +sha256 fab47f56200fa54ce76c854f7a048fe61a2b346b87884199bb7e9ac527a86de1 x86-64-v4--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 2806f6e9a586d17b0009cf6b8b4ed351b3a6cefea552890e41ab9b56917c2470 x86-64-v4--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2024.05-1.sha256 +sha256 38ca4406dc1706153850ce331b82eda97e2badbd09ba033981da1bf66acaee17 x86-64-v4--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2024.05-1.sha256 +sha256 3076f0bd485696a1b8f29683d9330dcc79526cc9328064911548dd66e7bbe84f x86-64-core-i7--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2024.05-1.sha256 +sha256 c80884040a81a33fdd6a4d3f54d63650dbeea280ee6324664faba094ad93bd74 x86-64-core-i7--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2024.05-1.sha256 +sha256 0a8a2e6f6dfe8207bef3ce7c0445e4b72f57390ca590f6d50f61f03eeb8e2e0e x86-64-core-i7--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2024.05-1.sha256 +sha256 da77433e841011e0d8e3c360851e1e4b88996888a749b41067bfd7296e47f1f3 x86-64-core-i7--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 eddf678bfb23dbc2d07157c3371f8c45e8e9f8438ad64b615fa35e94d2a840cc x86-64-core-i7--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2024.05-1.sha256 +sha256 4c4a8ec05711f2e902b0cea50b29a6f536a0f184651ebe03fadcd8aa5febe11c x86-64-core-i7--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2024.05-1.sha256 +sha256 999cc27420b4305e200017d0780759206656cf0d39f20fe4502e4e547c9a432b x86-core2--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2024.05-1.sha256 +sha256 8bbff9a34cb5807bd81d46489c115fc4073726db2afab079ffdb7e4b44994b9e x86-core2--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2024.05-1.sha256 +sha256 583b11a382b536610c73583121500ee8e88ec3942f99090051a272ca0891dfac x86-core2--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2024.05-1.sha256 +sha256 c28cb368d67172a6e2d404250cbd5b1be70c1ae4f77e4514a46ac82bf53c030c x86-core2--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 d73f4119c0afc073fd1273cf1cc787b531b64665fb1dd1a2304de8c0fe4445ac x86-core2--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2024.05-1.sha256 +sha256 69fb29808de400fe59dc8c47b60c0e0cb5b65f48cbef09432edfc8cecb25a6b3 x86-core2--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2024.05-1.sha256 +sha256 81115a9b098b86c5ff37f3adac265d55c572fef1936378991995c285d9a65847 x86-i686--glibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2024.05-1.sha256 +sha256 023e4f03cd212b5545c4c184238693b61b40fa36d257b84546100a92ea2c1d8b x86-i686--glibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2024.05-1.sha256 +sha256 1fadb2e0195eec06efef94f16339ad1a950789dde618bd17f22fbc7346893584 x86-i686--musl--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2024.05-1.sha256 +sha256 f16c0f2cff527bdf9753135d5e22dfe81390f3646c34d05d951d23f76fbe06e9 x86-i686--musl--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 b958ab84b59f2993afa5b2aba4b24b42c95826ae9ea01f04cf6b2dfbbb2e8a6d x86-i686--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2024.05-1.sha256 +sha256 e240d983717e03a8ea7c5ffba71077b555f05f40694f177e23756d2a47656599 x86-i686--uclibc--stable-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2024.05-1.sha256 +sha256 eec483e97164d82939034c28bf3443e1d3d92f1674b9060d4086b773ac4e6ea0 xtensa-lx60--uclibc--bleeding-edge-2024.05-1.tar.xz +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2024.05-1.sha256 +sha256 99f275b884895049a2d47812a94953199368da99f4bc2bd39869711006610c0e xtensa-lx60--uclibc--stable-2024.05-1.tar.xz 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 07ae8304106..18639db1b3a 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -7,1292 +7,1322 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_UCLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-2 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.02-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index 292e652fb01..dc333f84747 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,17 +1,12 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2019.09 toolchain" + bool "Synopsys ARC 2024.06 toolchain" depends on BR2_arc depends on BR2_HOSTARCH = "x86_64" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 select BR2_INSTALL_LIBSTDCPP - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_14 help Toolchain for the ARC cores, from https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options index ceb7dd0081f..4b4482106c0 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options @@ -1,5 +1,37 @@ if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC +choice + prompt "Synopsys toolchain variant" + +config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC700 + bool "Linux/uClibc ARC 700" + depends on BR2_arc750d || BR2_arc770d + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + select BR2_USE_WCHAR + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + +config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_UCLIBC + bool "Linux/uClibc ARC HS" + depends on BR2_archs38_64mpy || BR2_archs38_full || \ + BR2_archs4x_rel31 || BR2_archs4x + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + select BR2_USE_WCHAR + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_GLIBC + bool "Linux/glibc ARC HS" + depends on BR2_archs38_64mpy || BR2_archs38_full || \ + BR2_archs4x_rel31 || BR2_archs4x + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_FORTRAN + +endchoice + config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arc-linux" if BR2_arcle default "arceb-linux" if BR2_arceb 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 3c227238338..52273871aba 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,7 @@ -# 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 +# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2024.06-release +sha256 080bbf8c0747d221314d04b0fcef89f91dc82710afa1aa66a88f04c93719663a arc_gnu_2024.06_prebuilt_uclibc_le_arc700_linux_install.tar.bz2 +sha256 37ad59b2624608cd126fab3a83a188edc18ad9e2bba8bbb778d46cdd49ad2ffe arc_gnu_2024.06_prebuilt_glibc_le_archs_linux_install.tar.bz2 +sha256 6867bc6f895c29b053020423923ead2054b8474816f1d067f2726b13e8ee16c0 arc_gnu_2024.06_prebuilt_uclibc_le_archs_linux_install.tar.bz2 +sha256 6efd9025e4b226bf1b4a4d448670e00f928e61e0051a0b209b7adaa327945a32 arc_gnu_2024.06_prebuilt_uclibc_be_arc700_linux_install.tar.bz2 +sha256 ae2ffb5fbe8d6002341dd87d005400010e85dfc1df1e8db070a19ab7300d738f arc_gnu_2024.06_prebuilt_glibc_be_archs_linux_install.tar.bz2 +sha256 892a576acdf962afafde345d2c830317cb14ff8ef95da7cadc79177c226db269 arc_gnu_2024.06_prebuilt_uclibc_be_archs_linux_install.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk index c8f141e45d9..c88ca35c431 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -4,13 +4,18 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2019.09 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2024.06 TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release -ifeq ($(BR2_arc750d)$(BR2_arc770d),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC700),y) TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = arc700 -else +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_LIBC = uclibc +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_UCLIBC),y) +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = archs +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_LIBC = uclibc +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARCHS_GLIBC),y) TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = archs +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_LIBC = glibc endif ifeq ($(BR2_arcle),y) @@ -19,6 +24,6 @@ else TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS = be endif -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SOURCE = arc_gnu_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE)_linux_install.tar.gz +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SOURCE = arc_gnu_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)_prebuilt_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_LIBC)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE)_linux_install.tar.bz2 $(eval $(toolchain-external-package)) diff --git a/utils/brmake b/utils/brmake index 70dfb6cdc8f..4756016a0c4 100755 --- a/utils/brmake +++ b/utils/brmake @@ -12,7 +12,13 @@ main() { start=${SECONDS} - ( exec 2>&1; unbuffer make "${@}"; ) \ + if [ -n "$BR2_DOCKER" ]; then + docker=("${0%/*}/docker-run") + else + docker=() + fi + + ( exec 2>&1; unbuffer "${docker[@]}" make "${@}"; ) \ > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ diff --git a/utils/get-developers b/utils/get-developers index 9ab5c4503f1..83c573bf232 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -5,7 +5,7 @@ import getdeveloperlib import sys -def parse_args(): +def __main__(): parser = argparse.ArgumentParser() parser.add_argument('patches', metavar='P', type=argparse.FileType('r'), nargs='*', help='list of patches (use - to read patches from stdin)') @@ -17,17 +17,15 @@ def parse_args(): help='find developers in charge of these files') parser.add_argument('-c', dest='check', action='store_const', const=True, help='list files not handled by any developer') + parser.add_argument('--cc', action="store_true", + help='list affected developers as CC: lines ready to be pasted in a commit log') parser.add_argument('-e', dest='email', action='store_const', const=True, help='only list affected developer email addresses') parser.add_argument('-v', dest='validate', action='store_const', const=True, help='validate syntax of DEVELOPERS file') parser.add_argument('-d', dest='filename', action='store', default=None, help='override the default DEVELOPERS file (for debug)') - return parser.parse_args() - - -def __main__(): - args = parse_args() + args = parser.parse_args() # Check that only one action is given action = 0 @@ -44,11 +42,11 @@ def __main__(): if len(args.patches) != 0: action += 1 if action > 1: - print("Cannot do more than one action") - return + parser.error("Cannot do more than one action") if action == 0: - print("No action specified") - return + if sys.stdin.isatty(): + parser.error("No action specified") + args.patches.append(sys.stdin) devs = getdeveloperlib.parse_developers(args.filename) if devs is None: @@ -102,9 +100,10 @@ def __main__(): if i in dev.infras: matching_devs.add(dev.name) - if args.email: + matching_devs = sorted(matching_devs) + if args.email or args.cc: for dev in matching_devs: - print(dev) + print(f"{'Cc: ' if args.cc else ''}{dev}") else: result = "--to buildroot@buildroot.org" for dev in matching_devs: diff --git a/utils/readme.txt b/utils/readme.txt index b5862f1fb98..abff659d4fa 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -7,6 +7,9 @@ brmake front of each line, redirects all of the build output to a file ("'br.log' in the current directory), and just outputs the Buildroot messages (those lines starting with >>>) on stdout. + To run this within a container using docker-run (see below), set + BR2_DOCKER=y in the environment, i.e. call it as + `BR2_DOCKER=y utils/brmake`. Do not run this script for interactive configuration (e.g. menuconfig) or on an unconfigured directory. The output is redirected so you will see nothing. diff --git a/utils/scanpypi b/utils/scanpypi index 8765a983237..af62c01632c 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later AND MIT """ Utility for building Buildroot packages for existing PyPI packages @@ -18,8 +19,9 @@ import hashlib import re import textwrap import tempfile -import imp -from functools import wraps +import traceback +import importlib +import importlib.metadata import six.moves.urllib.request import six.moves.urllib.error import six.moves.urllib.parse @@ -93,32 +95,6 @@ def toml_load(f): raise ex -def setup_decorator(func, method): - """ - Decorator for distutils.core.setup and setuptools.setup. - Puts the arguments with which setup is called as a dict - Add key 'method' which should be either 'setuptools' or 'distutils'. - - Keyword arguments: - func -- either setuptools.setup or distutils.core.setup - method -- either 'setuptools' or 'distutils' - """ - - @wraps(func) - def closure(*args, **kwargs): - # Any python packages calls its setup function to be installed. - # Argument 'name' of this setup function is the package's name - BuildrootPackage.setup_args[kwargs['name']] = kwargs - BuildrootPackage.setup_args[kwargs['name']]['method'] = method - return closure - -# monkey patch -import setuptools # noqa E402 -setuptools.setup = setup_decorator(setuptools.setup, 'setuptools') -import distutils # noqa E402 -distutils.core.setup = setup_decorator(setuptools.setup, 'distutils') - - def find_file_upper_case(filenames, path='./'): """ List generator: @@ -156,6 +132,48 @@ class DownloadFailed(Exception): pass +# Copied and adapted from +# https://github.com/pypa/pyproject-hooks/blob/v1.1.0/src/pyproject_hooks/_in_process/_in_process.py +# SPDX-License-Identifier: MIT + +class BackendUnavailable(Exception): + """Raised if we cannot import the backend""" + + def __init__(self, message, traceback=None): + super().__init__(message) + self.message = message + self.traceback = traceback + + +class BackendPathFinder: + """Implements the MetaPathFinder interface to locate modules in ``backend-path``. + + Since the environment provided by the frontend can contain all sorts of + MetaPathFinders, the only way to ensure the backend is loaded from the + right place is to prepend our own. + """ + + def __init__(self, backend_path, backend_module): + self.backend_path = backend_path + self.backend_module = backend_module + self.backend_parent, _, _ = backend_module.partition(".") + + def find_spec(self, fullname, _path, _target=None): + if "." in fullname: + # Rely on importlib to find nested modules based on parent's path + return None + + # Ignore other items in _path or sys.path and use backend_path instead: + spec = importlib.machinery.PathFinder.find_spec(fullname, path=self.backend_path) + if spec is None and fullname == self.backend_parent: + # According to the spec, the backend MUST be loaded from backend-path. + # Therefore, we can halt the import machinery and raise a clean error. + msg = f"Cannot find module {self.backend_module!r} in {self.backend_path!r}" + raise BackendUnavailable(msg) + + return spec + + class BuildrootPackage(): """This class's methods are not meant to be used individually please use them in the correct order: @@ -191,6 +209,8 @@ class BuildrootPackage(): self.metadata_url = None self.pkg_req = None self.setup_metadata = None + self.backend_path = None + self.build_backend = None self.tmp_extract = None self.used_url = None self.filename = None @@ -339,32 +359,46 @@ class BuildrootPackage(): folder=tmp_pkg, name=pkg_filename) - def load_setup(self): + def load_metadata(self): """ Loads the corresponding setup and store its metadata """ current_dir = os.getcwd() os.chdir(self.tmp_extract) - sys.path.insert(0, self.tmp_extract) try: - 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('-', '_') + mod_path, _, obj_path = self.build_backend.partition(":") + + path_finder = None + if self.backend_path: + path_finder = BackendPathFinder(self.backend_path, mod_path) + sys.meta_path.insert(0, path_finder) + 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 + build_backend = importlib.import_module(self.build_backend) + except ImportError: + msg = f"Cannot import {mod_path!r}" + raise BackendUnavailable(msg, traceback.format_exc()) + + if obj_path: + for path_part in obj_path.split("."): + build_backend = getattr(build_backend, path_part) + + if path_finder: + sys.meta_path.remove(path_finder) + + prepare_metadata_for_build_wheel = getattr( + build_backend, 'prepare_metadata_for_build_wheel' + ) + metadata = prepare_metadata_for_build_wheel(self.tmp_extract) + try: + dist = importlib.metadata.Distribution.at(metadata) + self.metadata_name = dist.name + if dist.requires: + self.setup_metadata['install_requires'] = dist.requires + finally: + shutil.rmtree(metadata) finally: os.chdir(current_dir) - sys.path.remove(self.tmp_extract) def load_pyproject(self): """ @@ -372,28 +406,36 @@ class BuildrootPackage(): """ current_dir = os.getcwd() os.chdir(self.tmp_extract) - sys.path.insert(0, self.tmp_extract) try: pyproject_data = toml_load('pyproject.toml') - try: - self.setup_metadata = pyproject_data.get('project', {}) - self.metadata_name = self.setup_metadata.get('name', self.real_name) - build_system = pyproject_data.get('build-system', {}) - build_backend = build_system.get('build-backend', None) - if build_backend and build_backend == 'flit_core.buildapi': + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + self.backend_path = build_system.get('backend-path', None) + if build_backend: + self.build_backend = build_backend + if build_backend == 'flit_core.buildapi': self.setup_metadata['method'] = 'flit' - elif build_system.get('backend-path', None): - self.setup_metadata['method'] = 'pep517' + elif build_backend == 'hatchling.build': + self.setup_metadata['method'] = 'hatch' + elif build_backend == 'poetry.core.masonry.api': + self.setup_metadata['method'] = 'poetry' + elif build_backend == 'setuptools.build_meta': + self.setup_metadata['method'] = 'setuptools' else: - self.setup_metadata['method'] = 'unknown' - except KeyError: - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) - raise + if self.backend_path: + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + else: + self.build_backend = 'setuptools.build_meta' + self.setup_metadata = {'method': 'setuptools'} except FileNotFoundError: - raise - os.chdir(current_dir) - sys.path.remove(self.tmp_extract) + self.build_backend = 'setuptools.build_meta' + self.setup_metadata = {'method': 'setuptools'} + finally: + os.chdir(current_dir) def get_requirements(self, pkg_folder): """ @@ -406,7 +448,11 @@ class BuildrootPackage(): if 'install_requires' not in self.setup_metadata: self.pkg_req = None return set() - self.pkg_req = self.setup_metadata['install_requires'] + self.pkg_req = set() + extra_re = re.compile(r'''extra\s*==\s*("([^"]+)"|'([^']+)')''') + for req in self.setup_metadata['install_requires']: + if not extra_re.search(req): + self.pkg_req.add(req) self.pkg_req = [re.sub(r'([-.\w]+).*', r'\1', req) for req in self.pkg_req] @@ -753,11 +799,6 @@ def main(): package.fetch_package_info() except (six.moves.urllib.error.URLError, six.moves.urllib.error.HTTPError): continue - if package.metadata_name.lower() == 'setuptools': - # setuptools imports itself, that does not work very well - # with the monkey path at the beginning - print('Error: setuptools cannot be built using scanPyPI') - continue try: package.download_package() @@ -777,17 +818,15 @@ def main(): continue # Loading the package install info from the package + package.load_pyproject() try: - package.load_setup() + package.load_metadata() except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') continue else: - try: - package.load_pyproject() - except Exception: - raise + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error))