Merge branch 'next'
This commit is contained in:
commit
df48bcd151
@ -144,6 +144,15 @@ endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
comment "Legacy options removed in 2023.05"
|
||||
|
||||
config BR2_PACAKGE_OPENFPGALOADER_CMSIS
|
||||
bool "openfpgaloader cmsis option name fixed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
A typo on BR2_PACAKGE_OPENFPGALOADER_CMSIS was fixed by
|
||||
renaming the option to BR2_PACKAGE_OPENFPGALOADER_CMSIS.
|
||||
|
||||
comment "Legacy options removed in 2023.02"
|
||||
|
||||
config BR2_PACKAGE_PUGIXML_HEADER_ONLY
|
||||
|
11
DEVELOPERS
11
DEVELOPERS
@ -1146,9 +1146,14 @@ F: package/webp/
|
||||
F: package/xapian/
|
||||
|
||||
N: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
F: board/bananapi/bananapi-m2-ultra/
|
||||
F: board/freescale/imx6ullevk/
|
||||
F: board/olimex/a*
|
||||
F: configs/amarula_vyasa_rk3288_defconfig
|
||||
F: configs/asus_tinker_rk3288_defconfig
|
||||
F: configs/bananapi_m2_ultra_defconfig
|
||||
F: configs/freescale_imx6ullevk_defconfig
|
||||
F: configs/imx6ullevk_defconfig
|
||||
F: configs/olimex_a*
|
||||
F: package/at/
|
||||
F: package/binutils/
|
||||
@ -1727,7 +1732,11 @@ F: support/testing/tests/package/sample_python_spake2.py
|
||||
F: support/testing/tests/package/test_gnupg2.py
|
||||
F: support/testing/tests/package/test_highway.py
|
||||
F: support/testing/tests/package/test_hwloc.py
|
||||
F: support/testing/tests/package/test_iperf3.py
|
||||
F: support/testing/tests/package/test_kexec.py
|
||||
F: support/testing/tests/package/test_kexec/
|
||||
F: support/testing/tests/package/test_libjxl.py
|
||||
F: support/testing/tests/package/test_lsof.py
|
||||
F: support/testing/tests/package/test_ncdu.py
|
||||
F: support/testing/tests/package/test_octave.py
|
||||
F: support/testing/tests/package/test_ola.py
|
||||
@ -1741,6 +1750,7 @@ F: support/testing/tests/package/test_python_pyalsa.py
|
||||
F: support/testing/tests/package/test_python_spake2.py
|
||||
F: support/testing/tests/package/test_rdma_core.py
|
||||
F: support/testing/tests/package/test_rdma_core/
|
||||
F: support/testing/tests/package/test_stress_ng.py
|
||||
F: support/testing/tests/package/test_z3.py
|
||||
F: support/testing/tests/package/test_z3/
|
||||
|
||||
@ -2438,6 +2448,7 @@ F: support/testing/tests/package/test_python_rsa.py
|
||||
F: support/testing/tests/package/test_python_s3transfer.py
|
||||
|
||||
N: Raphael Pavlidis <raphael.pavlidis@gmail.com>
|
||||
F: package/shadow/
|
||||
F: package/slirp4netns/
|
||||
F: package/sway/
|
||||
F: package/x11r7/xwayland/
|
||||
|
@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture.
|
||||
|
||||
First, one has to download the AArch64 software simulator from:
|
||||
|
||||
https://silver.arm.com/download/download.tm?pv=4807186
|
||||
https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz
|
||||
|
||||
Then, use the arm_foundationv8_defconfig configuration to build your
|
||||
Buildroot system.
|
||||
|
||||
Finally, boot your system with:
|
||||
|
||||
${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \
|
||||
${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \
|
||||
--image output/images/linux-system.axf \
|
||||
--block-device output/images/rootfs.ext2 \
|
||||
--network=nat \
|
||||
|
@ -2,5 +2,5 @@ set default="0"
|
||||
set timeout="5"
|
||||
|
||||
menuentry "Buildroot" {
|
||||
linux /Image root=/dev/sda2 rootwait console=ttyAMA0
|
||||
linux /Image root=PARTLABEL=root rootwait
|
||||
}
|
||||
|
@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y
|
||||
CONFIG_RNG_OPTEE=y
|
||||
CONFIG_RTC_EMULATION=y
|
||||
CONFIG_SCMI_FIRMWARE=y
|
||||
CONFIG_SYS_TEXT_BASE=0x60000000
|
||||
CONFIG_TEE=y
|
||||
CONFIG_TEXT_BASE=0x60000000
|
||||
|
3
board/spike/riscv64/linux.fragment
Normal file
3
board/spike/riscv64/linux.fragment
Normal file
@ -0,0 +1,3 @@
|
||||
CONFIG_RISCV_SBI_V01=y
|
||||
CONFIG_HVC_RISCV_SBI=y
|
||||
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
|
@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33
|
||||
bool "Use Barebox as BL33"
|
||||
depends on BR2_TARGET_BAREBOX
|
||||
help
|
||||
This option allows to embed the Barebox generic BL33 image in
|
||||
the ARM Trusted Firmware. It ensures that the Barebox package
|
||||
gets built before ATF, and that the appropriate BL33
|
||||
variable pointing to the generic bl33 image is passed
|
||||
when building ATF.
|
||||
|
||||
if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE
|
||||
string "Barebox BL33 image name"
|
||||
default "*-generic-bl33.img"
|
||||
help
|
||||
Name of the Barebox BL33 image to include in ATF, it must
|
||||
have been installed to BINARIES_DIR by the Barebox package.
|
||||
|
||||
endif
|
||||
|
||||
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
|
||||
bool "Use U-Boot as BL33"
|
||||
depends on BR2_TARGET_UBOOT
|
||||
|
@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee
|
||||
endif
|
||||
endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y)
|
||||
ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE))
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN)
|
||||
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y)
|
||||
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2
|
||||
# Since the flash device name vary between platforms, we use the variable
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a
|
||||
BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa
|
||||
BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_SITE_METHOD = git
|
||||
BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
|
||||
|
@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2
|
||||
Amongst others, GRUB2 offers EFI support, which GRUB Legacy
|
||||
doesn't provide.
|
||||
|
||||
The file boot/grub2/grub.cfg is used by default as the Grub
|
||||
configuration file. It can be overridden using a rootfs
|
||||
overlay or post-build script.
|
||||
|
||||
For additional notes on using Grub 2 with Buildroot, see
|
||||
boot/grub2/readme.txt
|
||||
|
||||
|
@ -1,15 +1,16 @@
|
||||
BR2_aarch64=y
|
||||
# Linux headers same as kernel, a 5.16 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
|
||||
# Linux headers same as kernel, a 6.1 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci"
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
BR2_TARGET_BOOT_WRAPPER_AARCH64=y
|
||||
BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci"
|
||||
|
@ -1,12 +1,12 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra"
|
||||
@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
|
||||
|
@ -1,11 +1,11 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk"
|
||||
@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.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
|
||||
|
@ -3,8 +3,8 @@ BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_ARM_FPU_NEON_VFPV4=y
|
||||
|
||||
# Linux headers same as kernel, a 5.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y
|
||||
# Linux headers same as kernel, a 6.1 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
|
||||
# system
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.14"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk"
|
||||
@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
|
||||
BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01"
|
||||
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
|
||||
|
@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg"
|
||||
|
||||
# Linux headers
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y
|
||||
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.0.6"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
|
||||
@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64"
|
||||
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config"
|
||||
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment"
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
|
||||
# Host tools
|
||||
|
@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post-
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg"
|
||||
|
||||
# Linux headers
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y
|
||||
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.0.9"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment"
|
||||
|
||||
@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.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
|
||||
|
@ -2,9 +2,10 @@ BR2_riscv=y
|
||||
BR2_RISCV_64=y
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_TARGET_ROOTFS_CPIO=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
BR2_TARGET_OPENSBI=y
|
||||
|
@ -2705,6 +2705,7 @@ menu "System tools"
|
||||
source "package/sdbus-cpp/Config.in"
|
||||
source "package/sdbusplus/Config.in"
|
||||
source "package/seatd/Config.in"
|
||||
source "package/shadow/Config.in"
|
||||
source "package/smack/Config.in"
|
||||
source "package/start-stop-daemon/Config.in"
|
||||
source "package/supervisor/Config.in"
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Keep the version and patches in sync with bluez5_utils
|
||||
BLUEZ5_UTILS_HEADERS_VERSION = 5.65
|
||||
BLUEZ5_UTILS_HEADERS_VERSION = 5.66
|
||||
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
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
|
||||
sha256 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.tar.xz
|
||||
sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.tar.xz
|
||||
# Locally computed
|
||||
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
|
||||
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Keep the version and patches in sync with bluez5_utils-headers
|
||||
BLUEZ5_UTILS_VERSION = 5.65
|
||||
BLUEZ5_UTILS_VERSION = 5.66
|
||||
BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
|
||||
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
|
||||
BLUEZ5_UTILS_INSTALL_STAGING = YES
|
||||
|
@ -1,4 +1,4 @@
|
||||
# sha256 computed locally
|
||||
sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz
|
||||
sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt
|
||||
sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc
|
||||
sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz
|
||||
sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt
|
||||
sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc
|
||||
|
@ -4,27 +4,19 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CCACHE_VERSION = 3.7.12
|
||||
CCACHE_VERSION = 4.7.4
|
||||
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
|
||||
CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt
|
||||
|
||||
# Force ccache to use its internal zlib. The problem is that without
|
||||
# this, ccache would link against the zlib of the build system, but we
|
||||
# might build and install a different version of zlib in $(O)/host
|
||||
# afterwards, which ccache will pick up. This might break if there is
|
||||
# a version mismatch. A solution would be to add host-zlib has a
|
||||
# dependency of ccache, but it would require tuning the zlib .mk file
|
||||
# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
|
||||
# path: tell ccache to use its internal copy of zlib, so that ccache
|
||||
# has zero dependency besides the C library.
|
||||
HOST_CCACHE_CONF_OPTS += --with-bundled-zlib
|
||||
HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd
|
||||
|
||||
# We are ccache, so we can't use ccache
|
||||
HOST_CCACHE_CONF_ENV = \
|
||||
CC="$(HOSTCC_NOCCACHE)" \
|
||||
CXX="$(HOSTCXX_NOCCACHE)"
|
||||
HOST_CCACHE_CONF_OPTS += \
|
||||
-UCMAKE_C_COMPILER_LAUNCHER \
|
||||
-UCMAKE_CXX_COMPILER_LAUNCHER \
|
||||
-DZSTD_FROM_INTERNET=OFF \
|
||||
-DHIREDIS_FROM_INTERNET=OFF
|
||||
|
||||
# Patch host-ccache as follows:
|
||||
# - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
|
||||
@ -33,13 +25,17 @@ HOST_CCACHE_CONF_ENV = \
|
||||
# BR2_CCACHE_DIR.
|
||||
# - Change hard-coded last-ditch default to match path in .config, to avoid
|
||||
# the need to specify BR_CACHE_DIR when invoking ccache directly.
|
||||
# CCache replaces "%s" with the home directory of the current user,
|
||||
# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose
|
||||
HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR))
|
||||
# CCache replaces "home_dir" with the home directory of the current user,
|
||||
# so rewrite BR_CACHE_DIR to take that into consideration for SDK purpose
|
||||
HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR))
|
||||
|
||||
define HOST_CCACHE_PATCH_CONFIGURATION
|
||||
sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c
|
||||
sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c
|
||||
sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp
|
||||
sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
|
||||
sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
|
||||
sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp
|
||||
sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp
|
||||
sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp
|
||||
endef
|
||||
|
||||
HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
|
||||
@ -62,7 +58,7 @@ endef
|
||||
HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP
|
||||
endif
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
$(eval $(host-cmake-package))
|
||||
|
||||
ifeq ($(BR2_CCACHE),y)
|
||||
ccache-stats: host-ccache
|
||||
|
@ -40,9 +40,16 @@ CMAKE_CONF_OPTS = \
|
||||
HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
|
||||
HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
|
||||
|
||||
# We may be a ccache dependency, so we can't use ccache
|
||||
HOST_CMAKE_CONFIGURE_OPTS = \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
CC="$(HOSTCC_NOCCACHE)" \
|
||||
GCC="$(HOSTCC_NOCCACHE)" \
|
||||
CXX="$(HOSTCXX_NOCCACHE)"
|
||||
|
||||
define HOST_CMAKE_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
$(HOST_CMAKE_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(HOST_CMAKE_CFLAGS)" \
|
||||
./bootstrap --prefix=$(HOST_DIR) \
|
||||
--parallel=$(PARALLEL_JOBS) -- \
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz
|
||||
sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz
|
||||
sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE
|
||||
sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS
|
||||
sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md
|
||||
@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro
|
||||
sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md
|
||||
sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS
|
||||
sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md
|
||||
sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS
|
||||
sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md
|
||||
sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS
|
||||
sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md
|
||||
sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS
|
||||
sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DBUS_BROKER_VERSION = 32
|
||||
DBUS_BROKER_VERSION = 33
|
||||
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)
|
||||
|
||||
|
@ -1,483 +0,0 @@
|
||||
From fd02caa75918401f2cb75af1f2a181c1959e070d Mon Sep 17 00:00:00 2001
|
||||
From: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Date: Sat, 14 Jan 2023 08:34:09 -0800
|
||||
Subject: [PATCH] uapi: Bring in if.h
|
||||
|
||||
Bring in if.h from commit eec517cdb481 ("net: Add IF_OPER_TESTING") as
|
||||
well as uapi/linux/hdlc/ioctl.h. Ensure that we define all of the
|
||||
necessary guards to provide updated definitions of ifmap, ifreq and
|
||||
IFNAMSIZ. This resolves build issues with kernel headers < 4.11 which
|
||||
lacked 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h
|
||||
userspace compilation errors").
|
||||
|
||||
Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
|
||||
Reported-by: Markus Mayer <mmayer@broadcom.com>
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Message-Id: <20230114163411.3290201-2-f.fainelli@gmail.com>
|
||||
|
||||
[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-2-f.fainelli@gmail.com/]
|
||||
[vfazio@gmail.com: fix whitespace issues]
|
||||
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
|
||||
---
|
||||
Makefile.am | 6 +-
|
||||
internal.h | 7 +-
|
||||
uapi/linux/hdlc/ioctl.h | 94 +++++++++++++
|
||||
uapi/linux/if.h | 296 ++++++++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 397 insertions(+), 6 deletions(-)
|
||||
create mode 100644 uapi/linux/hdlc/ioctl.h
|
||||
create mode 100644 uapi/linux/if.h
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 663f40a..691a20e 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -7,7 +7,8 @@ EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh
|
||||
|
||||
sbin_PROGRAMS = ethtool
|
||||
ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \
|
||||
- uapi/linux/net_tstamp.h rxclass.c common.c common.h \
|
||||
+ uapi/linux/net_tstamp.h uapi/linux/if.h uapi/linux/hdlc/ioctl.h \
|
||||
+ rxclass.c common.c common.h \
|
||||
json_writer.c json_writer.h json_print.c json_print.h \
|
||||
list.h
|
||||
if ETHTOOL_ENABLE_PRETTY_DUMP
|
||||
@@ -43,7 +44,8 @@ ethtool_SOURCES += \
|
||||
netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \
|
||||
uapi/linux/ethtool_netlink.h \
|
||||
uapi/linux/netlink.h uapi/linux/genetlink.h \
|
||||
- uapi/linux/rtnetlink.h uapi/linux/if_link.h
|
||||
+ uapi/linux/rtnetlink.h uapi/linux/if_link.h \
|
||||
+ uapi/linux/if.h uapi/linux/hdlc/ioctl.h
|
||||
AM_CPPFLAGS += @MNL_CFLAGS@
|
||||
LDADD += @MNL_LIBS@
|
||||
endif
|
||||
diff --git a/internal.h b/internal.h
|
||||
index b80f77a..3923719 100644
|
||||
--- a/internal.h
|
||||
+++ b/internal.h
|
||||
@@ -21,6 +21,9 @@
|
||||
#include <unistd.h>
|
||||
#include <endian.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#define __UAPI_DEF_IF_IFNAMSIZ 1
|
||||
+#define __UAPI_DEF_IF_IFMAP 1
|
||||
+#define __UAPI_DEF_IF_IFREQ 1
|
||||
#include <linux/if.h>
|
||||
|
||||
#include "json_writer.h"
|
||||
@@ -52,10 +55,6 @@ typedef int32_t s32;
|
||||
#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
|
||||
#endif
|
||||
|
||||
-#ifndef ALTIFNAMSIZ
|
||||
-#define ALTIFNAMSIZ 128
|
||||
-#endif
|
||||
-
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/net_tstamp.h>
|
||||
|
||||
diff --git a/uapi/linux/hdlc/ioctl.h b/uapi/linux/hdlc/ioctl.h
|
||||
new file mode 100644
|
||||
index 0000000..b06341a
|
||||
--- /dev/null
|
||||
+++ b/uapi/linux/hdlc/ioctl.h
|
||||
@@ -0,0 +1,94 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
+#ifndef __HDLC_IOCTL_H__
|
||||
+#define __HDLC_IOCTL_H__
|
||||
+
|
||||
+
|
||||
+#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */
|
||||
+
|
||||
+#define CLOCK_DEFAULT 0 /* Default setting */
|
||||
+#define CLOCK_EXT 1 /* External TX and RX clock - DTE */
|
||||
+#define CLOCK_INT 2 /* Internal TX and RX clock - DCE */
|
||||
+#define CLOCK_TXINT 3 /* Internal TX and external RX clock */
|
||||
+#define CLOCK_TXFROMRX 4 /* TX clock derived from external RX clock */
|
||||
+
|
||||
+
|
||||
+#define ENCODING_DEFAULT 0 /* Default setting */
|
||||
+#define ENCODING_NRZ 1
|
||||
+#define ENCODING_NRZI 2
|
||||
+#define ENCODING_FM_MARK 3
|
||||
+#define ENCODING_FM_SPACE 4
|
||||
+#define ENCODING_MANCHESTER 5
|
||||
+
|
||||
+
|
||||
+#define PARITY_DEFAULT 0 /* Default setting */
|
||||
+#define PARITY_NONE 1 /* No parity */
|
||||
+#define PARITY_CRC16_PR0 2 /* CRC16, initial value 0x0000 */
|
||||
+#define PARITY_CRC16_PR1 3 /* CRC16, initial value 0xFFFF */
|
||||
+#define PARITY_CRC16_PR0_CCITT 4 /* CRC16, initial 0x0000, ITU-T version */
|
||||
+#define PARITY_CRC16_PR1_CCITT 5 /* CRC16, initial 0xFFFF, ITU-T version */
|
||||
+#define PARITY_CRC32_PR0_CCITT 6 /* CRC32, initial value 0x00000000 */
|
||||
+#define PARITY_CRC32_PR1_CCITT 7 /* CRC32, initial value 0xFFFFFFFF */
|
||||
+
|
||||
+#define LMI_DEFAULT 0 /* Default setting */
|
||||
+#define LMI_NONE 1 /* No LMI, all PVCs are static */
|
||||
+#define LMI_ANSI 2 /* ANSI Annex D */
|
||||
+#define LMI_CCITT 3 /* ITU-T Annex A */
|
||||
+#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */
|
||||
+
|
||||
+#ifndef __ASSEMBLY__
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int clock_rate; /* bits per second */
|
||||
+ unsigned int clock_type; /* internal, external, TX-internal etc. */
|
||||
+ unsigned short loopback;
|
||||
+} sync_serial_settings; /* V.35, V.24, X.21 */
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int clock_rate; /* bits per second */
|
||||
+ unsigned int clock_type; /* internal, external, TX-internal etc. */
|
||||
+ unsigned short loopback;
|
||||
+ unsigned int slot_map;
|
||||
+} te1_settings; /* T1, E1 */
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned short encoding;
|
||||
+ unsigned short parity;
|
||||
+} raw_hdlc_proto;
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int t391;
|
||||
+ unsigned int t392;
|
||||
+ unsigned int n391;
|
||||
+ unsigned int n392;
|
||||
+ unsigned int n393;
|
||||
+ unsigned short lmi;
|
||||
+ unsigned short dce; /* 1 for DCE (network side) operation */
|
||||
+} fr_proto;
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int dlci;
|
||||
+} fr_proto_pvc; /* for creating/deleting FR PVCs */
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int dlci;
|
||||
+ char master[IFNAMSIZ]; /* Name of master FRAD device */
|
||||
+}fr_proto_pvc_info; /* for returning PVC information only */
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned int interval;
|
||||
+ unsigned int timeout;
|
||||
+} cisco_proto;
|
||||
+
|
||||
+typedef struct {
|
||||
+ unsigned short dce; /* 1 for DCE (network side) operation */
|
||||
+ unsigned int modulo; /* modulo (8 = basic / 128 = extended) */
|
||||
+ unsigned int window; /* frame window size */
|
||||
+ unsigned int t1; /* timeout t1 */
|
||||
+ unsigned int t2; /* timeout t2 */
|
||||
+ unsigned int n2; /* frame retry counter */
|
||||
+} x25_hdlc_proto;
|
||||
+
|
||||
+/* PPP doesn't need any info now - supply length = 0 to ioctl */
|
||||
+
|
||||
+#endif /* __ASSEMBLY__ */
|
||||
+#endif /* __HDLC_IOCTL_H__ */
|
||||
diff --git a/uapi/linux/if.h b/uapi/linux/if.h
|
||||
new file mode 100644
|
||||
index 0000000..75ee7f4
|
||||
--- /dev/null
|
||||
+++ b/uapi/linux/if.h
|
||||
@@ -0,0 +1,296 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
|
||||
+/*
|
||||
+ * INET An implementation of the TCP/IP protocol suite for the LINUX
|
||||
+ * operating system. INET is implemented using the BSD Socket
|
||||
+ * interface as the means of communication with the user level.
|
||||
+ *
|
||||
+ * Global definitions for the INET interface module.
|
||||
+ *
|
||||
+ * Version: @(#)if.h 1.0.2 04/18/93
|
||||
+ *
|
||||
+ * Authors: Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988
|
||||
+ * Ross Biro
|
||||
+ * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License
|
||||
+ * as published by the Free Software Foundation; either version
|
||||
+ * 2 of the License, or (at your option) any later version.
|
||||
+ */
|
||||
+#ifndef _LINUX_IF_H
|
||||
+#define _LINUX_IF_H
|
||||
+
|
||||
+#include <linux/libc-compat.h> /* for compatibility with glibc */
|
||||
+#include <linux/types.h> /* for "__kernel_caddr_t" et al */
|
||||
+#include <linux/socket.h> /* for "struct sockaddr" et al */
|
||||
+ /* for "__user" et al */
|
||||
+
|
||||
+#include <sys/socket.h> /* for struct sockaddr. */
|
||||
+
|
||||
+#if __UAPI_DEF_IF_IFNAMSIZ
|
||||
+#define IFNAMSIZ 16
|
||||
+#endif /* __UAPI_DEF_IF_IFNAMSIZ */
|
||||
+#define IFALIASZ 256
|
||||
+#define ALTIFNAMSIZ 128
|
||||
+#include <linux/hdlc/ioctl.h>
|
||||
+
|
||||
+/* For glibc compatibility. An empty enum does not compile. */
|
||||
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \
|
||||
+ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
|
||||
+/**
|
||||
+ * enum net_device_flags - &struct net_device flags
|
||||
+ *
|
||||
+ * These are the &struct net_device flags, they can be set by drivers, the
|
||||
+ * kernel and some can be triggered by userspace. Userspace can query and
|
||||
+ * set these flags using userspace utilities but there is also a sysfs
|
||||
+ * entry available for all dev flags which can be queried and set. These flags
|
||||
+ * are shared for all types of net_devices. The sysfs entries are available
|
||||
+ * via /sys/class/net/<dev>/flags. Flags which can be toggled through sysfs
|
||||
+ * are annotated below, note that only a few flags can be toggled and some
|
||||
+ * other flags are always preserved from the original net_device flags
|
||||
+ * even if you try to set them via sysfs. Flags which are always preserved
|
||||
+ * are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__
|
||||
+ * are annotated below as such.
|
||||
+ *
|
||||
+ * You should have a pretty good reason to be extending these flags.
|
||||
+ *
|
||||
+ * @IFF_UP: interface is up. Can be toggled through sysfs.
|
||||
+ * @IFF_BROADCAST: broadcast address valid. Volatile.
|
||||
+ * @IFF_DEBUG: turn on debugging. Can be toggled through sysfs.
|
||||
+ * @IFF_LOOPBACK: is a loopback net. Volatile.
|
||||
+ * @IFF_POINTOPOINT: interface is has p-p link. Volatile.
|
||||
+ * @IFF_NOTRAILERS: avoid use of trailers. Can be toggled through sysfs.
|
||||
+ * Volatile.
|
||||
+ * @IFF_RUNNING: interface RFC2863 OPER_UP. Volatile.
|
||||
+ * @IFF_NOARP: no ARP protocol. Can be toggled through sysfs. Volatile.
|
||||
+ * @IFF_PROMISC: receive all packets. Can be toggled through sysfs.
|
||||
+ * @IFF_ALLMULTI: receive all multicast packets. Can be toggled through
|
||||
+ * sysfs.
|
||||
+ * @IFF_MASTER: master of a load balancer. Volatile.
|
||||
+ * @IFF_SLAVE: slave of a load balancer. Volatile.
|
||||
+ * @IFF_MULTICAST: Supports multicast. Can be toggled through sysfs.
|
||||
+ * @IFF_PORTSEL: can set media type. Can be toggled through sysfs.
|
||||
+ * @IFF_AUTOMEDIA: auto media select active. Can be toggled through sysfs.
|
||||
+ * @IFF_DYNAMIC: dialup device with changing addresses. Can be toggled
|
||||
+ * through sysfs.
|
||||
+ * @IFF_LOWER_UP: driver signals L1 up. Volatile.
|
||||
+ * @IFF_DORMANT: driver signals dormant. Volatile.
|
||||
+ * @IFF_ECHO: echo sent packets. Volatile.
|
||||
+ */
|
||||
+enum net_device_flags {
|
||||
+/* for compatibility with glibc net/if.h */
|
||||
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
|
||||
+ IFF_UP = 1<<0, /* sysfs */
|
||||
+ IFF_BROADCAST = 1<<1, /* __volatile__ */
|
||||
+ IFF_DEBUG = 1<<2, /* sysfs */
|
||||
+ IFF_LOOPBACK = 1<<3, /* __volatile__ */
|
||||
+ IFF_POINTOPOINT = 1<<4, /* __volatile__ */
|
||||
+ IFF_NOTRAILERS = 1<<5, /* sysfs */
|
||||
+ IFF_RUNNING = 1<<6, /* __volatile__ */
|
||||
+ IFF_NOARP = 1<<7, /* sysfs */
|
||||
+ IFF_PROMISC = 1<<8, /* sysfs */
|
||||
+ IFF_ALLMULTI = 1<<9, /* sysfs */
|
||||
+ IFF_MASTER = 1<<10, /* __volatile__ */
|
||||
+ IFF_SLAVE = 1<<11, /* __volatile__ */
|
||||
+ IFF_MULTICAST = 1<<12, /* sysfs */
|
||||
+ IFF_PORTSEL = 1<<13, /* sysfs */
|
||||
+ IFF_AUTOMEDIA = 1<<14, /* sysfs */
|
||||
+ IFF_DYNAMIC = 1<<15, /* sysfs */
|
||||
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
|
||||
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
|
||||
+ IFF_LOWER_UP = 1<<16, /* __volatile__ */
|
||||
+ IFF_DORMANT = 1<<17, /* __volatile__ */
|
||||
+ IFF_ECHO = 1<<18, /* __volatile__ */
|
||||
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
|
||||
+};
|
||||
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
|
||||
+
|
||||
+/* for compatibility with glibc net/if.h */
|
||||
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
|
||||
+#define IFF_UP IFF_UP
|
||||
+#define IFF_BROADCAST IFF_BROADCAST
|
||||
+#define IFF_DEBUG IFF_DEBUG
|
||||
+#define IFF_LOOPBACK IFF_LOOPBACK
|
||||
+#define IFF_POINTOPOINT IFF_POINTOPOINT
|
||||
+#define IFF_NOTRAILERS IFF_NOTRAILERS
|
||||
+#define IFF_RUNNING IFF_RUNNING
|
||||
+#define IFF_NOARP IFF_NOARP
|
||||
+#define IFF_PROMISC IFF_PROMISC
|
||||
+#define IFF_ALLMULTI IFF_ALLMULTI
|
||||
+#define IFF_MASTER IFF_MASTER
|
||||
+#define IFF_SLAVE IFF_SLAVE
|
||||
+#define IFF_MULTICAST IFF_MULTICAST
|
||||
+#define IFF_PORTSEL IFF_PORTSEL
|
||||
+#define IFF_AUTOMEDIA IFF_AUTOMEDIA
|
||||
+#define IFF_DYNAMIC IFF_DYNAMIC
|
||||
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */
|
||||
+
|
||||
+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
|
||||
+#define IFF_LOWER_UP IFF_LOWER_UP
|
||||
+#define IFF_DORMANT IFF_DORMANT
|
||||
+#define IFF_ECHO IFF_ECHO
|
||||
+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
|
||||
+
|
||||
+#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\
|
||||
+ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT)
|
||||
+
|
||||
+#define IF_GET_IFACE 0x0001 /* for querying only */
|
||||
+#define IF_GET_PROTO 0x0002
|
||||
+
|
||||
+/* For definitions see hdlc.h */
|
||||
+#define IF_IFACE_V35 0x1000 /* V.35 serial interface */
|
||||
+#define IF_IFACE_V24 0x1001 /* V.24 serial interface */
|
||||
+#define IF_IFACE_X21 0x1002 /* X.21 serial interface */
|
||||
+#define IF_IFACE_T1 0x1003 /* T1 telco serial interface */
|
||||
+#define IF_IFACE_E1 0x1004 /* E1 telco serial interface */
|
||||
+#define IF_IFACE_SYNC_SERIAL 0x1005 /* can't be set by software */
|
||||
+#define IF_IFACE_X21D 0x1006 /* X.21 Dual Clocking (FarSite) */
|
||||
+
|
||||
+/* For definitions see hdlc.h */
|
||||
+#define IF_PROTO_HDLC 0x2000 /* raw HDLC protocol */
|
||||
+#define IF_PROTO_PPP 0x2001 /* PPP protocol */
|
||||
+#define IF_PROTO_CISCO 0x2002 /* Cisco HDLC protocol */
|
||||
+#define IF_PROTO_FR 0x2003 /* Frame Relay protocol */
|
||||
+#define IF_PROTO_FR_ADD_PVC 0x2004 /* Create FR PVC */
|
||||
+#define IF_PROTO_FR_DEL_PVC 0x2005 /* Delete FR PVC */
|
||||
+#define IF_PROTO_X25 0x2006 /* X.25 */
|
||||
+#define IF_PROTO_HDLC_ETH 0x2007 /* raw HDLC, Ethernet emulation */
|
||||
+#define IF_PROTO_FR_ADD_ETH_PVC 0x2008 /* Create FR Ethernet-bridged PVC */
|
||||
+#define IF_PROTO_FR_DEL_ETH_PVC 0x2009 /* Delete FR Ethernet-bridged PVC */
|
||||
+#define IF_PROTO_FR_PVC 0x200A /* for reading PVC status */
|
||||
+#define IF_PROTO_FR_ETH_PVC 0x200B
|
||||
+#define IF_PROTO_RAW 0x200C /* RAW Socket */
|
||||
+
|
||||
+/* RFC 2863 operational status */
|
||||
+enum {
|
||||
+ IF_OPER_UNKNOWN,
|
||||
+ IF_OPER_NOTPRESENT,
|
||||
+ IF_OPER_DOWN,
|
||||
+ IF_OPER_LOWERLAYERDOWN,
|
||||
+ IF_OPER_TESTING,
|
||||
+ IF_OPER_DORMANT,
|
||||
+ IF_OPER_UP,
|
||||
+};
|
||||
+
|
||||
+/* link modes */
|
||||
+enum {
|
||||
+ IF_LINK_MODE_DEFAULT,
|
||||
+ IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */
|
||||
+ IF_LINK_MODE_TESTING, /* limit upward transition to testing */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Device mapping structure. I'd just gone off and designed a
|
||||
+ * beautiful scheme using only loadable modules with arguments
|
||||
+ * for driver options and along come the PCMCIA people 8)
|
||||
+ *
|
||||
+ * Ah well. The get() side of this is good for WDSETUP, and it'll
|
||||
+ * be handy for debugging things. The set side is fine for now and
|
||||
+ * being very small might be worth keeping for clean configuration.
|
||||
+ */
|
||||
+
|
||||
+/* for compatibility with glibc net/if.h */
|
||||
+#if __UAPI_DEF_IF_IFMAP
|
||||
+struct ifmap {
|
||||
+ unsigned long mem_start;
|
||||
+ unsigned long mem_end;
|
||||
+ unsigned short base_addr;
|
||||
+ unsigned char irq;
|
||||
+ unsigned char dma;
|
||||
+ unsigned char port;
|
||||
+ /* 3 bytes spare */
|
||||
+};
|
||||
+#endif /* __UAPI_DEF_IF_IFMAP */
|
||||
+
|
||||
+struct if_settings {
|
||||
+ unsigned int type; /* Type of physical device or protocol */
|
||||
+ unsigned int size; /* Size of the data allocated by the caller */
|
||||
+ union {
|
||||
+ /* {atm/eth/dsl}_settings anyone ? */
|
||||
+ raw_hdlc_proto *raw_hdlc;
|
||||
+ cisco_proto *cisco;
|
||||
+ fr_proto *fr;
|
||||
+ fr_proto_pvc *fr_pvc;
|
||||
+ fr_proto_pvc_info *fr_pvc_info;
|
||||
+ x25_hdlc_proto *x25;
|
||||
+
|
||||
+ /* interface settings */
|
||||
+ sync_serial_settings *sync;
|
||||
+ te1_settings *te1;
|
||||
+ } ifs_ifsu;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Interface request structure used for socket
|
||||
+ * ioctl's. All interface ioctl's must have parameter
|
||||
+ * definitions which begin with ifr_name. The
|
||||
+ * remainder may be interface specific.
|
||||
+ */
|
||||
+
|
||||
+/* for compatibility with glibc net/if.h */
|
||||
+#if __UAPI_DEF_IF_IFREQ
|
||||
+struct ifreq {
|
||||
+#define IFHWADDRLEN 6
|
||||
+ union
|
||||
+ {
|
||||
+ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */
|
||||
+ } ifr_ifrn;
|
||||
+
|
||||
+ union {
|
||||
+ struct sockaddr ifru_addr;
|
||||
+ struct sockaddr ifru_dstaddr;
|
||||
+ struct sockaddr ifru_broadaddr;
|
||||
+ struct sockaddr ifru_netmask;
|
||||
+ struct sockaddr ifru_hwaddr;
|
||||
+ short ifru_flags;
|
||||
+ int ifru_ivalue;
|
||||
+ int ifru_mtu;
|
||||
+ struct ifmap ifru_map;
|
||||
+ char ifru_slave[IFNAMSIZ]; /* Just fits the size */
|
||||
+ char ifru_newname[IFNAMSIZ];
|
||||
+ void * ifru_data;
|
||||
+ struct if_settings ifru_settings;
|
||||
+ } ifr_ifru;
|
||||
+};
|
||||
+#endif /* __UAPI_DEF_IF_IFREQ */
|
||||
+
|
||||
+#define ifr_name ifr_ifrn.ifrn_name /* interface name */
|
||||
+#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
|
||||
+#define ifr_addr ifr_ifru.ifru_addr /* address */
|
||||
+#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */
|
||||
+#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
|
||||
+#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */
|
||||
+#define ifr_flags ifr_ifru.ifru_flags /* flags */
|
||||
+#define ifr_metric ifr_ifru.ifru_ivalue /* metric */
|
||||
+#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */
|
||||
+#define ifr_map ifr_ifru.ifru_map /* device map */
|
||||
+#define ifr_slave ifr_ifru.ifru_slave /* slave device */
|
||||
+#define ifr_data ifr_ifru.ifru_data /* for use by interface */
|
||||
+#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */
|
||||
+#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */
|
||||
+#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */
|
||||
+#define ifr_newname ifr_ifru.ifru_newname /* New name */
|
||||
+#define ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/
|
||||
+
|
||||
+/*
|
||||
+ * Structure used in SIOCGIFCONF request.
|
||||
+ * Used to retrieve interface configuration
|
||||
+ * for machine (useful for programs which
|
||||
+ * must know all networks accessible).
|
||||
+ */
|
||||
+
|
||||
+/* for compatibility with glibc net/if.h */
|
||||
+#if __UAPI_DEF_IF_IFCONF
|
||||
+struct ifconf {
|
||||
+ int ifc_len; /* size of buffer */
|
||||
+ union {
|
||||
+ char *ifcu_buf;
|
||||
+ struct ifreq *ifcu_req;
|
||||
+ } ifc_ifcu;
|
||||
+};
|
||||
+#endif /* __UAPI_DEF_IF_IFCONF */
|
||||
+
|
||||
+#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */
|
||||
+#define ifc_req ifc_ifcu.ifcu_req /* array of structures */
|
||||
+
|
||||
+#endif /* _LINUX_IF_H */
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,71 +0,0 @@
|
||||
From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Date: Sat, 14 Jan 2023 08:34:11 -0800
|
||||
Subject: [PATCH] marvell.c: Fix build with musl-libc
|
||||
|
||||
After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped
|
||||
including net/if.h which resolved the proper defines to pull in
|
||||
sys/types.h and provide a definition for u_int32_t. With musl-libc we
|
||||
would need to define _GNU_SOURCE to ensure that sys/types.h does provide a
|
||||
definition for u_int32_t.
|
||||
|
||||
Rather, just replace u_uint{16,32}_t with the more standard
|
||||
uint{16,32}_t types from stdint.h
|
||||
|
||||
Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
|
||||
[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli@gmail.com/]
|
||||
Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
|
||||
---
|
||||
marvell.c | 34 +++++++++++++++++-----------------
|
||||
1 file changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/marvell.c b/marvell.c
|
||||
index d3d570e..3f3aed8 100644
|
||||
--- a/marvell.c
|
||||
+++ b/marvell.c
|
||||
@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p)
|
||||
static void dump_queue(const char *name, const void *a, int rx)
|
||||
{
|
||||
struct desc {
|
||||
- u_int32_t ctl;
|
||||
- u_int32_t next;
|
||||
- u_int32_t data_lo;
|
||||
- u_int32_t data_hi;
|
||||
- u_int32_t status;
|
||||
- u_int32_t timestamp;
|
||||
- u_int16_t csum2;
|
||||
- u_int16_t csum1;
|
||||
- u_int16_t csum2_start;
|
||||
- u_int16_t csum1_start;
|
||||
- u_int32_t addr_lo;
|
||||
- u_int32_t addr_hi;
|
||||
- u_int32_t count_lo;
|
||||
- u_int32_t count_hi;
|
||||
- u_int32_t byte_count;
|
||||
- u_int32_t csr;
|
||||
- u_int32_t flag;
|
||||
+ uint32_t ctl;
|
||||
+ uint32_t next;
|
||||
+ uint32_t data_lo;
|
||||
+ uint32_t data_hi;
|
||||
+ uint32_t status;
|
||||
+ uint32_t timestamp;
|
||||
+ uint16_t csum2;
|
||||
+ uint16_t csum1;
|
||||
+ uint16_t csum2_start;
|
||||
+ uint16_t csum1_start;
|
||||
+ uint32_t addr_lo;
|
||||
+ uint32_t addr_hi;
|
||||
+ uint32_t count_lo;
|
||||
+ uint32_t count_hi;
|
||||
+ uint32_t byte_count;
|
||||
+ uint32_t csr;
|
||||
+ uint32_t flag;
|
||||
};
|
||||
const struct desc *d = a;
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc
|
||||
sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz
|
||||
sha256 86df0114064d4d73f6bf72bf03e85c33964a519ee0c1d1ba65005ad2d0e570e1 ethtool-6.2.tar.xz
|
||||
# Locally calculated
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ETHTOOL_VERSION = 6.1
|
||||
ETHTOOL_VERSION = 6.2
|
||||
ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
|
||||
ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
|
||||
ETHTOOL_LICENSE = GPL-2.0
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz
|
||||
sha256 dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b gsl-2.7.1.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSL_VERSION = 2.6
|
||||
GSL_VERSION = 2.7.1
|
||||
GSL_SITE = $(BR2_GNU_MIRROR)/gsl
|
||||
GSL_INSTALL_STAGING = YES
|
||||
GSL_LICENSE = GPL-3.0
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz
|
||||
sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz
|
||||
sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HACKRF_VERSION = 2022.09.1
|
||||
HACKRF_VERSION = 2023.01.1
|
||||
HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION)
|
||||
HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz
|
||||
HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz
|
||||
sha256 f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b harfbuzz-7.1.0.tar.xz
|
||||
sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HARFBUZZ_VERSION = 5.3.1
|
||||
HARFBUZZ_VERSION = 7.1.0
|
||||
HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)
|
||||
HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz
|
||||
HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
|
||||
|
@ -1,62 +0,0 @@
|
||||
From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Olivain <ju.o@free.fr>
|
||||
Date: Wed, 23 Nov 2022 23:27:11 +0100
|
||||
Subject: [PATCH] Check for the presence of <sys/auxv.h>
|
||||
|
||||
Not all gcc versions are providing <sys/auxv.h>. Checking for
|
||||
HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not
|
||||
sufficient and fail to build in some situations (it was observed for
|
||||
some gcc armv7m toolchains).
|
||||
|
||||
This patch adds a check for <sys/auxv.h> and include it only if present.
|
||||
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
hwy/detect_targets.h | 2 +-
|
||||
hwy/targets.cc | 2 +-
|
||||
3 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b6b14ab..df6b5ab 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -84,6 +84,9 @@ check_cxx_source_compiles(
|
||||
HWY_RISCV
|
||||
)
|
||||
|
||||
+include(CheckIncludeFile)
|
||||
+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H)
|
||||
+
|
||||
if (HWY_ENABLE_CONTRIB)
|
||||
# Glob all the traits so we don't need to modify this file when adding
|
||||
# additional special cases.
|
||||
diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h
|
||||
index 7f7e179..f0c6f94 100644
|
||||
--- a/hwy/detect_targets.h
|
||||
+++ b/hwy/detect_targets.h
|
||||
@@ -392,7 +392,7 @@
|
||||
#define HWY_HAVE_RUNTIME_DISPATCH 1
|
||||
// On Arm, currently only GCC does, and we require Linux to detect CPU
|
||||
// capabilities.
|
||||
-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX
|
||||
+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H
|
||||
#define HWY_HAVE_RUNTIME_DISPATCH 1
|
||||
#else
|
||||
#define HWY_HAVE_RUNTIME_DISPATCH 0
|
||||
diff --git a/hwy/targets.cc b/hwy/targets.cc
|
||||
index 2fde4db..abd6a94 100644
|
||||
--- a/hwy/targets.cc
|
||||
+++ b/hwy/targets.cc
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <cpuid.h>
|
||||
#endif // HWY_COMPILER_MSVC
|
||||
|
||||
-#elif HWY_ARCH_ARM && HWY_OS_LINUX
|
||||
+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H
|
||||
#include <asm/hwcap.h>
|
||||
#include <sys/auxv.h>
|
||||
#endif // HWY_ARCH_*
|
||||
--
|
||||
2.38.1
|
||||
|
@ -0,0 +1,46 @@
|
||||
From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Olivain <ju.o@free.fr>
|
||||
Date: Fri, 10 Feb 2023 21:25:36 +0100
|
||||
Subject: [PATCH] Fix compilation for armv7 with gcc < 8
|
||||
|
||||
Highway uses the construct __attribute__((target(+neon-vfpv4)) for
|
||||
Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1].
|
||||
When using a gcc < 8 (for example, like [2]), compilation fails with
|
||||
message:
|
||||
|
||||
In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0,
|
||||
from /build/highway-1.0.3/hwy/per_target.cc:20:
|
||||
/build/highway-1.0.3/hwy/per_target.cc: At global scope:
|
||||
/build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown
|
||||
|
||||
This commit protects the definition of HWY_TARGET_STR only when gcc
|
||||
version 8 or greater is used for armv7.
|
||||
|
||||
[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce
|
||||
[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz
|
||||
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
hwy/ops/set_macros-inl.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h
|
||||
index 051dbb3..00b4b1b 100644
|
||||
--- a/hwy/ops/set_macros-inl.h
|
||||
+++ b/hwy/ops/set_macros-inl.h
|
||||
@@ -230,7 +230,12 @@
|
||||
// Can use pragmas instead of -march compiler flag
|
||||
#if HWY_HAVE_RUNTIME_DISPATCH
|
||||
#if HWY_ARCH_ARM_V7
|
||||
+#if HWY_COMPILER_GCC_ACTUAL >= 800
|
||||
+// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8.
|
||||
+// In case we have a gcc < 8, we can still compile by keeping
|
||||
+// HWY_TARGET_STR undefined.
|
||||
#define HWY_TARGET_STR "+neon-vfpv4"
|
||||
+#endif
|
||||
#else
|
||||
#define HWY_TARGET_STR "+crypto"
|
||||
#endif // HWY_ARCH_ARM_V7
|
||||
--
|
||||
2.39.2
|
||||
|
@ -0,0 +1,118 @@
|
||||
From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Olivain <ju.o@free.fr>
|
||||
Date: Mon, 20 Feb 2023 23:22:28 +0100
|
||||
Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When using a armv7 gcc >= 8 toolchain (like [1]) with Highway
|
||||
configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON,
|
||||
compilation fails with error:
|
||||
|
||||
In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33,
|
||||
from /build/highway-1.0.3/hwy/highway.h:358,
|
||||
from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104,
|
||||
from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27,
|
||||
from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23,
|
||||
from /build/highway-1.0.3/hwy/foreach_target.h:81,
|
||||
from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20:
|
||||
/toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128<long long unsigned int, 2>, Full128<long long unsigned int>, uint64_t*)':
|
||||
/toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch
|
||||
11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b)
|
||||
| ^~~~~~~~~
|
||||
/build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here
|
||||
2786 | vst1q_u64(unaligned, v.raw);
|
||||
| ~~~~~~~~~^~~~~~~~~~~~~~~~~~
|
||||
|
||||
The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON,
|
||||
or from client libraries like libjxl (at other places).
|
||||
|
||||
The issue is that Highway Arm NEON ops have a dependency on the
|
||||
Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions.
|
||||
The SIMD (Neon) v1 and VFPv3 instructions are not supported.
|
||||
|
||||
There was several attempts to fix variants of this issues.
|
||||
See #834 and #1032.
|
||||
|
||||
HWY_NEON target is selected only if __ARM_NEON is defined. See:
|
||||
https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251
|
||||
|
||||
This test is not sufficient since __ARM_NEON will be predefined in
|
||||
any cases when Neon is enabled (neon-vfpv3, neon-vfpv4).
|
||||
|
||||
The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2.
|
||||
When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced,
|
||||
but the code is still using intrinsics assuming VFPv4. Gcc will fail
|
||||
with error because code cannot be generated for the selected
|
||||
architecture.
|
||||
|
||||
This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in
|
||||
CXXFLAGS. The problem with this solution is that every client program will
|
||||
also need to do the same. This goes against the very purpose of
|
||||
"hwy/detect_targets.h".
|
||||
|
||||
Technically, Armv7-a processors with VFPv4 can be detected using some
|
||||
ACLE (Arm C Language Extensions [2]) predefined macros:
|
||||
|
||||
Basically, we want Highway to define HWY_NEON only when the target
|
||||
supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only
|
||||
(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore
|
||||
would fallback on HWY_SCALAR implementation.
|
||||
|
||||
However, not all compiler completely support ACLE. There is also
|
||||
several versions too. So we cannot easily rely on macros like
|
||||
"__ARM_VFPV4__" (which clang predefine, but not gcc).
|
||||
|
||||
The alternative solution proposed in this patch, is to declare the
|
||||
HWY_NEON target architecture as broken, when we detect the target is
|
||||
Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA)
|
||||
are missing. Half-floats are tested using the macro __ARM_NEON_FP,
|
||||
and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The
|
||||
intent of declaring the target as broken, rather than selecting
|
||||
HWY_NEON only if vfpv4 features are detected is to remain a bit
|
||||
conservative, since the detection is slithly inaccurate.
|
||||
|
||||
For a given compiler/cflags, predefined macros for Arm/ACLE can be
|
||||
reviewed with commands like:
|
||||
|
||||
arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort
|
||||
arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort
|
||||
clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort
|
||||
clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort
|
||||
|
||||
The different values of __ARM_NEON_FP can be seen, depending which
|
||||
"-mfpu" is passed. Same for __ARM_FEATURE_FMA.
|
||||
|
||||
[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2
|
||||
[2] https://github.com/ARM-software/acle/
|
||||
|
||||
Signed-off-by: Julien Olivain <ju.o@free.fr>
|
||||
---
|
||||
hwy/detect_targets.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h
|
||||
index 2beca95..40ae7fe 100644
|
||||
--- a/hwy/detect_targets.h
|
||||
+++ b/hwy/detect_targets.h
|
||||
@@ -154,6 +154,16 @@
|
||||
(defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN))
|
||||
#define HWY_BROKEN_TARGETS (HWY_NEON)
|
||||
|
||||
+// armv7-a without a detected vfpv4 is not supported
|
||||
+// (for example Cortex-A8, Cortex-A9)
|
||||
+// vfpv4 always have neon half-float _and_ FMA.
|
||||
+#elif HWY_ARCH_ARM_V7 && \
|
||||
+ (__ARM_ARCH_PROFILE == 'A') && \
|
||||
+ !defined(__ARM_VFPV4__) && \
|
||||
+ !((__ARM_NEON_FP & 0x2 /* half-float */) && \
|
||||
+ (__ARM_FEATURE_FMA == 1))
|
||||
+#define HWY_BROKEN_TARGETS (HWY_NEON)
|
||||
+
|
||||
// SVE[2] require recent clang or gcc versions.
|
||||
#elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \
|
||||
(HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000)
|
||||
--
|
||||
2.39.2
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz
|
||||
sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz
|
||||
sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HIGHWAY_VERSION = 1.0.2
|
||||
HIGHWAY_VERSION = 1.0.3
|
||||
HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION))
|
||||
HIGHWAY_LICENSE = Apache-2.0
|
||||
HIGHWAY_LICENSE_FILES = LICENSE
|
||||
@ -35,6 +35,9 @@ endif
|
||||
ifeq ($(BR2_ARM_FPU_VFPV4),y)
|
||||
HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON
|
||||
else
|
||||
# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we
|
||||
# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be
|
||||
# set to off.
|
||||
HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF
|
||||
endif
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz.sha256
|
||||
sha256 5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb htop-3.2.1.tar.xz
|
||||
# From https://github.com/htop-dev/htop/releases/download/3.2.2/htop-3.2.2.tar.xz.sha256
|
||||
sha256 bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 htop-3.2.2.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HTOP_VERSION = 3.2.1
|
||||
HTOP_VERSION = 3.2.2
|
||||
HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz
|
||||
HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION)
|
||||
HTOP_DEPENDENCIES = ncurses
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated:
|
||||
sha256 3cdc558ec8e53ef374a42490b2f28c0b23981fa8754a6d7182044707828ad1e9 htpdate-1.3.6.tar.gz
|
||||
sha256 88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2 htpdate-1.3.7.tar.gz
|
||||
sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HTPDATE_VERSION = 1.3.6
|
||||
HTPDATE_VERSION = 1.3.7
|
||||
HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION))
|
||||
HTPDATE_LICENSE = GPL-2.0+
|
||||
HTPDATE_LICENSE_FILES = LICENSE
|
||||
|
@ -1,4 +1,4 @@
|
||||
# From https://downloads.es.net/pub/iperf/iperf-3.12.tar.gz.sha256
|
||||
sha256 72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 iperf-3.12.tar.gz
|
||||
# From https://downloads.es.net/pub/iperf/iperf-3.13.tar.gz.sha256
|
||||
sha256 bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 iperf-3.13.tar.gz
|
||||
# Locally computed
|
||||
sha256 a5c2e3d799f2835156e565a3de4fad33d32ed289cdc9e414dfaf75719fd12ef9 LICENSE
|
||||
sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPERF3_VERSION = 3.12
|
||||
IPERF3_VERSION = 3.13
|
||||
IPERF3_SITE = https://downloads.es.net/pub/iperf
|
||||
IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
|
||||
IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001
|
||||
From: Benson Muite <bkmgit@users.noreply.github.com>
|
||||
Date: Wed, 4 Jan 2023 13:33:36 +0300
|
||||
Subject: [PATCH] Use parentheses to ensure compilation (#3138)
|
||||
|
||||
Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/turnrest.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/turnrest.c b/src/turnrest.c
|
||||
index b8560d22f2..42e6114de8 100644
|
||||
--- a/src/turnrest.c
|
||||
+++ b/src/turnrest.c
|
||||
@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) {
|
||||
JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri);
|
||||
janus_mutex_unlock(&api_mutex);
|
||||
curl_easy_setopt(curl, CURLOPT_URL, request_uri);
|
||||
- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1);
|
||||
+ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1);
|
||||
if(!api_http_get) {
|
||||
/* FIXME Some servers don't like a POST with no data */
|
||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string);
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz
|
||||
sha256 f721d62a22b38ba3a341a5502f06b8b3a5a4f7bd0e9cc6c53de257fe99695e17 janus-gateway-1.1.2.tar.gz
|
||||
sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JANUS_GATEWAY_VERSION = 1.1.1
|
||||
JANUS_GATEWAY_VERSION = 1.1.2
|
||||
JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION))
|
||||
JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception
|
||||
JANUS_GATEWAY_LICENSE_FILES = COPYING
|
||||
|
@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
|
||||
sha256 7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d kexec-tools-2.0.25.tar.xz
|
||||
sha256 7fe36a064101cd5c515e41b2be393dce3ca88adce59d6ee668e0af7c0c4570cd kexec-tools-2.0.26.tar.xz
|
||||
# locally calculated
|
||||
sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEXEC_VERSION = 2.0.25
|
||||
KEXEC_VERSION = 2.0.26
|
||||
KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
|
||||
KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
|
||||
KEXEC_LICENSE = GPL-2.0
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz
|
||||
sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz
|
||||
sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix
|
||||
KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix
|
||||
KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
|
||||
KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
|
||||
KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md
|
||||
|
@ -1,35 +0,0 @@
|
||||
From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001
|
||||
From: Marcus Folkesson <marcus.folkesson@gmail.com>
|
||||
Date: Tue, 31 Jan 2023 09:14:15 +0100
|
||||
Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long
|
||||
|
||||
VIDIOC_QUARYCAP is an unsigned long and should be passed as one.
|
||||
|
||||
Get rid of the following error:
|
||||
core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow]
|
||||
33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
|
||||
|
||||
Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861
|
||||
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
|
||||
---
|
||||
core/libcamera_app.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp
|
||||
index 04696fb..8cb6563 100644
|
||||
--- a/core/libcamera_app.cpp
|
||||
+++ b/core/libcamera_app.cpp
|
||||
@@ -30,7 +30,9 @@ static void check_camera_stack()
|
||||
return;
|
||||
|
||||
v4l2_capability caps;
|
||||
- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
|
||||
+ unsigned long request = VIDIOC_QUERYCAP;
|
||||
+
|
||||
+ int ret = ioctl(fd, request, &caps);
|
||||
close(fd);
|
||||
|
||||
if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal"))
|
||||
--
|
||||
2.38.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz
|
||||
sha256 a19f3960b97ec1c0d42df8af972868ff0d4c48be6096e7ac02dbaaa4c7c75636 libcamera-apps-1.1.2.tar.gz
|
||||
sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCAMERA_APPS_VERSION = 1.1.1
|
||||
LIBCAMERA_APPS_VERSION = 1.1.2
|
||||
LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION))
|
||||
LIBCAMERA_APPS_LICENSE = BSD-2-Clause
|
||||
LIBCAMERA_APPS_LICENSE_FILES = license.txt
|
||||
|
@ -0,0 +1,35 @@
|
||||
From 20811c5aa9c528405eaa3f88ff22a9adebafa9e6 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
|
||||
Date: Wed, 8 Mar 2023 14:00:52 +0100
|
||||
Subject: [PATCH] sysdir: Do not declare win32 functions on non-win32 platforms
|
||||
|
||||
These declaration poses problems on some embedded or retro Linux systems
|
||||
that deliberately disable support for wchar_t from their libc.
|
||||
|
||||
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
|
||||
[Retrieved from:
|
||||
https://github.com/libgit2/libgit2/commit/20811c5aa9c528405eaa3f88ff22a9adebafa9e6]
|
||||
---
|
||||
src/libgit2/sysdir.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/libgit2/sysdir.h b/src/libgit2/sysdir.h
|
||||
index 1d15bbf43..03f59e1de 100644
|
||||
--- a/src/libgit2/sysdir.h
|
||||
+++ b/src/libgit2/sysdir.h
|
||||
@@ -134,10 +134,12 @@ extern int git_sysdir_set(git_sysdir_t which, const char *paths);
|
||||
*/
|
||||
extern int git_sysdir_reset(void);
|
||||
|
||||
+#ifdef GIT_WIN32
|
||||
/** Sets the registry system dir to a mock; for testing. */
|
||||
extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir);
|
||||
|
||||
/** Find the given system dir; for testing. */
|
||||
extern int git_win32__find_system_dirs(git_str *out, const char *subdir);
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
--
|
||||
2.39.2
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz
|
||||
sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING
|
||||
sha256 d557fbf35557bb5df53cbf38ae0081edb4a36494ec0d19741fa673e509245f8f libgit2-1.6.2.tar.gz
|
||||
sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING
|
||||
|
@ -4,14 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGIT2_VERSION = 1.5.1
|
||||
LIBGIT2_VERSION = 1.6.2
|
||||
LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
|
||||
LIBGIT2_LICENSE = \
|
||||
GPL-2.0 with linking exception, \
|
||||
MIT (sha1), \
|
||||
BSD-3-Clause (sha256), \
|
||||
wildmatch license (wildmatch), \
|
||||
CC0-1.0 (xoroshiro256)
|
||||
CC0-1.0 (xoroshiro256), \
|
||||
BSD-2-Clause (basename_r)
|
||||
LIBGIT2_LICENSE_FILES = COPYING
|
||||
LIBGIT2_CPE_ID_VENDOR = libgit2_project
|
||||
LIBGIT2_INSTALL_STAGING = YES
|
||||
@ -24,6 +25,8 @@ LIBGIT2_CONF_OPTS = \
|
||||
-DUSE_NTLMCLIENT=OFF \
|
||||
-DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF)
|
||||
|
||||
LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
LIBGIT2_DEPENDENCIES = zlib libhttpparser
|
||||
|
||||
# If libiconv is available (for !locale toolchains), then we can use
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum
|
||||
sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz
|
||||
# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.sha256sum
|
||||
sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBGTK3_VERSION_MAJOR = 3.24
|
||||
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36
|
||||
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).37
|
||||
LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
|
||||
LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
|
||||
LIBGTK3_LICENSE = LGPL-2.0+
|
||||
|
@ -57,18 +57,16 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEV),y)
|
||||
LIBWEBSOCKETS_DEPENDENCIES += libev
|
||||
LIBWEBSOCKETS_CONF_OPTS += \
|
||||
-DLWS_WITH_LIBEV=ON \
|
||||
-DLWS_WITH_LIBEVENT=OFF
|
||||
else ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
LIBWEBSOCKETS_DEPENDENCIES += libevent
|
||||
LIBWEBSOCKETS_CONF_OPTS += \
|
||||
-DLWS_WITH_LIBEV=OFF \
|
||||
-DLWS_WITH_LIBEVENT=ON
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON
|
||||
else
|
||||
LIBWEBSOCKETS_CONF_OPTS += \
|
||||
-DLWS_WITH_LIBEV=OFF \
|
||||
-DLWS_WITH_LIBEVENT=OFF
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
LIBWEBSOCKETS_DEPENDENCIES += libevent
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON
|
||||
else
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz
|
||||
sha256 80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16 lsof-4.98.0.tar.gz
|
||||
sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LSOF_VERSION = 4.96.5
|
||||
LSOF_VERSION = 4.98.0
|
||||
LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION))
|
||||
LSOF_LICENSE = lsof license
|
||||
# License is repeated in each file, this is a relatively small one.
|
||||
|
42
package/lzop/0001-allow-overriding-modification-time.patch
Normal file
42
package/lzop/0001-allow-overriding-modification-time.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From: =?UTF-8?q?Florian=20B=C3=A4uerle?= <florian.baeuerle@allegion.com>
|
||||
Date: Thu, 25 Oct 2018 17:26:30 +0200
|
||||
Subject: [PATCH] allow overriding modification time
|
||||
|
||||
This patch allows to set the mtime of the lzop archive to
|
||||
$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to
|
||||
pengutronix by florian Bäuerle in october 2018.
|
||||
|
||||
https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch
|
||||
|
||||
Signed-off-by: Casey Reeves <casey@xogium.me>
|
||||
---
|
||||
src/lzop.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lzop.c b/src/lzop.c
|
||||
index a540ad9c4d33..c2f877d16f92 100644
|
||||
--- a/src/lzop.c
|
||||
+++ b/src/lzop.c
|
||||
@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop)
|
||||
assert(opt_method > 0);
|
||||
assert(opt_level > 0);
|
||||
assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode));
|
||||
+ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
|
||||
|
||||
memset(h,0,sizeof(header_t));
|
||||
|
||||
@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop)
|
||||
|
||||
h->mode = fix_mode_for_header(fip->st.st_mode);
|
||||
|
||||
- if (fip->st.st_mtime > 0)
|
||||
+ if (source_date_epoch)
|
||||
+ {
|
||||
+ time_t mtime = strtoul(source_date_epoch, NULL, 0);
|
||||
+ h->mtime_low = (lzo_uint32) (mtime);
|
||||
+ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16);
|
||||
+ }
|
||||
+ else if (fip->st.st_mtime > 0)
|
||||
{
|
||||
h->mtime_low = (lzo_uint32) (fip->st.st_mtime);
|
||||
h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16);
|
@ -1,37 +0,0 @@
|
||||
From: Jaap Crezee <jaap@jcz.nl>
|
||||
Date: Sat, 25 june 2016 13:13:00 +0200
|
||||
Subject: [PATCH] fix compilation host-lzop with gcc-6
|
||||
|
||||
This patch allows host-lzop to be compiled with host systems containing gcc-6
|
||||
|
||||
Upstream patch found here:
|
||||
https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1
|
||||
|
||||
Signed-off-by: Jaap Crezee <jaap@jcz.nl>
|
||||
|
||||
--- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100
|
||||
+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100
|
||||
@@ -4469,12 +4469,12 @@
|
||||
#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
|
||||
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
|
||||
#else
|
||||
- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
|
||||
+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0)
|
||||
#endif
|
||||
ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0)
|
||||
#if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
|
||||
#else
|
||||
- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
|
||||
+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0)
|
||||
#endif
|
||||
ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
|
||||
#if defined(acc_int16e_t)
|
||||
@@ -4703,7 +4703,7 @@
|
||||
#elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
|
||||
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
|
||||
#elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
|
||||
- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
|
||||
+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
|
||||
#endif
|
||||
#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
|
||||
# pragma option pop
|
@ -1,102 +0,0 @@
|
||||
From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 16 Aug 2015 10:35:47 -0700
|
||||
Subject: [PATCH] use static inlines as the external inline definition has
|
||||
changed with gcc5
|
||||
|
||||
[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
src/miniacc.h | 24 ++++++++----------------
|
||||
1 file changed, 8 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/miniacc.h b/src/miniacc.h
|
||||
index 09e6f0c..cae98d1 100644
|
||||
--- a/src/miniacc.h
|
||||
+++ b/src/miniacc.h
|
||||
@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
|
||||
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
||||
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
||||
#if !defined(ACC_UA_GET_LE16)
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
||||
+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
||||
__acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
|
||||
unsigned long v;
|
||||
__asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
||||
@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
|
||||
#define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
|
||||
#endif
|
||||
#if !defined(ACC_UA_SET_LE16)
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
__acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
|
||||
__asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
||||
}
|
||||
@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
|
||||
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
||||
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
||||
#if !defined(ACC_UA_GET_LE32)
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
||||
+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
||||
__acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
|
||||
unsigned long v;
|
||||
__asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
||||
@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
|
||||
#define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
|
||||
#endif
|
||||
#if !defined(ACC_UA_SET_LE32)
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
__acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
|
||||
__asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
||||
}
|
||||
@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
|
||||
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
||||
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
||||
#if !defined(ACC_UA_GET_LE16)
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
||||
+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
|
||||
__acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
|
||||
unsigned long v;
|
||||
__asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
||||
@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
|
||||
#define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
|
||||
#endif
|
||||
#if !defined(ACC_UA_SET_LE16)
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
__acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
|
||||
__asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
||||
}
|
||||
@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
|
||||
#if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
|
||||
#if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
|
||||
#if !defined(ACC_UA_GET_LE32)
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
|
||||
-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
||||
+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
|
||||
__acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
|
||||
unsigned long v;
|
||||
__asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
|
||||
@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
|
||||
#define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
|
||||
#endif
|
||||
#if !defined(ACC_UA_SET_LE32)
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
|
||||
-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
|
||||
__acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
|
||||
__asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
|
||||
}
|
||||
--
|
||||
2.5.0
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz
|
||||
sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz
|
||||
sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING
|
||||
|
@ -4,13 +4,26 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LZOP_VERSION = 1.03
|
||||
LZOP_VERSION = 1.04
|
||||
LZOP_SITE = http://www.lzop.org/download
|
||||
LZOP_LICENSE = GPL-2.0+
|
||||
LZOP_LICENSE_FILES = COPYING
|
||||
LZOP_DEPENDENCIES = lzo
|
||||
HOST_LZOP_DEPENDENCIES = host-lzo
|
||||
|
||||
# lzop uses libtool 2.4.2.418, which is right between 2.4.2 and
|
||||
# 2.4.4. While our patch for 2.4 is also supposed to work up to and
|
||||
# including 2.4.2.x, it does not work for libtool 2.4.2.418, which
|
||||
# requires the patch for 2.4.4. So we disable the libtool patching
|
||||
# from autotools-package and do our own.
|
||||
LZOP_LIBTOOL_PATCH = NO
|
||||
|
||||
define LZOP_LIBTOOL_FIXUP
|
||||
patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh
|
||||
endef
|
||||
LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP
|
||||
HOST_LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
|
@ -12,7 +12,7 @@ endif
|
||||
|
||||
# Not possible to directly refer to mesa3d variables, because of
|
||||
# first/second expansion trickery...
|
||||
MESA3D_HEADERS_VERSION = 22.3.4
|
||||
MESA3D_HEADERS_VERSION = 22.3.5
|
||||
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
|
||||
MESA3D_HEADERS_SITE = https://archive.mesa3d.org
|
||||
MESA3D_HEADERS_DL_SUBDIR = mesa3d
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html
|
||||
sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz
|
||||
sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html
|
||||
sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz
|
||||
sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz
|
||||
# License
|
||||
sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# When updating the version, please also update mesa3d-headers
|
||||
MESA3D_VERSION = 22.3.4
|
||||
MESA3D_VERSION = 22.3.5
|
||||
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
|
||||
MESA3D_SITE = https://archive.mesa3d.org
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz
|
||||
sha256 40a98fd9bcc865997866015013c3c64a304d98c2892fe4ab892ffd6ac3dd9bae mtools-4.0.42.tar.lz
|
||||
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MTOOLS_VERSION = 4.0.38
|
||||
MTOOLS_VERSION = 4.0.42
|
||||
MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz
|
||||
MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools
|
||||
MTOOLS_LICENSE = GPL-3.0+
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum
|
||||
sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz
|
||||
# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum
|
||||
sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz
|
||||
# Locally computed
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
|
||||
|
@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.40
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.42
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0
|
||||
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
|
||||
|
@ -1,3 +1,3 @@
|
||||
# locally computed
|
||||
sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2
|
||||
sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2
|
||||
sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETWORKD_DISPATCHER_VERSION = 2.2.3
|
||||
NETWORKD_DISPATCHER_VERSION = 2.2.4
|
||||
NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2
|
||||
NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION)
|
||||
NETWORKD_DISPATCHER_LICENSE = GPL-3.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz
|
||||
sha256 44073698c147fe641507398253c2e52ff8dc7eac8606cbf286c29f37939a4ebf ola-0.10.9.tar.gz
|
||||
|
||||
# License files (locally computed)
|
||||
sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OLA_VERSION = 0.10.8
|
||||
OLA_VERSION = 0.10.9
|
||||
OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION)
|
||||
OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests)
|
||||
OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE
|
||||
|
@ -12,7 +12,7 @@ config BR2_PACKAGE_OPENFPGALOADER
|
||||
|
||||
if BR2_PACKAGE_OPENFPGALOADER
|
||||
|
||||
config BR2_PACAKGE_OPENFPGALOADER_CMSIS
|
||||
config BR2_PACKAGE_OPENFPGALOADER_CMSIS
|
||||
bool "CMSIS-DAP support"
|
||||
depends on BR2_PACKAGE_HAS_UDEV # hidapi
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi
|
||||
@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS
|
||||
comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads"
|
||||
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD
|
||||
bool "libgpiod support"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod
|
||||
select BR2_PACKAGE_LIBGPIOD
|
||||
help
|
||||
openfpgaloader libgpiod support
|
||||
|
||||
comment "openfpgaloader libgpiod needs kernel headers >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
|
||||
|
||||
endif
|
||||
|
||||
comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9"
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz
|
||||
sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz
|
||||
sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENFPGALOADER_VERSION = 0.6.1
|
||||
OPENFPGALOADER_VERSION = 0.10.0
|
||||
OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION))
|
||||
OPENFPGALOADER_LICENSE = Apache-2.0
|
||||
OPENFPGALOADER_LICENSE_FILES = LICENSE
|
||||
@ -17,11 +17,18 @@ else
|
||||
OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACAKGE_OPENFPGALOADER_CMSIS),y)
|
||||
ifeq ($(BR2_PACKAGE_OPENFPGALOADER_CMSIS),y)
|
||||
OPENFPGALOADER_DEPENDENCIES += hidapi
|
||||
OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=ON
|
||||
else
|
||||
OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD),y)
|
||||
OPENFPGALOADER_DEPENDENCIES += libgpiod
|
||||
OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON
|
||||
else
|
||||
OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
@ -1,10 +1,10 @@
|
||||
# https://github.com/adoptium/temurin17-binaries/releases
|
||||
sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz
|
||||
sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz
|
||||
sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz
|
||||
sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz
|
||||
|
||||
# From https://github.com/adoptium/temurin11-binaries/releases
|
||||
sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz
|
||||
sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz
|
||||
sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz
|
||||
sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE
|
||||
|
@ -6,10 +6,10 @@
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
|
||||
HOST_OPENJDK_BIN_VERSION_MAJOR = 17
|
||||
HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8
|
||||
HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10
|
||||
else
|
||||
HOST_OPENJDK_BIN_VERSION_MAJOR = 11
|
||||
HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1
|
||||
HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10
|
||||
endif
|
||||
|
||||
ifeq ($(HOSTARCH),x86_64)
|
||||
|
@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
|
||||
index 5120918aed2..f7a99955874 100644
|
||||
--- a/make/autoconf/libraries.m4
|
||||
+++ b/make/autoconf/libraries.m4
|
||||
@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
|
||||
@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
fi
|
||||
fi
|
||||
|
||||
+ # Libatomic library
|
||||
@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644
|
||||
arm*)
|
||||
VAR_CPU=arm
|
||||
VAR_CPU_ARCH=arm
|
||||
@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
||||
@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
||||
HOTSPOT_$1_CPU_DEFINE=PPC64
|
||||
|
||||
# The cpu defines below are for zero, we don't support them directly.
|
||||
@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c
|
||||
index b08caf4d5d3..2bf084895ba 100644
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
#ifndef EM_AARCH64
|
||||
#define EM_AARCH64 183 /* ARM AARCH64 */
|
||||
#endif
|
||||
@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644
|
||||
#ifndef EM_RISCV
|
||||
#define EM_RISCV 243 /* RISC-V */
|
||||
#endif
|
||||
@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
{EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"},
|
||||
#endif
|
||||
{EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
|
||||
@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644
|
||||
// we only support 64 bit z architecture
|
||||
{EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"},
|
||||
{EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
|
||||
@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_PPC;
|
||||
#elif (defined AARCH64)
|
||||
static Elf32_Half running_arch_code=EM_AARCH64;
|
||||
@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644
|
||||
#elif (defined ARM)
|
||||
static Elf32_Half running_arch_code=EM_ARM;
|
||||
#elif (defined S390)
|
||||
@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_RISCV;
|
||||
@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_LOONGARCH;
|
||||
#else
|
||||
#error Method os::dll_load requires that one of following is defined:\
|
||||
- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
+ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
#endif
|
||||
|
||||
// Identify compatibility class for VM's architecture and library's architecture
|
@ -1,4 +1,4 @@
|
||||
# Locally computed
|
||||
sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz
|
||||
sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz
|
||||
sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz
|
||||
sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz
|
||||
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
|
||||
|
@ -6,10 +6,10 @@
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
|
||||
OPENJDK_VERSION_MAJOR = 17
|
||||
OPENJDK_VERSION_MINOR = 0.2+8
|
||||
OPENJDK_VERSION_MINOR = 0.6+10
|
||||
else
|
||||
OPENJDK_VERSION_MAJOR = 11
|
||||
OPENJDK_VERSION_MINOR = 0.14.1+1
|
||||
OPENJDK_VERSION_MINOR = 0.18+10
|
||||
endif
|
||||
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
|
||||
OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
|
||||
|
@ -1,5 +1,6 @@
|
||||
comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
depends on !BR2_sparc
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|
||||
|| !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
|
||||
@ -8,6 +9,7 @@ config BR2_PACKAGE_OPENMPI
|
||||
bool "openmpi"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
|
@ -1,6 +1,6 @@
|
||||
# From: https://www.open-mpi.org/software/ompi/v4.0/
|
||||
md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2
|
||||
sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2
|
||||
# From: https://www.open-mpi.org/software/ompi/v4.1/
|
||||
md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2
|
||||
sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2
|
||||
sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2
|
||||
# Locally computed
|
||||
sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2
|
||||
sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE
|
||||
sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE
|
||||
|
@ -4,14 +4,21 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENMPI_VERSION_MAJOR = 4.0
|
||||
OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0
|
||||
OPENMPI_VERSION_MAJOR = 4.1
|
||||
OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5
|
||||
OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
|
||||
OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
|
||||
OPENMPI_LICENSE = BSD-3-Clause
|
||||
OPENMPI_LICENSE_FILES = LICENSE
|
||||
OPENMPI_INSTALL_STAGING = YES
|
||||
|
||||
# The macro searching for IME (Infinite Memory Engine) filesystem
|
||||
# brings "-I/usr/local/include" in the CPPFLAGS, even if not
|
||||
# found. This makes the configuration fail. See:
|
||||
# https://github.com/open-mpi/ompi/blob/v4.1.5/config/ompi_check_ime.m4#L35
|
||||
# Disable explicitly to avoid the issue.
|
||||
OPENMPI_CONF_OPTS = --without-ime
|
||||
|
||||
# Enabling Fortran support requires pre-seeding the configure script
|
||||
# with various values that cannot be guessed, so we provide cache
|
||||
# files for various architectures.
|
||||
@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
|
||||
OPENMPI_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)"
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
OPENMPI_LIBS += -latomic
|
||||
endif
|
||||
|
||||
OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://download.gnome.org/sources/pango/1.50/pango-1.50.12.sha256sum
|
||||
sha256 caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 pango-1.50.12.tar.xz
|
||||
# From https://download.gnome.org/sources/pango/1.50/pango-1.50.14.sha256sum
|
||||
sha256 1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8 pango-1.50.14.tar.xz
|
||||
|
||||
# Locally computed
|
||||
sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
PANGO_VERSION_MAJOR = 1.50
|
||||
PANGO_VERSION = $(PANGO_VERSION_MAJOR).12
|
||||
PANGO_VERSION = $(PANGO_VERSION_MAJOR).14
|
||||
PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
|
||||
PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR)
|
||||
PANGO_INSTALL_STAGING = YES
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
PCRE2_VERSION = 10.42
|
||||
PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION)
|
||||
PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION)
|
||||
PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2
|
||||
PCRE2_LICENSE = BSD-3-Clause
|
||||
PCRE2_LICENSE_FILES = LICENCE
|
||||
|
@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \
|
||||
endif
|
||||
|
||||
ifeq ($$(BR2_CCACHE),y)
|
||||
ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),)
|
||||
ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),)
|
||||
$(2)_DEPENDENCIES += host-ccache
|
||||
endif
|
||||
endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after vendoring
|
||||
sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz
|
||||
sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache
|
||||
sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit
|
||||
|
@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_MATURIN_VERSION = 0.14.9
|
||||
PYTHON_MATURIN_VERSION = 0.14.13
|
||||
PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz
|
||||
PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad
|
||||
PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290
|
||||
PYTHON_MATURIN_SETUP_TYPE = setuptools
|
||||
PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT
|
||||
PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit
|
||||
|
@ -58,6 +58,17 @@ config BR2_PACKAGE_QEMU_SYSTEM
|
||||
|
||||
if BR2_PACKAGE_QEMU_SYSTEM
|
||||
|
||||
config BR2_PACKAGE_QEMU_BLOBS
|
||||
bool "Install binary blobs"
|
||||
default y
|
||||
help
|
||||
Say 'y' here (the default) to install binary blobs (such as
|
||||
BIOS or firmwares for the different machines simulated by
|
||||
QEMU). Say 'n' to not install those blobs.
|
||||
|
||||
Note: Some machines may be unbootable without those blobs.
|
||||
If unsure, say 'y'.
|
||||
|
||||
config BR2_PACKAGE_QEMU_SLIRP
|
||||
bool "Enable user mode networking (SLIRP)"
|
||||
select BR2_PACKAGE_SLIRP
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user