Commit a759931c authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Peter Korsgaard
Browse files

package/libcap: Fix build error with kernel headers < 3.6 

Fixes
http://autobuild.buildroot.net/results/cce/cceb1ccacec36fb7ef41bb7cdb13b3014813b599/

XATTR_NAME_CAPS appears in kernel headers since 3.7:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/include/uapi/linux/xattr.h?id=v3.7

Before it was an internal define of the kernel:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/xattr.h?id=607ca46e97a1b6594b29647d98a32d545c24bdff



Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent e6debc2e

package/cdrkit/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config BR2_PACKAGE_CDRKIT 
	select BR2_PACKAGE_BZIP2

	select BR2_PACKAGE_LIBCAP

	depends on BR2_LARGEFILE

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap

	depends on BR2_USE_MMU # fork

	bool "cdrkit"

	help
@@ -12,6 +13,6 @@ config BR2_PACKAGE_CDRKIT 


	  http://www.cdrkit.org/



comment "cdrkit needs a toolchain w/ largefile"

comment "cdrkit needs a toolchain w/ largefile, headers >= 3.7"

	depends on BR2_USE_MMU

	depends on !BR2_LARGEFILE
 
	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

package/libcap/Config.in

+4 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBCAP

	bool "libcap"

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

	help

	  This library implements the user-space interfaces to the

	  POSIX 1003.1e capabilities available in Linux kernels. These
@@ -22,3 +23,6 @@ config BR2_PACKAGE_LIBCAP_TOOLS 
	  CONFIG_EXT2_FS_XATTR and CONFIG_EXT2_FS_SECURITY for ext2).



endif



comment "libcap needs headers >= 3.7"

	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

package/lxc/Config.in

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LXC 
	select BR2_PACKAGE_LIBCAP

	depends on BR2_INET_IPV6

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap

	depends on BR2_LARGEFILE

	depends on BR2_USE_MMU # fork()

	depends on !BR2_avr32 # no timerfd
@@ -14,8 +15,9 @@ config BR2_PACKAGE_LXC 


	  https://linuxcontainers.org/



comment "lxc needs a toolchain w/ IPv6, threads, largefile"

comment "lxc needs a toolchain w/ IPv6, threads, largefile, headers >= 3.7"

	depends on BR2_USE_MMU

	depends on !BR2_avr32 # no timerfd

	depends on !BR2_nios2 # the toolchain doesn't support setns syscall

	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE
 
	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || \

		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

package/squid/Config.in

+4 −2
Original line number Diff line number Diff line 
comment "squid needs a toolchain w/ C++, IPv6"

comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.7"

	depends on BR2_USE_MMU

	depends on !BR2_avr32 # toolchain too old

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 || \

		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7



config BR2_PACKAGE_SQUID

	bool "squid"

	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_INET_IPV6

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap

	# needs fork()

	depends on BR2_USE_MMU

	select BR2_PACKAGE_LIBCAP

package/systemd/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config BR2_PACKAGE_SYSTEMD 
	depends on BR2_INET_IPV6

	depends on !BR2_PREFER_STATIC_LIB # kmod

	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # libcap

	depends on BR2_USE_MMU # dbus

	select BR2_PACKAGE_HAS_UDEV

	select BR2_PACKAGE_DBUS # runtime dependency only