Skip to contentSkip to conversation

RFC PATCHES for libnet and lmsensors

PATCH In review [email protected] 2 participants 4 messages Feb 22, 2011

lore
Share & tools
lore
#0 lore raw

The following two patches are speculative. The libnet one has been causing me headaches for a while and is very much in the works for me category. Neater solutions welcome.

The second patch was a result of a suggestion on #oe.

[PATCH 1/2] libnet: fake a libnet pkg to allow libnet-dev to be in SDK [PATCH 2/2] libsensors: Remove clashing header definition from package

#1 lore raw

PATCH 1/2 libnet: fake a libnet pkg to allow libnet-dev to be in SDK

From: Alex Bennee <[email protected]>

I'm sure there is a better way than this but this works for now. By default libnet-dev has a dependancy on libnet, however this is not built as libnet is a static package. This makes it impossible to add libnet-dev to a SDK.

Commenting out the FILES_${PN} for libnet means it does get built and together with the -dev package can be added to the SDK

---
 recipes/libnet/libnet_1.1.2.1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/libnet/libnet_1.1.2.1.bb +1 -1
index b09f56e..94c0418 100644
@@ -32,7 +32,7 @@ do_install_append () {
 }
 
 #static build
-FILES_${PN} = ""
+#FILES_${PN} = ""
 FILES_${PN}-dev += "${bindir}/libnet-config"
 
 CPPFLAGS_prepend = "-I${S}/libnet/include "
Signature · 1 line
1.7.4.1
#2 lore raw

Re: [PATCH 1/2] libnet: fake a libnet pkg to allow libnet-dev to be in SDK

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 20 lines · On 22-02-11 11:21, [email protected] wrote:

From: Alex Bennee <[email protected]>

I'm sure there is a better way than this but this works for now. By default libnet-dev has a dependancy on libnet, however this is not built as libnet is a static package. This makes it impossible to add libnet-dev to a SDK.

Commenting out the FILES_${PN} for libnet means it does get built and together with the -dev package can be added to the SDK

---
 recipes/libnet/libnet_1.1.2.1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/libnet/libnet_1.1.2.1.bb +0 -0
index b09f56e..94c0418 100644

recipes/libnet/libnet_1.1.2.1.bb do_install_append () { · line 38

Quoted 8 lines
recipes/libnet/libnet_1.1.2.1.bb +1 -1
@@ -32,7 +32,7 @@ do_install_append () {
 }
 
 #static build
-FILES_${PN} = ""
+#FILES_${PN} = ""
 FILES_${PN}-dev += "${bindir}/libnet-config"
 
 CPPFLAGS_prepend = "-I${S}/libnet/include "

setting ALLOW_EMPTY to '1' and bumping PR would be a better fix IMO

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNY9oCMkyGM64RGpERAke4AJ9qOy+UbwMMBg+6cRzdgkmxFW6ZgACfRbwt l64XgWXekQ4Rs3/0uwmjbqQ=
=Lay7
-----END PGP SIGNATURE-----

#3 lore raw

PATCH 2/2 libsensors: Remove clashing header definition from package

In reply to [email protected]

From: Alex Bennee <[email protected]>

libsensors attempts to install:

/usr/include/linux/i2c-dev.h

Which clashes with the libc definition. This patch removes it from the build (as suggested by _pb on #oe).

---
 recipes/lm_sensors/lmsensors-apps_2.10.8.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
recipes/lm_sensors/lmsensors-apps_2.10.8.bb +3 -0
index dcc33ac..266f1b8 100644
@@ -29,6 +29,9 @@ do_install() {
 	install -d ${D}${mandir}
 	rm -rf ${D}${mandir}/*
 	mv ${D}/usr/man/* ${D}${mandir}
+
+	# Remove clashing headers, libc packages i2c-dev.h
+	rm ${D}/usr/include/linux/i2c-dev.h
 }
 
 do_stage() {
Signature · 1 line
1.7.4.1