Remove commented out patches from spec

For now we build directly from git tree. Remove commented out patches
from spec file to make it more readable.

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index 24d9db453feb6ea3381dca704dfb4cefa1e0a47b..11baed3c521c6d99d67981f2fccc7d1deec672cb 100644 (file)
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -585,47 +585,8 @@ Patch00: patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 ### BRANCH PATCH ###
 %endif
 
-#Patch02: git-linus.diff
-
-# we always need nonintconfig, even for -vanilla kernels
-#Patch03: nonint_oldconfig_2632rc7.patch
-
-# we also need compile fixes for -vanilla
-#Patch04: linux-2.6-compile-fixes.patch
-
-# build tweak for build ID magic, even for -vanilla
-#Patch05: linux-2.6-makefile-after_link.patch
-
-# fix firmware install path problem (patch added/reverted after 2.6.30-rc1)
-##Patch06: revert-fix-mod-install-nfs.patch
-
 %if !%{nopatches}
-
 # revert upstream patches we get via other methods
-#Patch09: linux-2.6-upstream-reverts.patch
-# Git trees.
-#Patch10: git-cpufreq.patch
-#Patch11: git-bluetooth.patch
-
-# Standalone patches
-#Patch20: linux-2.6-hotfixes.patch
-##Patch20: linus26-blk-iopoll.patch
-
-#Patch41: linux-2.6-sysrq-c.patch
-
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-#Patch1550: linux-2.6-cdrom-door-status.patch
-
-# fs fixes
-#Patch3000: linux-2.6-btrfs-experimental-branch.patch
-
-#Patch4000: linux-2.6-bootarg-strict-devmem.patch
-
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-#Patch9210: linux-2.6.29-pat-fixes.patch
-
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1010,196 +971,8 @@ make -f %{SOURCE20} VERSION=%{version} configs
   done
 %endif
 
-#ApplyPatch git-linus.diff
-
-# This patch adds a "make nonint_oldconfig" which is non-interactive and
-# also gives a list of missing options at the end. Useful for automated
-# builds (as used in the buildsystem).
-#ApplyPatch nonint_oldconfig_2632rc7.patch
-
-#ApplyPatch linux-2.6-makefile-after_link.patch
-
-#
-# misc small stuff to make things compile
-#
-##C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-##if [ "$C" -gt 10 ]; then
-##ApplyPatch linux-2.6-compile-fixes.patch
-##fi
-
 %if !%{nopatches}
-
 # revert patches from upstream that conflict or that we get via other means
