summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-05-20 16:11:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-22 07:24:52 +0100
commit71290d7131926b0e8f15126acdf7c5b15e6b4d75 (patch)
treeede584d127104a68c9f2b540c1cedd212a70e805 /meta/recipes-bsp
parent783bf15e9de4f2cb08b059d1306ceb30920b9260 (diff)
downloadpoky-71290d7131926b0e8f15126acdf7c5b15e6b4d75.tar.gz
usbutils: upgrade 010->012
(From OE-Core rev: 22a61a71daa7019e1b89ec5aabbecc0126e453aa) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch30
-rw-r--r--meta/recipes-bsp/usbutils/usbutils_012.bb (renamed from meta/recipes-bsp/usbutils/usbutils_010.bb)5
2 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
deleted file mode 100644
index 7edff2614a..0000000000
--- a/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport (https://github.com/gregkh/usbutils/commit/508d1acf42e1bfd470c6bf1a188574c69c20aeed)
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 1c9162a5b30550aec8fa163906067bc179291b57 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Fri, 27 Jul 2018 15:28:34 +0100
7Subject: [PATCH] usb-devices: use /bin/sh
8
9This script doesn't use any bashisms, so change the hashbang to /bin/sh.
10
11Fixes #73.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 usb-devices | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/usb-devices b/usb-devices
19index afb4217..89d1b7d 100755
20--- a/usb-devices
21+++ b/usb-devices
22@@ -1,4 +1,4 @@
23-#!/bin/bash
24+#!/bin/sh
25 # SPDX-License-Identifier: GPL-2.0+
26 #
27 # Copyright (c) 2009 Greg Kroah-Hartman <greg@kroah.com>
28--
292.11.0
30
diff --git a/meta/recipes-bsp/usbutils/usbutils_010.bb b/meta/recipes-bsp/usbutils/usbutils_012.bb
index e6d05b8e87..0213e7af63 100644
--- a/meta/recipes-bsp/usbutils/usbutils_010.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_012.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://lsusb.c;endline=1;md5=7d4861d978ff5ba7cb2b319ed1d4afe
11DEPENDS = "libusb1 virtual/libiconv udev" 11DEPENDS = "libusb1 virtual/libiconv udev"
12 12
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
14 file://usb-devices-avoid-dependency-on-bash.patch \
15 " 14 "
16SRC_URI[md5sum] = "5eb2d2d68f9ed6dc3e9659a5988f7ed6" 15SRC_URI[md5sum] = "7484445cbcf04b3eacac892fe58f8d9f"
17SRC_URI[sha256sum] = "881ba47fb2df10c3ba54a4cd6755a90377180890788e476f99d480ea9bc8bb58" 16SRC_URI[sha256sum] = "ae2e10aad530d95839b6f4d46cd41715eae6f0f1789310d793e9be21b3e7ae20"
18 17
19inherit autotools pkgconfig distro_features_check update-alternatives 18inherit autotools pkgconfig distro_features_check update-alternatives
20 19