Commit graph

44 commits

Author SHA1 Message Date
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Louis Taylor
307c073fa3 spl: 0.6.5.5 -> 0.6.5.6 2016-03-29 13:28:20 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Joachim Fasting
2a097803d4 spl: mark as broken on grsec kernels
All hydra builds against grsec kernels fail; non-grsec kernels
succeed.
2016-03-27 01:39:07 +01:00
Ricardo M. Correia
56f7fb9a04 spl: 0.6.5.4 -> 0.6.5.5 2016-03-15 18:31:07 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
7c206e8c4c linuxPackages.spl: no pic hardening 2016-02-07 22:45:34 +00:00
Ricardo M. Correia
fe53cb56d9 spl: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
William A. Kennington III
e57217d874 spl: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Ricardo M. Correia
42104219f7 spl: 0.6.5 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Eelco Dolstra
0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
William A. Kennington III
9cb93e7966 spl: Update to 0.6.5 2015-09-11 17:45:38 -07:00
William A. Kennington III
4fc07740c6 spl: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:48:21 -07:00
Ricardo M. Correia
a46066219c spl: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:08 +02:00
William A. Kennington III
758c8e5c5d spl: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
Ricardo M. Correia
1e28cd0c83 spl: Update from 0.6.3-1.2 -> 0.6.3-1.3
Removed time.patch (applied upstream).
2015-03-19 06:07:54 +01:00
William A. Kennington III
91e6126a32 spl: Modularize and create a userspace only package 2015-02-07 15:07:38 -08:00
Ricardo M. Correia
e0336a504e spl: Fix mtime going backwards in time
Fixes #5652.
2015-01-18 18:21:35 +01:00
William A. Kennington III
7e8eea59ee spl: 0.6.3 -> 0.6.3-1.2 2014-12-23 17:05:02 -08:00
Ricardo M. Correia
ebfb506036 spl: Backport compatibility patches for newer kernels 2014-10-07 16:52:14 +02:00
Ricardo M. Correia
b5b8b5247a spl, spl.git: Update to 0.6.3 2014-06-23 15:52:20 +02:00
Ricardo M. Correia
1c2aacb5d8 spl: Fix compilation with grsecurity's constify plugin and kernels < 3.8 2014-05-15 13:25:47 +02:00
Ricardo M. Correia
3c97fdc7a8 spl, zfs: Add myself as a maintainer 2014-03-15 02:01:57 +01:00
Ricardo M. Correia
c5b3257388 spl: Fix compilation on 3.13 and later kernels 2014-03-04 12:58:55 +01:00
Ricardo M. Correia
17073197e9 spl: Fix compilation on 3.12 and later kernels 2014-03-04 12:58:39 +01:00
Shea Levy
a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Jack Cummings
fc101c01a5 zfs-0.6.2 and spl-0.6.2
Enable parallelBuilding, too.
2013-08-23 23:20:03 -07:00
Jack Cummings
4c37edd6f3 Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches. 2013-04-06 00:06:27 -07:00
Jack Cummings
d1cb67a629 spl-0.6.1, zfs-0.6.1 2013-04-06 00:01:02 -07:00
Shea Levy
4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
David Guibert
059c30bf9d add kernel 3.8 2013-02-21 08:53:16 +01:00
Jack Cummings
c6d9e073b0 zfs-0.6.0-rc14, spl-0.6.0-rc14 2013-02-01 19:52:57 -08:00
David Guibert
bc8a6e6c19 new download host for zfsonlinux.org: spl/zfs 2013-01-18 08:31:25 +01:00
Jack Cummings
c73e542634 zfs-0.6.0-rc13, spl-0.6.0-rc13 2012-12-21 16:30:19 -08:00
Eelco Dolstra
79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
David Guibert
085825bc3c spl: remove useless patch 2012-11-15 09:13:03 +01:00
David Guibert
87d2a82628 update spl/zfs to 0.6.0-rc12 2012-11-15 08:58:34 +01:00
Jack Cummings
0611a8b223 Linux-3.6 fixes. Need to ./autogen.sh in zfs now, as the linux-3.6 patch adds autoconf macros. Which means that all of my Makefile.in patches need to be puplifted to Makefile.am patches. 2012-11-15 07:41:11 +01:00
Jack Cummings
2dd60084f8 - updates from the license discussion in https://github.com/NixOS/nixpkgs/pull/145 2012-11-15 07:41:11 +01:00
Jack Cummings
abd6046168 - fix spl license, add workarounds for zfs on i686-linux 2012-11-15 07:41:11 +01:00
Jack Cummings
b70d41d309 - long descriptions 2012-10-11 13:50:28 -07:00
Jack Cummings
e7f3ff803e - zfs 0.6.0-rc11, spl 0.6.0-rc11 2012-10-05 09:11:25 -07:00
Jack Cummings
ccad09d3b9 Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11"
This reverts commit 8eb9491a22.
2012-10-05 09:07:33 -07:00
Jack Cummings
8eb9491a22 - zfs-0.6.0-rc11, and spl-0.6.0-rc11 2012-10-05 00:09:49 -07:00