-##C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-##if [ "$C" -gt 10 ]; then
-##ApplyPatch linux-2.6-upstream-reverts.patch -R
-##fi
-
-#ApplyPatch git-cpufreq.patch
-#ApplyPatch git-bluetooth.patch
-
-#ApplyPatch linux-2.6-hotfixes.patch
-
-# Roland's utrace ptrace replacement.
-#ApplyPatch linux-2.6-tracehook.patch
-#ApplyPatch linux-2.6-utrace.patch
-#ApplyPatch linux-2.6-utrace-ftrace.patch
-
-# enable sysrq-c on all kernels, not only kexec
-#ApplyPatch linux-2.6-sysrq-c.patch
-
-#ApplyPatch rds-only-on-64-bit-or-x86.patch
-
-
-# Architecture patches
-# x86(-64)
-
-#
-# PowerPC
-#
-### NOT (YET) UPSTREAM:
-# The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
-# module name to work on upgrades. Otherwise, I believe mkinitrd will fail
-# to pull the module in,
-#ApplyPatch linux-2.6-ps3-storage-alias.patch
-# Alleviate G5 thermal shutdown problems
-#ApplyPatch linux-2.6-g5-therm-shutdown.patch
-# Provide modalias in sysfs for vio devices
-#ApplyPatch linux-2.6-vio-modalias.patch
-# Work around PCIe bridge setup on iSight
-#ApplyPatch linux-2.6-imac-transparent-bridge.patch
-
-#
-# SPARC64
-#
-#ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-
-#
-# Exec shield
-#
-#ApplyPatch linux-2.6-execshield.patch
-
-# Extra patches:
-##ApplyPatch linus26-blk-iopoll.patch
-
-#
-# bugfixes to drivers and filesystems
-#
-
-# ext4
-
-# xfs
-
-# btrfs
-#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
-
-# Make strict devmem a boot arg
-#ApplyPatch linux-2.6-bootarg-strict-devmem.patch
-
-# USB
-
-# ACPI
-#ApplyPatch linux-2.6-defaults-acpi-video.patch
-#ApplyPatch linux-2.6-acpi-video-dos.patch
-#ApplyPatch linux-2.6-hwmon-atk0110.patch
-
-# Various low-impact patches to aid debugging.
-#ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
-#ApplyPatch linux-2.6-debug-taint-vm.patch
-#ApplyPatch linux-2.6-debug-spinlock-taint.patch
-#ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
-#ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
-
-#
-# PCI
-#
-# disable message signaled interrupts
-#ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-# update the pciehp driver
-#ApplyPatch linux-2.6-pciehp-update.patch
-# default to enabling passively listening for hotplug events
-#ApplyPatch linux-2.6-defaults-pciehp.patch
-
-#
-# SCSI Bits.
-#
-
-# ALSA
-# squelch hda_beep by default
-#ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-#ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
-
-# Networking
-
-# Misc fixes
-# The input layer spews crap no-one cares about.
-#ApplyPatch linux-2.6-input-kill-stupid-messages.patch
-
-# Get away from having to poll Toshibas
-#ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
-
-# Allow to use 480600 baud on 16C950 UARTs
-#ApplyPatch linux-2.6-serial-460800.patch
-
-#ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
-
-# Silence some useless messages that still get printed with 'quiet'
-#ApplyPatch linux-2.6-silence-noise.patch
-
-# Make fbcon not show the penguins with 'quiet'
-#ApplyPatch linux-2.6-silence-fbcon-logo.patch
-
-# Fix the SELinux mprotect checks on executable mappings
-#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
-# Fix SELinux for sparc
-#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
-
-# Changes to upstream defaults.
-
-
-# ia64 ata quirk
-#ApplyPatch linux-2.6-ata-quirk.patch
-
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
-
-# back-port scan result aging patches
-#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-#ApplyPatch at76-netdev_ops.patch
-
-# http://www.lirc.org/
-#ApplyPatch linux-2.6.29-lirc.patch
-
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-#ApplyPatch linux-2.6-cdrom-door-status.patch
-
-#ApplyPatch linux-2.6-e1000-ich9.patch
-
-# Nouveau DRM + drm fixes
-
-# linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-#if [ "$C" -gt 10 ]; then
-#ApplyPatch linux-2.6-firewire-git-pending.patch
-#fi
-
-# silence the ACPI blacklist code
-#ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-
-# V4L/DVB updates/fixes/experimental drivers
-
-# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
-#ApplyPatch revert-fix-modules_install-via-nfs.patch
-
-#ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-
-#ApplyPatch linux-2.6.29-pat-fixes.patch
-
-# END OF PATCH APPLICATIONS
-
 %endif
 
 # Any further pre-build tree manipulations happen here.

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 9d4577547e9b187e7f32a5cb558d52d12cedd680..8c5549e8cc12a5a23d8857ace96d49673e590c5d 100644 (file)
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -593,46 +593,8 @@ Patch00: patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 ### BRANCH PATCH ###
 %endif
 
-#Patch02: git-linus.diff
-
-# we always need nonintconfig, even for -vanilla kernels
-#Patch03: nonint_oldconfig_2632rc7.patch
-
-# we also need compile fixes for -vanilla
-#Patch04: linux-2.6-compile-fixes.patch
-
-# build tweak for build ID magic, even for -vanilla
-#Patch05: linux-2.6-makefile-after_link.patch
-
-# fix firmware install path problem (patch added/reverted after 2.6.30-rc1)
-##Patch06: revert-fix-mod-install-nfs.patch
-
 %if !%{nopatches}
-
-# revert upstream patches we get via other methods
-#Patch09: linux-2.6-upstream-reverts.patch
-# Git trees.
-#Patch10: git-cpufreq.patch
-#Patch11: git-bluetooth.patch
-
-# Standalone patches
-#Patch20: linux-2.6-hotfixes.patch
-##Patch20: linus26-blk-iopoll.patch
-
-#Patch41: linux-2.6-sysrq-c.patch
-
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-#Patch1550: linux-2.6-cdrom-door-status.patch
-
-# fs fixes
-#Patch3000: linux-2.6-btrfs-experimental-branch.patch
-
-#Patch4000: linux-2.6-bootarg-strict-devmem.patch
-
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-#Patch9210: linux-2.6.29-pat-fixes.patch
-
+# revert patches place holder
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1018,165 +980,10 @@ make -f %{SOURCE20} VERSION=%{version} configs
   done
 %endif
 
-#ApplyPatch git-linus.diff
-
-# This patch adds a "make nonint_oldconfig" which is non-interactive and
-# also gives a list of missing options at the end. Useful for automated
-# builds (as used in the buildsystem).
-#ApplyPatch nonint_oldconfig_2632rc7.patch
-
 %if !%{nopatches}
