diff options
Diffstat (limited to 'sys-kernel/tuxonice-sources')
11 files changed, 64 insertions, 711 deletions
diff --git a/sys-kernel/tuxonice-sources/ChangeLog b/sys-kernel/tuxonice-sources/ChangeLog index e98733343fda..3a4f9adc1fca 100644 --- a/sys-kernel/tuxonice-sources/ChangeLog +++ b/sys-kernel/tuxonice-sources/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for sys-kernel/tuxonice-sources # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.153 2013/03/09 21:07:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/ChangeLog,v 1.154 2013/05/09 21:03:41 pacho Exp $ + +*tuxonice-sources-3.9.1 (09 May 2013) +*tuxonice-sources-3.0.77 (09 May 2013) +*tuxonice-sources-3.6.11-r1 (09 May 2013) +*tuxonice-sources-3.8.12 (09 May 2013) +*tuxonice-sources-3.4.44 (09 May 2013) + + 09 May 2013; Pacho Ramos <pacho@gentoo.org> +tuxonice-sources-3.0.77.ebuild, + +tuxonice-sources-3.4.44.ebuild, +tuxonice-sources-3.6.11-r1.ebuild, + +tuxonice-sources-3.8.12.ebuild, +tuxonice-sources-3.9.1.ebuild, + -files/tuxonice-sources-3.3-undo-cleanup.patch, + -tuxonice-sources-3.0.57.ebuild, -tuxonice-sources-3.3.8-r1.ebuild, + -tuxonice-sources-3.3.8-r2.ebuild, -tuxonice-sources-3.3.8.ebuild, + -tuxonice-sources-3.4.11.ebuild, -tuxonice-sources-3.4.24.ebuild, + -tuxonice-sources-3.5.7.ebuild, -tuxonice-sources-3.7.1.ebuild: + Version bump, drop old 09 Mar 2013; Tom Wijsman <TomWij@gentoo.org> tuxonice-sources-3.0.35.ebuild, tuxonice-sources-3.0.57.ebuild, tuxonice-sources-3.3.8-r1.ebuild, diff --git a/sys-kernel/tuxonice-sources/files/tuxonice-sources-3.3-undo-cleanup.patch b/sys-kernel/tuxonice-sources/files/tuxonice-sources-3.3-undo-cleanup.patch deleted file mode 100644 index d6d9e8716f31..000000000000 --- a/sys-kernel/tuxonice-sources/files/tuxonice-sources-3.3-undo-cleanup.patch +++ /dev/null @@ -1,540 +0,0 @@ -From 00b0d9240df48d74ea61ff539c1e040dfe41570f Mon Sep 17 00:00:00 2001 -From: Nigel <nigel@tuxonice.net> -Date: Sat, 7 Jul 2012 13:51:47 +1000 -Subject: [PATCH] Cleanup - indentation, unneeded exports etc. - -Cleanup indentation & remove unneeded includes and symbol -exports. Remove now unused filesystem freezer code. Generally -minimise the diff from vanilla. - -Signed-off-by: Nigel <nigel@tuxonice.net> ---- - arch/powerpc/platforms/83xx/suspend.c | 2 +- - arch/powerpc/platforms/ps3/device-init.c | 2 +- - arch/x86/kernel/reboot.c | 1 - - arch/x86/mm/pageattr.c | 1 + - drivers/acpi/acpi_pad.c | 2 +- - drivers/block/xen-blkback/blkback.c | 2 +- - drivers/md/md.c | 10 ++-- - drivers/net/irda/stir4200.c | 2 +- - drivers/uwb/uwbd.c | 2 +- - drivers/w1/w1.c | 2 +- - fs/block_dev.c | 87 ------------------------------ - fs/btrfs/async-thread.c | 2 +- - fs/btrfs/disk-io.c | 4 +- - fs/ext4/super.c | 2 +- - fs/gfs2/log.c | 2 +- - fs/gfs2/quota.c | 2 +- - fs/jfs/jfs_logmgr.c | 2 +- - fs/jfs/jfs_txnmgr.c | 4 +- - fs/nilfs2/segment.c | 2 +- - fs/xfs/xfs_trans_ail.c | 2 +- - kernel/kthread.c | 2 +- - kernel/power/tuxonice.h | 1 - - kernel/power/tuxonice_ui.c | 2 +- - kernel/power/tuxonice_userui.c | 1 - - kernel/power/user.c | 1 - - mm/bootmem.c | 1 - - mm/swapfile.c | 1 - - mm/vmscan.c | 4 +- - 28 files changed, 28 insertions(+), 120 deletions(-) - -diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c -index 94d508d..f52960c 100644 ---- a/arch/powerpc/platforms/83xx/suspend.c -+++ b/arch/powerpc/platforms/83xx/suspend.c -@@ -262,7 +262,7 @@ static int mpc83xx_suspend_begin(suspend_state_t state) - - static int agent_thread_fn(void *data) - { -- set_freezable(); -+ set_freezable(); - - while (1) { - wait_event_interruptible(agent_wq, pci_pm_state >= 2); -diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c -index e470b8e..b5d59c6 100644 ---- a/arch/powerpc/platforms/ps3/device-init.c -+++ b/arch/powerpc/platforms/ps3/device-init.c -@@ -841,7 +841,7 @@ static int ps3_probe_thread(void *data) - if (res) - goto fail_free_irq; - -- set_freezable(); -+ set_freezable(); - - /* Loop here processing the requested notification events. */ - do { -diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index 9c83701..d840e69 100644 ---- a/arch/x86/kernel/reboot.c -+++ b/arch/x86/kernel/reboot.c -@@ -747,7 +747,6 @@ void machine_restart(char *cmd) - { - machine_ops.restart(cmd); - } --EXPORT_SYMBOL_GPL(machine_restart); - - void machine_halt(void) - { -diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c -index ac13eec..3eb0ede 100644 ---- a/arch/x86/mm/pageattr.c -+++ b/arch/x86/mm/pageattr.c -@@ -1349,6 +1349,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) - */ - __flush_tlb_all(); - } -+ - EXPORT_SYMBOL_GPL(kernel_map_pages); - - #ifdef CONFIG_HIBERNATION -diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c -index 1f33b27..e99cb20 100644 ---- a/drivers/acpi/acpi_pad.c -+++ b/drivers/acpi/acpi_pad.c -@@ -153,7 +153,7 @@ static int power_saving_thread(void *data) - u64 last_jiffies = 0; - - sched_setscheduler(current, SCHED_RR, ¶m); -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - int cpu; -diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c -index a7d1d54..39d9e12 100644 ---- a/drivers/block/xen-blkback/blkback.c -+++ b/drivers/block/xen-blkback/blkback.c -@@ -276,7 +276,7 @@ int xen_blkif_schedule(void *arg) - struct xen_vbd *vbd = &blkif->vbd; - - xen_blkif_get(blkif); -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - if (try_to_freeze()) -diff --git a/drivers/md/md.c b/drivers/md/md.c -index 0e23084..f902dcf 100644 ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -7104,13 +7104,13 @@ void md_do_sync(struct mddev *mddev) - * - */ - -- set_freezable(); -+ set_freezable(); - - do { - mddev->curr_resync = 2; - - try_again: -- try_to_freeze(); -+ try_to_freeze(); - - if (kthread_should_stop()) - set_bit(MD_RECOVERY_INTR, &mddev->recovery); -@@ -7135,7 +7135,7 @@ void md_do_sync(struct mddev *mddev) - */ - continue; - -- try_to_freeze(); -+ try_to_freeze(); - - /* We need to wait 'interruptible' so as not to - * contribute to the load average, and not to -@@ -7257,7 +7257,7 @@ void md_do_sync(struct mddev *mddev) - || kthread_should_stop()); - } - -- try_to_freeze(); -+ try_to_freeze(); - - if (kthread_should_stop()) - goto interrupted; -@@ -7302,7 +7302,7 @@ void md_do_sync(struct mddev *mddev) - last_mark = next; - } - -- try_to_freeze(); -+ try_to_freeze(); - - if (kthread_should_stop()) - goto interrupted; -diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c -index 39ecf01..b6cae37 100644 ---- a/drivers/net/irda/stir4200.c -+++ b/drivers/net/irda/stir4200.c -@@ -739,7 +739,7 @@ static int stir_transmit_thread(void *arg) - struct net_device *dev = stir->netdev; - struct sk_buff *skb; - -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - #ifdef CONFIG_PM -diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c -index ea26336..ce8fc9c3 100644 ---- a/drivers/uwb/uwbd.c -+++ b/drivers/uwb/uwbd.c -@@ -271,7 +271,7 @@ static int uwbd(void *param) - struct uwb_event *evt; - int should_stop = 0; - -- set_freezable(); -+ set_freezable(); - while (1) { - wait_event_interruptible_timeout( - rc->uwbd.wq, -diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c -index cd648af..0291fb2 100644 ---- a/drivers/w1/w1.c -+++ b/drivers/w1/w1.c -@@ -976,7 +976,7 @@ int w1_process(void *data) - * time can be calculated in jiffies once. - */ - const unsigned long jtime = msecs_to_jiffies(w1_timeout * 1000); -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - if (dev->search_count) { -diff --git a/fs/block_dev.c b/fs/block_dev.c -index cbab341..236dd6c 100644 ---- a/fs/block_dev.c -+++ b/fs/block_dev.c -@@ -337,93 +337,6 @@ int thaw_bdev(struct block_device *bdev, struct super_block *sb) - } - EXPORT_SYMBOL(thaw_bdev); - --#ifdef CONFIG_FS_FREEZER_DEBUG --#define FS_PRINTK(fmt, args...) printk(fmt, ## args) --#else --#define FS_PRINTK(fmt, args...) --#endif -- --/* #define DEBUG_FS_FREEZING */ -- --/** -- * freeze_filesystems - lock all filesystems and force them into a consistent -- * state -- * @which: What combination of fuse & non-fuse to freeze. -- */ --void freeze_filesystems(int which) --{ -- struct super_block *sb; -- -- lockdep_off(); -- -- /* -- * Freeze in reverse order so filesystems dependant upon others are -- * frozen in the right order (eg. loopback on ext3). -- */ -- list_for_each_entry_reverse(sb, &super_blocks, s_list) { -- FS_PRINTK(KERN_INFO "Considering %s.%s: (root %p, bdev %x)", -- sb->s_type->name ? sb->s_type->name : "?", -- sb->s_subtype ? sb->s_subtype : "", sb->s_root, -- sb->s_bdev ? sb->s_bdev->bd_dev : 0); -- -- if (sb->s_type->fs_flags & FS_IS_FUSE && -- sb->s_frozen == SB_UNFROZEN && -- which & FS_FREEZER_FUSE) { -- sb->s_frozen = SB_FREEZE_TRANS; -- sb->s_flags |= MS_FROZEN; -- FS_PRINTK("Fuse filesystem done.\n"); -- continue; -- } -- -- if (!sb->s_root || !sb->s_bdev || -- (sb->s_frozen == SB_FREEZE_TRANS) || -- (sb->s_flags & MS_RDONLY) || -- (sb->s_flags & MS_FROZEN) || -- !(which & FS_FREEZER_NORMAL)) { -- FS_PRINTK(KERN_INFO "Nope.\n"); -- continue; -- } -- -- FS_PRINTK(KERN_INFO "Freezing %x... ", sb->s_bdev->bd_dev); -- freeze_bdev(sb->s_bdev); -- sb->s_flags |= MS_FROZEN; -- FS_PRINTK(KERN_INFO "Done.\n"); -- } -- -- lockdep_on(); --} -- --/** -- * thaw_filesystems - unlock all filesystems -- * @which: What combination of fuse & non-fuse to thaw. -- */ --void thaw_filesystems(int which) --{ -- struct super_block *sb; -- -- lockdep_off(); -- -- list_for_each_entry(sb, &super_blocks, s_list) { -- if (!(sb->s_flags & MS_FROZEN)) -- continue; -- -- if (sb->s_type->fs_flags & FS_IS_FUSE) { -- if (!(which & FS_FREEZER_FUSE)) -- continue; -- -- sb->s_frozen = SB_UNFROZEN; -- } else { -- if (!(which & FS_FREEZER_NORMAL)) -- continue; -- -- thaw_bdev(sb->s_bdev, sb); -- } -- sb->s_flags &= ~MS_FROZEN; -- } -- -- lockdep_on(); --} -- - static int blkdev_writepage(struct page *page, struct writeback_control *wbc) - { - return block_write_full_page(page, blkdev_get_block, wbc); -diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c -index 4b93b5a..0d73d54 100644 ---- a/fs/btrfs/async-thread.c -+++ b/fs/btrfs/async-thread.c -@@ -301,7 +301,7 @@ static int worker_loop(void *arg) - INIT_LIST_HEAD(&head); - INIT_LIST_HEAD(&prio_head); - -- set_freezable(); -+ set_freezable(); - - do { - again: -diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index e70299c..251dfc1 100644 ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -1585,7 +1585,7 @@ static int cleaner_kthread(void *arg) - { - struct btrfs_root *root = arg; - -- set_freezable(); -+ set_freezable(); - - do { - vfs_check_frozen(root->fs_info->sb, SB_FREEZE_WRITE); -@@ -1618,7 +1618,7 @@ static int transaction_kthread(void *arg) - unsigned long delay; - int ret; - -- set_freezable(); -+ set_freezable(); - - do { - delay = HZ * 30; -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 211e085..a512606 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -2837,7 +2837,7 @@ static int ext4_lazyinit_thread(void *arg) - unsigned long next_wakeup, cur; - - BUG_ON(NULL == eli); -- set_freezable(); -+ set_freezable(); - - cont_thread: - while (true) { -diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c -index 91f8b67..266c3ee 100644 ---- a/fs/gfs2/log.c -+++ b/fs/gfs2/log.c -@@ -932,7 +932,7 @@ int gfs2_logd(void *data) - DEFINE_WAIT(wait); - unsigned preflush; - -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index 25872c9..73e6ac9 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1397,7 +1397,7 @@ int gfs2_quotad(void *data) - DEFINE_WAIT(wait); - int empty; - -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - -diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c -index dcb6196..ce8687e 100644 ---- a/fs/jfs/jfs_logmgr.c -+++ b/fs/jfs/jfs_logmgr.c -@@ -2337,7 +2337,7 @@ int jfsIOWait(void *arg) - { - struct lbuf *bp; - -- set_freezable(); -+ set_freezable(); - - do { - spin_lock_irq(&log_redrive_lock); -diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c -index 61eeb32..8f57229 100644 ---- a/fs/jfs/jfs_txnmgr.c -+++ b/fs/jfs/jfs_txnmgr.c -@@ -2752,7 +2752,7 @@ int jfs_lazycommit(void *arg) - unsigned long flags; - struct jfs_sb_info *sbi; - -- set_freezable(); -+ set_freezable(); - - do { - LAZY_LOCK(flags); -@@ -2938,7 +2938,7 @@ int jfs_sync(void *arg) - struct jfs_inode_info *jfs_ip; - tid_t tid; - -- set_freezable(); -+ set_freezable(); - - do { - /* -diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c -index 7316dc5..0885235 100644 ---- a/fs/nilfs2/segment.c -+++ b/fs/nilfs2/segment.c -@@ -2435,7 +2435,7 @@ static int nilfs_segctor_thread(void *arg) - struct the_nilfs *nilfs = sci->sc_super->s_fs_info; - int timeout = 0; - -- set_freezable(); -+ set_freezable(); - - sci->sc_timer.data = (unsigned long)current; - sci->sc_timer.function = nilfs_construction_timeout; -diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c -index a1f1375..c240b7a 100644 ---- a/fs/xfs/xfs_trans_ail.c -+++ b/fs/xfs/xfs_trans_ail.c -@@ -544,7 +544,7 @@ struct xfs_log_item * - struct xfs_ail *ailp = data; - long tout = 0; /* milliseconds */ - -- set_freezable(); -+ set_freezable(); - - while (!kthread_should_stop()) { - if (tout && tout <= 20) -diff --git a/kernel/kthread.c b/kernel/kthread.c -index 0d1a4a8..ee0bb9c 100644 ---- a/kernel/kthread.c -+++ b/kernel/kthread.c -@@ -342,7 +342,7 @@ int kthread_worker_fn(void *worker_ptr) - - WARN_ON(worker->task); - worker->task = current; -- set_freezable(); -+ set_freezable(); - - repeat: - set_current_state(TASK_INTERRUPTIBLE); /* mb paired w/ kthread_stop */ -diff --git a/kernel/power/tuxonice.h b/kernel/power/tuxonice.h -index 2fdfb2c..11d997f 100644 ---- a/kernel/power/tuxonice.h -+++ b/kernel/power/tuxonice.h -@@ -16,7 +16,6 @@ - #include <linux/bootmem.h> - #include <linux/suspend.h> - #include <linux/fs.h> --#include <linux/kmod.h> - #include <linux/module.h> - #include <linux/tuxonice.h> - #include <asm/setup.h> -diff --git a/kernel/power/tuxonice_ui.c b/kernel/power/tuxonice_ui.c -index b0b3b40..452b3db 100644 ---- a/kernel/power/tuxonice_ui.c -+++ b/kernel/power/tuxonice_ui.c -@@ -178,7 +178,7 @@ void toi_early_boot_message(int message_detail, int default_answer, - - post_ask: - if ((warning_reason) && (!continue_req)) -- machine_restart(NULL); -+ kernel_restart(NULL); - - restore_toi_state(orig_state); - if (continue_req) -diff --git a/kernel/power/tuxonice_userui.c b/kernel/power/tuxonice_userui.c -index 8dbc7e7..bc74672 100644 ---- a/kernel/power/tuxonice_userui.c -+++ b/kernel/power/tuxonice_userui.c -@@ -29,7 +29,6 @@ - #include <linux/tty.h> - #include <linux/vt_kern.h> - #include <linux/reboot.h> --#include <linux/kmod.h> - #include <linux/security.h> - #include <linux/syscalls.h> - #include <linux/vt.h> -diff --git a/kernel/power/user.c b/kernel/power/user.c -index a79d572..4a7f42e 100644 ---- a/kernel/power/user.c -+++ b/kernel/power/user.c -@@ -13,7 +13,6 @@ - #include <linux/syscalls.h> - #include <linux/reboot.h> - #include <linux/export.h> --#include <linux/kmod.h> - #include <linux/string.h> - #include <linux/device.h> - #include <linux/miscdevice.h> -diff --git a/mm/bootmem.c b/mm/bootmem.c -index 95c7541..0131170 100644 ---- a/mm/bootmem.c -+++ b/mm/bootmem.c -@@ -33,7 +33,6 @@ struct pglist_data __refdata contig_page_data = { - unsigned long max_low_pfn; - unsigned long min_low_pfn; - unsigned long max_pfn; --EXPORT_SYMBOL_GPL(max_pfn); - - bootmem_data_t bootmem_node_data[MAX_NUMNODES] __initdata; - -diff --git a/mm/swapfile.c b/mm/swapfile.c -index 400b42d..2f7ebcd 100644 ---- a/mm/swapfile.c -+++ b/mm/swapfile.c -@@ -449,7 +449,6 @@ swp_entry_t get_swap_page(void) - spin_unlock(&swap_lock); - return (swp_entry_t) {0}; - } --EXPORT_SYMBOL_GPL(get_swap_page); - - /* The only caller of this function is now susupend routine */ - swp_entry_t get_swap_page_of_type(int type) -diff --git a/mm/vmscan.c b/mm/vmscan.c -index a3e1935..8f177492 100644 ---- a/mm/vmscan.c -+++ b/mm/vmscan.c -@@ -2020,8 +2020,8 @@ static inline bool should_continue_reclaim(struct mem_cgroup_zone *mz, - unsigned long pages_for_compaction; - unsigned long inactive_lru_pages; - -- if (sc->hibernation_mode && nr_reclaimed && nr_scanned && sc->nr_to_reclaim >= sc->nr_reclaimed) -- return true; -+ if (sc->hibernation_mode && nr_reclaimed && nr_scanned && sc->nr_to_reclaim >= sc->nr_reclaimed) -+ return true; - - /* If not in reclaim/compaction mode, stop */ - if (!(sc->reclaim_mode & RECLAIM_MODE_COMPACTION)) --- -1.7.10 - diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.77.ebuild index 804a1c2b0b15..270bdd15c55c 100644 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.77.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.57.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.77.ebuild,v 1.1 2013/05/09 21:03:41 pacho Exp $ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="35" +K_GENPATCHES_VER="48" inherit kernel-2 versionator detect_version @@ -14,7 +14,7 @@ detect_arch DESCRIPTION="TuxOnIce + Gentoo patchset sources" HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -TUXONICE_SNAPSHOT="2012-12-23" +TUXONICE_SNAPSHOT="2013-05-09" TUXONICE_PV="$(replace_version_separator 2 '-')" TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r1.ebuild deleted file mode 100644 index fa47d30b8ef8..000000000000 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r1.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="10" - -inherit kernel-2 -detect_version -detect_arch - -DESCRIPTION="TuxOnIce + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -IUSE="" - -TUXONICE_SNAPSHOT="20120721" -TUXONICE_VERSION="" -TUXONICE_TARGET="3.3" -TUXONICE_URI="http://dev.gentoo.org/~pacho/tuxonice/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" - -UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" -UNIPATCH_STRICTORDER="yes" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="${RDEPEND} - >=sys-apps/tuxonice-userui-1.0 - || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" - -K_EXTRAELOG="If there are issues with this kernel, please direct any -queries to the tuxonice-users mailing list: -http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" -K_SECURITY_UNSUPPORTED="1" - -src_prepare() { - epatch -R "${FILESDIR}/${PN}-3.3-undo-cleanup.patch" # bug #427626 -} diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild deleted file mode 100644 index c6ed60414cda..000000000000 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8-r2.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ - -EAPI="5" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="10" - -inherit kernel-2 versionator -detect_version -detect_arch - -DESCRIPTION="TuxOnIce + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" - -TUXONICE_SNAPSHOT="2012-10-23" -TUXONICE_PV="$(get_version_component_range 1-2)" - -TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2" -TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}" -UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" -UNIPATCH_STRICTORDER="yes" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="${RDEPEND} - >=sys-apps/tuxonice-userui-1.0 - || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" - -K_EXTRAELOG="If there are issues with this kernel, please direct any - queries to the tuxonice-users mailing list: - http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" -K_SECURITY_UNSUPPORTED="1" - -src_prepare() { - epatch -R "${FILESDIR}/${PN}-3.3-undo-cleanup.patch" # bug #427626 -} diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8.ebuild deleted file mode 100644 index 00a63bd3b822..000000000000 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.3.8.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="10" - -inherit kernel-2 -detect_version -detect_arch - -DESCRIPTION="TuxOnIce + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -IUSE="" - -TUXONICE_SNAPSHOT="20120721" -TUXONICE_VERSION="" -TUXONICE_TARGET="3.3" -TUXONICE_URI="http://dev.gentoo.org/~pacho/tuxonice/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" - -UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" -UNIPATCH_STRICTORDER="yes" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="${RDEPEND} - >=sys-apps/tuxonice-userui-1.0 - || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" - -K_EXTRAELOG="If there are issues with this kernel, please direct any -queries to the tuxonice-users mailing list: -http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" -K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.11.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.11.ebuild deleted file mode 100644 index 8f0997db2789..000000000000 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.11.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.11.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ - -EAPI="5" - -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="12" - -inherit kernel-2 -detect_version -detect_arch - -DESCRIPTION="TuxOnIce + Gentoo patchset sources" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -IUSE="" - -TUXONICE_SNAPSHOT="20120721" -TUXONICE_VERSION="" -TUXONICE_TARGET="3.4" -TUXONICE_URI="http://dev.gentoo.org/~pacho/tuxonice/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" - -UNIPATCH_LIST="${DISTDIR}/${TUXONICE_SNAPSHOT}-TuxOnIce-for-Linux-${TUXONICE_TARGET}.patch.bz2" -UNIPATCH_STRICTORDER="yes" - -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" - -KEYWORDS="~amd64 ~x86" - -RDEPEND="${RDEPEND} - >=sys-apps/tuxonice-userui-1.0 - || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" - -K_EXTRAELOG="If there are issues with this kernel, please direct any -queries to the tuxonice-users mailing list: -http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" -K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.44.ebuild index 0974fb35398b..8fb8ff004cbf 100644 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.44.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.5.7.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.44.ebuild,v 1.1 2013/05/09 21:03:41 pacho Exp $ EAPI="5" ETYPE="sources" K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="7" +K_GENPATCHES_VER="26" inherit kernel-2 versionator detect_version @@ -14,8 +14,8 @@ detect_arch DESCRIPTION="TuxOnIce + Gentoo patchset sources" HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -TUXONICE_SNAPSHOT="2012-10-23" -TUXONICE_PV="$(get_version_component_range 1-2)" +TUXONICE_SNAPSHOT="2013-05-09" +TUXONICE_PV="$(replace_version_separator 2 '-')" TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2" TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11-r1.ebuild index c901c4a2a5c1..203208721285 100644 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.24.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.6.11-r1.ebuild,v 1.1 2013/05/09 21:03:41 pacho Exp $ EAPI="5" ETYPE="sources" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.8.12.ebuild index 869b6a1f0b8f..52fd258d2157 100644 --- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.8.12.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.7.1.ebuild,v 1.2 2013/03/09 21:07:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.8.12.ebuild,v 1.1 2013/05/09 21:03:41 pacho Exp $ EAPI="5" ETYPE="sources" -K_WANT_GENPATCHES="base" -# Looks like 3.7.x don't have 'extras', recheck on every bump -K_GENPATCHES_VER="2" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="15" inherit kernel-2 versionator detect_version @@ -15,7 +14,7 @@ detect_arch DESCRIPTION="TuxOnIce + Gentoo patchset sources" HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" -TUXONICE_SNAPSHOT="2012-12-23" +TUXONICE_SNAPSHOT="2013-05-09" TUXONICE_PV="$(replace_version_separator 2 '-')" TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.9.1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.9.1.ebuild new file mode 100644 index 000000000000..55c57b0d18b2 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.9.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.9.1.ebuild,v 1.1 2013/05/09 21:03:41 pacho Exp $ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="3" + +inherit kernel-2 versionator +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net" + +TUXONICE_SNAPSHOT="2013-05-09" +TUXONICE_PV="$(replace_version_separator 2 '-')" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_SNAPSHOT}.patch.bz2" +TUXONICE_URI="http://tuxonice.net/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any + queries to the tuxonice-users mailing list: + http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" |