[kernel/f16] Drop ARM support. It isn't built in F16.
Josh Boyer
jwboyer at fedoraproject.org
Wed Jul 25 20:33:39 UTC 2012
commit 4277cc49acc8f5dded21d504a00aa614d3874e4f
Author: Josh Boyer <jwboyer at redhat.com>
Date: Wed Jul 25 16:33:25 2012 -0400
Drop ARM support. It isn't built in F16.
Makefile.config | 56 -
arm-omap-dt-compat.patch | 42 -
...port-reading-mac-address-from-device-tree.patch | 92 --
config-arm-generic | 365 -------
config-arm-highbank | 31 -
config-arm-imx | 89 --
config-arm-kirkwood | 54 -
config-arm-omap-generic | 1086 --------------------
config-arm-tegra | 99 --
kernel.spec | 135 +---
10 files changed, 3 insertions(+), 2046 deletions(-)
---
diff --git a/Makefile.config b/Makefile.config
index 331aa46..0e6587f 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,11 +9,6 @@ CONFIGFILES = \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config \
- $(CFG)-arm.config $(CFG)-armv5tel.config \
- $(CFG)-armv5tel-kirkwood.config $(CFG)-armv7l-imx.config \
- $(CFG)-armv7l-omap.config $(CFG)-armv7l-tegra.config \
- $(CFG)-armv7hl-imx.config $(CFG)-armv7hl-highbank.config \
- $(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config
@@ -36,24 +31,6 @@ temp-generic: config-generic
temp-debug-generic: config-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-armv7l-tegra: config-arm-tegra temp-arm-generic
- perl merge.pl $^ > $@
-
-temp-armv5tel-kirkwood: config-arm-kirkwood temp-arm-generic
- perl merge.pl $^ > $@
-
-temp-armv7l-imx: config-arm-imx temp-arm-generic
- perl merge.pl $^ > $@
-
-temp-armv7l-highbank: config-arm-highbank temp-arm-generic
- perl merge.pl $^ > $@
-
temp-x86-32: config-x86-32-generic config-x86-generic
perl merge.pl $^ > $@
@@ -117,39 +94,6 @@ kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generi
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@
-kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv5tel.config: /dev/null temp-arm-generic
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv5tel-kirkwood.config: /dev/null temp-armv5tel-kirkwood
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-imx.config: /dev/null temp-armv7l-imx
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-highbank.config: /dev/null temp-armv7l-highbank
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl-imx.config: /dev/null temp-armv7l-imx
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl-highbank.config: /dev/null temp-armv7l-highbank
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap-generic
- perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra
- perl merge.pl $^ arm > $@
-
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
perl merge.pl $^ powerpc > $@
diff --git a/kernel.spec b/kernel.spec
index 2069a06..1286e8f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -124,16 +124,6 @@ Summary: The Linux kernel
%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
# Want to build a the vsdo directories installed
%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
-# ARM OMAP (Beagle/Panda Board)
-%define with_omap %{?_without_omap: 0} %{?!_without_omap: 1}
-# kernel-tegra (only valid for arm)
-%define with_tegra %{?_without_tegra: 0} %{?!_without_tegra: 1}
-# kernel-kirkwood (only valid for arm)
-%define with_kirkwood %{?_without_kirkwood: 0} %{?!_without_kirkwood: 1}
-# kernel-imx (only valid for arm)
-%define with_imx %{?_without_imx: 0} %{?!_without_imx: 1}
-# kernel-highbank (only valid for arm)
-%define with_highbank %{?_without_highbank: 0} %{?!_without_highbank: 1}
# Build the kernel-doc package, but don't fail the build if it botches.
# Here "true" means "continue" and "false" means "fail the build".
@@ -244,19 +234,6 @@ Summary: The Linux kernel
%define with_pae 0
%endif
-# kernel-tegra, omap, imx and highbank are only built on armv7 hard and softfp
-%ifnarch armv7hl armv7l
-%define with_tegra 0
-%define with_omap 0
-%define with_imx 0
-%define with_highbank 0
-%endif
-
-# kernel-kirkwood is only built for armv5
-%ifnarch armv5tel
-%define with_kirkwood 0
-%endif
-
# if requested, only build base kernel
%if %{with_baseonly}
%define with_smp 0
@@ -399,26 +376,6 @@ Summary: The Linux kernel
%define kernel_image vmlinux
%endif
-%ifarch %{arm}
-%define all_arch_configs kernel-%{version}-arm*.config
-%define image_install_path boot
-%define asmarch arm
-%define hdrarch arm
-%define make_target bzImage
-%define kernel_image arch/arm/boot/zImage
-# we build a up kernel on armv5tel. its used for qemu.
-%ifnarch armv5tel
-%define with_up 0
-%endif
-# we only build headers on the base arm arches
-# just like we used to only build them on i386 for x86
-%ifnarch armv5tel armv7hl
-%define with_headers 0
-%define with_perf 0
-%define with_tools 0
-%endif
-%endif
-
%if %{nopatches}
# XXX temporary until last vdso patches are upstream
%define vdso_arches ppc ppc64
@@ -530,7 +487,7 @@ Version: %{rpmversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 %{sparc} s390 s390x alpha alphaev56 %{arm}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 %{sparc} s390 s390x alpha alphaev56
ExclusiveOS: Linux
%kernel_reqprovconf
@@ -591,13 +548,6 @@ Source70: config-s390x
Source90: config-sparc64-generic
-Source100: config-arm-generic
-Source110: config-arm-omap-generic
-Source111: config-arm-tegra
-Source112: config-arm-kirkwood
-Source113: config-arm-imx
-Source114: config-arm-highbank
-
# 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.
Source1000: config-local
@@ -730,10 +680,6 @@ Patch20000: uprobes-3.4-backport.patch
Patch20001: uprobes-3.4-tip.patch
Patch20002: uprobes-task_work_add-generic-process-context-callbacks.patch
-# Flattened devicetree support
-Patch21000: arm-omap-dt-compat.patch
-Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
-
#rhbz 769766
Patch21072: mac80211-fix-rx-key-NULL-ptr-deref-in-promiscuous-mode.patch
@@ -978,36 +924,6 @@ This variant of the kernel has numerous debugging options enabled.
It should only be installed when trying to gather additional information
on kernel bugs, as some of these options impact performance noticably.
-%define variant_summary The Linux kernel compiled for marvell kirkwood boards
-%kernel_variant_package kirkwood
-%description kirkwood
-This package includes a version of the Linux kernel with support for
-marvell kirkwood based systems, i.e., guruplug, sheevaplug
-
-%define variant_summary The Linux kernel compiled for freescale boards
-%kernel_variant_package imx
-%description imx
-This package includes a version of the Linux kernel with support for
-freescale based systems, i.e., efika smartbook.
-
-%define variant_summary The Linux kernel compiled for Calxeda boards
-%kernel_variant_package highbank
-%description highbank
-This package includes a version of the Linux kernel with support for
-Calxeda based systems, i.e., HP arm servers.
-
-%define variant_summary The Linux kernel compiled for TI-OMAP boards
-%kernel_variant_package omap
-%description omap
-This package includes a version of the Linux kernel with support for
-TI-OMAP based systems, i.e., BeagleBoard-xM.
-
-%define variant_summary The Linux kernel compiled for tegra boards
-%kernel_variant_package tegra
-%description tegra
-This package includes a version of the Linux kernel with support for
-nvidia tegra based systems, i.e., trimslice, ac-100.
-
%prep
# do a few sanity-checks for --with *only builds
@@ -1264,12 +1180,6 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
# Architecture patches
# x86(-64)
-#
-# ARM
-#
-# ApplyPatch arm-omap-dt-compat.patch
-# ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
-
ApplyPatch taint-vbox.patch
#
# NX Emulation
@@ -1734,26 +1644,6 @@ BuildKernel %make_target %kernel_image PAEdebug
BuildKernel %make_target %kernel_image PAE
%endif
-%if %{with_kirkwood}
-BuildKernel %make_target %kernel_image kirkwood
-%endif
-
-%if %{with_imx}
-BuildKernel %make_target %kernel_image imx
-%endif
-
-%if %{with_highbank}
-BuildKernel %make_target %kernel_image highbank
-%endif
-
-%if %{with_omap}
-BuildKernel %make_target %kernel_image omap
-%endif
-
-%if %{with_tegra}
-BuildKernel %make_target %kernel_image tegra
-%endif
-
%if %{with_up}
BuildKernel %make_target %kernel_image
%endif
@@ -1999,21 +1889,6 @@ fi}\
%kernel_variant_post -v PAEdebug -r (kernel|kernel-smp)
%kernel_variant_preun PAEdebug
-%kernel_variant_preun kirkwood
-%kernel_variant_post -v kirkwood
-
-%kernel_variant_preun imx
-%kernel_variant_post -v imx
-
-%kernel_variant_preun highbank
-%kernel_variant_post -v highbank
-
-%kernel_variant_preun omap
-%kernel_variant_post -v omap
-
-%kernel_variant_preun tegra
-%kernel_variant_post -v tegra
-
if [ -x /sbin/ldconfig ]
then
/sbin/ldconfig -X || exit $?
@@ -2143,17 +2018,13 @@ fi
%kernel_variant_files %{with_debug} debug
%kernel_variant_files %{with_pae} PAE
%kernel_variant_files %{with_pae_debug} PAEdebug
-%kernel_variant_files %{with_kirkwood} kirkwood
-%kernel_variant_files %{with_imx} imx
-%kernel_variant_files %{with_highbank} highbank
-%kernel_variant_files %{with_omap} omap
-%kernel_variant_files %{with_tegra} tegra
# plz don't put in a version string unless you're going to tag
# and build.
%changelog
* Wed Jul 25 2012 Josh Boyer <jwboyer at redhat.com>
+- Drop ARM support. It isn't built in F16.
- Add patch to fix cpu pinning after suspend/resume (rhbz 714271)
* Thu Jul 19 2012 Josh Boyer <jwboyer at redhat.com> - 3.4.6-1
More information about the scm-commits
mailing list