bachport-Fix-GCC-12-warning.patch

@@ -1,25 +0,0 @@
-From 33be0ef3579da7a451df4b945d6b150bea2d4429 Mon Sep 17 00:00:00 2001
-From: xu_lei_123 <xulei@xfusion.com>
-Date: Fri, 30 Dec 2022 11:10:26 +0800
-Subject: [PATCH] Fix GCC 12 warning
-
----
- fcoeadm_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fcoeadm_display.c b/fcoeadm_display.c
-index cc8f4fe..ab75172 100644
---- a/fcoeadm_display.c
-+++ b/fcoeadm_display.c
-@@ -246,7 +246,7 @@ static void show_full_lun_info(unsigned int hba, unsigned int port,
- 	char vendor[256];
- 	char model[256];
- 	char rev[256];
--	char *osname;
-+	char *osname = NULL;
- 	char *capstr;
- 	uint64_t lba = 0;
- 	uint32_t blksize = 0;
--- 
-2.21.0
-

backport-Fix-build-error-to-change-char-type.patch

@@ -1,23 +0,0 @@
-From 7f4c8df2adb258d61be3df7cee24afef2901629d Mon Sep 17 00:00:00 2001
-From: Guillaume Gardet <guillaume.gardet@arm.com>
-Date: Thu, 20 Aug 2020 09:55:47 +0000
-Subject: [PATCH 1/1] char can be unsigned on arm, so set signed explicitly as
- the check expects it can be negative
-
----
- fcnsq.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fcnsq.c b/fcnsq.c
-index 1597cd5..c59c428 100644
---- a/fcnsq.c
-+++ b/fcnsq.c
-@@ -381,7 +381,7 @@ int main(int argc, char *argv[])
- 	u64 wwnn = 0;
- 	int rc = 0;
- 	enum commands cmd = 0;
--	char c;
-+	signed char c;
- 	uintmax_t wwnn_tmp = 0;
- 
- 	while(1) {

backport-handle-NIC-names-longer-than-7-characters.patch

@@ -1,33 +0,0 @@
-From 74359e5a9965ed26e0b42d890bf802103da6c97f Mon Sep 17 00:00:00 2001
-From: xulei <xulei@xfusion.com>
-Date: Thu, 29 Dec 2022 20:07:41 +0800
-Subject: [PATCH] handle NIC names longer than 7 characters
-
----
- fcoeadm_display.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fcoeadm_display.c b/fcoeadm_display.c
-index cc8f4fe..585ecfa 100644
---- a/fcoeadm_display.c
-+++ b/fcoeadm_display.c
-@@ -476,7 +476,7 @@ static void scan_device_map(char *rport, enum disp_style style)
- static void show_port_stats_header(const char *ifname, int interval)
- {
- 	printf("\n");
--	printf("%-7s interval: %-2d                                    Err  Inv  "
-+	printf("%-15s interval: %-2d                            Err  Inv  "
- 	       "IvTx Link Cntl Input     Input     Output    Output\n",
- 	       ifname, interval);
- 	printf("Seconds TxFrames  TxBytes      RxFrames  RxBytes        "
-@@ -921,7 +921,7 @@ static void
- print_interface_fcoe_lesb_stats_header(const char *ifname, int interval)
- {
- 	printf("\n");
--	printf("%-7s interval: %-2d\n", ifname, interval);
-+	printf("%-15s interval: %-2d\n", ifname, interval);  
- 	printf("LinkFail VLinkFail MissFKA SymbErr ErrBlkCnt FCSErrCnt\n");
- 	printf("-------- --------- ------- ------- --------- ---------\n");
- }
--- 
-2.33.0

fcoe-utils.spec

@@ -1,19 +1,19 @@
 Name:               fcoe-utils
 Version:            1.0.33
-Release:            5
+Release:            1
 Summary:            Fibre Channel over Ethernet utilities
 License:            GPLv2
 URL:                https://github.com/morbidrsa/fcoe-utils
 Source0:            https://github.com/morbidrsa/fcoe-utils/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:            quickstart.txt
+Source2:            fcoe.service
+Source3:            fcoe.config
 Patch0:             backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch 
 Patch1:             backport-01-fix_VLAN_device_name_overflow_check.patch 
 Patch2:             backport-02-string_op_truncation_format_trauncation.patch     
 Patch3:             backport-03-use-of-uninitialized-values-detected-during-LTO.patch
 #This patch refer to ubuntu's version
-Patch4:             backport-Fix-build-error-to-change-char-type.patch
+
-Patch5:             backport-handle-NIC-names-longer-than-7-characters.patch           
-Patch6:             bachport-Fix-GCC-12-warning.patch
 
 BuildRequires:      autoconf automake libpciaccess-devel libtool lldpad-devel systemd
 Requires:           lldpad iproute device-mapper-multipath
@@ -38,10 +38,15 @@ cp -v %{SOURCE1} quickstart.txt
 %install
 %make_install
 rm -rf %{buildroot}/etc/init.d
+install -d %{buildroot}%{_sysconfdir}/sysconfig %{buildroot}%{_unitdir}
+rm -f %{buildroot}%{_unitdir}/*
+install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcoe
 install -d %{buildroot}%{_libexecdir}/fcoe
 for file in contrib/*.sh debug/*sh
     do install -m 755 ${file} %{buildroot}%{_libexecdir}/fcoe/
 done
+rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 
 %post
 %systemd_post fcoe.service
@@ -56,9 +61,8 @@ done
 %defattr(-,root,root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
-%config(noreplace) %{_sysconfdir}/fcoe/config
+%config(noreplace) %{_sysconfdir}/sysconfig/fcoe
 %{_unitdir}/fcoe.service
-%{_unitdir}/fcoemon.socket
 %{_sbindir}/*
 %{_datadir}/bash-completion/completions/*
 %{_libexecdir}/fcoe/
@@ -69,18 +73,6 @@ done
 %{_mandir}/man8/*
 
 %changelog
-* Fri Dec 30 2022 xulei <xulei@xfusion.com> - 1.0.33-5
-- Backport upstream patch to fix GCC 12 warning.
-
-* Thu Dec 29 2022 xulei <xulei@xfusion.com> - 1.0.33-4
-- Backport upstream patch to handle NIC names lognger than 7 characters
-
-* Wed Mar 03 2022 xu_ping <xuping33@huawei.com> - 1.0.33-3
-- Backport upstream patch to avoid non-X86 build break.
-
-* Wed Aug 25 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.0.33-2
-- Fix fcoe.service start error
-
 * Tue Mar 30 2021 lijingyuan <lijingyuan@huawei.com> - 1.0.33-1
 - Type:requirement
 - Id:NA

fcoe.config

@@ -0,0 +1,5 @@
+# All supported drivers listed here are loaded when service starts
+SUPPORTED_DRIVERS="libfc fcoe bnx2fc"
+
+# Add --debug to enable debug messages
+FCOEMON_OPTS="--syslog"

fcoe.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Open-FCoE Inititator.
+After=syslog.target network.target lldpad.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/sysconfig/fcoe
+ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS
+ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target