From: [email protected] [mailto:[email protected]] On Behalf Of Zhou, Jingting Sent: Wednesday, May 21, 2014 5:59 PM To: '[email protected]'; Nelson, Sam Subject: [meta-arago] patch to upgrade libnl to version 3.2.24
>From 2597ee553110251bf6413b4216ea400eb0167426 Mon Sep 17 00:00:00 2001 From: Jingting Zhou <jingtinglocal@uda0221004> Date: Wed, 21 May 2014 17:52:25 -0500 Subject: [PATCH] updated the libnl to version 3.2.24 --- .../recipes-connectivity/libnl/libnl_3.2.11.bb | 54 ------------------- .../recipes-connectivity/libnl/libnl_3.2.24.bb | 55 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 54 deletions(-) delete mode 100755 meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.11.bb create mode 100755 meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.24.bb Use –m or --find-copies-harder to make this patch easier to read. diff --git a/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.11.bb b/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.11.bb deleted file mode 100755 index e67b67e..0000000 --- a/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.11.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets." -HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"; -SECTION = "libs/network" - -PE = "1" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c<file:///\\COPYING;md5=4fbd65380cdd255951079008b364516c>" - -DEPENDS = "flex-native bison-native" - - -SRC_URI[md5sum] = "7a35f3a17b52f41ee120dceb99b2ef72" -SRC_URI[sha256sum] = "9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d" - -SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ - file://fix_for_masking_addr.patch<file:///\\fix_for_masking_addr.patch>" - -inherit autotools pkgconfig - -do_install_append() { - # make wpa-supplicant happy - # TODO: when moving to oe-core fix at wpa-supplicant - # (e.g src/drivers/drivers.mak) - cd ${D}${includedir} - ln -sf libnl3/netlink netlink - cd ${D}${libdir} - ln -sf libnl-3.so.200 libnl.so - ln -sf libnl-3.so.200 libnl.so.3 - ln -sf libnl-genl-3.so.200 libnl-genl.so - ln -sf libnl-genl-3.so.200 libnl-genl.so.3 -} - -FILES_${PN} = "${libdir}/libnl-3.so.* \ - ${libdir}/libnl.so.* \ - ${sysconfdir}" -RREPLACES_${PN} = "libnl2" -RCONFLICTS_${PN} = "libnl2" -FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ - ${libdir}/libnl/cli/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" - -PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl" -FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ - ${libdir}/libnl/cli/*/*.so.* \ - ${sbindir}/nl-*" -FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" -FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" -FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ - ${libdir}/libnl-genl.so.* \ - ${sbindir}/genl-ctrl-list" -RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" -RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" diff --git a/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.24.bb b/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.24.bb new file mode 100755 index 0000000..e89246d --- /dev/null +++ b/meta-arago-distro/recipes-connectivity/libnl/libnl_3.2.24.bb Oe-core already has version 3.2.22. Would that work? If so why not use that rather than overlay this recipe. If not then please also submit a patch to bump the base recipe version in oe-core up to the latest as well so we don’t carry this version forever. @@ -0,0 +1,55 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets." +HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"; +SECTION = "libs/network" + +PE = "1" +PR = "r1" No need to set PR + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c<file:///\\COPYING;md5=4fbd65380cdd255951079008b364516c>" + +DEPENDS = "flex-native bison-native" + +SRC_URI[md5sum] = "6e0e7bad0674749d930dd9f285343d55" +SRC_URI[sha256sum] = "fb8d6e5dc8af5b85bc6d00a71582a68a01e6a3f7d1664d4a646e289a99dd6816" +SRC_URI = "http://www.carisma.slowglass.com/~tgr/libnl/files/${BP}.tar.gz<http://www.carisma.slowglass.com/~tgr/libnl/files/$%7bBP%7d.tar.gz>" + +inherit autotools pkgconfig + +do_install_append() { + # make wpa-supplicant happy + # TODO: when moving to oe-core fix at wpa-supplicant + # (e.g src/drivers/drivers.mak) + cd ${D}${includedir} + ln -sf libnl3/netlink netlink + cd ${D}${libdir} + ln -sf libnl-3.so.200 libnl.so + ln -sf libnl-3.so.200 libnl.so.3 + ln -sf libnl-genl-3.so.200 libnl-genl.so + ln -sf libnl-genl-3.so.200 libnl-genl.so.3 + install -d ${D}${includedir}/netlink-private + cp -r ${S}/include/netlink-private/cache-api.h ${D}${includedir}/netlink-private/ + cp -r ${S}/include/netlink-private/object-api.h ${D}${includedir}/netlink-private/ +} This needs more detail. The base recipe in oe-core doesn’t have this so what is special about this version that requires this? + +FILES_${PN} = "${libdir}/libnl-3.so.* \ + ${libdir}/libnl.so.* \ + ${sysconfdir}" +RREPLACES_${PN} = "libnl2" +RCONFLICTS_${PN} = "libnl2" +FILES_${PN}-dbg += "${libdir}/libnl/cli/*/.debug" +FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.so \ + ${libdir}/libnl/cli/*/*.la" +FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" + +PACKAGES += "${PN}-cli ${PN}-route ${PN}-nf ${PN}-genl" +FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ + ${libdir}/libnl/cli/*/*.so.* \ + ${sbindir}/nl-*" +FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" +FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ + ${libdir}/libnl-genl.so.* \ + ${sbindir}/genl-ctrl-list" +RREPLACES_${PN}-genl = "libnl-genl2 libnl-genl-3-200" +RCONFLICTS_${PN}-genl = "libnl-genl2 libnl-genl-3-200" Something that might be worth investigating would be to inherit the 3.22.22 version of the recipe and then tweak the SRC_URI variables, etc. Denys, if we have to overlay this what would you prefer to see? We can’t use a .bbappend very well because of the version change. But most of this code is duplicate from the oe-core code. -- 1.7.9.5
_______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
