rpms/kernel/devel linux-2.6.14-kauditd-suspend.patch, NONE, 1.1.2.1 linux-2.6.14-powerpc-build.patch, NONE, 1.1.2.1 Makefile.config, 1.27.8.2, 1.27.8.3 kernel-2.6.spec, 1.1636.2.1, 1.1636.2.2 linux-2.6-bzimage.patch, 1.3.6.1, 1.3.6.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Nov 2 10:26:15 UTC 2005 

Author: dwmw2

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

Modified Files:
      Tag: private-arch-powerpc-2_6_14-branch
	Makefile.config kernel-2.6.spec linux-2.6-bzimage.patch 
Added Files:
      Tag: private-arch-powerpc-2_6_14-branch
	linux-2.6.14-kauditd-suspend.patch 
	linux-2.6.14-powerpc-build.patch 
Log Message:
test build

linux-2.6.14-kauditd-suspend.patch:
 audit.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE linux-2.6.14-kauditd-suspend.patch ---
--- linux-2.6.14/kernel/audit.c.orig	2005-11-02 08:45:20.000000000 +0000
+++ linux-2.6.14/kernel/audit.c	2005-11-02 08:44:41.000000000 +0000
@@ -288,6 +288,10 @@ int kauditd_thread(void *dummy)
 			}
 		} else {
 			DECLARE_WAITQUEUE(wait, current);
+
+			if (try_to_freeze())
+				continue;
+
 			set_current_state(TASK_INTERRUPTIBLE);
 			add_wait_queue(&kauditd_wait, &wait);
 

linux-2.6.14-powerpc-build.patch:
 b/arch/powerpc/platforms/chrp/pegasos_eth.c     |    1 +
 linux-2.6.14/arch/powerpc/kernel/setup-common.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.14-powerpc-build.patch ---
--- linux-2.6.14/arch/powerpc/kernel/setup-common.c.orig	2005-11-01 10:14:32.000000000 +0000
+++ linux-2.6.14/arch/powerpc/kernel/setup-common.c	2005-11-01 10:15:03.000000000 +0000
@@ -203,11 +203,11 @@ static int show_cpuinfo(struct seq_file 
 #ifdef CONFIG_TAU_AVERAGE
 		/* more straightforward, but potentially misleading */
 		seq_printf(m,  "temperature \t: %u C (uncalibrated)\n",
-			   cpu_temp(i));
+			   cpu_temp(cpu_id));
 #else
 		/* show the actual temp sensor range */
 		u32 temp;
-		temp = cpu_temp_both(i);
+		temp = cpu_temp_both(cpu_id);
 		seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",
 			   temp & 0xff, temp >> 16);
 #endif
diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c
--- a/arch/powerpc/platforms/chrp/pegasos_eth.c
+++ b/arch/powerpc/platforms/chrp/pegasos_eth.c
@@ -15,6 +15,7 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/mv643xx.h>
+#include <linux/platform_device.h>
 #include <linux/pci.h>
 
 #define PEGASOS2_MARVELL_REGBASE 		(0xf1000000)


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.27.8.2
retrieving revision 1.27.8.3
diff -u -r1.27.8.2 -r1.27.8.3
--- Makefile.config	1 Nov 2005 10:52:45 -0000	1.27.8.2
+++ Makefile.config	2 Nov 2005 10:26:12 -0000	1.27.8.3
@@ -92,10 +92,10 @@
 	perl scripts/merge.pl $^ sparc64 > $@
 
 kernel-$(VERSION)-ppc64.config: configs/config-ppc64 temp-ppc64-generic
-	perl scripts/merge.pl $^ ppc64 > $@
+	perl scripts/merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ppc64iseries.config: configs/config-ppc64-iseries temp-ppc64-generic
-	perl scripts/merge.pl $^ ppc64 > $@
+	perl scripts/merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic
 	perl scripts/merge.pl $^ s390 > $@
