diff --git a/kernel26/PKGBUILD b/kernel26/PKGBUILD index 3e1e042e4..d91ba9d32 100644 --- a/kernel26/PKGBUILD +++ b/kernel26/PKGBUILD @@ -14,7 +14,7 @@ pkgname=('kernel26' 'kernel26-firmware' 'kernel26-headers') # Build stock -CHAKR _kernelname="" _basekernel=2.6.36 pkgver=${_basekernel} -pkgrel=4 +pkgrel=5 _patchname="patch-${pkgver}-${pkgrel}-CHAKRA" arch=(i686 x86_64) license=('GPL2') @@ -26,7 +26,7 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 # standard config files for mkinitcpio ramdisk kernel26.preset) md5sums=('61f3739a73afb6914cb007f37fb09b62' - 'bb0c5a8cc17fefe882cc00214345a90c' + 'e5fb1e3dd9f6f400c32206eb6b873abf' '3a263275881b62bd4368852bde286d09' 'c5502e97bf409a4f5755de1534f5e836' '25584700a0a679542929c4bed31433b6') diff --git a/linux-2.6-CHAKRA/PATCHCFG b/linux-2.6-CHAKRA/PATCHCFG index 06af42ac5..62a346795 100644 --- a/linux-2.6-CHAKRA/PATCHCFG +++ b/linux-2.6-CHAKRA/PATCHCFG @@ -20,13 +20,13 @@ PATCHES=( aufs2-kbuild.patch%1 aufs2-base.patch%1 aufs2-standalone.patch%1 - aufs2.1-standalone.tree-36-UNRELEASED-20101027.patch.bz2%1 + aufs2.1-standalone.tree-36-UNRELEASED-20101103.patch.bz2%1 # squashfs with lzma kernel-squashfs-lzma-v1.7-2.6.36.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.36-4-CHAKRA" +PATCHNAME="patch-2.6.36-5-CHAKRA" # Run this before applying patches pre_apply() { diff --git a/linux-2.6-CHAKRA/patches/aufs2-standalone.patch b/linux-2.6-CHAKRA/patches/aufs2-standalone.patch deleted file mode 100644 index f97eb1f49..000000000 --- a/linux-2.6-CHAKRA/patches/aufs2-standalone.patch +++ /dev/null @@ -1,289 +0,0 @@ -aufs2.1 standalone patch for linux-2.6.36 - -diff --git a/fs/inode.c b/fs/inode.c -index 722860b..bfb0698 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -84,6 +84,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_GPL(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 56e8ece..ba75f28 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL_GPL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1177,6 +1178,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - return ERR_PTR(err); - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL_GPL(lookup_hash); - - int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) -@@ -1199,6 +1201,7 @@ int __lookup_one_len(const char *name, struct qstr *this, - this->hash = end_name_hash(hash); - return 0; - } -+EXPORT_SYMBOL_GPL(__lookup_one_len); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index 2e10cb1..8fa77c4 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1283,6 +1283,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL_GPL(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 - #include - #include -+#include - - #include - #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_GPL(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_GPL(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_GPL(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_GPL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -277,6 +279,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL_GPL(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_GPL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 630715f..1c864c7 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_GPL(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 278c94f..033f7ac 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_GPL(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_GPL(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 4e01599..3611e1b 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL_GPL(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_GPL(devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index c53949f..0ae5b91 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -376,6 +376,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_GPL(security_path_mkdir); - - int security_path_rmdir(struct path *dir, struct dentry *dentry) - { -@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL_GPL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_unlink(dir, dentry); - } -+EXPORT_SYMBOL_GPL(security_path_unlink); - - int security_path_symlink(struct path *dir, struct dentry *dentry, - const char *old_name) -@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL_GPL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -406,6 +410,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_GPL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -416,6 +421,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_GPL(security_path_rename); - - int security_path_truncate(struct path *path) - { -@@ -423,6 +429,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL_GPL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -431,6 +438,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL_GPL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -438,6 +446,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_GPL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -514,6 +523,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL_GPL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -528,6 +538,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL_GPL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -627,6 +638,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL_GPL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -654,6 +666,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL_GPL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) -diff --git a/fs/file_table.c b/fs/file_table.c -index 44abf87..4081dda 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -395,6 +395,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL_GPL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* diff --git a/linux-2.6-CHAKRA/patches/aufs2.1-standalone.tree-36-UNRELEASED-20101027.patch.bz2 b/linux-2.6-CHAKRA/patches/aufs2.1-standalone.tree-36-UNRELEASED-20101027.patch.bz2 deleted file mode 100644 index dd5be4fcf..000000000 Binary files a/linux-2.6-CHAKRA/patches/aufs2.1-standalone.tree-36-UNRELEASED-20101027.patch.bz2 and /dev/null differ