rpms/kernel/devel kernel-2.6.spec, 1.3273, 1.3274 linux-2.6-debug-boot-delay.patch, 1.5, 1.6
Dave Jones (davej)
fedora-extras-commits at redhat.com
Thu Jul 5 21:11:53 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12202
Modified Files:
kernel-2.6.spec linux-2.6-debug-boot-delay.patch
Log Message:
checkpatch fixes
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3273
retrieving revision 1.3274
diff -u -r1.3273 -r1.3274
--- kernel-2.6.spec 5 Jul 2007 21:01:23 -0000 1.3273
+++ kernel-2.6.spec 5 Jul 2007 21:11:16 -0000 1.3274
@@ -1132,6 +1132,11 @@
ApplyPatch linux-2.6-dmi-based-module-autoloading.patch
# END OF PATCH APPLICATIONS
+
+# Any further pre-build tree manipulations happen here.
+
+chmod +x scripts/checkpatch.pl
+
%endif
cp %{SOURCE10} Documentation/
@@ -1231,7 +1236,6 @@
make -s ARCH=$Arch %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
# Start installing the results
-
%if %{with_debuginfo}
mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot
mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/%{image_install_path}
linux-2.6-debug-boot-delay.patch:
Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-boot-delay.patch 28 May 2007 03:29:08 -0000 1.5
+++ linux-2.6-debug-boot-delay.patch 5 Jul 2007 21:11:16 -0000 1.6
@@ -27,7 +27,7 @@
--- linux-2.6.19.noarch/init/main.c~ 2006-12-12 09:32:35.000000000 -0500
+++ linux-2.6.19.noarch/init/main.c 2006-12-12 09:33:32.000000000 -0500
-@@ -685,6 +685,30 @@ static void __init do_initcalls(void)
+@@ -685,6 +685,31 @@ static void __init do_initcalls(void)
flush_scheduled_work();
}
@@ -47,7 +47,8 @@
+ boot_delay = 0;
+
+ printk_delay_msec = loops_per_msec;
-+ printk("boot_delay: %u, preset_lpj: %ld, lpj: %lu, CONFIG_HZ: %d, printk_delay_msec: %llu\n",
++ printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
++ "CONFIG_HZ: %d, printk_delay_msec: %llu\n",
+ boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
+ return 1;
+}
More information about the fedora-extras-commits
mailing list