rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

From: David Marlin <dmarlin@redhat.com>

Browse Source 
Modify to split the ARM config files to work more like other archs.

Rename:
  config-arm -> config-arm-generic
Add:
  config-arm-omap-generic
This commit is contained in:
Josh Boyer 2011-08-16 10:31:26 -04:00
parent 6920e17ebc
commit 8ffa0afd4c
4 changed files with 1117 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.config
View File

@ -8,7 +8,8 @@ CONFIGFILES = \
$(CFG)-i686.config $(CFG)-i686-debug.config \ $(CFG)-i686.config $(CFG)-i686-debug.config \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \ $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \ $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config $(CFG)-arm.config \ $(CFG)-s390x.config \
$(CFG)-arm.config $(CFG)-armv7l-omap.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \ $(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \ $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
@ -32,6 +33,12 @@ temp-generic: config-generic
temp-debug-generic: config-generic temp-debug-generic: config-generic
cat config-generic config-debug > temp-debug-generic cat config-generic config-debug > temp-debug-generic
temp-arm-generic: config-arm-generic temp-generic
perl merge.pl $^ > $@
temp-armv7l-omap-generic: config-arm-omap-generic temp-arm-generic
perl merge.pl $^ > $@
temp-x86-32: config-x86-32-generic config-x86-generic temp-x86-32: config-x86-32-generic config-x86-generic
perl merge.pl $^ > $@ perl merge.pl $^ > $@
@ -98,7 +105,10 @@ kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generi
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@ perl merge.pl $^ s390 > $@
kernel-$(VERSION)-arm.config: config-arm temp-generic kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
perl merge.pl $^ arm > $@ perl merge.pl $^ arm > $@
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic

0
config-arm → config-arm-generic
View File

1099
config-arm-omap-generic Normal file
View File

File diff suppressed because it is too large Load Diff

7
kernel.spec
View File

@ -381,6 +381,7 @@ Summary: The Linux kernel
%ifarch %{arm} %ifarch %{arm}
%define all_arch_configs kernel-%{version}-arm*.config %define all_arch_configs kernel-%{version}-arm*.config
%define image_install_path boot %define image_install_path boot
%define asmarch arm
%define hdrarch arm %define hdrarch arm
%define make_target vmlinux %define make_target vmlinux
%define kernel_image vmlinux %define kernel_image vmlinux
@ -558,7 +559,8 @@ Source70: config-s390x
Source90: config-sparc64-generic Source90: config-sparc64-generic
Source100: config-arm Source100: config-arm-generic
Source110: config-arm-omap-generic
# This file is intentionally left empty in the stock kernel. Its a nicety # This file is intentionally left empty in the stock kernel. Its a nicety
# added for those wanting to do custom rebuilds with altered config opts. # added for those wanting to do custom rebuilds with altered config opts.
@ -1898,6 +1900,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Aug 16 2011 Josh Boyer <jwboyer@redhat.com>
- Bring ARM config changes from David Marlin forward
* Mon Aug 15 2011 Josh Boyer <jwboyer@redhat.com> * Mon Aug 15 2011 Josh Boyer <jwboyer@redhat.com>
- Linux-3.1-rc2 - Linux-3.1-rc2
- Replace trial patch for rhbz 726877 with a better fix - Replace trial patch for rhbz 726877 with a better fix