Commit 2676d7f8 authored by Alexey Mednyy's avatar Alexey Mednyy Committed by Thomas Petazzoni
Browse files

eudev: fix dependency on kernel headers version 



[Thomas:
  - indicate upstream commit id, as suggested by Baruch.
  - add SoB of Alexey inside the patch itself.
  - adjust sequence number to 0003.]

Signed-off-by: default avatarAlexey Mednyy <swexru@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent cadeb9c2

package/eudev/0003-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch

0 → 100644
+41 −0
Original line number Diff line number Diff line 
From 6740579367ddd2ce0b315863cdb92d34d1d693c7 Mon Sep 17 00:00:00 2001

From: "Anthony G. Basile" <blueness@gentoo.org>

Date: Sun, 16 Nov 2014 13:40:43 -0500

Subject: [PATCH] configure.ac: don't die on missing linux/btrfs.h, fixes issue

 #100



Signed-off-by: Anthony G. Basile <blueness@gentoo.org>



Taken from upstream commit 6740579367d.



Signed-off-by: Alexey Mednyy <swexru@gmail.com>

---

 configure.ac | 8 +++++++-

 1 file changed, 7 insertions(+), 1 deletion(-)



diff --git a/configure.ac b/configure.ac

index a3747f9..dbca833 100644

--- a/configure.ac

+++ b/configure.ac

@@ -49,11 +49,17 @@ AC_CHECK_HEADERS(

 )

 

 AC_CHECK_HEADERS(

-	[linux/btrfs.h mtd/mtd-user.h],

+	[mtd/mtd-user.h],

 	[],

 	[AC_MSG_ERROR([*** KERNEL header not found])]

 )

 

+AC_CHECK_HEADERS(

+	[linux/btrfs.h],

+	[],

+	[AC_MSG_WARN([*** KERNEL header not found])]

+)

+

 # Checks for typedefs, structures, and compiler characteristics.

 AC_TYPE_UID_T

 AC_C_INLINE

-- 

1.9.1

package/eudev/eudev.mk

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev 
EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)

EUDEV_LICENSE_FILES = COPYING

EUDEV_INSTALL_STAGING = YES

# We're patching configure.ac

EUDEV_AUTORECONF = YES



# mq_getattr is in librt

EUDEV_CONF_ENV += LIBS=-lrt

system/Config.in

+2 −4
Original line number Diff line number Diff line
@@ -128,13 +128,11 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV 
	depends on BR2_USE_WCHAR

	depends on !BR2_STATIC_LIBS

	depends on BR2_USE_MMU # eudev

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9

	select BR2_PACKAGE_EUDEV



comment "eudev needs a toolchain w/ largefile, wchar, dynamic library, headers >= 3.9"

comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"

	depends on BR2_USE_MMU

	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS \

		|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9

	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS



endchoice