rpms/kernel-xen/devel linux-2.6-apm-depends-fix.patch, NONE, 1.1 patch-2.6.15-rc6-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.5, 1.6 kernel-xen.spec, 1.21, 1.22 sources, 1.5, 1.6 upstream, 1.2, 1.3 patch-2.6.15-rc5-git7.bz2.sign, 1.2, NONE

Wed Dec 21 15:05:00 UTC 2005

Author: quintela

Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5561

Modified Files:
	.cvsignore kernel-xen.spec sources upstream 
Added Files:
	linux-2.6-apm-depends-fix.patch patch-2.6.15-rc6-git1.bz2.sign 
Removed Files:
	patch-2.6.15-rc5-git7.bz2.sign 
Log Message:
rebase with rawhide 2.6.14-1.7779

linux-2.6-apm-depends-fix.patch:
 Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-apm-depends-fix.patch ---
--- linux-2.6.14/arch/i386/Kconfig~	2005-12-20 18:26:50.000000000 -0500
+++ linux-2.6.14/arch/i386/Kconfig	2005-12-20 18:26:56.000000000 -0500
@@ -710,7 +710,7 @@ depends on PM && !X86_VISWS
 
 config APM
 	tristate "APM (Advanced Power Management) BIOS support"
-	depends on PM && PM_LEGACY
+	depends on PM
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with


--- NEW FILE patch-2.6.15-rc6-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDp7xdyGugalF9Dw4RAp1jAJ0eNRqkSfwoV+5KesFcAGjH9aRa4QCfUgrX
Jr+N8D1kZVbTTUw4JST/r50=
=0fiy
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 11:24:50 -0000	1.5
+++ .cvsignore	21 Dec 2005 15:04:47 -0000	1.6
@@ -4,3 +4,4 @@
 linux-2.6.14.tar.bz2
 xen-20051206.tar.bz2
 patch-2.6.15-rc6.bz2
+patch-2.6.15-rc6-git1.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kernel-xen.spec	21 Dec 2005 11:42:31 -0000	1.21
+++ kernel-xen.spec	21 Dec 2005 15:04:47 -0000	1.22
@@ -214,7 +214,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.15-rc6.bz2
-Patch2: patch-2.6.15-rc5-git7.bz2
+Patch2: patch-2.6.15-rc6-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -365,6 +365,7 @@
 Patch1710: linux-2.6-autofs-pathlookup.patch
 Patch1720: linux-2.6-selinux-hush.patch
 Patch1730: linux-2.6-ide-cd-shutup.patch
+Patch1740: linux-2.6-apm-depends-fix.patch
 Patch1750: linux-2.6-ub.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
@@ -598,7 +599,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -850,6 +851,8 @@
 %patch1720 -p1
 # Silence noisy CD drive spew
 %patch1730 -p1
+# Fix APM dependancy
+%patch1740 -p1
 # Enable USB storage,UB & libusual magick.
 %patch1750 -p1
 # Enable SATA ATAPI by default.
@@ -1389,6 +1392,9 @@
 %endif
 
 %changelog
+* Wed Dec 21 2005 Juan Quintela <quintela at trasno.org>
+- rebase to rawhide 1.7779.
+
 * Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
 - switch BSD license to Dual BSD/GPL as agreed with upstream.
 
@@ -1401,6 +1407,10 @@
 - HIGHMEM4G is default now.
 
 * Tue Dec 20 2005 Dave Jones <davej at redhat.com>
+- 2.6.15-rc6-git1
+- Make APM work again.
+
+* Tue Dec 20 2005 Dave Jones <davej at redhat.com>
 - Try to disable SMBFS again.
   smbfs got hardly any fixing in the last 12 months, whilst
   cifs is under constant improvement.  Hopefully things are


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 11:24:55 -0000	1.5
+++ sources	21 Dec 2005 15:04:57 -0000	1.6
@@ -1,3 +1,4 @@
 66d02cbd723876c6d69846a067875a22  linux-2.6.14.tar.bz2
 04385c8abed5541c0710b15393b79020  xen-20051206.tar.bz2
 9c1d46fca842361a84e499e851c7548e  patch-2.6.15-rc6.bz2
+69f8999146103a293b1e1c085713f1aa  patch-2.6.15-rc6-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upstream	21 Dec 2005 11:24:55 -0000	1.2
+++ upstream	21 Dec 2005 15:04:57 -0000	1.3
@@ -1,3 +1,3 @@
 linux-2.6.14.tar.bz2
 patch-2.6.15-rc6.bz2
-patch-2.6.15-rc5-git7.bz2
+patch-2.6.15-rc6-git1.bz2


--- patch-2.6.15-rc5-git7.bz2.sign DELETED ---


