Accepting request 225721 from home:hreinecke:branches:network:fcoe

- Refresh patches with upstream version
- Require open-lldp rpm (bnc#864387)

OBS-URL: https://build.opensuse.org/request/show/225721
OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal 2014-03-19 09:20:41 +00:00 committed by Git OBS Bridge
parent fe27e2b1a0
commit 57ffee7555
24 changed files with 41 additions and 31 deletions

View File

@ -1,7 +1,7 @@
From fd085bc2188785859b9ab1f6d27d0fe061baf88c Mon Sep 17 00:00:00 2001
From: Robert Love <robert.w.love@intel.com>
Date: Tue, 15 Oct 2013 01:48:18 +0000
Subject: [PATCH 01/17] man: Fix small typo regarding --fcf option
Subject: man: Fix small typo regarding --fcf option
The option is coded as '--fcf', so fix the documentation
to match the implementation.

View File

@ -1,7 +1,7 @@
From 0f63a3ed3a12b4f88f5dd49983cdf3f9b24e9fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Thu, 7 Nov 2013 11:31:11 +0000
Subject: [PATCH 02/17] Don't call AM_INIT_AUTOMAKE twice
Subject: Don't call AM_INIT_AUTOMAKE twice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

View File

@ -1,7 +1,7 @@
From 921a055f5ea6b68f16db585e985eb24b4c32be2c Mon Sep 17 00:00:00 2001
From: Raju Chakraborty <rajuchak@linux.vnet.ibm.com>
Date: Mon, 18 Nov 2013 14:33:13 +0000
Subject: [PATCH 03/17] fipvlan fails on powerpc
Subject: fipvlan fails on powerpc
fipvlan fails to execute properly on powerpc architecture.

View File

@ -1,8 +1,7 @@
From 29d172232050386b456da62bf873278bb90d4676 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:01 +0000
Subject: [PATCH 04/17] fipvlan: Only shutdown interfaces if no vlans are
created
Subject: fipvlan: Only shutdown interfaces if no vlans are created
Instead of having to check the individual stages we can
easier just check if any vlans are created. Vlans are

View File

@ -1,7 +1,7 @@
From ef209fd4f68fb90f85f89612ebbf9c3e8843f33c Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:02 +0000
Subject: [PATCH 05/17] fipvlan: start VLAN interface from netlink handler
Subject: fipvlan: start VLAN interface from netlink handler
Instead of starting the VLAN interface after the call to
vlan_create() we should rather start it after the netlink

View File

@ -1,7 +1,7 @@
From 6ce709fd271ace5a549a43f11343638273684916 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:03 +0000
Subject: [PATCH 06/17] fipvlan: Extract create_missing_vlan function from loop
Subject: fipvlan: Extract create_missing_vlan function from loop
No functional change.

View File

@ -1,7 +1,7 @@
From ac1fc202b5efda33df3445c2a60709264a0032e5 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:04 +0000
Subject: [PATCH 07/17] fipvlan: create VLANs from netlink handler
Subject: fipvlan: create VLANs from netlink handler
Instead of having its own loop we should better create VLANs
directly from the netlink handler. With this we can eliminate

View File

@ -1,7 +1,7 @@
From 16e421a30caae0e2968941c7bde48f512d9ec106 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:05 +0000
Subject: [PATCH 08/17] fipvlan: Start FCoE from netlink handler
Subject: fipvlan: Start FCoE from netlink handler
Whenever a VLAN or real device is found to have a FCF record
we can go ahead and start FCoE. With this change we can remove

View File

@ -1,7 +1,7 @@
From 9f5e376f3cf16bdd83d731fdc02a877e78a75c26 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:06 +0000
Subject: [PATCH 09/17] fipvlan: Update wait loop to wait for VLANs
Subject: fipvlan: Update wait loop to wait for VLANs
The wait loop should be waiting for any VLAN to become activated,
otherwise we might fail too early.

View File

@ -1,7 +1,7 @@
From 3ded1660f3e2eb79e4dd8155996b0802b6ee664b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:07 +0000
Subject: [PATCH 10/17] fipvlan: Re-send VLAN discovery
Subject: fipvlan: Re-send VLAN discovery
Some switches might decide to discard the VLAN discovery request,
so we should rather re-send it whenever we need to retry.

View File

@ -1,7 +1,7 @@
From 9ade5c67217915aaf38a9e239503d3c982ab6300 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:08 +0000
Subject: [PATCH 11/17] fipvlan: update manpage
Subject: fipvlan: update manpage
'-d' was missing on one instance.

View File

@ -1,7 +1,7 @@
From 0559d7dd7f3e1fff5a76d45bf4c0ca5944640af6 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:09 +0000
Subject: [PATCH 12/17] fipvlan: Leave link up if requested
Subject: fipvlan: Leave link up if requested
This patch adds an option '-u' / '--link-up' to leave the network
interface running if a FIP response has been received.

View File

@ -1,7 +1,7 @@
From 08d9872fb579c0764115beadf588cc52c9f7d97a Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:10 +0000
Subject: [PATCH 13/17] fipvlan: Update manpage to reflect correct timeout
Subject: fipvlan: Update manpage to reflect correct timeout
The timeout per loop is 1000ms, not 500ms.

View File

@ -1,8 +1,7 @@
From 86928f2be78cfb80ff61856e1b7189ed88c836c1 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:11 +0000
Subject: [PATCH 14/17] fipvlan: Do not shut down FCoE connections on physical
interface
Subject: fipvlan: Do not shut down FCoE connections on physical interface
When FCoE is started on the physical interface fipvlan will
shutdown the interface upon exit.

View File

@ -1,7 +1,7 @@
From 78ea81aaef57b5b40fdc86335a7e6a432a72ad48 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:12 +0000
Subject: [PATCH 15/17] fipvlan: break out of receive loop on error
Subject: fipvlan: break out of receive loop on error
When fip_recv() returns an error we need to break out of the
receive loop; otherwise we might be stuck in there forever.

View File

@ -1,7 +1,7 @@
From 45d0e704e82b1c00d3e45745ac3d466fce4c953c Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:13 +0000
Subject: [PATCH 16/17] fipvlan: handle errors from fip socket creation
Subject: fipvlan: handle errors from fip socket creation
If we don't receive a SAN MAC address it's pointless to try
to create a socket, as FCoE itself cannot continue. So we

View File

@ -1,7 +1,7 @@
From 6bde8d1b9f63a7d110fab53e3791040cbe9b101f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 19 Nov 2013 20:26:14 +0000
Subject: [PATCH 17/17] fipvlan: filter interfaces from rtnl_getlink
Subject: fipvlan: filter interfaces from rtnl_getlink
Instead of carrying around two different ways on selecting
interfaces we should be filter the list of possible interfaces

View File

@ -1,11 +1,12 @@
From d61a3d41a935a389c3cf6d4040905a4e296095c5 Mon Sep 17 00:00:00 2001
From e566b3ecac367cf59a1d3995b32591bba2ad2972 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 6 Dec 2013 11:54:49 +0100
Date: Fri, 6 Dec 2013 19:51:53 +0000
Subject: Fix integer formatting
Properly use inttypes when printing 64bit values.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
fcoeadm_display.c | 4 ++--
fcoemon.c | 2 +-

View File

@ -1,11 +1,12 @@
From a300e36092c51953cc55691f2d7514ee14ba1431 Mon Sep 17 00:00:00 2001
From 6750b2abc6d39867954437fd58e8a593613b9c37 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 6 Dec 2013 11:22:02 +0100
Date: Fri, 6 Dec 2013 19:51:54 +0000
Subject: fcnsq: Fixup help text
The help text was missing the '-q' short option.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
fcnsq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

View File

@ -1,15 +1,16 @@
From 0fc2690e701941dfa71ae207286b39b7d99ed801 Mon Sep 17 00:00:00 2001
From d8deef20a4a427dfa866398047e00cd3e28c0545 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 6 Dec 2013 11:57:30 +0100
Date: Fri, 6 Dec 2013 19:51:55 +0000
Subject: fcnsq: Fixup 64bit integer handling
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
fcnsq.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/fcnsq.c b/fcnsq.c
index 2510f1c..68a0697 100644
index 2510f1c..1597cd5 100644
--- a/fcnsq.c
+++ b/fcnsq.c
@@ -24,6 +24,7 @@

View File

@ -1,11 +1,12 @@
From bf7f4b232fec6767e767287d2f04cd782467000d Mon Sep 17 00:00:00 2001
From 41e9d79bd4bf9af4aa422615453333e860acabcd Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 6 Dec 2013 11:32:20 +0100
Date: Fri, 6 Dec 2013 19:51:56 +0000
Subject: fcoemon: add systemd service file
Add fcoe.service file to start fcoemon from systemd
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
Makefile.am | 5 +++++
configure.ac | 8 ++++++++

View File

@ -1,11 +1,12 @@
From a8993f1a41d65d5b6e1a4fef081eb2d84bb0426b Mon Sep 17 00:00:00 2001
From 09caead4ae14c868cee0ad71f8bb8648746a81a0 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 6 Dec 2013 10:59:19 +0100
Date: Fri, 6 Dec 2013 19:51:57 +0000
Subject: fcoemon: systemd socket activation
Implement systemd socket activation on the CLIF socket.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
Makefile.am | 2 +-
etc/systemd/fcoe.service | 3 ++-

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 12 11:25:09 CET 2014 - hare@suse.de
- Refresh patches with upstream version
- Require open-lldp rpm (bnc#864387)
-------------------------------------------------------------------
Fri Dec 6 12:54:33 CET 2013 - hare@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package fcoe-utils
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,7 @@ BuildRequires: libtool
BuildRequires: open-lldp-devel
Requires: device-mapper
Requires: iproute
Requires: open-lldp
BuildRequires: systemd-devel
%systemd_requires
Version: 1.0.29