[oe-commits] org.oe.dev merge of 'd8e93653bdd44929cd8b804051b01cad64bc4550'

[koen commit]

merge of 'd8e93653bdd44929cd8b804051b01cad64bc4550'
     and 'f273d173d517ba98778745b37b0f630d81deb1ee'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: fb219c422f079516e577dbf33254979d7258a84b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fb219c422f079516e577dbf33254979d7258a84b
Files:
1
conf/machine/include/zaurus-2.6.conf
packages/curl/curl-native_7.16.2.bb
packages/curl/curl_7.16.2.bb
Diffs:

#
# mt diff -rd8e93653bdd44929cd8b804051b01cad64bc4550 -rfb219c422f079516e577dbf33254979d7258a84b
#
# 
# 
# patch "conf/machine/include/zaurus-2.6.conf"
#  from [a8b44649ec95bb1e794763e0208039060bd44405]
#    to [08f890e9c168eb62bf5bb23912bd916c209271ed]
# 
============================================================
--- conf/machine/include/zaurus-2.6.conf	a8b44649ec95bb1e794763e0208039060bd44405
+++ conf/machine/include/zaurus-2.6.conf	08f890e9c168eb62bf5bb23912bd916c209271ed
@@ -28,7 +28,7 @@ MACHINE_FEATURES = "kernel26 apm alsa pc
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
-MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
+MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
 


#
# mt diff -rf273d173d517ba98778745b37b0f630d81deb1ee -rfb219c422f079516e577dbf33254979d7258a84b
#
# 
# 
# add_file "packages/curl/curl-native_7.16.2.bb"
#  content [547e4a39ad646c653e282f5be92bbd23d0727fcd]
# 
# add_file "packages/curl/curl_7.16.2.bb"
#  content [96043638b03e8381c2d6e87633f13d8b69ae7213]
# 
============================================================
--- packages/curl/curl-native_7.16.2.bb	547e4a39ad646c653e282f5be92bbd23d0727fcd
+++ packages/curl/curl-native_7.16.2.bb	547e4a39ad646c653e282f5be92bbd23d0727fcd
@@ -0,0 +1,14 @@
+require curl_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage () {
+        install -d ${STAGING_INCDIR}/curl
+        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+do_install() {
+	:
+}
+
============================================================
--- packages/curl/curl_7.16.2.bb	96043638b03e8381c2d6e87633f13d8b69ae7213
+++ packages/curl/curl_7.16.2.bb	96043638b03e8381c2d6e87633f13d8b69ae7213
@@ -0,0 +1,51 @@
+DESCRIPTION = "Command line tool and library for client-side URL transfers."
+LICENSE = "MIT"
+DEPENDS = "zlib gnutls"
+SECTION = "console/network"
+PR = "r0"
+
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
+S = "${WORKDIR}/curl-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
+                --with-gnutls=${STAGING_BINDIR_CROSS}/ \
+                --without-ssl \
+		--with-random=/dev/urandom \
+		--without-idn \
+		--enable-crypto-auth \
+		"
+
+do_configure_prepend() {
+	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
+}
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/curl
+	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+
+FILES_${PN} = "${bindir}/curl"
+
+FILES_${PN}-certs = "${datadir}/curl/curl-*"
+PACKAGE_ARCH_${PN}-certs = "all"
+
+FILES_${PN}-doc = "${mandir}/man1/curl.1"
+
+FILES_lib${PN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${PN} += "${PN}-certs"
+FILES_lib${PN}-dev = "${includedir} \
+                      ${libdir}/lib*.so \
+                      ${libdir}/lib*.a \
+                      ${libdir}/lib*.la \
+                      ${libdir}/pkgconfig \
+                      ${datadir}/aclocal \
+                      ${bindir}/*-config"
+
+FILES_lib${PN}-doc = "${mandir}/man3 \
+                      ${mandir}/man1/curl-config.1"
+