Created
March 5, 2011 18:54
-
-
Save shlevy/856607 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -Naur orig//nixos/modules/profiles/base.nix changed//nixos/modules/profiles/base.nix | |
--- orig//nixos/modules/profiles/base.nix 2011-03-05 18:41:45.031108002 +0000 | |
+++ changed//nixos/modules/profiles/base.nix 2011-03-05 18:45:08.301108003 +0000 | |
@@ -1,6 +1,7 @@ | |
{config, pkgs, ...}: | |
{ | |
+ boot.kernelPackages = pkgs.linuxPackages_2_6_37; | |
# The initrd has to contain any module that might be necessary for | |
# mounting the CD/DVD. | |
diff -Naur orig//nixos/release.nix changed//nixos/release.nix | |
--- orig//nixos/release.nix 2011-03-05 18:41:45.771108002 +0000 | |
+++ changed//nixos/release.nix 2011-03-05 18:43:31.601108000 +0000 | |
@@ -7,7 +7,7 @@ | |
{ module, description, maintainers ? ["eelco"]}: | |
{ nixosSrc ? {outPath = ./.; rev = 1234;} | |
, officialRelease ? false | |
- , system ? "i686-linux" | |
+ , system ? "x86_64-linux" | |
}: | |
with import nixpkgs {inherit system;}; | |
@@ -45,7 +45,7 @@ | |
{ module, maintainers ? ["viric"]}: | |
{ nixosSrc ? {outPath = ./.; rev = 1234;} | |
, officialRelease ? false | |
- , system ? "i686-linux" | |
+ , system ? "x86_64-linux" | |
}: | |
with import nixpkgs {inherit system;}; | |
@@ -152,7 +152,7 @@ | |
let | |
t = import ./tests { | |
inherit nixpkgs services; | |
- system = "i686-linux"; | |
+ system = "x86_64-linux"; | |
}; | |
in { | |
avahi = t.avahi.test; | |
diff -Naur orig//nixpkgs/pkgs/os-specific/linux/kernel/aufs2-37.patch changed//nixpkgs/pkgs/os-specific/linux/kernel/aufs2-37.patch | |
--- orig//nixpkgs/pkgs/os-specific/linux/kernel/aufs2-37.patch 1970-01-01 00:00:00.000000000 +0000 | |
+++ changed//nixpkgs/pkgs/os-specific/linux/kernel/aufs2-37.patch 2011-03-05 18:47:27.461108001 +0000 | |
@@ -0,0 +1,289 @@ | |
+aufs2.1 standalone patch for linux-2.6.37 | |
+ | |
+diff --git a/fs/file_table.c b/fs/file_table.c | |
+index c3dee38..f529e4d 100644 | |
+--- a/fs/file_table.c | |
++++ b/fs/file_table.c | |
+@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file) | |
+ } | |
+ } | |
+ | |
++EXPORT_SYMBOL(file_sb_list_del); | |
++ | |
+ #ifdef CONFIG_SMP | |
+ | |
+ /* | |
+diff --git a/fs/inode.c b/fs/inode.c | |
+index ae2727a..2c8071a 100644 | |
+--- a/fs/inode.c | |
++++ b/fs/inode.c | |
+@@ -82,6 +82,7 @@ static struct hlist_head *inode_hashtable __read_mostly; | |
+ * the i_state of an inode while it is in use.. | |
+ */ | |
+ DEFINE_SPINLOCK(inode_lock); | |
++EXPORT_SYMBOL(inode_lock); | |
+ | |
+ /* | |
+ * iprune_sem provides exclusion between the kswapd or try_to_free_pages | |
+diff --git a/fs/namei.c b/fs/namei.c | |
+index a8c583f..b020c45 100644 | |
+--- a/fs/namei.c | |
++++ b/fs/namei.c | |
+@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) | |
+ | |
+ return 0; | |
+ } | |
++EXPORT_SYMBOL(deny_write_access); | |
+ | |
+ /** | |
+ * path_get - get a reference to a path | |
+@@ -1165,6 +1166,7 @@ struct dentry *lookup_hash(struct nameidata *nd) | |
+ { | |
+ return __lookup_hash(&nd->last, nd->path.dentry, nd); | |
+ } | |
++EXPORT_SYMBOL(lookup_hash); | |
+ | |
+ int __lookup_one_len(const char *name, struct qstr *this, | |
+ struct dentry *base, int len) | |
+@@ -1187,6 +1189,7 @@ int __lookup_one_len(const char *name, struct qstr *this, | |
+ this->hash = end_name_hash(hash); | |
+ return 0; | |
+ } | |
++EXPORT_SYMBOL(__lookup_one_len); | |
+ | |
+ /** | |
+ * lookup_one_len - filesystem helper to lookup single pathname component | |
+diff --git a/fs/namespace.c b/fs/namespace.c | |
+index 3dbfc07..3998762 100644 | |
+--- a/fs/namespace.c | |
++++ b/fs/namespace.c | |
+@@ -1321,6 +1321,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, | |
+ } | |
+ return 0; | |
+ } | |
++EXPORT_SYMBOL(iterate_mounts); | |
+ | |
+ static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) | |
+ { | |
+diff --git a/fs/notify/group.c b/fs/notify/group.c | |
+index d309f38..f0e9568 100644 | |
+--- a/fs/notify/group.c | |
++++ b/fs/notify/group.c | |
+@@ -22,6 +22,7 @@ | |
+ #include <linux/srcu.h> | |
+ #include <linux/rculist.h> | |
+ #include <linux/wait.h> | |
++#include <linux/module.h> | |
+ | |
+ #include <linux/fsnotify_backend.h> | |
+ #include "fsnotify.h" | |
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) | |
+ if (atomic_dec_and_test(&group->refcnt)) | |
+ fsnotify_destroy_group(group); | |
+ } | |
++EXPORT_SYMBOL(fsnotify_put_group); | |
+ | |
+ /* | |
+ * Create a new fsnotify_group and hold a reference for the group returned. | |
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) | |
+ | |
+ return group; | |
+ } | |
++EXPORT_SYMBOL(fsnotify_alloc_group); | |
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c | |
+index 325185e..adede09 100644 | |
+--- a/fs/notify/mark.c | |
++++ b/fs/notify/mark.c | |
+@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) | |
+ if (atomic_dec_and_test(&mark->refcnt)) | |
+ mark->free_mark(mark); | |
+ } | |
++EXPORT_SYMBOL(fsnotify_put_mark); | |
+ | |
+ /* | |
+ * Any time a mark is getting freed we end up here. | |
+@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) | |
+ if (unlikely(atomic_dec_and_test(&group->num_marks))) | |
+ fsnotify_final_destroy_group(group); | |
+ } | |
++EXPORT_SYMBOL(fsnotify_destroy_mark); | |
+ | |
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) | |
+ { | |
+@@ -277,6 +279,7 @@ err: | |
+ | |
+ return ret; | |
+ } | |
++EXPORT_SYMBOL(fsnotify_add_mark); | |
+ | |
+ /* | |
+ * clear any marks in a group in which mark->flags & flags is true | |
+@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, | |
+ atomic_set(&mark->refcnt, 1); | |
+ mark->free_mark = free_mark; | |
+ } | |
++EXPORT_SYMBOL(fsnotify_init_mark); | |
+ | |
+ static int fsnotify_mark_destroy(void *ignored) | |
+ { | |
+diff --git a/fs/open.c b/fs/open.c | |
+index 4197b9e..912817a 100644 | |
+--- a/fs/open.c | |
++++ b/fs/open.c | |
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, | |
+ mutex_unlock(&dentry->d_inode->i_mutex); | |
+ return ret; | |
+ } | |
++EXPORT_SYMBOL(do_truncate); | |
+ | |
+ static long do_sys_truncate(const char __user *pathname, loff_t length) | |
+ { | |
+diff --git a/fs/splice.c b/fs/splice.c | |
+index ff0ae69..1c9e9b0 100644 | |
+--- a/fs/splice.c | |
++++ b/fs/splice.c | |
+@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, | |
+ | |
+ return splice_write(pipe, out, ppos, len, flags); | |
+ } | |
++EXPORT_SYMBOL(do_splice_from); | |
+ | |
+ /* | |
+ * Attempt to initiate a splice from a file to a pipe. | |
+@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, | |
+ | |
+ return splice_read(in, ppos, pipe, len, flags); | |
+ } | |
++EXPORT_SYMBOL(do_splice_to); | |
+ | |
+ /** | |
+ * splice_direct_to_actor - splices data directly between two non-pipes | |
+diff --git a/security/commoncap.c b/security/commoncap.c | |
+index 64c2ed9..e58b5d8 100644 | |
+--- a/security/commoncap.c | |
++++ b/security/commoncap.c | |
+@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, | |
+ } | |
+ return ret; | |
+ } | |
++EXPORT_SYMBOL(cap_file_mmap); | |
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c | |
+index 8d9c48f..29108aa 100644 | |
+--- a/security/device_cgroup.c | |
++++ b/security/device_cgroup.c | |
+@@ -515,6 +515,7 @@ found: | |
+ | |
+ return -EPERM; | |
+ } | |
++EXPORT_SYMBOL(devcgroup_inode_permission); | |
+ | |
+ int devcgroup_inode_mknod(int mode, dev_t dev) | |
+ { | |
+diff --git a/security/security.c b/security/security.c | |
+index 1b798d3..3b7d2ca 100644 | |
+--- a/security/security.c | |
++++ b/security/security.c | |
+@@ -360,6 +360,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) | |
+ return 0; | |
+ return security_ops->path_mkdir(dir, dentry, mode); | |
+ } | |
++EXPORT_SYMBOL(security_path_mkdir); | |
+ | |
+ int security_path_rmdir(struct path *dir, struct dentry *dentry) | |
+ { | |
+@@ -367,6 +368,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) | |
+ return 0; | |
+ return security_ops->path_rmdir(dir, dentry); | |
+ } | |
++EXPORT_SYMBOL(security_path_rmdir); | |
+ | |
+ int security_path_unlink(struct path *dir, struct dentry *dentry) | |
+ { | |
+@@ -374,6 +376,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) | |
+ return 0; | |
+ return security_ops->path_unlink(dir, dentry); | |
+ } | |
++EXPORT_SYMBOL(security_path_unlink); | |
+ | |
+ int security_path_symlink(struct path *dir, struct dentry *dentry, | |
+ const char *old_name) | |
+@@ -382,6 +385,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, | |
+ return 0; | |
+ return security_ops->path_symlink(dir, dentry, old_name); | |
+ } | |
++EXPORT_SYMBOL(security_path_symlink); | |
+ | |
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir, | |
+ struct dentry *new_dentry) | |
+@@ -390,6 +394,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, | |
+ return 0; | |
+ return security_ops->path_link(old_dentry, new_dir, new_dentry); | |
+ } | |
++EXPORT_SYMBOL(security_path_link); | |
+ | |
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, | |
+ struct path *new_dir, struct dentry *new_dentry) | |
+@@ -400,6 +405,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, | |
+ return security_ops->path_rename(old_dir, old_dentry, new_dir, | |
+ new_dentry); | |
+ } | |
++EXPORT_SYMBOL(security_path_rename); | |
+ | |
+ int security_path_truncate(struct path *path) | |
+ { | |
+@@ -407,6 +413,7 @@ int security_path_truncate(struct path *path) | |
+ return 0; | |
+ return security_ops->path_truncate(path); | |
+ } | |
++EXPORT_SYMBOL(security_path_truncate); | |
+ | |
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, | |
+ mode_t mode) | |
+@@ -415,6 +422,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, | |
+ return 0; | |
+ return security_ops->path_chmod(dentry, mnt, mode); | |
+ } | |
++EXPORT_SYMBOL(security_path_chmod); | |
+ | |
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid) | |
+ { | |
+@@ -422,6 +430,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) | |
+ return 0; | |
+ return security_ops->path_chown(path, uid, gid); | |
+ } | |
++EXPORT_SYMBOL(security_path_chown); | |
+ | |
+ int security_path_chroot(struct path *path) | |
+ { | |
+@@ -498,6 +507,7 @@ int security_inode_readlink(struct dentry *dentry) | |
+ return 0; | |
+ return security_ops->inode_readlink(dentry); | |
+ } | |
++EXPORT_SYMBOL(security_inode_readlink); | |
+ | |
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) | |
+ { | |
+@@ -512,6 +522,7 @@ int security_inode_permission(struct inode *inode, int mask) | |
+ return 0; | |
+ return security_ops->inode_permission(inode, mask); | |
+ } | |
++EXPORT_SYMBOL(security_inode_permission); | |
+ | |
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | |
+ { | |
+@@ -611,6 +622,7 @@ int security_file_permission(struct file *file, int mask) | |
+ | |
+ return fsnotify_perm(file, mask); | |
+ } | |
++EXPORT_SYMBOL(security_file_permission); | |
+ | |
+ int security_file_alloc(struct file *file) | |
+ { | |
+@@ -638,6 +650,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, | |
+ return ret; | |
+ return ima_file_mmap(file, prot); | |
+ } | |
++EXPORT_SYMBOL(security_file_mmap); | |
+ | |
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, | |
+ unsigned long prot) | |
diff -Naur orig//nixpkgs/pkgs/os-specific/linux/kernel/patches.nix changed//nixpkgs/pkgs/os-specific/linux/kernel/patches.nix | |
--- orig//nixpkgs/pkgs/os-specific/linux/kernel/patches.nix 2011-03-05 18:42:03.961108004 +0000 | |
+++ changed//nixpkgs/pkgs/os-specific/linux/kernel/patches.nix 2011-03-05 18:47:00.381108001 +0000 | |
@@ -175,6 +175,15 @@ | |
features.aufsBase = true; | |
}; | |
+ aufs2_2_6_37 = | |
+ { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2.1-37;hb=refs/heads/aufs2.1-37 | |
+ # Note that this merely the patch needed to build AUFS2 as a | |
+ # standalone package. | |
+ name = "aufs2"; | |
+ patch = ./aufs2-37.patch; | |
+ features.aufsBase = true; | |
+ }; | |
+ | |
# Increase the timeout on CIFS requests from 15 to 120 seconds to | |
# make CIFS more resilient to high load on the CIFS server. | |
cifs_timeout = | |
diff -Naur orig//nixpkgs/pkgs/top-level/all-packages.nix changed//nixpkgs/pkgs/top-level/all-packages.nix | |
--- orig//nixpkgs/pkgs/top-level/all-packages.nix 2011-03-05 18:42:04.911108004 +0000 | |
+++ changed//nixpkgs/pkgs/top-level/all-packages.nix 2011-03-05 18:45:56.391108001 +0000 | |
@@ -5055,7 +5055,7 @@ | |
kernelPatches = | |
[ #kernelPatches.fbcondecor_2_6_35 | |
kernelPatches.sec_perm_2_6_24 | |
- #kernelPatches.aufs2_2_6_35 | |
+ kernelPatches.aufs2_2_6_37 | |
#kernelPatches.mips_restart_2_6_36 | |
]; | |
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment