Skip to contentSkip to conversation

eudev: fix dependency on kernel headers version

PATCH Superseded Alexey Mednyy 3 participants 4 messages Mar 9, 2015

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Alexey Mednyy

author
#0 lore raw

PATCH v2 1/1 eudev: fix dependency on kernel headers version

Signed-off-by Alexey Mednyy <[email protected]>
---
 ...c-don-t-die-on-missing-linux-btrfs.h-fixe.patch | 37 ++++++++++++++++++++++
 package/eudev/eudev.mk                             |  1 +
 system/Config.in                                   |  7 ++--
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 package/eudev/0001-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch
package/eudev/0001-configure.ac-don-t-die-on-missing-linux-btrfs.h-fixe.patch new file +37 -0
new file mode 100644
index 0000000..a749b08
@@ -0,0 +1,37 @@
+From 6740579367ddd2ce0b315863cdb92d34d1d693c7 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <[email protected]>
+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 <[email protected]>
+---
+ 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 +1 -0
index 2221966..eb266a1 100644
@@ -10,6 +10,7 @@ EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
 EUDEV_INSTALL_STAGING = YES
+EUDEV_AUTORECONF = YES
 
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt
system/Config.in +3 -4
index 4d1c3d2..9e2b13f 100644
@@ -128,13 +128,12 @@ 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
+#	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
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 eudev: fix dependency on kernel headers version

Hi Alexey,

package/eudev/eudev.mk EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev · line 13

Quoted 9 lines · Alexey Mednyy
package/eudev/eudev.mk +1 -0
index 2221966..eb266a1 100644
@@ -10,6 +10,7 @@ EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
 EUDEV_INSTALL_STAGING = YES
+EUDEV_AUTORECONF = YES

Please add a comment here saying that we are patching configure.ac.

system/Config.in config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV · line 131

Quoted 12 lines
package/eudev/eudev.mk +0 -0
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt
system/Config.in +1 -1
index 4d1c3d2..9e2b13f 100644
@@ -128,13 +128,12 @@ 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
+#	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9

Please remove this line.

system/Config.in config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV · line 136

Quoted 8 lines
system/Config.in +2 -3
 	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

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#2 lore raw

PATCH v2 1/1 eudev: fix dependency on kernel headers version

Hi Baruch,
sorry need more experience with git.
git reset --soft HEAD~1
gives files both in Changes to be commited and Changes not staged for commit.
Now I know need to git add those files again.
Patch v3 on the way.

Thanks.

Quoted 38 lines · Baruch Siach

Hi Alexey,

package/eudev/eudev.mk EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev · line 13

Quoted 9 lines · Alexey Mednyy
package/eudev/eudev.mk +1 -0
index 2221966..eb266a1 100644
@@ -10,6 +10,7 @@ EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
 EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
 EUDEV_INSTALL_STAGING = YES
+EUDEV_AUTORECONF = YES

Please add a comment here saying that we are patching configure.ac.

system/Config.in config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV · line 131

Quoted 12 lines
package/eudev/eudev.mk +0 -0
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt
system/Config.in +1 -1
index 4d1c3d2..9e2b13f 100644
@@ -128,13 +128,12 @@ 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
+#	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9

Please remove this line.

system/Config.in config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV · line 136

Quoted 8 lines
system/Config.in +2 -3
 	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

baruch

Signature · 2 lines
_________________________________
Best regards, Mednyy Alexey.
#3 lore raw

PATCH v2 1/1 eudev: fix dependency on kernel headers version

Quoted 5 lines · Alexey Mednyy

sorry need more experience with git.
git reset --soft HEAD~1
gives files both in Changes to be commited and Changes not staged for commit.
Now I know need to git add those files again.

You want to use 'git commit --amend'.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F