diff --git a/package/grout/Config.in b/package/grout/Config.in index 1cfec41d7a..c57937dc18 100644 --- a/package/grout/Config.in +++ b/package/grout/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_GROUT bool "grout" depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS # dpdk depends on BR2_TOOLCHAIN_HAS_THREADS # dpdk - depends on BR2_USE_MMU # dpdk, numactl, libecoli, util-linux-smartcols - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # dpdk + depends on BR2_USE_MMU # dpdk, numactl, libecoli + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_13 # C23 enum underlying types depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 # dpdk depends on BR2_TOOLCHAIN_USES_GLIBC # dpdk depends on BR2_TOOLCHAIN_HAS_ATOMIC # numactl @@ -14,16 +14,14 @@ config BR2_PACKAGE_GROUT select BR2_PACKAGE_NUMACTL select BR2_PACKAGE_LIBECOLI select BR2_PACKAGE_LIBMNL - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS help Graph router based on DPDK -comment "grout needs a glibc toolchain w/ dynamic library, threads, wchar, gcc >= 4.9, headers >= 4.19" +comment "grout needs a glibc toolchain w/ dynamic library, threads, wchar, gcc >= 13, headers >= 4.19" depends on BR2_USE_MMU depends on BR2_PACKAGE_DPDK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_13 || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 diff --git a/package/grout/grout.hash b/package/grout/grout.hash index bf3d6b87ec..ead390f8fc 100644 --- a/package/grout/grout.hash +++ b/package/grout/grout.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4ccceea87ead25dfbee7d44d25283abc61173caf6bae08c9644fa9a6cb6b9ade grout-0.14.3.tar.gz +sha256 c4a289d13453a42961db2131a179e95965450feb27505f4c463adbd8970e0440 grout-0.15.0.tar.gz sha256 1e412aae8da58b718c78b3d7a52eb547004384d4347e4746a22ca6af7522930c licenses/BSD-3-clause.txt diff --git a/package/grout/grout.mk b/package/grout/grout.mk index 39bdc7f824..0b66995dfe 100644 --- a/package/grout/grout.mk +++ b/package/grout/grout.mk @@ -4,7 +4,7 @@ # ################################################################################ -GROUT_VERSION = 0.14.3 +GROUT_VERSION = 0.15.0 GROUT_SITE = $(call github,DPDK,grout,v$(GROUT_VERSION)) GROUT_LICENSE = BSD-3-Clause GROUT_LICENSE_FILES = licenses/BSD-3-clause.txt @@ -18,8 +18,7 @@ GROUT_DEPENDENCIES = \ libevent \ libmnl \ numactl \ - libecoli \ - util-linux + libecoli define GROUT_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_TUN)