summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-27 12:46:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 12:44:35 +0100
commitd0404f538b5b4828498533b22244e5c412831ed8 (patch)
tree99835c868f25002a36eb13f474020911314e3148 /meta
parent5e12e440fd0a7f917fe445f01d5bb02db1d0a5f7 (diff)
downloadpoky-d0404f538b5b4828498533b22244e5c412831ed8.tar.gz
libusb-compat: remove
Nothing in oe-core or meta-oe links to this now, so the recipe can finally be removed. (From OE-Core rev: be9d9b7d6f5917b63660fe5561078851d4a42a9c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch30
-rw-r--r--meta/recipes-support/libusb/libusb-compat_0.1.5.bb42
4 files changed, 0 insertions, 74 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 1498e12441..793a1c2f09 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -190,7 +190,6 @@ DISTRO_PN_ALIAS_pn-libtelepathy = "Debian=libtelepathy2 Ubuntu=libtelepathy2"
190DISTRO_PN_ALIAS_pn-libtimedate-perl = "Debian=libtimedate-perl Ubuntu=libtimedate-perl" 190DISTRO_PN_ALIAS_pn-libtimedate-perl = "Debian=libtimedate-perl Ubuntu=libtimedate-perl"
191DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0" 191DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0"
192DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 Fedora=libusb1" 192DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 Fedora=libusb1"
193DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT"
194DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" 193DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"
195DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/" 194DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/"
196DISTRO_PN_ALIAS_pn-libxfont2 = "Fedora=libXfont2 Clear=libXfont2" 195DISTRO_PN_ALIAS_pn-libxfont2 = "Fedora=libXfont2 Clear=libXfont2"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 6e7efd1275..f80627c671 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -364,7 +364,6 @@ RECIPE_MAINTAINER_pn-libunistring = "Maxin B. John <maxin.john@intel.com>"
364RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield <bruce.ashfield@windriver.com>" 364RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield <bruce.ashfield@windriver.com>"
365RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <alex.kanavin@gmail.com>" 365RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <alex.kanavin@gmail.com>"
366RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" 366RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
367RECIPE_MAINTAINER_pn-libusb-compat = "Maxin B. John <maxin.john@intel.com>"
368RECIPE_MAINTAINER_pn-libusb1 = "Maxin B. John <maxin.john@intel.com>" 367RECIPE_MAINTAINER_pn-libusb1 = "Maxin B. John <maxin.john@intel.com>"
369RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <anuj.mittal@intel.com>" 368RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <anuj.mittal@intel.com>"
370RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>" 369RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
deleted file mode 100644
index b88440dec9..0000000000
--- a/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 340f911f9e3f4ff6b01682c5341c959060782af2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Apr 2015 19:18:45 -0700
4Subject: [PATCH] usb.h: Include sys/types.h
5
6We need the definitions for things like u_intX_t
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libusb/usb.h | 2 ++
13 1 file changed, 2 insertions(+)
14
15diff --git a/libusb/usb.h b/libusb/usb.h
16index 84e730f..caffae2 100644
17--- a/libusb/usb.h
18+++ b/libusb/usb.h
19@@ -31,6 +31,8 @@
20
21 #include <dirent.h>
22
23+#include <sys/types.h>
24+
25 /*
26 * USB spec information
27 *
28--
292.1.4
30
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
deleted file mode 100644
index 1ddbe238fc..0000000000
--- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
+++ /dev/null
@@ -1,42 +0,0 @@
1SUMMARY = "libusb-0.1 compatibility layer for libusb1"
2DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \
3that aims to look, feel and behave exactly like libusb-0.1"
4HOMEPAGE = "http://www.libusb.org/"
5BUGTRACKER = "http://www.libusb.org/report"
6SECTION = "libs"
7
8LICENSE = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423"
10DEPENDS = "libusb1"
11
12# Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0),
13# so here libusb-0.1 is removed completely instead of adding virtual/libusb0.
14# Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power
15# consumption.
16PROVIDES = "libusb virtual/libusb0"
17BBCLASSEXTEND = "native nativesdk"
18
19PE = "1"
20
21SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
22 file://0001-usb.h-Include-sys-types.h.patch \
23 "
24
25SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4"
26SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
27
28UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/"
29UPSTREAM_CHECK_REGEX = "/libusb-compat-(?P<pver>(\d+[\.\-_]*)+)/$"
30
31BINCONFIG = "${bindir}/libusb-config"
32
33inherit autotools pkgconfig binconfig-disabled lib_package
34
35EXTRA_OECONF = "--libdir=${base_libdir}"
36
37do_install_append() {
38 install -d ${D}${libdir}
39 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
40 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
41 fi
42}