@@ -104,10 +104,10 @@
 	perl scripts/merge.pl $^ s390 > $@
 
 kernel-$(VERSION)-ppc.config: configs/config-ppc-pmac temp-ppc-generic
-	perl scripts/merge.pl $^ ppc > $@
+	perl scripts/merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ppc-smp.config: configs/config-ppc-pmac-smp temp-ppc-generic
-	perl scripts/merge.pl $^ ppc > $@
+	perl scripts/merge.pl $^ powerpc > $@
 
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl scripts/merge.pl $^ ia64 > $@


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1636.2.1
retrieving revision 1.1636.2.2
diff -u -r1.1636.2.1 -r1.1636.2.2
--- kernel-2.6.spec	1 Nov 2005 09:29:20 -0000	1.1636.2.1
+++ kernel-2.6.spec	2 Nov 2005 10:26:12 -0000	1.1636.2.2
@@ -24,6 +24,7 @@
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
+%define kernel_image arch/$Arch/boot/bzImage
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -71,6 +72,7 @@
 %define image_install_path boot
 %define signmodules 1
 %define make_target vmlinux
+%define kernel_image vmlinux
 %endif
 
 %ifarch ppc64iseries
@@ -107,6 +109,7 @@
 %define buildsmp 1
 %define image_install_path boot
 %define make_target vmlinux
+%define kernel_image vmlinux
 %endif
 
 %ifarch ia64
@@ -199,7 +202,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.14-git3.bz2
+Patch1: patch-2.6.14-git5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -214,7 +217,7 @@
 Patch300: linux-2.6-ppc64-build.patch
 Patch301: linux-2.6-ppc64-eeh-panic.patch
 Patch302: linux-2.6-serial-of.patch
-Patch303: linux-2.6-ibmveth-bug.patch
+Patch303: linux-2.6.14-powerpc-build.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -240,6 +243,9 @@
 Patch812: linux-2.6-execshield-vdso.patch
 Patch813: linux-2.6-xen-vdso-note.patch
 
+# kauditd thread prevents sleep
+Patch820: linux-2.6.14-kauditd-suspend.patch
+
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
 Patch901: linux-2.6-modsign-crypto.patch
@@ -629,6 +635,9 @@
 %patch813 -p1
 %endif
 
+# kauditd thread prevents sleep
+%patch820 -p1
+
 #
 # GPG signed kernel modules
 #
@@ -836,7 +845,6 @@
 ### build
 ###
 %build
-
 #
 # Create gpg keys for signing the modules
 #
@@ -892,7 +900,7 @@
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
-    cp arch/$Arch/boot/bzImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
+    cp %{kernel_image} $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -1261,6 +1269,11 @@
 %endif
 
 %changelog
+* Wed Nov 02 2005 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.14-git5
+- Fix up PPC configs in preparation for using arch/powerpc
+- Prevent kauditd from aborting suspend
+
 * Sun Oct 30 2005 Dave Jones <davej at redhat.com>
 - 2.6.14-git2
 

linux-2.6-bzimage.patch:
 linux-400/arch/ia64/Makefile    |    4 ++++
 linux-500/arch/s390/Makefile    |    5 +++++
 linux-600/arch/sparc/Makefile   |    3 +++
 linux-600/arch/sparc64/Makefile |    3 +++
 4 files changed, 15 insertions(+)

Index: linux-2.6-bzimage.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bzimage.patch,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- linux-2.6-bzimage.patch	1 Nov 2005 09:29:20 -0000	1.3.6.1
+++ linux-2.6-bzimage.patch	2 Nov 2005 10:26:12 -0000	1.3.6.2
@@ -2,6 +2,7 @@
 so that every arch understands bzImage
 
 
+diff -urNp --exclude-from=/home/davej/.exclude linux-400/arch/s390/Makefile linux-500/arch/s390/Makefile
 --- linux-400/arch/s390/Makefile
 +++ linux-500/arch/s390/Makefile
 @@ -91,6 +91,11 @@ boot		:= arch/$(ARCH)/boot

More information about the fedora-cvs-commits mailing list