Skip to content

Commit 85ac6a6

Browse files
committed
BUILD: makefile: bump the default minimum linux version to 4.17
As explained during the 3.3-dev7 announcement below: https://www.mail-archive.com/[email protected]/msg46073.html no regularly maintained distro supports a kernel older than 4.18 anymore, and KTLS is supported since 4.17. So it's about the right moment to bump the default minimum kernel version supported by glibc and musl to automatically cover new features. The linux-glibc-legacy target still supports 2.6.28 and above.
1 parent 670dc29 commit 85ac6a6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

INSTALL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ It goes into more details with the main options.
559559
To build haproxy, you have to choose your target OS amongst the following ones
560560
and assign it to the TARGET variable :
561561

562-
- linux-glibc for Linux kernel 2.6.28 and above
562+
- linux-glibc for Linux kernel 4.17 and above
563563
- linux-glibc-legacy for Linux kernel 2.6.28 and above without new features
564-
- linux-musl for Linux kernel 2.6.28 and above with musl libc
564+
- linux-musl for Linux kernel 4.17 and above with musl libc
565565
- solaris for Solaris 10 and above
566566
- freebsd for FreeBSD 10 and above
567567
- dragonfly for DragonFlyBSD 4.3 and above

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,13 @@ ifeq ($(TARGET),haiku)
379379
set_target_defaults = $(call default_opts,USE_POLL USE_TPROXY USE_OBSOLETE_LINKER)
380380
endif
381381

382-
# For linux >= 2.6.28 and glibc
382+
# For linux >= 4.17 and glibc
383383
ifeq ($(TARGET),linux-glibc)
384384
set_target_defaults = $(call default_opts, \
385385
USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \
386386
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_LINUX_TPROXY USE_LINUX_CAP \
387387
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \
388-
USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN)
388+
USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN USE_KTLS)
389389
INSTALL = install -v
390390
endif
391391

@@ -398,13 +398,13 @@ ifeq ($(TARGET),linux-glibc-legacy)
398398
INSTALL = install -v
399399
endif
400400

401-
# For linux >= 2.6.28 and musl
401+
# For linux >= 4.17 and musl
402402
ifeq ($(TARGET),linux-musl)
403403
set_target_defaults = $(call default_opts, \
404404
USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \
405405
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_LINUX_TPROXY USE_LINUX_CAP \
406406
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \
407-
USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN)
407+
USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN USE_KTLS)
408408
INSTALL = install -v
409409
endif
410410

doc/configuration.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16801,8 +16801,8 @@ interface <interface>
1680116801

1680216802
ktls <on|off> [ EXPERIMENTAL ]
1680316803
Enables or disables ktls for those sockets. If enabled, kTLS will be used
16804-
if the kernel supports it and the cipher is compatible.
16805-
This is only available on linux.
16804+
if the kernel supports it and the cipher is compatible. This is only
16805+
available on Linux kernel 4.17 and above.
1680616806

1680716807
label <label>
1680816808
Sets an optional label for these sockets. It could be used group sockets by

0 commit comments

Comments
 (0)