diff options
author | Christian Hesse | 2015-06-30 15:42:56 +0200 |
---|---|---|
committer | Christian Hesse | 2015-06-30 15:42:56 +0200 |
commit | 4a3be9889ee86fdcb78864656960951e33466b0e (patch) | |
tree | bf35c0c42a138692fadcab29cdb128063f5a4453 | |
download | aur-4a3be9889ee86fdcb78864656960951e33466b0e.tar.gz |
initial import of open-fcoe 3.19-1
-rw-r--r-- | .SRCINFO | 46 | ||||
-rw-r--r-- | 0002-configure.patch | 28 | ||||
-rw-r--r-- | 0003-declaration.patch | 63 | ||||
-rw-r--r-- | 0004-include.patch | 26 | ||||
-rw-r--r-- | 0005-makefile.patch | 29 | ||||
-rw-r--r-- | 0006-bash-completion.patch | 13 | ||||
-rw-r--r-- | 0007-confdir.patch | 13 | ||||
-rw-r--r-- | PKGBUILD | 112 | ||||
-rw-r--r-- | config | 19 |
9 files changed, 349 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..dc7e1dbec466 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,46 @@ +pkgbase = open-fcoe + pkgdesc = Fibre Channel over Ethernet implementation for Linux + pkgver = 3.19 + pkgrel = 1 + url = http://www.open-fcoe.org/ + arch = i686 + arch = x86_64 + license = GPL + makedepends = libpciaccess + makedepends = open-lldp + source = http://ftp-osl.osuosl.org/pub/open-fcoe/open-fcoe-3.19.tar.gz + source = http://ftp-osl.osuosl.org/pub/open-fcoe/open-fcoe-3.19.tar.gz.sig + source = config + source = 0002-configure.patch + source = 0003-declaration.patch + source = 0004-include.patch + source = 0005-makefile.patch + source = 0006-bash-completion.patch + source = 0007-confdir.patch + sha256sums = 68383cee4840148bcefc372840783ecbb3fcb45eabee0501ba103749894e7e50 + sha256sums = SKIP + sha256sums = 91fceebb455997dea11feda863a9c9f68b7b9fab85b7dbaa24b6b9daef49a716 + sha256sums = 12fb3e94657d801dc1af67c6ec0aed8919e85a66db5411b17bcc61846b4990cf + sha256sums = 1a49ba2a371b6e78e6640a848059ee19c5f87d46124281ad40fd24070add4d3f + sha256sums = 1d9c325efaf6bdca22ff1927c885ca393cca14723acf6946176be475cb914746 + sha256sums = ff3d290ae4d09a18b1775e0f5747f9187f66b2a8a155db5547c927c22b195717 + sha256sums = 441bf7080d98d5d1089c36c34b1796fd84fe5065137385381d88b0f7838f470f + sha256sums = bcd8fca39f2a3433188de70d7f5bc919eb57f0ec2d154e08f260dab46aea7a52 + +pkgname = libhbaapi + pkgdesc = Fibre Channel over Ethernet implementation for Linux - libhbaapi + backup = etc/hba.conf + +pkgname = libhbalinux + pkgdesc = Fibre Channel over Ethernet implementation for Linux - libhbalinux + depends = libhbaapi + depends = libpciaccess + +pkgname = fcoe-utils + pkgdesc = Fibre Channel over Ethernet implementation for Linux - utils + depends = open-lldp + depends = libhbaapi + depends = libhbalinux + optdepends = bash-completion: command completion in bash + backup = etc/conf.d/fcoe + diff --git a/0002-configure.patch b/0002-configure.patch new file mode 100644 index 000000000000..d14a49544454 --- /dev/null +++ b/0002-configure.patch @@ -0,0 +1,28 @@ +diff --git a/libhbalinux/configure.ac b/libhbalinux/configure.ac +index 3a8ae4c..1249e47 100644 +--- a/libhbalinux/configure.ac ++++ b/libhbalinux/configure.ac +@@ -12,6 +12,7 @@ AC_SUBST(PCIACCESS_LIBS) + + PKG_CHECK_MODULES(HBAAPI, HBAAPI) + AC_SUBST(HBAAPI_CFLAGS) ++AC_SUBST(HBAAPI_LIBS) + + AC_CONFIG_FILES([Makefile libhbalinux.spec libhbalinux.pc]) + AC_OUTPUT +diff --git a/fcoe-utils/configure.ac b/fcoe-utils/configure.ac +index 423361b..1a6fb64 100644 +--- a/fcoe-utils/configure.ac ++++ b/fcoe-utils/configure.ac +@@ -13,9 +13,11 @@ AC_SUBST([HBAAPI_LIBS]) + + PKG_CHECK_MODULES([LLDPAD], [lldpad >= 0.9.46]) + AC_SUBST([LLDPAD_CFLAGS]) ++AC_SUBST([LLDPAD_LIBS]) + + PKG_CHECK_MODULES([LIBHBALINUX], [libhbalinux >= 1.0.17]) + AC_SUBST([LIBHBALINUX_CFLAGS]) ++AC_SUBST([LIBHBALINUX_LIBS]) + + AC_CONFIG_FILES([Makefile fcoe-utils.spec include/fcoe_utils_version.h]) + AC_OUTPUT diff --git a/0003-declaration.patch b/0003-declaration.patch new file mode 100644 index 000000000000..0a75451d3ddf --- /dev/null +++ b/0003-declaration.patch @@ -0,0 +1,63 @@ +diff --git a/libHBAAPI/hbaapi.h b/libHBAAPI/hbaapi.h +index 58098e0..952a02c 100644 +--- a/libHBAAPI/hbaapi.h ++++ b/libHBAAPI/hbaapi.h +@@ -523,17 +523,17 @@ typedef void * HBA_CALLBACKHANDLE; + #define HBA_EVENT_LINK_UNKNOWN 0x500 + #define HBA_EVENT_LINK_INCIDENT 0x501 + +-HBA_API HBA_UINT32 HBA_GetVersion(); ++HBA_API HBA_UINT32 HBA_GetVersion(void); + + /* + * Make sure HBA_LoadLibrary returns before any other threads + * make calls to the library + */ +-HBA_API HBA_STATUS HBA_LoadLibrary(); ++HBA_API HBA_STATUS HBA_LoadLibrary(void); + +-HBA_API HBA_STATUS HBA_FreeLibrary(); ++HBA_API HBA_STATUS HBA_FreeLibrary(void); + +-HBA_API HBA_UINT32 HBA_GetNumberOfAdapters(); ++HBA_API HBA_UINT32 HBA_GetNumberOfAdapters(void); + + HBA_API HBA_STATUS HBA_GetAdapterName( + HBA_UINT32 adapterindex, +@@ -602,7 +602,7 @@ HBA_API HBA_STATUS HBA_SendCTPassThru( + HBA_UINT32 RspBufferSize + ); + +-HBA_API void HBA_RefreshAdapterConfiguration(); ++HBA_API void HBA_RefreshAdapterConfiguration(void); + + HBA_API HBA_STATUS HBA_GetEventBuffer( + HBA_HANDLE handle, +diff --git a/libHBAAPI/vendorhbaapi.h b/libHBAAPI/vendorhbaapi.h +index ca27045..6e14636 100644 +--- a/libHBAAPI/vendorhbaapi.h ++++ b/libHBAAPI/vendorhbaapi.h +@@ -44,10 +44,10 @@ extern "C" { + + + /* 6.10.1 HBA Library Function Table */ +-typedef HBA_UINT32 (* HBAGetVersionFunc)(); +-typedef HBA_STATUS (* HBALoadLibraryFunc)(); +-typedef HBA_STATUS (* HBAFreeLibraryFunc)(); +-typedef HBA_UINT32 (* HBAGetNumberOfAdaptersFunc)(); ++typedef HBA_UINT32 (* HBAGetVersionFunc)(void); ++typedef HBA_STATUS (* HBALoadLibraryFunc)(void); ++typedef HBA_STATUS (* HBAFreeLibraryFunc)(void); ++typedef HBA_UINT32 (* HBAGetNumberOfAdaptersFunc)(void); + typedef HBA_STATUS (* HBAGetAdapterNameFunc)(HBA_UINT32, char *); + /* + * Open Adapter.... the vendor function is limmited to 16 bits, +@@ -72,7 +72,7 @@ typedef HBA_STATUS (* HBAGetPortAttributesByWWNFunc) + typedef HBA_STATUS (* HBASendCTPassThruV2Func) + (HBA_HANDLE, HBA_WWN, void *, HBA_UINT32, void *, HBA_UINT32 *); + typedef void (* HBARefreshInformationFunc)(HBA_HANDLE); +-typedef void (* HBARefreshAdapterConfigurationFunc) (); ++typedef void (* HBARefreshAdapterConfigurationFunc) (void); + typedef void (* HBAResetStatisticsFunc)(HBA_HANDLE, HBA_UINT32); + typedef HBA_STATUS (* HBAGetFcpTargetMappingV2Func) + (HBA_HANDLE, HBA_WWN, HBA_FCPTARGETMAPPINGV2 *); diff --git a/0004-include.patch b/0004-include.patch new file mode 100644 index 000000000000..ab1a47e11c96 --- /dev/null +++ b/0004-include.patch @@ -0,0 +1,26 @@ +diff --git a/fcoe-utils/fcoeadm_display.c b/fcoe-utils/fcoeadm_display.c +index 287e370..2d38116 100644 +--- a/fcoe-utils/fcoeadm_display.c ++++ b/fcoe-utils/fcoeadm_display.c +@@ -38,7 +38,7 @@ + #include "net_types.h" + #include "fc_types.h" + #include "fc_scsi.h" +-#include "hbaapi.h" ++#include <hbaapi.h> + #include "fcoeadm_display.h" + #include "fcoe_utils.h" + #include "fcoemon_utils.h" +diff --git a/fcoe-utils/fcoemon.c b/fcoe-utils/fcoemon.c +index a5babfa..cd58900 100644 +--- a/fcoe-utils/fcoemon.c ++++ b/fcoe-utils/fcoemon.c +@@ -60,7 +60,7 @@ + #include "fcoemon.h" + #include "fcoe_clif.h" + #include "fcoe_utils.h" +-#include "hbaapi.h" ++#include <hbaapi.h> + #include "strarr.h" + + #include "fip.h" diff --git a/0005-makefile.patch b/0005-makefile.patch new file mode 100644 index 000000000000..a37fa0e25cdb --- /dev/null +++ b/0005-makefile.patch @@ -0,0 +1,29 @@ +diff --git a/fcoe-utils/Makefile.am b/fcoe-utils/Makefile.am +index c6599ef..efc2c64 100644 +--- a/fcoe-utils/Makefile.am ++++ b/fcoe-utils/Makefile.am +@@ -9,18 +9,18 @@ AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes + + ## rules for building fcoeadm + fcoeadm_SOURCES = fcoeadm.c fcoeadm_display.c +-fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(HBAAPI_LIBS) +-fcoeadm_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) ++fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(HBAAPI_LIBS) $(LIBHBALINUX_LIBS) ++fcoeadm_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) $(LIBHBALINUX_CFLAGS) + + ## rules for building fcoemon + fcoemon_SOURCES = fcoemon.c +-fcoemon_LDADD = lib/libutil.a -lrt +-fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) ++fcoemon_LDADD = lib/libutil.a $(HBAAPI_LIBS) -lrt ++fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) $(HBAAPI_CFLAGS) + + ## rules for building fcping + fcping_SOURCES = fcping.c +-fcping_LDADD = lib/libutil.a $(HBAAPI_LIBS) -lrt +-fcping_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) ++fcping_LDADD = lib/libutil.a $(HBAAPI_LIBS) $(LIBHBALINUX_LIBS) -lrt ++fcping_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS) $(LIBHBALINUX_CFLAGS) + + ## rules for building fipvlan + fipvlan_SOURCES = fipvlan.c diff --git a/0006-bash-completion.patch b/0006-bash-completion.patch new file mode 100644 index 000000000000..0929a6ac0399 --- /dev/null +++ b/0006-bash-completion.patch @@ -0,0 +1,13 @@ +diff --git a/fcoe-utils/Makefile.am b/fcoe-utils/Makefile.am +index efc2c64..4d51ad0 100644 +--- a/fcoe-utils/Makefile.am ++++ b/fcoe-utils/Makefile.am +@@ -72,7 +72,7 @@ init_d_SCRIPTS = etc/initd/fcoe + + dist_noinst_DATA = README COPYING INSTALL CONFIGURE QUICKSTART fcoe-utils.spec etc/config + +-bashcompletiondir = $(sysconfdir)/bash_completion.d ++bashcompletiondir = /usr/share/bash-completion/completions/bash_completion.d + dist_bashcompletion_DATA = contrib/bash_completion/fcoeadm contrib/bash_completion/fcoemon + + install-data-hook: diff --git a/0007-confdir.patch b/0007-confdir.patch new file mode 100644 index 000000000000..b8b649235e19 --- /dev/null +++ b/0007-confdir.patch @@ -0,0 +1,13 @@ +diff --git a/fcoe-utils/etc/systemd/fcoe.service b/fcoe-utils/etc/systemd/fcoe.service +index 5e5c8a2..144c466 100644 +--- a/fcoe-utils/etc/systemd/fcoe.service ++++ b/fcoe-utils/etc/systemd/fcoe.service +@@ -4,7 +4,7 @@ After=syslog.target network.target + + [Service] + Type=simple +-EnvironmentFile=/etc/sysconfig/fcoe ++EnvironmentFile=/etc/conf.d/fcoe + ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS + ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..b1afbc5093a7 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,112 @@ +# Maintainer: Christian Hesse <mail@eworm.de> + +pkgbase=open-fcoe +pkgname=('libhbaapi' 'libhbalinux' 'fcoe-utils') +pkgver=3.19 +pkgrel=1 +pkgdesc='Fibre Channel over Ethernet implementation for Linux' +arch=('i686' 'x86_64') +url='http://www.open-fcoe.org/' +license=('GPL') +makedepends=('libpciaccess' 'open-lldp') +validpgpkeys=('1EFB3A04BBD6C0DBF64D5B3346A3C53C3D727E07' # Robert Love <robert.w.love@intel.com> + 'ECAD90B5697B35ACB65919E0D7832D07664BDE98') # Vasu Dev <vasu.dev@intel.com> +source=("http://ftp-osl.osuosl.org/pub/${pkgbase}/${pkgbase}-${pkgver}.tar.gz"{,.sig} + 'config' + '0002-configure.patch' + '0003-declaration.patch' + '0004-include.patch' + '0005-makefile.patch' + '0006-bash-completion.patch' + '0007-confdir.patch') +sha256sums=('68383cee4840148bcefc372840783ecbb3fcb45eabee0501ba103749894e7e50' + 'SKIP' + '91fceebb455997dea11feda863a9c9f68b7b9fab85b7dbaa24b6b9daef49a716' + '12fb3e94657d801dc1af67c6ec0aed8919e85a66db5411b17bcc61846b4990cf' + '1a49ba2a371b6e78e6640a848059ee19c5f87d46124281ad40fd24070add4d3f' + '1d9c325efaf6bdca22ff1927c885ca393cca14723acf6946176be475cb914746' + 'ff3d290ae4d09a18b1775e0f5747f9187f66b2a8a155db5547c927c22b195717' + '441bf7080d98d5d1089c36c34b1796fd84fe5065137385381d88b0f7838f470f' + 'bcd8fca39f2a3433188de70d7f5bc919eb57f0ec2d154e08f260dab46aea7a52') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}/" + + patch -Np1 < "${srcdir}/0002-configure.patch" + patch -Np1 < "${srcdir}/0003-declaration.patch" + patch -Np1 < "${srcdir}/0004-include.patch" + patch -Np1 < "${srcdir}/0005-makefile.patch" + patch -Np1 < "${srcdir}/0006-bash-completion.patch" + patch -Np1 < "${srcdir}/0007-confdir.patch" +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}/libHBAAPI/" + + autoreconf -fi + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + + make + + export HBAAPI_CFLAGS="-I${srcdir}/${pkgbase}-${pkgver}/libHBAAPI/" + export HBAAPI_LIBS="-L${srcdir}/${pkgbase}-${pkgver}/libHBAAPI/.libs/ -lHBAAPI -ldl" + + cd "${srcdir}/${pkgbase}-${pkgver}/libhbalinux/" + + autoreconf -fi + ./configure \ + --prefix=/usr + + make + + export LIBHBALINUX_CFLAGS="-I${srcdir}/${pkgbase}-${pkgver}/libhbalinux/" + export LIBHBALINUX_LIBS="-L${srcdir}/${pkgbase}-${pkgver}/libhbalinux/.libs/ -ldl" + + cd "${srcdir}/${pkgbase}-${pkgver}/fcoe-utils/" + + autoreconf -fi + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --with-systemdsystemunitdir=/usr/lib/systemd/system + + make +} + +package_libhbaapi() { + pkgdesc='Fibre Channel over Ethernet implementation for Linux - libhbaapi' + backup=('etc/hba.conf') + + cd "${srcdir}/${pkgbase}-${pkgver}/libHBAAPI/" + + make DESTDIR="${pkgdir}" install +} + +package_libhbalinux() { + pkgdesc='Fibre Channel over Ethernet implementation for Linux - libhbalinux' + depends=('libhbaapi' 'libpciaccess') + + cd "${srcdir}/${pkgbase}-${pkgver}/libhbalinux/" + + make DESTDIR="${pkgdir}" install +} + +package_fcoe-utils() { + pkgdesc='Fibre Channel over Ethernet implementation for Linux - utils' + depends=('open-lldp' 'libhbaapi' 'libhbalinux') + optdepends=('bash-completion: command completion in bash') + backup=('etc/conf.d/fcoe') + + cd "${srcdir}/${pkgbase}-${pkgver}/fcoe-utils/" + + make DESTDIR="${pkgdir}" install + + install -D -m0644 "${srcdir}/config" "${pkgdir}/etc/conf.d/fcoe" + + rm -rf "${pkgdir}/etc/init.d/" + rm -rf "${pkgdir}/etc/fcoe/" +} + diff --git a/config b/config new file mode 100644 index 000000000000..ac2778b8339e --- /dev/null +++ b/config @@ -0,0 +1,19 @@ +## Type: yes/no +## Default: no +# Switch on/off debug messages (script & C code) +DEBUG="no" + +## Type: yes/no +## Default: yes +# All the messages go to syslog and stderr (script & C code) +USE_SYSLOG="yes" + +## Type: string. Driver names separated by space +## Default: list of default drivers +# All supported drivers listed here are loaded when service starts +SUPPORTED_DRIVERS="fcoe bnx2fc" + +## Type: string. Command options to fcoeman +## Default: none +# Add command options to fcoeman +FCOEMON_OPTS="" |