diff options
author | Ido Rosen | 2016-06-30 15:48:36 -0400 |
---|---|---|
committer | Ido Rosen | 2016-06-30 15:49:09 -0400 |
commit | 7317d20565bc3cdebe034eb275452c0ffa4d000d (patch) | |
tree | 0670fca03eb275c92c914674996f1e488d00e58d | |
parent | 268abd6e2665257dcf35422dfc07d738df9adbc5 (diff) | |
download | aur-7317d20565bc3cdebe034eb275452c0ffa4d000d.tar.gz |
openonload -> 201606
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | openonload-201310-cpp11-space-literal-fix.patch | 23 | ||||
-rw-r--r-- | openonload-201405-extramodules-and-noinitrc.patch | 50 | ||||
-rw-r--r-- | openonload-201405-extramodules-and-noinitrc2.patch | 12 | ||||
-rw-r--r-- | openonload-201606-archlinux.patch | 64 |
7 files changed, 106 insertions, 88 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Thu Jun 30 19:49:00 UTC 2016 pkgbase = openonload pkgdesc = A high performance network stack from Solarflare. - pkgver = 201509 + pkgver = 201606 pkgrel = 1 url = http://www.openonload.org/ install = openonload.install @@ -15,18 +17,16 @@ pkgbase = openonload options = !makeflags options = !buildflags options = staticlibs - source = http://www.openonload.org/download/openonload-201509.tgz + source = http://www.openonload.org/download/openonload-201606.tgz source = openonload.install source = openonload.service source = openonload-201310-cpp11-space-literal-fix.patch - source = openonload-201405-extramodules-and-noinitrc.patch - source = openonload-201405-extramodules-and-noinitrc2.patch - sha512sums = 012e65107327d52af455e8c6b476b65a360180269d47beb4b99883883af8e5c1c017dfbf13f112c25db5811d3cb92f52316e3311ff4cc4cb138dec2fc8f9d47a + source = openonload-201606-archlinux.patch + sha512sums = 23207e9c701ccf85cdc70229390dfdf5b351d362509a1fd8d8666231f1061fe4054a95dc1d4968ce8c43be490abaf405f252f07a07eec72771b015cf9ff01b16 sha512sums = ac464250f2fb96d13e8ae129bac80c03f8cca62e450fdd765f24ccd064e28e9942e4a16ebc693e75c71fc1eb86c3a1b08337b2e39c6c618e129d8ec87d872bdb sha512sums = b7e4529e37c64f99c660ca9b58f388cdd8f0d2f250ba875eb210f4909bb1f1c985a065aae64c048ca6f824adc6e3176c6eae1f582c049631326db73e939edd7b - sha512sums = d4fda83764e79cff525f578e14b337937d2a6a3e0fc5f3cc5ec07b739f4bcc46b294fa560db595b0efb14bdf70eab44e833c05278e28d8fb947f9f8b77748a78 - sha512sums = a206a6890793a4b3d7ac7090ef2a660d80782f9d6995df0e04d563e0653e10c480e7444a11b3cae64c669592375d5fdb21893c961438e0864e478138b37c5dd9 - sha512sums = 5a2a8984bfc8ba4e75637fab24970764da165dd3cf7253dd32f647a866e4ad0bfd77732f3739066f2479333a466574a55db46142d3ed47a5c5f6e2f6e65c0b39 + sha512sums = a1d23b60b699c04caee93eb18d855dbe2e65d2115f10eb3771d1a2f04eea8d3b8042550152a5f96140aca759db10c3fbebdde85dbebcf46505c15f2ba7934bdb + sha512sums = c368ce3ed7987d1b374f1e671eb21bc80af4b927e4db4a229712f334ee4843f5921fb64c7ac83df214a9cc37134f8a3360273e9ba9496ff56c329476d26d050a pkgname = openonload diff --git a/.gitignore b/.gitignore index 4a64aca6a1a8..f558fba85fe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ /openonload-*.tgz +/src/ +/pkg/ +/*.pkg.tar.xz +/*.src.tar.gz @@ -18,11 +18,7 @@ pkgname='openonload' pkgdesc="A high performance network stack from Solarflare." -pkgver='201509' -if [[ -z "$_kernelver" ]]; then - #_kernelver="$(uname -r)" # running - _kernelver="$(cat /lib/modules/extramodules-4.1-lts/version)" # installed -fi +pkgver='201606' pkgrel=1 arch=('i686' 'x86_64') url='http://www.openonload.org/' @@ -34,24 +30,27 @@ source=("http://www.openonload.org/download/openonload-${pkgver//\./-}.tgz" 'openonload.install' 'openonload.service' 'openonload-201310-cpp11-space-literal-fix.patch' - 'openonload-201405-extramodules-and-noinitrc.patch' - 'openonload-201405-extramodules-and-noinitrc2.patch' + 'openonload-201606-archlinux.patch' ) -sha512sums=('012e65107327d52af455e8c6b476b65a360180269d47beb4b99883883af8e5c1c017dfbf13f112c25db5811d3cb92f52316e3311ff4cc4cb138dec2fc8f9d47a' +sha512sums=('23207e9c701ccf85cdc70229390dfdf5b351d362509a1fd8d8666231f1061fe4054a95dc1d4968ce8c43be490abaf405f252f07a07eec72771b015cf9ff01b16' 'ac464250f2fb96d13e8ae129bac80c03f8cca62e450fdd765f24ccd064e28e9942e4a16ebc693e75c71fc1eb86c3a1b08337b2e39c6c618e129d8ec87d872bdb' 'b7e4529e37c64f99c660ca9b58f388cdd8f0d2f250ba875eb210f4909bb1f1c985a065aae64c048ca6f824adc6e3176c6eae1f582c049631326db73e939edd7b' - 'd4fda83764e79cff525f578e14b337937d2a6a3e0fc5f3cc5ec07b739f4bcc46b294fa560db595b0efb14bdf70eab44e833c05278e28d8fb947f9f8b77748a78' - 'a206a6890793a4b3d7ac7090ef2a660d80782f9d6995df0e04d563e0653e10c480e7444a11b3cae64c669592375d5fdb21893c961438e0864e478138b37c5dd9' - '5a2a8984bfc8ba4e75637fab24970764da165dd3cf7253dd32f647a866e4ad0bfd77732f3739066f2479333a466574a55db46142d3ed47a5c5f6e2f6e65c0b39') + 'a1d23b60b699c04caee93eb18d855dbe2e65d2115f10eb3771d1a2f04eea8d3b8042550152a5f96140aca759db10c3fbebdde85dbebcf46505c15f2ba7934bdb' + 'c368ce3ed7987d1b374f1e671eb21bc80af4b927e4db4a229712f334ee4843f5921fb64c7ac83df214a9cc37134f8a3360273e9ba9496ff56c329476d26d050a') install="openonload.install" +if [[ -z "$_kernelver" ]]; then + #_kernelver="$(uname -r)" # running + #_kernelver="$(cat /lib/modules/extramodules-4.4-lts/version)" # installed + _kernelver="$(pacman -Q linux-lts | cut -d' ' -f2)-lts" # installed +fi + prepare() { cd "${srcdir}/${pkgname}-${pkgver//\./-}" patch -p1 < "${srcdir}/openonload-201310-cpp11-space-literal-fix.patch" - patch -p1 < "${srcdir}/openonload-201405-extramodules-and-noinitrc.patch" - patch -p1 < "${srcdir}/openonload-201405-extramodules-and-noinitrc2.patch" + patch -p1 < "${srcdir}/openonload-201606-archlinux.patch" } build() { diff --git a/openonload-201310-cpp11-space-literal-fix.patch b/openonload-201310-cpp11-space-literal-fix.patch index 5ddb7daebe56..520a8cab1bd9 100644 --- a/openonload-201310-cpp11-space-literal-fix.patch +++ b/openonload-201310-cpp11-space-literal-fix.patch @@ -1,8 +1,18 @@ -diff -rupN old/src/include/ci/efhw/common.h new/src/include/ci/efhw/common.h ---- old/src/include/ci/efhw/common.h 2013-10-11 10:28:47.000000000 -0400 -+++ new/src/include/ci/efhw/common.h 2013-11-05 10:59:34.023661092 -0500 -@@ -62,7 +62,7 @@ enum efhw_arch { - }; +From 0fdfc0f7ea9db1036bb6895d2f9704b6f05411ff Mon Sep 17 00:00:00 2001 +From: Ido Rosen <code@idorosen.com> +Date: Thu, 30 Jun 2016 15:16:17 -0400 +Subject: [PATCH 1/2] openonload-201310-cpp11-space-literal-fix + +--- + src/include/ci/efhw/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/ci/efhw/common.h b/src/include/ci/efhw/common.h +index 10d854c..4a4edd5 100644 +--- a/src/include/ci/efhw/common.h ++++ b/src/include/ci/efhw/common.h +@@ -58,7 +58,7 @@ + #include <ci/efhw/device.h> typedef uint32_t efhw_buffer_addr_t; -#define EFHW_BUFFER_ADDR_FMT "[ba:%"PRIx32"]" @@ -10,3 +20,6 @@ diff -rupN old/src/include/ci/efhw/common.h new/src/include/ci/efhw/common.h /* Below event structure is in NIC bytes order. When using either field for * something other then check against 0xffff one should convert the event +-- +2.7.4 (Apple Git-66) + diff --git a/openonload-201405-extramodules-and-noinitrc.patch b/openonload-201405-extramodules-and-noinitrc.patch deleted file mode 100644 index d97c6e045d9b..000000000000 --- a/openonload-201405-extramodules-and-noinitrc.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/scripts/onload_install b/scripts/onload_install -index 3af0917..d33f565 100755 ---- a/scripts/onload_install -+++ b/scripts/onload_install -@@ -259,7 +259,7 @@ install_userland() { - install_x onload_tool "$i_sbin/onload_tool" - install_x onload "$i_usrbin/onload" - install_x sfcirqaffinity "$i_usrsbin/sfcirqaffinity" -- install_x onload_misc/onload_init_rc "$i_etc/init.d/openonload" -+# install_x onload_misc/onload_init_rc "$i_etc/init.d/openonload" - install_f onload_misc/onload_sysconfig "$i_etc/sysconfig/openonload" - install_x onload_tcpdump "$i_usrbin/onload_tcpdump" - install_x onload_iptables "$i_usrbin/onload_iptables" -@@ -325,7 +325,7 @@ install_ldconfig() { - - install_kernel_modules() { - # Install kernel drivers. -- did="$i_prefix/lib/modules/$KVER/extra" -+ did="$i_prefix$(readlink -f /lib/modules/$KVER/extramodules)" - try $do cd "$TOP/build" - d=$(mmaketool --driverbuild) - if ! $test; then -@@ -487,7 +487,7 @@ check_whether_installed() { - fi - local drv where - for drv in sfc.ko onload.ko sfc_aoe.ko; do -- for where in updates extra; do -+ for where in extramodules; do - check_file_installed "$i_prefix/lib/modules/$KVER/$where/$drv" - done - done -@@ -508,7 +508,7 @@ do_rpm_install() { - - do_rpm_post() { - # Invoked by the rpm install. -- install_init_script -+ #install_init_script - is_rhel4 && rhel4_modprobe_fixup - exit - } -diff --git a/scripts/onload_misc/onload_depmod.conf b/scripts/onload_misc/onload_depmod.conf -index c2cdeeb..65dae7a 100644 ---- a/scripts/onload_misc/onload_depmod.conf -+++ b/scripts/onload_misc/onload_depmod.conf -@@ -1,4 +1,4 @@ - # Ensure that drivers provided by Onload install override any that came - # with the kernel. - override sfc * weak-updates --override sfc * extra -+override sfc * extramodules diff --git a/openonload-201405-extramodules-and-noinitrc2.patch b/openonload-201405-extramodules-and-noinitrc2.patch deleted file mode 100644 index 3bfad46da1c1..000000000000 --- a/openonload-201405-extramodules-and-noinitrc2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN openonload-201405/scripts/onload_install openonload-201405b/scripts/onload_install ---- openonload-201405/scripts/onload_install 2014-07-24 12:06:05.619914425 -0400 -+++ openonload-201405b/scripts/onload_install 2014-07-24 12:05:36.220069022 -0400 -@@ -488,7 +488,7 @@ check_whether_installed() { - local drv where - for drv in sfc.ko onload.ko sfc_aoe.ko; do - for where in extramodules; do -- check_file_installed "$i_prefix/lib/modules/$KVER/$where/$drv" -+ check_file_installed "$i_prefix$(readlink -f /lib/modules/$KVER/$where)/$drv" - done - done - } diff --git a/openonload-201606-archlinux.patch b/openonload-201606-archlinux.patch new file mode 100644 index 000000000000..5d4a816b2cea --- /dev/null +++ b/openonload-201606-archlinux.patch @@ -0,0 +1,64 @@ +From 59fe13806e0d055dc2cdc88fcaef502e1721a2ad Mon Sep 17 00:00:00 2001 +From: Ido Rosen <code@idorosen.com> +Date: Thu, 30 Jun 2016 15:30:17 -0400 +Subject: [PATCH 2/2] openonload-201606-archlinux + +--- + scripts/onload_install | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/scripts/onload_install b/scripts/onload_install +index 3526705..eb8e672 100755 +--- a/scripts/onload_install ++++ b/scripts/onload_install +@@ -292,7 +292,7 @@ echo + install_x onload_tool "$i_sbin/onload_tool" + install_x onload "$i_usrbin/onload" + install_x sfcirqaffinity "$i_usrsbin/sfcirqaffinity" +- install_x onload_misc/onload_init_rc "$i_etc/init.d/openonload" ++ install_x onload_misc/onload_init_rc "$i_usrlibexec/onload_init_rc" + install_f onload_misc/onload_sysconfig "$i_etc/sysconfig/openonload" + install_x onload_tcpdump "$i_usrbin/onload_tcpdump" + install_x onload_iptables "$i_usrbin/onload_iptables" +@@ -354,7 +354,7 @@ install_ldconfig() { + + install_kernel_modules() { + # Install kernel drivers. +- did="$i_prefix/lib/modules/$KVER/extra" ++ did="$i_prefix$(readlink -f /lib/modules/$KVER/extramodules)" + try $do cd "$TOP/build" + d=$(mmaketool --driverbuild) + if ! $test; then +@@ -525,9 +525,7 @@ check_whether_installed() { + fi + local drv where + for drv in sfc.ko onload.ko; do +- for where in updates extra; do +- check_file_installed "$i_prefix/lib/modules/$KVER/$where/$drv" +- done ++ check_file_installed "$i_prefix$(readlink -f /lib/modules/$KVER/extramodules)/$drv" + done + } + +@@ -545,7 +543,7 @@ do_rpm_install() { + + do_rpm_post() { + # Invoked by the rpm install. +- install_init_script ++ #install_init_script + is_rhel4 && rhel4_modprobe_fixup + exit + } +@@ -602,7 +600,8 @@ install_modules=true + install_user=true + ppc_at= + +-KVER=$(uname -r) ++KVER=$(pacman -Q linux-lts | cut -d' ' -f2) # installed ++KVER=${KVER:-$(uname -r)} # running + export KVER + + while [ $# -gt 0 ]; do +-- +2.7.4 (Apple Git-66) + |