package/network-manager: needs headers >= 4.6
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sun, 8 Aug 2021 08:39:42 +0000 (10:39 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sun, 8 Aug 2021 20:23:34 +0000 (22:23 +0200)
network-manager uncondtionally uses ETHTOOL_GLINKSETTINGS since version
1.31.3 and
https://github.com/NetworkManager/NetworkManager/commit/4a81fe13ae18cb6d157d7cb3eec300f3061263fe
which is only available since kernel 4.6 and
https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf
resulting in the following build failure since commit
360d1aad84449c6a1993d8c7e469dc0cd35339a2:

In file included from ./src/libnm-glib-aux/nm-default-glib.h:69:0,
                 from ./src/libnm-glib-aux/nm-default-glib-i18n-lib.h:13,
                 from src/libnm-platform/nm-platform-utils.c:6:
src/libnm-platform/nm-platform-utils.c: In function '_ethtool_cmd_to_string':
src/libnm-platform/nm-platform-utils.c:280:51: error: 'ETHTOOL_GLINKSETTINGS' undeclared (first use in this function)
                                 NM_UTILS_ENUM2STR(ETHTOOL_GLINKSETTINGS, "ETHTOOL_GLINKSETTINGS"),
                                                   ^

Fixes:
 - http://autobuild.buildroot.org/results/10b9b68ab6987b99b3e8dfb2d651808008ad0bb7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/network-manager/Config.in

index 38ab43740fe0042ae779ed42a0de4a67d3bb5a8e..43987451b61159259581123f323faeb19eb98a8d 100644 (file)
@@ -6,7 +6,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
        depends on BR2_PACKAGE_HAS_UDEV
        depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
        # Tested with 3.2, but may even work with earlier versions
-       depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+       depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
        depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_*
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        depends on BR2_USE_WCHAR # libglib2
@@ -62,10 +62,10 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 
 endif
 
-comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads, gcc >= 4.9"
+comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9"
        depends on BR2_USE_MMU
        depends on !BR2_PACKAGE_HAS_UDEV || \
-               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 || \
                !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
                !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9