From 4adf16c5b63c15c03b460250ea07c361573b25e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 28 Sep 2015 21:53:57 +0300 Subject: [PATCH 1/3] works for module-nvidia304 and 340 --- kernel/drivers/module-nvidia304/actions.py | 2 +- .../module-nvidia304/files/nv-drm.patch | 27 +++++++++++++++++++ kernel/drivers/module-nvidia304/pspec.xml | 19 ++++++++----- .../module-nvidia340/files/nv-drm.patch | 27 +++++++++++++++++++ kernel/drivers/module-nvidia340/pspec.xml | 13 ++++++--- 5 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 kernel/drivers/module-nvidia304/files/nv-drm.patch create mode 100644 kernel/drivers/module-nvidia340/files/nv-drm.patch diff --git a/kernel/drivers/module-nvidia304/actions.py b/kernel/drivers/module-nvidia304/actions.py index 043480d88d..3d00e24a22 100644 --- a/kernel/drivers/module-nvidia304/actions.py +++ b/kernel/drivers/module-nvidia304/actions.py @@ -31,7 +31,7 @@ def setup(): % (arch, get.srcVERSION())) shelltools.move("tmp/*", ".") - shelltools.system("patch -p1 < NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch") + #shelltools.system("patch -p0 < nv-drm.patch") # Our libc is TLS enabled so use TLS library shelltools.unlink("*-tls.so*") diff --git a/kernel/drivers/module-nvidia304/files/nv-drm.patch b/kernel/drivers/module-nvidia304/files/nv-drm.patch new file mode 100644 index 0000000000..4c6a393c43 --- /dev/null +++ b/kernel/drivers/module-nvidia304/files/nv-drm.patch @@ -0,0 +1,27 @@ +--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200 ++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200 +@@ -18,6 +18,11 @@ + + #include + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + struct nv_gem_object { +diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c +index ecc982a..60d7aae 100644 +--- kernel/nv-drm.c~ ++++ kernel/nv-drm.c +@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", diff --git a/kernel/drivers/module-nvidia304/pspec.xml b/kernel/drivers/module-nvidia304/pspec.xml index 19b8a467c6..7907fa15fe 100644 --- a/kernel/drivers/module-nvidia304/pspec.xml +++ b/kernel/drivers/module-nvidia304/pspec.xml @@ -15,10 +15,10 @@ http://download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125.run - NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch + nv-drm.patch - kernel-module-headers + kernel-module-headers @@ -26,7 +26,7 @@ module-nvidia304 Kernel module for NVIDIA driver 304.xx releases - kernel + kernel /lib/modules @@ -63,6 +63,13 @@ + + 2015-09-23 + 304.125 + version bump for kernel 4.1.8 + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-05-22 304.125 @@ -70,21 +77,21 @@ Ertuğrul Erata ertugrulerata@gmail.com - + 2015-05-05 304.125 Rebuild for kernel 3.19.6 Ertuğrul Erata ertugrulerata@gmail.com - + 2015-04-24 304.125 Rebuild for kernel 3.19.5 Ertuğrul Erata ertugrulerata@gmail.com - + 2015-04-16 304.125 Rebuild for kernel 3.19.4 diff --git a/kernel/drivers/module-nvidia340/files/nv-drm.patch b/kernel/drivers/module-nvidia340/files/nv-drm.patch new file mode 100644 index 0000000000..4c6a393c43 --- /dev/null +++ b/kernel/drivers/module-nvidia340/files/nv-drm.patch @@ -0,0 +1,27 @@ +--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200 ++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200 +@@ -18,6 +18,11 @@ + + #include + ++/* 3.18-rc0+ */ ++#ifndef drm_gem_object ++#include ++#endif ++ + extern nv_linux_state_t *nv_linux_devices; + + struct nv_gem_object { +diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c +index ecc982a..60d7aae 100644 +--- kernel/nv-drm.c~ ++++ kernel/nv-drm.c +@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = { + .gem_prime_vmap = nv_gem_prime_vmap, + .gem_prime_vunmap = nv_gem_prime_vunmap, + ++ .set_busid = drm_pci_set_busid, ++ + .name = "nvidia-drm", + .desc = "NVIDIA DRM driver", + .date = "20130102", diff --git a/kernel/drivers/module-nvidia340/pspec.xml b/kernel/drivers/module-nvidia340/pspec.xml index f44312f8d7..b2824e9855 100644 --- a/kernel/drivers/module-nvidia340/pspec.xml +++ b/kernel/drivers/module-nvidia340/pspec.xml @@ -14,7 +14,7 @@ ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76.run - kernel-module-headers + kernel-module-headers @@ -23,7 +23,7 @@ driver Kernel module for NVIDIA driver 340.xx releases - kernel + kernel /lib/modules @@ -95,7 +95,14 @@ - + + 2015-09-23 + 340.76 + Version bump, for kernel 3.19.8 + Ertuğrul Erata + ertugrulerata@gmail.com + + 2015-05-22 340.76 Rebuild for kernel 3.19.8 From bf11c551120a38f1df0c925bc797704c5b222828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Thu, 1 Oct 2015 22:46:01 +0300 Subject: [PATCH 2/3] iputils update --- network/misc/iputils/actions.py | 11 ++-- network/misc/iputils/files/fedora/tftp.xinetd | 10 +++ network/misc/iputils/pspec.xml | 65 +++++-------------- 3 files changed, 29 insertions(+), 57 deletions(-) create mode 100644 network/misc/iputils/files/fedora/tftp.xinetd diff --git a/network/misc/iputils/actions.py b/network/misc/iputils/actions.py index 661fe8eba7..2442dd3c35 100644 --- a/network/misc/iputils/actions.py +++ b/network/misc/iputils/actions.py @@ -10,19 +10,16 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def build(): - autotools.make("CCOPT='%s -fpie' CC=%s" % (get.CFLAGS(), get.CC())) - - autotools.compile("ifenslave.c -o ifenslave") + autotools.make("USE_GNUTLS=no CCOPT='%s -fpie' CC=%s" % (get.CFLAGS(), get.CC())) def install(): - for app in ["ping", "ping6"]: - pisitools.dobin(app) + pisitools.dobin("ping") - for app in ["clockdiff", "arping", "rdisc", "tracepath", "tracepath6", "traceroute6", "ifenslave"]: + for app in ["clockdiff", "rarpd", "tftpd", "arping", "rdisc", "tracepath", "tracepath6", "traceroute6"]: pisitools.dosbin(app) # We will not need these if we set cap on postInstall like Fedora shelltools.chmod("%s/usr/bin/ping" % get.installDIR(), 04711) - shelltools.chmod("%s/usr/bin/ping6" % get.installDIR(), 04711) + #shelltools.chmod("%s/usr/bin/ping6" % get.installDIR(), 04711) pisitools.dodoc("RELNOTES") diff --git a/network/misc/iputils/files/fedora/tftp.xinetd b/network/misc/iputils/files/fedora/tftp.xinetd new file mode 100644 index 0000000000..26041a3f90 --- /dev/null +++ b/network/misc/iputils/files/fedora/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + socket_type = dgram + protocol = udp + wait = yes + user = nobody + server = /usr/sbin/tftpd + server_args = /var/tftpboot + disable = yes +} diff --git a/network/misc/iputils/pspec.xml b/network/misc/iputils/pspec.xml index d0870317c1..356b5a4603 100644 --- a/network/misc/iputils/pspec.xml +++ b/network/misc/iputils/pspec.xml @@ -3,7 +3,7 @@ iputils - http://www.linux-ipv6.org + https://github.com/iputils/iputils PisiLinux Community admins@pisilinux.org @@ -12,66 +12,25 @@ app:console Network monitoring tools including ping and ping6 iputils contains network monitoring tools including ping and ping6. - http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 - - - ifenslave/ifenslave.c - + https://github.com/iputils/iputils/archive/s20150815.tar.gz openssl-devel libidn-devel - gnutls-devel libcap-devel - - 021109-uclibc-no-ether_ntohost.patch - - iputils-20121221-printf-size.patch - iputils-20121221-owl-pingsock.diff - iputils-20121221-openssl.patch - iputils-20121221-makefile.patch - iputils-20121221-crypto-build.patch - iputils-20100418-so_mark.patch - iputils-20071127-nonroot-floodping.patch - iputils-20071127-kernel-ifaddr.patch - - - - fedora/iputils-20020124-countermeasures.patch - - fedora/iputils-20020927-ping-subint.patch - - fedora/iputils-20070202-traffic_class.patch - - fedora/iputils-20100418-convtoint.patch - - - - - - - docs.patch - iputils libcap - gnutls + libidn - /bin + /etc /usr/bin /usr/sbin /sbin @@ -89,16 +48,22 @@ man/rdisc.8 man/tracepath.8 man/traceroute6.8 - ifenslave/ifenslave.8 - ifenslave/README.bonding - + + fedora/tftp.xinetd - fedora/rdisc.sysconfig - fedora/rdisc.service + + + 2015-10-01 + 20150815 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 20121221 From 27f43c54f67d88dd0666851505e3cdc700d13885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Thu, 1 Oct 2015 22:51:05 +0300 Subject: [PATCH 3/3] thats not builded... --- kernel/drivers/module-nvidia304/pspec.xml | 19 ++++++------------- kernel/drivers/module-nvidia340/pspec.xml | 13 +++---------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/kernel/drivers/module-nvidia304/pspec.xml b/kernel/drivers/module-nvidia304/pspec.xml index 7907fa15fe..19b8a467c6 100644 --- a/kernel/drivers/module-nvidia304/pspec.xml +++ b/kernel/drivers/module-nvidia304/pspec.xml @@ -15,10 +15,10 @@ http://download.nvidia.com/XFree86/Linux-x86_64/304.125/NVIDIA-Linux-x86_64-304.125.run - nv-drm.patch + NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch - kernel-module-headers + kernel-module-headers @@ -26,7 +26,7 @@ module-nvidia304 Kernel module for NVIDIA driver 304.xx releases - kernel + kernel /lib/modules @@ -63,13 +63,6 @@ - - 2015-09-23 - 304.125 - version bump for kernel 4.1.8 - Ertuğrul Erata - ertugrulerata@gmail.com - 2015-05-22 304.125 @@ -77,21 +70,21 @@ Ertuğrul Erata ertugrulerata@gmail.com - + 2015-05-05 304.125 Rebuild for kernel 3.19.6 Ertuğrul Erata ertugrulerata@gmail.com - + 2015-04-24 304.125 Rebuild for kernel 3.19.5 Ertuğrul Erata ertugrulerata@gmail.com - + 2015-04-16 304.125 Rebuild for kernel 3.19.4 diff --git a/kernel/drivers/module-nvidia340/pspec.xml b/kernel/drivers/module-nvidia340/pspec.xml index b2824e9855..f44312f8d7 100644 --- a/kernel/drivers/module-nvidia340/pspec.xml +++ b/kernel/drivers/module-nvidia340/pspec.xml @@ -14,7 +14,7 @@ ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76.run - kernel-module-headers + kernel-module-headers @@ -23,7 +23,7 @@ driver Kernel module for NVIDIA driver 340.xx releases - kernel + kernel /lib/modules @@ -95,14 +95,7 @@ - - 2015-09-23 - 340.76 - Version bump, for kernel 3.19.8 - Ertuğrul Erata - ertugrulerata@gmail.com - - + 2015-05-22 340.76 Rebuild for kernel 3.19.8