rpms/kernel/devel Makefile, 1.48, 1.49 kernel-2.6.spec, 1.3184, 1.3185 sources, 1.585, 1.586

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20697

Modified Files:
	Makefile kernel-2.6.spec sources 
Log Message:
Sigh. I loathe rpm.
It needs a Patch: reference otherwise it doesn't end up in the source rpm.
There's no means of doing wildcards like patch: linux-2.6-*.patch
and unnumbered patches only works for the first patch (Why?)
so having ApplyPatch automatically create a reference doesn't work either.
The previous 'build a tarball of patches, and upload it as a SOURCE: line' idea
would have probably worked, but it brings a bunch of other potential problems.

Until a better plan arises, add back the enormous list.
This means that for now, we still need to update two places in the spec.

I need a beer.




Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile	28 May 2007 04:45:06 -0000	1.48
+++ Makefile	28 May 2007 05:02:05 -0000	1.49
@@ -17,12 +17,6 @@
 include ../common/Makefile.common
 include Makefile.config
 
-prebuild:
-	tar -c linux-2.6-*.patch >patches.tar
-	bzip2 -9 patches.tar
-	make upload FILES=patches.tar.bz2
-	cvs commit -m "Upload new patches."
-
 debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_IGNORE_QUIET is not set/CONFIG_DEBUG_IGNORE_QUIET=y/' configs/config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' configs/config-nodebug


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3184
retrieving revision 1.3185
diff -u -r1.3184 -r1.3185
--- kernel-2.6.spec	28 May 2007 04:45:06 -0000	1.3184
+++ kernel-2.6.spec	28 May 2007 05:02:05 -0000	1.3185
@@ -377,7 +377,95 @@
 Source81: config-rhel-x86-generic
 Source82: config-olpc-generic
 
