diff options
Diffstat (limited to 'sys-kernel')
5 files changed, 167 insertions, 2 deletions
diff --git a/sys-kernel/suspend2-sources/ChangeLog b/sys-kernel/suspend2-sources/ChangeLog index ff81753100ae..5b877269c901 100644 --- a/sys-kernel/suspend2-sources/ChangeLog +++ b/sys-kernel/suspend2-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/suspend2-sources # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.20 2005/11/17 09:37:10 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/ChangeLog,v 1.21 2005/11/18 13:27:46 brix Exp $ + +*suspend2-sources-2.6.14-r2 (18 Nov 2005) + + 18 Nov 2005; Henrik Brix Andersen <brix@gentoo.org> + +files/suspend2-2.2-rc11-ro-mount-fixes.patch, + +suspend2-sources-2.6.14-r2.ebuild: + Added patch from upstream for fixing ro mount issues. 17 Nov 2005; Henrik Brix Andersen <brix@gentoo.org> -files/linux-2.6.12-try_to_freeze.patch, diff --git a/sys-kernel/suspend2-sources/Manifest b/sys-kernel/suspend2-sources/Manifest index 0cb8f99f7414..92dbcf3f5a8c 100644 --- a/sys-kernel/suspend2-sources/Manifest +++ b/sys-kernel/suspend2-sources/Manifest @@ -2,19 +2,22 @@ MD5 36b9f4b863ed2502c5a6947df920c318 suspend2-sources-2.6.13-r4.ebuild 1973 MD5 f23ae998b29e9b8c89629a960daf7bf8 suspend2-sources-2.6.13-r1.ebuild 2013 MD5 6390d140bb44f262eb10401c6de55326 suspend2-sources-2.6.13.ebuild 2070 MD5 87f85d43a2586902805f98101306cdb3 suspend2-sources-2.6.13-r3.ebuild 1974 +MD5 8524067ae33c670d2783856096114563 suspend2-sources-2.6.14-r2.ebuild 1699 MD5 509af92e8b755497d58fa8a7c241e4f5 suspend2-sources-2.6.13-r5.ebuild 1974 MD5 b2b02e62be94dd09f2b39fcfb91800d0 suspend2-sources-2.6.13-r2.ebuild 1974 -MD5 58ea64b400153df55a9994d978d0c22d ChangeLog 4208 +MD5 2fb5f13c78fe8a90cef30795d1cfc709 ChangeLog 4449 MD5 e40cb3df546efa5003fe3778c5a50854 metadata.xml 275 MD5 0ac91b574db18e623878d358a1e1c9e7 suspend2-sources-2.6.14.ebuild 1765 MD5 abd24ff658389505b8d77a774d7d6016 suspend2-sources-2.6.14-r1.ebuild 1769 MD5 8c885e50de95004ba759a137c3f93495 files/101-software-suspend-2.2-rc3-for-2.6.13-gcc4.patch 877 +MD5 edac5c5d09cb57b42228bdf2f81b28fa files/suspend2-2.2-rc11-ro-mount-fixes.patch 2423 MD5 5ff92c313009119044ed51956fb509f9 files/digest-suspend2-sources-2.6.13-r1 310 MD5 16d093ac8154cc561af7a4a90179d885 files/digest-suspend2-sources-2.6.13-r2 310 MD5 63ce46eba91fa8e586a2a26ed6432987 files/digest-suspend2-sources-2.6.13-r3 310 MD5 a1ecfa4588d9177bc680ebe3acf020b9 files/digest-suspend2-sources-2.6.13-r4 310 MD5 906ae7417b7d3ae2f2bf7859812f8396 files/digest-suspend2-sources-2.6.13-r5 310 MD5 3842f13456420014bc19ab851301c8a9 files/digest-suspend2-sources-2.6.14-r1 303 +MD5 3842f13456420014bc19ab851301c8a9 files/digest-suspend2-sources-2.6.14-r2 303 MD5 d1eff82a3bab3c5b67dec45a552888e4 files/linux-2.6.13-poweroff.patch 500 MD5 a67db8b8f894652b4d1456406d307a37 files/digest-suspend2-sources-2.6.13 310 MD5 ae95e997f0e9496adfb824ee7f166c5d files/digest-suspend2-sources-2.6.14 301 diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r2 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r2 new file mode 100644 index 000000000000..4e365473929f --- /dev/null +++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r2 @@ -0,0 +1,4 @@ +MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170 +MD5 b841739f9c8f5c7f10039399f768a1c0 genpatches-2.6.14-3.base.tar.bz2 16158 +MD5 9f4f1a2c33dcbf0e90cd03d8429ff0af genpatches-2.6.14-3.extras.tar.bz2 142535 +MD5 ab614d8637e367c3daf901ed4f0e00f1 suspend2-2.2-rc11-for-2.6.14.tar.bz2 114456 diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc11-ro-mount-fixes.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc11-ro-mount-fixes.patch new file mode 100644 index 000000000000..c49836d1abb2 --- /dev/null +++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc11-ro-mount-fixes.patch @@ -0,0 +1,91 @@ +Hi. + +Here it is. + +Regards, + +Nigel + + fs/super.c | 15 +++++++++++---- + kernel/power/process.c | 17 +++++++++++++---- + 2 files changed, 24 insertions(+), 8 deletions(-) +diff -ruNp 9010.patch-old/fs/super.c 9010.patch-new/fs/super.c +--- 9010.patch-old/fs/super.c 2005-10-25 17:15:01.000000000 +1000 ++++ 9010.patch-new/fs/super.c 2005-11-16 08:03:21.000000000 +1100 +@@ -543,10 +543,17 @@ int do_remount_sb(struct super_block *sb + /* If we are remounting RDONLY and current sb is read/write, + make sure there are no rw files opened */ + if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) { +- if (force) +- mark_files_ro(sb); +- else if (!fs_may_remount_ro(sb)) +- return -EBUSY; ++ switch (force) { ++ case 0: ++ if (!fs_may_remount_ro(sb)) ++ return -EBUSY; ++ break; ++ case 1: ++ mark_files_ro(sb); ++ break; ++ case 2: ++ break; ++ } + } + + if (sb->s_op->remount_fs) { +diff -ruNp 9010.patch-old/kernel/power/process.c 9010.patch-new/kernel/power/process.c +--- 9010.patch-old/kernel/power/process.c 2005-11-16 08:19:58.000000000 +1100 ++++ 9010.patch-new/kernel/power/process.c 2005-11-16 08:03:21.000000000 +1100 +@@ -88,11 +88,11 @@ void freezer_make_fses_rw(void) + this->sb->s_id); + + lock_kernel(); +- retval = do_remount_sb(this->sb, 0, NULL, 1); ++ retval = do_remount_sb(this->sb, 0, NULL, 2); + unlock_kernel(); + + if (retval) { +- freezer_message("Failed to remount %s as writable. Sorry.\n", ++ printk("Failed to remount %s as writable. Sorry.\n", + this->sb->s_id); + } + +@@ -104,7 +104,7 @@ int freezer_make_fses_ro(void) + { + struct remounted_fs *new; + struct super_block *sb; +- int retval; ++ int retval, tries; + + freezer_message("Remounting filesystems read-only.\n"); + +@@ -118,16 +118,25 @@ int freezer_make_fses_ro(void) + + if (!(sb->s_flags & MS_RDONLY)) { + ++ tries = 1; ++ + new = kmalloc(sizeof(struct remounted_fs), GFP_ATOMIC); + new->sb = sb; + new->next = remounted_fs_list; + ++again: + freezer_message("Attempting to remount %s ro.\n", sb->s_id); + lock_kernel(); +- retval = do_remount_sb(sb, MS_RDONLY, NULL, 1); ++ retval = do_remount_sb(sb, MS_RDONLY, NULL, 2); + unlock_kernel(); + ++ if (retval && tries < 3) { ++ tries++; ++ goto again; ++ } ++ + if (retval) { ++ freezer_message("Failed to remount %s ro.\n", sb->s_id); + kfree(new); + freezer_make_fses_rw(); + up_write(&sb->s_umount); + + diff --git a/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r2.ebuild b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r2.ebuild new file mode 100644 index 000000000000..435cb68e0275 --- /dev/null +++ b/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/suspend2-sources/suspend2-sources-2.6.14-r2.ebuild,v 1.1 2005/11/18 13:27:46 brix Exp $ + +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="3" + +inherit eutils kernel-2 +detect_version +detect_arch + +DESCRIPTION="Software Suspend 2 + Gentoo patchset sources" +HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://www.suspend2.net" + +SUSPEND2_VERSION="2.2-rc11" +SUSPEND2_TARGET="${PV}" +SUSPEND2_SRC="suspend2-${SUSPEND2_VERSION}-for-${SUSPEND2_TARGET}" +SUSPEND2_URI="http://www.suspend2.net/downloads/all/${SUSPEND2_SRC}.tar.bz2" + +UNIPATCH_LIST="${DISTDIR}/${SUSPEND2_SRC}.tar.bz2 +${FILESDIR}/suspend2-2.2-rc11-ro-mount-fixes.patch" +UNIPATCH_STRICTORDER="yes" +UNIPATCH_DOCS="${WORKDIR}/patches/${SUSPEND2_SRC}/Changelog.txt +${WORKDIR}/patches/${SUSPEND2_SRC}/ToDo" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${SUSPEND2_URI}" + +KEYWORDS="~x86" + +IUSE="ultra1" +RDEPEND="${RDEPEND} + >=sys-apps/suspend2-userui-0.6.1 + >=sys-power/hibernate-script-1.12" + +K_EXTRAEINFO="If there are issues with this kernel, please direct any +queries to the suspend2-devel mailing list: +http://lists.suspend2.net/cgi-bin/mailman/listinfo/suspend2-devel" + +pkg_setup() { + if use sparc; then + # hme lockup hack on ultra1 + use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch" + fi +} + +pkg_postinst() { + postinst_sources + + echo + + if [ "${ARCH}" = "sparc" ]; then + if [ x"`cat /proc/openprom/name 2>/dev/null`" \ + = x"'SUNW,Ultra-1'" ]; then + einfo "For users with an Enterprise model Ultra 1 using the HME" + einfo "network interface, please emerge the kernel using the" + einfo "following command: USE=ultra1 emerge ${PN}" + fi + fi +} |