summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2013-01-10 14:24:41 -0500
committerDave Jones <davej@redhat.com>2013-01-10 14:24:41 -0500
commitefd70b8f77b7a7adf3add772e424ce95f289b50e (patch)
tree9a1ef645e505365b98c15b27c8b0f6fd27146a66
parent1cdf6c9bdd28cb65fa59d2b2ce305cac30decd0d (diff)
downloadkernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.tar.gz
kernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.tar.xz
kernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.zip
Rename a bunch of patches.
-rw-r--r--acpi-debug-infinite-loop.patch (renamed from linux-2.6-acpi-debug-infinite-loop.patch)0
-rw-r--r--acpi-video-dos.patch (renamed from linux-2.6-acpi-video-dos.patch)0
-rw-r--r--compile-fixes.patch (renamed from linux-2.6-compile-fixes.patch)0
-rw-r--r--crash-driver.patch (renamed from linux-2.6-crash-driver.patch)0
-rw-r--r--defaults-acpi-video.patch (renamed from linux-2.6-defaults-acpi-video.patch)0
-rw-r--r--e1000-ich9-montevina.patch (renamed from linux-2.6-e1000-ich9-montevina.patch)0
-rw-r--r--input-kill-stupid-messages.patch (renamed from linux-2.6-input-kill-stupid-messages.patch)0
-rw-r--r--kernel.spec68
-rw-r--r--makefile-after_link.patch (renamed from linux-2.6-makefile-after_link.patch)0
-rw-r--r--no-pcspkr-modalias.patch (renamed from linux-2.6.30-no-pcspkr-modalias.patch)0
-rw-r--r--serial-460800.patch (renamed from linux-2.6-serial-460800.patch)0
-rw-r--r--silence-acpi-blacklist.patch (renamed from linux-2.6-silence-acpi-blacklist.patch)0
-rw-r--r--silence-fbcon-logo.patch (renamed from linux-2.6-silence-fbcon-logo.patch)0
-rw-r--r--silence-noise.patch (renamed from linux-2.6-silence-noise.patch)0
-rw-r--r--upstream-reverts.patch (renamed from linux-2.6-upstream-reverts.patch)0
-rw-r--r--v4l-dvb-experimental.patch (renamed from linux-2.6-v4l-dvb-experimental.patch)0
-rw-r--r--v4l-dvb-fixes.patch (renamed from linux-2.6-v4l-dvb-fixes.patch)0
-rw-r--r--v4l-dvb-update.patch (renamed from linux-2.6-v4l-dvb-update.patch)0
18 files changed, 34 insertions, 34 deletions
diff --git a/linux-2.6-acpi-debug-infinite-loop.patch b/acpi-debug-infinite-loop.patch
index f2cc1a55e..f2cc1a55e 100644
--- a/linux-2.6-acpi-debug-infinite-loop.patch
+++ b/acpi-debug-infinite-loop.patch
diff --git a/linux-2.6-acpi-video-dos.patch b/acpi-video-dos.patch
index 3e2085193..3e2085193 100644
--- a/linux-2.6-acpi-video-dos.patch
+++ b/acpi-video-dos.patch
diff --git a/linux-2.6-compile-fixes.patch b/compile-fixes.patch
index 34c08ce47..34c08ce47 100644
--- a/linux-2.6-compile-fixes.patch
+++ b/compile-fixes.patch
diff --git a/linux-2.6-crash-driver.patch b/crash-driver.patch
index 239f0f6a0..239f0f6a0 100644
--- a/linux-2.6-crash-driver.patch
+++ b/crash-driver.patch
diff --git a/linux-2.6-defaults-acpi-video.patch b/defaults-acpi-video.patch
index b83f4b614..b83f4b614 100644
--- a/linux-2.6-defaults-acpi-video.patch
+++ b/defaults-acpi-video.patch
diff --git a/linux-2.6-e1000-ich9-montevina.patch b/e1000-ich9-montevina.patch
index ec38a3902..ec38a3902 100644
--- a/linux-2.6-e1000-ich9-montevina.patch
+++ b/e1000-ich9-montevina.patch
diff --git a/linux-2.6-input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch
index ff7023f51..ff7023f51 100644
--- a/linux-2.6-input-kill-stupid-messages.patch
+++ b/input-kill-stupid-messages.patch
diff --git a/kernel.spec b/kernel.spec
index 97f0c8e70..1fda0b6a4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -630,16 +630,16 @@ Patch00: patch-3.%{base_sublevel}-git%{gitrev}.xz
%endif
# we also need compile fixes for -vanilla
-Patch04: linux-2.6-compile-fixes.patch
+Patch04: compile-fixes.patch
# build tweak for build ID magic, even for -vanilla
-Patch05: linux-2.6-makefile-after_link.patch
+Patch05: makefile-after_link.patch
%if !%{nopatches}
# revert upstream patches we get via other methods
-Patch09: linux-2.6-upstream-reverts.patch
+Patch09: upstream-reverts.patch
# Git trees.
# Standalone patches
@@ -648,25 +648,25 @@ Patch100: taint-vbox.patch
Patch110: vmbugon-warnon.patch
-Patch390: linux-2.6-defaults-acpi-video.patch
-Patch391: linux-2.6-acpi-video-dos.patch
-Patch394: linux-2.6-acpi-debug-infinite-loop.patch
+Patch390: defaults-acpi-video.patch
+Patch391: acpi-video-dos.patch
+Patch394: acpi-debug-infinite-loop.patch
Patch396: acpi-sony-nonvs-blacklist.patch
-Patch450: linux-2.6-input-kill-stupid-messages.patch
-Patch452: linux-2.6.30-no-pcspkr-modalias.patch
+Patch450: input-kill-stupid-messages.patch
+Patch452: no-pcspkr-modalias.patch
-Patch460: linux-2.6-serial-460800.patch
+Patch460: serial-460800.patch
Patch470: die-floppy-die.patch
-Patch510: linux-2.6-silence-noise.patch
+Patch510: silence-noise.patch
Patch520: quite-apm.patch
-Patch530: linux-2.6-silence-fbcon-logo.patch
+Patch530: silence-fbcon-logo.patch
-Patch700: linux-2.6-e1000-ich9-montevina.patch
+Patch700: e1000-ich9-montevina.patch
-Patch800: linux-2.6-crash-driver.patch
+Patch800: crash-driver.patch
# crypto/
@@ -687,12 +687,12 @@ Patch1825: drm-i915-dp-stfu.patch
# Quiet boot fixes
# silence the ACPI blacklist code
-Patch2802: linux-2.6-silence-acpi-blacklist.patch
+Patch2802: silence-acpi-blacklist.patch
# media patches
-Patch2899: linux-2.6-v4l-dvb-fixes.patch
-Patch2900: linux-2.6-v4l-dvb-update.patch
-Patch2901: linux-2.6-v4l-dvb-experimental.patch
+Patch2899: v4l-dvb-fixes.patch
+Patch2900: v4l-dvb-update.patch
+Patch2901: v4l-dvb-experimental.patch
# fs fixes
@@ -1281,17 +1281,17 @@ do
done
%endif
-ApplyPatch linux-2.6-makefile-after_link.patch
+ApplyPatch makefile-after_link.patch
#
# misc small stuff to make things compile
#
-ApplyOptionalPatch linux-2.6-compile-fixes.patch
+ApplyOptionalPatch compile-fixes.patch
%if !%{nopatches}
# revert patches from upstream that conflict or that we get via other means
-ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
+ApplyOptionalPatch upstream-reverts.patch -R
ApplyPatch taint-vbox.patch
@@ -1328,9 +1328,9 @@ ApplyPatch arm-tegra-usb-no-reset-linux33.patch
# WMI
# ACPI
-ApplyPatch linux-2.6-defaults-acpi-video.patch
-ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
+ApplyPatch defaults-acpi-video.patch
+ApplyPatch acpi-video-dos.patch
+ApplyPatch acpi-debug-infinite-loop.patch
ApplyPatch acpi-sony-nonvs-blacklist.patch
#
@@ -1349,30 +1349,30 @@ ApplyPatch acpi-sony-nonvs-blacklist.patch
# Misc fixes
# The input layer spews crap no-one cares about.
-ApplyPatch linux-2.6-input-kill-stupid-messages.patch
+ApplyPatch input-kill-stupid-messages.patch
# stop floppy.ko from autoloading during udev...
ApplyPatch die-floppy-die.patch
-ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
+ApplyPatch no-pcspkr-modalias.patch
# Allow to use 480600 baud on 16C950 UARTs
-ApplyPatch linux-2.6-serial-460800.patch
+ApplyPatch serial-460800.patch
# Silence some useless messages that still get printed with 'quiet'
-ApplyPatch linux-2.6-silence-noise.patch
+ApplyPatch silence-noise.patch
# Make fbcon not show the penguins with 'quiet'
-ApplyPatch linux-2.6-silence-fbcon-logo.patch
+ApplyPatch silence-fbcon-logo.patch
# Changes to upstream defaults.
# /dev/crash driver.
-ApplyPatch linux-2.6-crash-driver.patch
+ApplyPatch crash-driver.patch
# Hack e1000e to work on Montevina SDV
-ApplyPatch linux-2.6-e1000-ich9-montevina.patch
+ApplyPatch e1000-ich9-montevina.patch
# crypto/
@@ -1393,14 +1393,14 @@ ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-i915-dp-stfu.patch
# silence the ACPI blacklist code
-ApplyPatch linux-2.6-silence-acpi-blacklist.patch
+ApplyPatch silence-acpi-blacklist.patch
ApplyPatch quite-apm.patch
# V4L/DVB updates/fixes/experimental drivers
# apply if non-empty
-ApplyOptionalPatch linux-2.6-v4l-dvb-fixes.patch
-ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch
-ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
+ApplyOptionalPatch v4l-dvb-fixes.patch
+ApplyOptionalPatch v4l-dvb-update.patch
+ApplyOptionalPatch v4l-dvb-experimental.patch
# Patches headed upstream
ApplyPatch fs-proc-devtree-remove_proc_entry.patch
diff --git a/linux-2.6-makefile-after_link.patch b/makefile-after_link.patch
index b520b1942..b520b1942 100644
--- a/linux-2.6-makefile-after_link.patch
+++ b/makefile-after_link.patch
diff --git a/linux-2.6.30-no-pcspkr-modalias.patch b/no-pcspkr-modalias.patch
index 439269cef..439269cef 100644
--- a/linux-2.6.30-no-pcspkr-modalias.patch
+++ b/no-pcspkr-modalias.patch
diff --git a/linux-2.6-serial-460800.patch b/serial-460800.patch
index 0e68378e7..0e68378e7 100644
--- a/linux-2.6-serial-460800.patch
+++ b/serial-460800.patch
diff --git a/linux-2.6-silence-acpi-blacklist.patch b/silence-acpi-blacklist.patch
index c5997bb6e..c5997bb6e 100644
--- a/linux-2.6-silence-acpi-blacklist.patch
+++ b/silence-acpi-blacklist.patch
diff --git a/linux-2.6-silence-fbcon-logo.patch b/silence-fbcon-logo.patch
index 45ab73331..45ab73331 100644
--- a/linux-2.6-silence-fbcon-logo.patch
+++ b/silence-fbcon-logo.patch
diff --git a/linux-2.6-silence-noise.patch b/silence-noise.patch
index 1e4d7c57f..1e4d7c57f 100644
--- a/linux-2.6-silence-noise.patch
+++ b/silence-noise.patch
diff --git a/linux-2.6-upstream-reverts.patch b/upstream-reverts.patch
index 607602cfc..607602cfc 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/upstream-reverts.patch
diff --git a/linux-2.6-v4l-dvb-experimental.patch b/v4l-dvb-experimental.patch
index e69de29bb..e69de29bb 100644
--- a/linux-2.6-v4l-dvb-experimental.patch
+++ b/v4l-dvb-experimental.patch
diff --git a/linux-2.6-v4l-dvb-fixes.patch b/v4l-dvb-fixes.patch
index e69de29bb..e69de29bb 100644
--- a/linux-2.6-v4l-dvb-fixes.patch
+++ b/v4l-dvb-fixes.patch
diff --git a/linux-2.6-v4l-dvb-update.patch b/v4l-dvb-update.patch
index e69de29bb..e69de29bb 100644
--- a/linux-2.6-v4l-dvb-update.patch
+++ b/v4l-dvb-update.patch