diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-10-26 15:25:50 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-10-26 15:25:50 -0400 |
| commit | 9410e6cc1a1089ac15d3d0d30f4e22a6380ae202 (patch) | |
| tree | 4bfa0804447b04d9e0e786af76a898077df86033 /kernel.spec | |
| parent | 9845830cdcb048e5597670572b4f637dd50023af (diff) | |
| download | kernel-9410e6cc1a1089ac15d3d0d30f4e22a6380ae202.tar.gz kernel-9410e6cc1a1089ac15d3d0d30f4e22a6380ae202.tar.xz kernel-9410e6cc1a1089ac15d3d0d30f4e22a6380ae202.zip | |
drop rhel config bits which are not used in fedora kernels
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel.spec b/kernel.spec index 8832d35c0..275034018 100644 --- a/kernel.spec +++ b/kernel.spec @@ -547,7 +547,6 @@ Source20: Makefile.config Source21: config-debug Source22: config-nodebug Source23: config-generic -Source24: config-rhel-generic Source30: config-x86-generic Source31: config-i686-PAE @@ -1171,18 +1170,8 @@ make -f %{SOURCE19} config-release # Dynamically generate kernel .config files from config-* files make -f %{SOURCE20} VERSION=%{version} configs -%if %{?all_arch_configs:1}%{!?all_arch_configs:0} -#if a rhel kernel, apply the rhel config options -%if 0%{?rhel} - for i in %{all_arch_configs} - do - mv $i $i.tmp - ./merge.pl config-rhel-generic $i.tmp > $i - rm $i.tmp - done -%endif - # Merge in any user-provided local config option changes +%if %{?all_arch_configs:1}%{!?all_arch_configs:0} for i in %{all_arch_configs} do mv $i $i.tmp @@ -2065,6 +2054,7 @@ fi (https://lkml.org/lkml/2009/11/26/57) - Drop vanilla-% targets, and other Makefile cruft which has been bit rotting for years. +- Dump %rhel config bits which are not used in Fedora. * Wed Oct 26 2011 Josh Boyer <jwboyer@redhat.com> - CVE-2011-4077: xfs: potential buffer overflow in xfs_readlink() (rhbz 749166) |