aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libusb
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-05-15 06:57:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-15 23:24:05 +0100
commit62bccaa7979213555fced945b1b09e92683d4213 (patch)
tree380ef0dc18d04c7e27dab4f49ac45a273c6b9dbb /meta/recipes-support/libusb
parent149885560e2fbc91c7f60226d015ba9842373e26 (diff)
downloadopenembedded-core-contrib-62bccaa7979213555fced945b1b09e92683d4213.tar.gz
libusb1: Update to 1.0.18
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libusb')
-rw-r--r--meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch (renamed from meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch)0
-rw-r--r--meta/recipes-support/libusb/libusb1_1.0.18.bb (renamed from meta/recipes-support/libusb/libusb1_1.0.9.bb)7
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch
index b1dd66c969..b1dd66c969 100644
--- a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch
+++ b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch
diff --git a/meta/recipes-support/libusb/libusb1_1.0.9.bb b/meta/recipes-support/libusb/libusb1_1.0.18.bb
index d57425b3c5..c64f1dba21 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.9.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.18.bb
@@ -8,14 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
BBCLASSEXTEND = "native nativesdk"
-PR = "r1"
-
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
- file://obsolete_automake_macros.patch \
"
-SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb"
-SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b"
+SRC_URI[md5sum] = "4a6d049923efc6496f1d383054dac1a6"
+SRC_URI[sha256sum] = "c73f5cec45a5de94418da4e151b7232958571926984acfb9bce02b9424e83720"
S = "${WORKDIR}/libusb-${PV}"
class="nv">d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi rm -rf ${D}${localstatedir} chown -R root:root ${D} } do_install_append_class-native() { install -d ${D}${bindir} ${D}${libdir} install -m 755 server/gen_test_char ${D}${bindir} } SYSROOT_PREPROCESS_FUNCS_append_class-target = " apache_sysroot_preprocess" apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk } # Implications - used by update-rc.d scripts INITSCRIPT_NAME = "apache2" INITSCRIPT_PARAMS = "defaults 91 20" SYSTEMD_SERVICE_${PN} = "apache2.service" SYSTEMD_AUTO_ENABLE_${PN} = "enable" ALTERNATIVE_${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ ${sysconfdir}/${BPN}/magic \ ${sysconfdir}/${BPN}/mime.types \ ${sysconfdir}/${BPN}/extra/*" # We override here rather than append so that .so links are # included in the runtime package rather than here (-dev) # and to get build, icons, error into the -dev package FILES_${PN}-dev = "${datadir}/${BPN}/build \ ${datadir}/${BPN}/icons \ ${datadir}/${BPN}/error \ ${includedir}/${BPN} \ ${bindir}/apxs \ " # Add the manual to -doc FILES_${PN}-doc += " ${datadir}/${BPN}/manual" FILES_${PN}-scripts += "${bindir}/dbmmanage" # Override this too - here is the default, less datadir FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ ${sysconfdir} ${libdir}/${BPN}" # We want htdocs and cgi-bin to go with the binary FILES_${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" RDEPENDS_${PN} += "openssl libgcc" RDEPENDS_${PN}-scripts += "perl ${PN}" RDEPENDS_${PN}-dev = "perl" BBCLASSEXTEND = "native"