From patchwork Tue Jan 14 12:33:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310616 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 9BA3F2C00AF for ; Tue, 14 Jan 2014 23:35:38 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id E92F03FE1A for ; Tue, 14 Jan 2014 13:35:36 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id BE05A3FDE8 for ; Tue, 14 Jan 2014 13:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=6511; q=dns/txt; s=ironport1; t=1389702903; x=1421238903; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=m6N3S/Ikbbdb+qYvUmB+EDSIOGWgxW4j+xvYpzwhX6E=; b=ev+avC49B9xjwJBqP8xUCEr5Ubzyvopo3tfXgDjAi81ROu+E+JCl5Y6P IwICBJPMnESZuM/12qJcDbEZ3OUcwVVOwMzI0zChdnT50P+AtoRoevYpg 587kfnkW+T9sYLSwU7L/wLk078XbfbhGcyNYomjc8/f1LcYqXX+FzROdF U=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="4300215" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:01 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:01 +0100 Received: by localhost (Postfix, from userid 30007) id 939E8681567; Tue, 14 Jan 2014 12:35:01 +0000 (UTC) From: To: Subject: [PATCH 036/131] libnl: Remove version 3.2.21 Date: Tue, 14 Jan 2014 12:33:23 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/libnl/libnl-3.2.21/fix-pc-file.patch | 9 -- ...provide-local-copy-of-linux-can-netlink.h.patch | 142 --------------------- recipes/libnl/libnl_3.2.21.oe | 6 - recipes/libnl/libnl_3.2.21.oe.sig | 1 - 4 files changed, 158 deletions(-) delete mode 100644 recipes/libnl/libnl-3.2.21/fix-pc-file.patch delete mode 100644 recipes/libnl/libnl-3.2.21/libnl-3.2.16-0001-can-provide-local-copy-of-linux-can-netlink.h.patch delete mode 100644 recipes/libnl/libnl_3.2.21.oe delete mode 100644 recipes/libnl/libnl_3.2.21.oe.sig diff --git a/recipes/libnl/libnl-3.2.21/fix-pc-file.patch b/recipes/libnl/libnl-3.2.21/fix-pc-file.patch deleted file mode 100644 index 19c3f79..0000000 --- a/recipes/libnl/libnl-3.2.21/fix-pc-file.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- libnl-3.2.7/libnl-3.0.pc.in.orig 2012-02-14 10:14:31.033464884 +0100 -+++ libnl-3.2.7/libnl-3.0.pc.in 2012-02-14 10:15:14.655707202 +0100 -@@ -6,5 +6,5 @@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-3 -lnl-nf-3 -lnl-route-3 - Cflags: -I${includedir}/libnl@MAJ_VERSION@ diff --git a/recipes/libnl/libnl-3.2.21/libnl-3.2.16-0001-can-provide-local-copy-of-linux-can-netlink.h.patch b/recipes/libnl/libnl-3.2.21/libnl-3.2.16-0001-can-provide-local-copy-of-linux-can-netlink.h.patch deleted file mode 100644 index ab6a77b..0000000 --- a/recipes/libnl/libnl-3.2.21/libnl-3.2.16-0001-can-provide-local-copy-of-linux-can-netlink.h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 913a689de34686e5ed2fa3c56e46e81f9f6eb682 Mon Sep 17 00:00:00 2001 -From: Thomas Graf -Date: Tue, 11 Dec 2012 17:59:30 +0100 -Subject: [PATCH 1/3] can: provide local copy of - -Signed-off-by: Thomas Graf ---- - include/linux/can/netlink.h | 122 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 122 insertions(+) - create mode 100644 include/linux/can/netlink.h - -diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h -new file mode 100644 -index 0000000..14966dd ---- /dev/null -+++ b/include/linux/can/netlink.h -@@ -0,0 +1,122 @@ -+/* -+ * linux/can/netlink.h -+ * -+ * Definitions for the CAN netlink interface -+ * -+ * Copyright (c) 2009 Wolfgang Grandegger -+ * -+ */ -+ -+#ifndef CAN_NETLINK_H -+#define CAN_NETLINK_H -+ -+#include -+ -+/* -+ * CAN bit-timing parameters -+ * -+ * For further information, please read chapter "8 BIT TIMING -+ * REQUIREMENTS" of the "Bosch CAN Specification version 2.0" -+ * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf. -+ */ -+struct can_bittiming { -+ __u32 bitrate; /* Bit-rate in bits/second */ -+ __u32 sample_point; /* Sample point in one-tenth of a percent */ -+ __u32 tq; /* Time quanta (TQ) in nanoseconds */ -+ __u32 prop_seg; /* Propagation segment in TQs */ -+ __u32 phase_seg1; /* Phase buffer segment 1 in TQs */ -+ __u32 phase_seg2; /* Phase buffer segment 2 in TQs */ -+ __u32 sjw; /* Synchronisation jump width in TQs */ -+ __u32 brp; /* Bit-rate prescaler */ -+}; -+ -+/* -+ * CAN harware-dependent bit-timing constant -+ * -+ * Used for calculating and checking bit-timing parameters -+ */ -+struct can_bittiming_const { -+ char name[16]; /* Name of the CAN controller hardware */ -+ __u32 tseg1_min; /* Time segement 1 = prop_seg + phase_seg1 */ -+ __u32 tseg1_max; -+ __u32 tseg2_min; /* Time segement 2 = phase_seg2 */ -+ __u32 tseg2_max; -+ __u32 sjw_max; /* Synchronisation jump width */ -+ __u32 brp_min; /* Bit-rate prescaler */ -+ __u32 brp_max; -+ __u32 brp_inc; -+}; -+ -+/* -+ * CAN clock parameters -+ */ -+struct can_clock { -+ __u32 freq; /* CAN system clock frequency in Hz */ -+}; -+ -+/* -+ * CAN operational and error states -+ */ -+enum can_state { -+ CAN_STATE_ERROR_ACTIVE = 0, /* RX/TX error count < 96 */ -+ CAN_STATE_ERROR_WARNING, /* RX/TX error count < 128 */ -+ CAN_STATE_ERROR_PASSIVE, /* RX/TX error count < 256 */ -+ CAN_STATE_BUS_OFF, /* RX/TX error count >= 256 */ -+ CAN_STATE_STOPPED, /* Device is stopped */ -+ CAN_STATE_SLEEPING, /* Device is sleeping */ -+ CAN_STATE_MAX -+}; -+ -+/* -+ * CAN bus error counters -+ */ -+struct can_berr_counter { -+ __u16 txerr; -+ __u16 rxerr; -+}; -+ -+/* -+ * CAN controller mode -+ */ -+struct can_ctrlmode { -+ __u32 mask; -+ __u32 flags; -+}; -+ -+#define CAN_CTRLMODE_LOOPBACK 0x01 /* Loopback mode */ -+#define CAN_CTRLMODE_LISTENONLY 0x02 /* Listen-only mode */ -+#define CAN_CTRLMODE_3_SAMPLES 0x04 /* Triple sampling mode */ -+#define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */ -+#define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ -+ -+/* -+ * CAN device statistics -+ */ -+struct can_device_stats { -+ __u32 bus_error; /* Bus errors */ -+ __u32 error_warning; /* Changes to error warning state */ -+ __u32 error_passive; /* Changes to error passive state */ -+ __u32 bus_off; /* Changes to bus off state */ -+ __u32 arbitration_lost; /* Arbitration lost errors */ -+ __u32 restarts; /* CAN controller re-starts */ -+}; -+ -+/* -+ * CAN netlink interface -+ */ -+enum { -+ IFLA_CAN_UNSPEC, -+ IFLA_CAN_BITTIMING, -+ IFLA_CAN_BITTIMING_CONST, -+ IFLA_CAN_CLOCK, -+ IFLA_CAN_STATE, -+ IFLA_CAN_CTRLMODE, -+ IFLA_CAN_RESTART_MS, -+ IFLA_CAN_RESTART, -+ IFLA_CAN_BERR_COUNTER, -+ __IFLA_CAN_MAX -+}; -+ -+#define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1) -+ -+#endif /* CAN_NETLINK_H */ --- -1.7.10.4 - diff --git a/recipes/libnl/libnl_3.2.21.oe b/recipes/libnl/libnl_3.2.21.oe deleted file mode 100644 index 523640e..0000000 --- a/recipes/libnl/libnl_3.2.21.oe +++ /dev/null @@ -1,6 +0,0 @@ -require ${PN}.inc - -LICENSE = "LGPLv2.1" - -SRC_URI += "file://fix-pc-file.patch" -SRC_URI += "file://libnl-3.2.16-0001-can-provide-local-copy-of-linux-can-netlink.h.patch" diff --git a/recipes/libnl/libnl_3.2.21.oe.sig b/recipes/libnl/libnl_3.2.21.oe.sig deleted file mode 100644 index 87e13a1..0000000 --- a/recipes/libnl/libnl_3.2.21.oe.sig +++ /dev/null @@ -1 +0,0 @@ -7d680788902f1e839889b7c2611393595beba907 libnl-3.2.21.tar.gz