-
-
-# Architecture patches
-# x86(-64)
-
-#
-# PowerPC
-#
-### NOT (YET) UPSTREAM:
-# The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
-# module name to work on upgrades. Otherwise, I believe mkinitrd will fail
-# to pull the module in,
-#ApplyPatch linux-2.6-ps3-storage-alias.patch
-# Alleviate G5 thermal shutdown problems
-#ApplyPatch linux-2.6-g5-therm-shutdown.patch
-# Provide modalias in sysfs for vio devices
-#ApplyPatch linux-2.6-vio-modalias.patch
-# Work around PCIe bridge setup on iSight
-#ApplyPatch linux-2.6-imac-transparent-bridge.patch
-
-#
-# SPARC64
-#
-#ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
-
-#
-# Exec shield
-#
-#ApplyPatch linux-2.6-execshield.patch
-
-# Extra patches:
-##ApplyPatch linus26-blk-iopoll.patch
-
-#
-# bugfixes to drivers and filesystems
-#
-
-# ext4
-
-# xfs
-
-# btrfs
-#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
-
-# Make strict devmem a boot arg
-#ApplyPatch linux-2.6-bootarg-strict-devmem.patch
-
-# USB
-
-# ACPI
-#ApplyPatch linux-2.6-defaults-acpi-video.patch
-#ApplyPatch linux-2.6-acpi-video-dos.patch
-#ApplyPatch linux-2.6-hwmon-atk0110.patch
-
-# Various low-impact patches to aid debugging.
-#ApplyPatch linux-2.6-debug-sizeof-structs.patch
-#ApplyPatch linux-2.6-debug-nmi-timeout.patch
-#ApplyPatch linux-2.6-debug-taint-vm.patch
-#ApplyPatch linux-2.6-debug-spinlock-taint.patch
-#ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
-#ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
-
-#
-# PCI
+# OF PATCH APPLICATIONS
 #
-# disable message signaled interrupts
-#ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-# update the pciehp driver
-#ApplyPatch linux-2.6-pciehp-update.patch
-# default to enabling passively listening for hotplug events
-#ApplyPatch linux-2.6-defaults-pciehp.patch
-
-#
-# SCSI Bits.
-#
-
-# ALSA
-# squelch hda_beep by default
-#ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
-#ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
-
-# Networking
-
-# Misc fixes
-# The input layer spews crap no-one cares about.
-#ApplyPatch linux-2.6-input-kill-stupid-messages.patch
-
-# Get away from having to poll Toshibas
-#ApplyPatch linux-2.6-input-fix-toshiba-hotkeys.patch
-
-# Allow to use 480600 baud on 16C950 UARTs
-#ApplyPatch linux-2.6-serial-460800.patch
-
-#ApplyPatch increase-MAX_LOCKDEP_ENTRIES.patch
-
-# Silence some useless messages that still get printed with 'quiet'
-#ApplyPatch linux-2.6-silence-noise.patch
-
-# Make fbcon not show the penguins with 'quiet'
-#ApplyPatch linux-2.6-silence-fbcon-logo.patch
-
-# Fix the SELinux mprotect checks on executable mappings
-#ApplyPatch linux-2.6-selinux-mprotect-checks.patch
-# Fix SELinux for sparc
-#ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
-
-# Changes to upstream defaults.
-
-
-# ia64 ata quirk
-#ApplyPatch linux-2.6-ata-quirk.patch
-
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
-
-# back-port scan result aging patches
-#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-#ApplyPatch at76-netdev_ops.patch
-
-# http://www.lirc.org/
-#ApplyPatch linux-2.6.29-lirc.patch
-
-# Fix the return code CD accesses when the CDROM drive door is closed
-# but the drive isn't yet ready.
-#ApplyPatch linux-2.6-cdrom-door-status.patch
-
-#ApplyPatch linux-2.6-e1000-ich9.patch
-
-# Nouveau DRM + drm fixes
-
-# linux1394 git patches
-#ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-#if [ "$C" -gt 10 ]; then
-#ApplyPatch linux-2.6-firewire-git-pending.patch
-#fi
-
-# silence the ACPI blacklist code
-#ApplyPatch linux-2.6-silence-acpi-blacklist.patch
-
-# V4L/DVB updates/fixes/experimental drivers
-
-# revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
-#ApplyPatch revert-fix-modules_install-via-nfs.patch
-
-#ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
-
-#ApplyPatch linux-2.6.29-pat-fixes.patch
-
 # END OF PATCH APPLICATIONS
-
 %endif
 
 # Any further pre-build tree manipulations happen here.