Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #442 from ertugerata/master

Browse Source 
iputils update
This commit is contained in:
Ertuğrul Erata
2015-10-01 22:52:59 +03:00
parent 8bec36aa2d 27f43c54f6
commit b3e95e84f4
6 changed files with 84 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-nvidia304/actions.py
+1 -1
View File
@@ -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*")
kernel/drivers/module-nvidia304/files/nv-drm.patch
+27
View File
@@ -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 <drm/drmP.h>
+/* 3.18-rc0+ */
+#ifndef drm_gem_object
+#include <drm/drm_gem.h>
+#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",
kernel/drivers/module-nvidia340/files/nv-drm.patch
+27
View File
@@ -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 <drm/drmP.h>
+/* 3.18-rc0+ */
+#ifndef drm_gem_object
+#include <drm/drm_gem.h>
+#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",
network/misc/iputils/actions.py
+4 -7
View File
@@ -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")
network/misc/iputils/files/fedora/tftp.xinetd
+10
View File
@@ -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
}
network/misc/iputils/pspec.xml
+15 -50
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>iputils</Name>
<Homepage>http://www.linux-ipv6.org</Homepage>
<Homepage>https://github.com/iputils/iputils</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
@@ -12,66 +12,25 @@
<IsA>app:console</IsA>
<Summary>Network monitoring tools including ping and ping6</Summary>
<Description>iputils contains network monitoring tools including ping and ping6.</Description>
<Archive sha1sum="4d56d8c75d6a5d58f052e4056e975f01ebab9ba9" type="tarbz2">http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2</Archive>
<AdditionalFiles>
<!-- Taken from linux-2.6.git/Documentation/networking and applied fedora's iputils-ifenslave.patch on top of it -->
<AdditionalFile target="ifenslave.c">ifenslave/ifenslave.c</AdditionalFile>
</AdditionalFiles>
<Archive sha1sum="14cd0f1cd87a21c60bf92fa6a18b56eeed55f459" type="targz">https://github.com/iputils/iputils/archive/s20150815.tar.gz</Archive>
<BuildDependencies>
<Dependency>openssl-devel</Dependency>
<Dependency>libidn-devel</Dependency>
<Dependency>gnutls-devel</Dependency>
<Dependency>libcap-devel</Dependency>
<!-- needed for generating man pages, see below
<Dependency>docbook-utils</Dependency>
-->
</BuildDependencies>
<Patches>
<Patch level="1">021109-uclibc-no-ether_ntohost.patch</Patch>
<!--<Patch level="1">iputils-20100418-printf-size.patch</Patch>-->
<Patch level="1">iputils-20121221-printf-size.patch</Patch>
<Patch level="1">iputils-20121221-owl-pingsock.diff</Patch>
<Patch level="1">iputils-20121221-openssl.patch</Patch>
<Patch level="1">iputils-20121221-makefile.patch</Patch>
<Patch level="1">iputils-20121221-crypto-build.patch</Patch>
<Patch level="0">iputils-20100418-so_mark.patch</Patch>
<Patch level="1">iputils-20071127-nonroot-floodping.patch</Patch>
<Patch level="1">iputils-20071127-kernel-ifaddr.patch</Patch>
<!-- Fedora patches -->
<!--<Patch level="1">fedora/iputils-20020927-rh.patch</Patch>-->
<Patch level="1">fedora/iputils-20020124-countermeasures.patch</Patch>
<!--<Patch level="1">fedora/iputils-20020927-addrcache.patch</Patch>-->
<Patch level="1">fedora/iputils-20020927-ping-subint.patch</Patch>
<!--<Patch level="1">fedora/iputils-ping_cleanup.patch</Patch>
<Patch level="1">fedora/iputils-20070202-idn.patch</Patch>-->
<Patch level="1">fedora/iputils-20070202-traffic_class.patch</Patch>
<!--<Patch level="1">fedora/iputils-20070202-ia64_align.patch</Patch>
<Patch level="1">fedora/iputils-20071127-warnings.patch</Patch>
<Patch level="1">fedora/iputils-20071127-corr_type.patch</Patch>
<Patch level="1">fedora/iputils-20071127-infiniband.patch</Patch>-->
<Patch level="1">fedora/iputils-20100418-convtoint.patch</Patch>
<!--<Patch level="1">fedora/iputils-20100418-flowlabel.patch</Patch>-->
<!-- We don't have capability setting support in PiSi, disable this
<Patch level="1">fedora/iputils-20101006-drop_caps.patch</Patch>
-->
<!--<Patch level="1">fedora/iputils-20101006-unused.patch</Patch>
<Patch level="1">fedora/iputils-20101006-man.patch</Patch>-->
<Patch level="1">docs.patch</Patch>
</Patches>
</Source>
<Package>
<Name>iputils</Name>
<RuntimeDependencies>
<Dependency>libcap</Dependency>
<Dependency>gnutls</Dependency>
<Dependency>libidn</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/bin</Path>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="executable">/sbin</Path>
@@ -89,16 +48,22 @@
<AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/rdisc.8">man/rdisc.8</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/tracepath.8">man/tracepath.8</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/traceroute6.8">man/traceroute6.8</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/man/man8/ifenslave.8">ifenslave/ifenslave.8</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/doc/iputils/README.bonding">ifenslave/README.bonding</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/xinetd.d/tftp">fedora/tftp.xinetd</AdditionalFile>
<!-- Add systemd files for rdisc daemon -->
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/rdisc">fedora/rdisc.sysconfig</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/lib/systemd/system/rdisc.service">fedora/rdisc.service</AdditionalFile>
<!--AdditionalFile owner="root" permission="0644" target="/etc/conf.d/rdisc">fedora/rdisc.sysconfig</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/lib/systemd/system/rdisc.service">fedora/rdisc.service</AdditionalFile-->
</AdditionalFiles>
</Package>
<History>
<Update release="5">
<Date>2015-10-01</Date>
<Version>20150815</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2014-05-11</Date>
<Version>20121221</Version>