-Source100: patches.tar.bz2
+Patch1: linux-2.6-utrace.patch
+Patch2: nouveau-drm.patch
+Patch3: linux-2.6-sysrq-c.patch
+Patch4: linux-2.6-x86-tune-generic.patch
+Patch5: linux-2.6-x86-vga-vidfail.patch
+Patch6: linux-2.6-x86-64-edac-support.patch
+Patch7: linux-2.6-x86_64-silence-up-apic-errors.patch
+Patch8: linux-2.6-x86-fsc-interrupt-controller-quirk.patch
+Patch9: linux-2.6-x86-dell-hpet.patch
+Patch10: linux-2.6-g5-therm-shutdown.patch
+Patch11: linux-2.6-powerpc-slabalign.patch
+Patch12: linux-2.6-ppc32-ucmpdi2.patch
+Patch13: linux-2.6-ibmvscsi-schizo.patch
+Patch14: linux-2.6-pmac-zilog.patch
+Patch15: linux-2.6-build-nonintconfig.patch
+Patch16: linux-2.6-execshield.patch
+Patch17: linux-2.6-modsign-mpilib.patch
+Patch18: linux-2.6-modsign-crypto.patch
+Patch19: linux-2.6-modsign-include.patch
+Patch20: linux-2.6-modsign-verify.patch
+Patch21: linux-2.6-modsign-ksign.patch
+Patch22: linux-2.6-modsign-core.patch
+Patch23: linux-2.6-modsign-script.patch
+Patch24: linux-2.6-xen.patch
+Patch25: linux-2.6-debug-sizeof-structs.patch
+Patch26: linux-2.6-debug-nmi-timeout.patch
+Patch27: linux-2.6-debug-taint-vm.patch
+Patch28: linux-2.6-debug-spinlock-taint.patch
+Patch29: linux-2.6-debug-extra-warnings.patch
+Patch30: linux-2.6-debug-slub-debug.patch
+Patch31: linux-2.6-debug-sleep-in-irq-warning.patch
+Patch32: linux-2.6-debug-must_check.patch
+Patch33: linux-2.6-debug-no-quiet.patch
+Patch34: linux-2.6-debug-boot-delay.patch
+Patch34: linux-2.6-debug-sysfs-crash-debugging.patch
+Patch35: linux-2.6-devmem.patch
+Patch36: linux-2.6-devmem-xen.patch
+Patch37: linux-2.6-crash-driver.patch
+Patch38: linux-2.6-crash-driver-xen.patch
+Patch39: linux-2.6-sleepon.patch
+Patch40: linux-2.6-scsi-cpqarray-set-master.patch
+Patch41: linux-2.6-NFSD-badness.patch
+Patch42: linux-2.6-squashfs.patch
+Patch43: linux-2.6-net-silence-noisy-printks.patch
+Patch44: linux-2.6-sha_alignment.patch
+Patch45: linux-2.6-input-kill-stupid-messages.patch
+Patch46: linux-2.6-serial-460800.patch
+Patch47: linux-2.6-xfs-umount-fix.patch
+Patch48: linux-2.6-proc-self-maps-fix.patch
+Patch49: linux-2.6-softlockup-disable.patch
+Patch50: linux-2.6-optimise-spinlock-debug.patch
+Patch51: linux-2.6-silence-noise.patch
+Patch52: linux-2.6-futex-compat-fix.patch
+Patch53: linux-2.6-libertas.diff
+Patch54: linux-2.6-olpc-touchpad.diff
+Patch55: linux-2.6-raid-autorun.patch
+Patch56: linux-2.6-crap-sysfs-workaround.patch
+Patch57: linux-2.6-selinux-mprotect-checks.patch
+Patch58: linux-2.6-obsolete-oss-warning.patch
+Patch59: linux-2.6-unexport-symbols.patch
+Patch60: linux-2.6-vm-silence-atomic-alloc-failures.patch
+Patch61: linux-2.6-defaults-fat-utf8.patch
+Patch62: linux-2.6-defaults-unicode-vt.patch
+Patch63: linux-2.6-defaults-nonmi.patch
+Patch64: linux-2.6-defaults-pci_no_msi_mmconf.patch
+Patch65: linux-2.6-sata-promise-pata-ports.patch
+Patch66: linux-2.6-libata-ali-atapi-dma.patch
+Patch67: linux-2.6-ata-quirk.patch
+Patch68: linux-2.6-wireless.patch
+Patch69: git-wireless-dev.patch
+Patch70: git-iwlwifi.patch
+Patch71: linux-2.6-bcm43xx-pci-neuter.patch
+Patch72: linux-2.6-iwlwifi-preferred_rate_control.patch
+Patch73: linux-2.6-iwlwifi-irq_tasklet.patch
+Patch74: linux-2.6-mac80211-fixes.patch
+Patch75: linux-2.6-iwlwifi-sw-scan-default.patch
+Patch76: linux-2.6-mac80211-scan-optimizations.patch
+Patch77: linux-2.6-bcm43xx-mac80211-fixes.patch
+Patch78: linux-2.6-clockevents-fix-resume-logic.patch
+Patch79: linux-2.6-acpi-dock-oops.patch
+Patch80: linux-2.6-wakeups-hdaps.patch
+Patch81: linux-2.6-firewire.patch
+Patch82: linux-2.6-compile-fixes.patch
+Patch83: linux-2.6-warnings-inline.patch
+Patch84: linux-2.6-warnings-emptymacros.patch
+Patch85: linux-2.6-warnings-register.patch
+Patch86: xen-printf-rate-limit.patch
+Patch87: xen-11668-hvm_disable_fix.patch
+Patch88: xen-dom0-reboot.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
 
@@ -737,8 +825,6 @@
   done
 %endif
 
-# Unpack the patch tarball here.
-tar jxvf %{SOURCE100} -C $RPM_SOURCE_DIR
 
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- sources	28 May 2007 04:45:06 -0000	1.585
+++ sources	28 May 2007 05:02:05 -0000	1.586
@@ -1,4 +1,3 @@
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
 c4c368f173af267a564948065ffc1689  patch-2.6.21.1.bz2
 2e7d2943ed89c4676296374d8eaaacb6  patch-2.6.22-rc3.bz2
-723352a4c83bc874ab5aaa9519f03c37  patches.tar.bz2