From patchwork Mon Mar 5 17:20:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130735 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2935875lja; Mon, 5 Mar 2018 09:24:41 -0800 (PST) X-Google-Smtp-Source: AG47ELuWC+WBhTbmJouBQBqUzkfJ01tAQ/7phVF4bGpczel1MGux8bIM0U1EdOYaVKz6YEV7ncu2 X-Received: by 2002:a17:902:d24:: with SMTP id 33-v6mr13439232plu.8.1520270681153; Mon, 05 Mar 2018 09:24:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520270681; cv=none; d=google.com; s=arc-20160816; b=VMlYt9o4ScUTRGMxHKEaKxNuoLQlYf9SWof6dF3jqEVcVfgSttz1D3pAIlFoQRhMhU W+X1zlz4KmOvPTD+q9tDdj8FIfpZJEhkJhFNb9AhSxucQn9tuLngLM9b1xeHCbVjzyxS d5oqkY2awuGN2Hc+tsVXh1NpqvHeQx9O29b5t5Z4MCquTQ9YzwAGL3/4BrJPZ4Pq8LQW ggUxJ47uW2OMgN6tS2lK/6vLxlgGXZPIMpA9lf1r1szP5pbF/uDNBr05vZrWF6oJC4cQ XpMGa5KWySgt08vdfuJ0ms5+efdCwNtZg73cF33zeujtzHABhJTssQW6LEMceW4E2kZE 6MGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=eV+0OJYqhvupQ1iiyB3C9kAesj/KjmzNiQ1+wDzlYzA=; b=rrhPmy32tzy+FTqCE2OFkTAcnvBI23z3+rtPGmu1+ujapFa5eyu7npuYvBKv86rRkO 0Skk0xwZVBG0jMFXwrYCHPqdmoR3yGmnbYZ/XeLUDL76yEehlqYD4paVQQX5N3WSD/Sn DCkdC9pBPuYKLV2XWsXHt0d+jWHrKhxeSi7J1ukZvmI178rR45dZDq0sO7obI7YqXy5R JAln7Fp3xU4EpUtixURhmLAqEJXPRSJcyrr8lWdQqm+f3IqQ42IlzPkrKyRTgVuQkTQ2 AKyzqzjkD/hMzdXBHbo4YB3DtFrk4UEDwVZ2hs4ZTKvXndW+q+sEbgo52olxsFjKV1oB KRMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=lEJ+6rcw; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g61-v6si9579621plb.291.2018.03.05.09.24.40; Mon, 05 Mar 2018 09:24:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=lEJ+6rcw; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9F5D078B2C; Mon, 5 Mar 2018 17:21:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by mail.openembedded.org (Postfix) with ESMTP id E515678ADA for ; Mon, 5 Mar 2018 17:21:20 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id w77so18115352wrc.6 for ; Mon, 05 Mar 2018 09:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=3pAWDSWRn4+yj//l0Q2pwfNdpvvyrQsQ4yvjBfBoQ/k=; b=lEJ+6rcwu+xCejwqP2GDsVuXokfj41l3XieZFSRvffqenv3EUKBSo4ubvTkD/YCv67 T0n89k0UTc42DRvbpEWiQUujRfjlWGLOqCpJQzofD39f+vZAdpODwxtmeReqI4Wn/O7M bXYpcAz+cxGa+DHaJJqE7QqP0IwExKE9Z39nTs1B+Ey4Bimc0FR4kE925iGuM4+Vyg3I QL2E9W+dZFbpRdpbqeoPyJZyc9aoZqh+2kTZEPJodns04qY37uzu5sO+MWOPHYJ1JU7T Tf+1d6f/d2Y7eWj9JQIoTv9MCembv798QdwoAtuq258az3/b+s9l/ut1pe2z8hCMDVHM dYZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3pAWDSWRn4+yj//l0Q2pwfNdpvvyrQsQ4yvjBfBoQ/k=; b=WqiIXKTQad7IQpWRLyP9B0I7yQ4dcZjxj4GvdeIrt/xY7EI6K8864R1RhKwtzOVDqW VhbSvQ/u5vsCSzvjlkOd05orBuPse+TVcMdqW2ZGp3OFoEd0DQUKGgoH9t27Ssey8A1S sAy3sESGHV5Nt7u9rgmZhSaz/7fR35zzff/RGJMGNrvFJHBeoMp4JTk9Y0O1XT1Yc9Xf 8PrHI8SK04J0fcsYr/I4OIqzJk2p+upvuiq3y6Np48KuGlPtuzdlEVHcORs/U+4Gc86+ IUoGldNshRDJYoxX8aQPWMcM8s7WP6rV2Vp20sKbISbk12yyHIEYTQpVEk+rBqsI1hEc yFZw== X-Gm-Message-State: APf1xPA8oJsLppd1BQpnWQb24eqQ2J5QNFeH1BQzgZY728PXvZbdLDpn aNn3Elda2N3lrHEI2DWHi4kagwjo X-Received: by 10.223.173.75 with SMTP id p69mr13269530wrc.222.1520270481866; Mon, 05 Mar 2018 09:21:21 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m190sm10082047wmb.6.2018.03.05.09.21.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 09:21:21 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 17:20:46 +0000 Message-Id: <20180305172046.21729-29-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305172046.21729-1-ross.burton@intel.com> References: <20180305172046.21729-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 29/29] usbutils: drop upstreamed patch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This has been fixed upstream since 008, albeit slightly differently so the patch continued to apply. Signed-off-by: Ross Burton --- .../usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 ---------------------- meta/recipes-bsp/usbutils/usbutils_009.bb | 1 - 2 files changed, 29 deletions(-) delete mode 100644 meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch deleted file mode 100644 index 0efdc59fc68..00000000000 --- a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix NULL pointer crash. - -Before use usbbuslist, we should check if it is valid. - -Upstream-Status: Pending -Signed-off-by: Roy.Li ---- - lsusb-t.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/lsusb-t.c b/lsusb-t.c -index f604155..583a46a 100644 ---- a/lsusb-t.c -+++ b/lsusb-t.c -@@ -643,6 +643,10 @@ static void sort_busses(void) - /* need to reverse sort bus numbers */ - struct usbbusnode *t, *p, **pp; - int swapped; -+ -+ if (!usbbuslist) -+ return; -+ - do { - p = usbbuslist; - pp = &usbbuslist; --- -1.7.4.1 - diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_009.bb index a7cbe454063..88c24bd22a7 100644 --- a/meta/recipes-bsp/usbutils/usbutils_009.bb +++ b/meta/recipes-bsp/usbutils/usbutils_009.bb @@ -10,7 +10,6 @@ DEPENDS = "libusb zlib virtual/libiconv udev" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ file://usb-devices-avoid-dependency-on-bash.patch \ - file://Fix-NULL-pointer-crash.patch \ " SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"