Commit graph

2765 commits

Author SHA1 Message Date
Domen Kožar bc6e2e9c36 remove pointless passthru meta 2014-01-10 01:45:35 +01:00
Nixpkgs Monitor a5882db800 cryptsetup: update from 1.6.2 to 1.6.3 2014-01-08 18:49:49 +01:00
Peter Simons 4888f83063 Merge pull request #1465 from msackman/master
Bump LXC to 1.0.0.beta1
2014-01-08 08:11:17 -08:00
Eelco Dolstra c3db56527d linux: Update to 3.4.75 2014-01-07 11:08:16 +01:00
Matthew Sackman 847a310c67 Bump LXC to 1.0.0.beta1
Tested locally. Builds and works for me.
2014-01-06 17:46:00 +00:00
Shea Levy 053e029ee6 Some arches have multiple Makefiles
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 16:07:32 -05:00
Shea Levy adb57a0cc4 kernel: Fix depmod references
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 10:31:16 -05:00
Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05:00
Shea Levy ac2035287f Greatly reduce kernel closure size
Based on access analysis with strace, I determined an essentially
minimal required set of files from the kernel source that was needed to
build all current kernel packages on 3.10, which ultimately resulted in
keeping 30M of source. Generalizing from that minimal set, which
required ad-hoc specifications of which headers outside of include/ and
arch/*/include and which files in the scripts/ directory should be kept,
to a policy of keeping all non-arch-specific headers that aren't part of
the drivers/ directory and the entire scripts/ directory added an
additional 17M, but there was nothing in the analysis that indicated
that that ad-hoc specification was at all complete so I think the extra
hit is worth the likely greater compatibility.

For reference, we now keep:

* All headers that are NOT in arch/${notTargetArch}/include or drivers/
* The scripts/ directory
* Makefile
* arch/${targetArch}/Makefile

IMO the most likely cause of future problems are the headers in
drivers/, but hopefully they won't actually be needed as they add 50M
Ideally kernel packages would only use include and
arch/${targetArch}/include, but alas this is observably not the case.

master:
  * $out
    * size: 234M
    * references-closure: linux-headers, glibc, attr, acl, zlib, gcc,
      coreutils, perl, bash
merge-kernel-builds:
  * $out
    * size: 152M
    * references-closure: none
  * $dev
    * size: 57M
    * references-closure: linux-headers, glibc, zlib, gcc

So even with the non-minimal set we still beat out master. Keeping the
drivers headers would make us only slightly bigger.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 06:55:47 -05: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
Domen Kožar 38fcedcd5f Merge pull request #1380 from offlinehacker/pkgs/ati-drivers/fix_download
ati-drivers: fix download
2014-01-03 03:40:36 -08:00
Shea Levy 2c38df1c5b kernel build: limit dev output footprint
This makes the disk usage footprint of building the kernel smaller in 3
ways:

1) There is no separate kernel source derivation
2) Rather than using the entire build tree, only the output of make
modules_prepare is kept in the $dev output (plus the module symbol
versioning file generated during the build)
3) Only the subset of the source tree known to be needed for external
builds is kept in $dev

Note that while 2) is supported by official kernel documentation, I
couldn't find any source describing what we need to keep for 3). I've
started with the bare minimum (the main Makefile is called by the
Makefile generated by make modules_prepare) and we can/should add more
as needed for kernelPackages.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-01 23:56:24 -05:00
Shea Levy f95d214cfd Implement generic kernel build via manual-config
This has three major benefits:

1. We no longer have two kernel build processes to maintain

2. The build process is (IMO) cleaner and cleaves more closely to
upstream. In partuclar, we use make install to install the kernel and
development source/build trees, eliminating the guesswork about which
files to copy.

3. The derivation has multiple outputs: the kernel and modules are in
the default `out' output, while the build and source trees are in a
`dev' output. This makes it possible for the full source and build tree
to be kept (which is expected by out-of-tree modules) without bloating
the closure of the system derivation.

In addition, if a solution for how to handle queries in the presence of
imports from derivations ever makes it into nix, a framework for
querying the full configuration of the kernel in nix expressions is
already in place.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-01 09:21:25 -05:00
Shea Levy a87b1f36e0 manual-config: Fully general cross-compiling
In the most general case, the cross and native kernel may differ in
patches and configuration file as well as architecture, kernel target,
etc. It's probably overkill to support that case, but since it was
doable without much duplication and it will make integrating with the
existing cross-compilation support in the generic kernel I decided to
implement it anyway.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 23:09:42 -05:00
Shea Levy 784c6d320c manual-config: Put `source' before the version in the sourceRoot name
nix's version parsing treats the previous name as a package named
`linux' with version `${version}-source', when we really want a package
named `linux-source' with version `${version}'

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 22:50:41 -05:00
Shea Levy 0c5776bc0f manual-config: Patch conf.c for generate-config.pl
This only affects the `oldaskconfig' make target, so it shouldn't really
affect current manual-config users, but it does make it more
straightforward to implement the generic kernel build on top of
manual-config.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 22:49:12 -05:00
Shea Levy fe185f0a18 manual-config: Always add config query functions
If the config attrset is manually specified, we still want isYes,
isModule, etc. to work. But we let the passed in config attrset take
precedence, if for some reason the caller wants to provide their own
implementation of one or more of these functions.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 22:46:43 -05:00
Shea Levy 008992619f linux/manual-config: Cross-compiling support
With this, I was able to successfully compile a defconfig kernel for the
sheevaplug, though I didn't actually try to run it (not having a
sheevaplug myself).

For native compiles, the most significant difference is that the
platform's kernel target is built directly rather than hoping the
default make target will pull it in.

Also some stylistic improvements along the way.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-31 22:38:06 -05:00
William A. Kennington III 609e981b93 ifenslave: Add new package 2013-12-31 09:28:52 -06:00
Nixpkgs Monitor 47c5b16643 syslinux: update from 4.06 to 4.07 2013-12-31 05:44:11 +02:00
William A. Kennington III 211b9a5016 linux: Update 3.10.18 -> 3.10.25 2013-12-29 07:53:23 -06:00
William A. Kennington III 811d88e94d linux: Update 3.11.8 -> 3.11.10 2013-12-29 07:53:19 -06:00
Tomasz Kontusz 18115fbbea Change pmount download address and add platforms
The URL change is needed as alioth.debian.org is forcing HTTPS with CA we don't recognize.
2013-12-24 10:50:40 +01:00
Nixpkgs Monitor dc2cb043a9 powertop: update from 2.2 to 2.5 2013-12-23 05:22:37 +02:00
Nixpkgs Monitor 100ad41627 udisks2: update from 2.1.0 to 2.1.1 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor e64b7663f6 v4l_utils: update from 0.9.3 to 1.0.0 2013-12-21 02:28:27 +02:00
Shea Levy 76da6e6ed3 Linux 3.12.6
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-20 13:45:45 -05:00
Shea Levy 01a051292f Linux 3.12.5
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-18 12:35:07 -05:00
Nixpkgs Monitor a94aa7cf49 bluez5: update from 5.8 to 5.12 2013-12-18 18:18:20 +02:00
Nixpkgs Monitor be11410d4a batctl: update from 2013.2.0 to 2013.4.0 2013-12-18 18:18:18 +02:00
Lluís Batlle i Rossell 05b94c04cf Updating nvidia legacy 304 to 304.117 2013-12-18 11:24:53 +01:00
Eelco Dolstra 82f39bd19e linux: Fix hash 2013-12-17 13:27:03 +01:00
Eelco Dolstra acac786868 linux: Update to 3.4.74 2013-12-16 14:46:21 +01:00
Nixpkgs Monitor aeda3e2216 psmisc: update from 22.19 to 22.21 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor 6fc2d316bb procps-ng: update from 3.3.6 to 3.3.9 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor e9a4b303e6 sdparm: update from 1.03 to 1.08 2013-12-14 21:44:51 +02:00
Jaka Hudoklin 220c3b5ba4 ati-drivers: fix download 2013-12-14 00:59:54 +01:00
Nixpkgs Monitor a398237f37 lsscsi: update from 0.24 to 0.27 2013-12-14 00:16:59 +02:00
Nixpkgs Monitor 05e8d1187f libvolume_id: update from 0.81.0 to 0.81.1 2013-12-13 22:41:58 +02:00
Jaka Hudoklin 3c677fde65 ati-drivers: fix aticonfig segmentation fault
Fix aticonfig tool by setting libXinerama to LD_LIBRARY_PATH
2013-12-13 09:34:04 +01:00
Nixpkgs Monitor ed9ce850fd policycoreutils: update from 2.2.4 to 2.2.5 2013-12-13 00:39:20 +02:00
Domen Kožar 3e06d3da1d dmidecode: set meta.platforms to linux 2013-12-12 00:32:31 +01:00
Eelco Dolstra f74ca42ba6 linux: Update to 3.4.73 2013-12-11 14:28:37 +01:00
Shea Levy 9131b45db4 Linux 3.12.4
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 12:01:37 -05:00
Nixpkgs Monitor 741b202d72 apparmor: update from 2.8.1 to 2.8.2 2013-12-09 11:04:25 +02:00
Peter Simons 87e87bd56c alsa: set meta.platform for ALSA-related packages to Linux 2013-12-06 19:26:34 +01:00
Vladimír Čunát 3d3b19d767 Merge #1325: linux-3.2 and grsecurity updates 2013-12-05 23:20:18 +01:00
Shea Levy bb9caf40dd Linux 3.12.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-05 10:21:06 -05:00
Ricardo M. Correia 61adb5962c grsecurity: Update to 3.0-3.2.53-201312021727 and 3.0-3.12.2-201312021733 2013-12-04 15:28:21 +01:00
Ricardo M. Correia 60ced497f6 linux: Update to 3.2.53 2013-12-04 15:28:20 +01:00