summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2013-10-03 12:14:40 -0400
committerKyle McMartin <kyle@redhat.com>2013-10-03 12:22:16 -0400
commitf1adcbd10272efbc1612af72a934ab3bd784a4cf (patch)
tree3bac3d742298eb619694570b5e9497c83413ef2d
parentdd6a11e56de2bd979b4ab30b9269c555a665f23d (diff)
downloadkernel-f1adcbd10272efbc1612af72a934ab3bd784a4cf.tar.gz
kernel-f1adcbd10272efbc1612af72a934ab3bd784a4cf.tar.xz
kernel-f1adcbd10272efbc1612af72a934ab3bd784a4cf.zip
disable extras on arm
-rw-r--r--Makefile.config5
-rw-r--r--config-no-extra27
-rw-r--r--kernel.spec7
3 files changed, 38 insertions, 1 deletions
diff --git a/Makefile.config b/Makefile.config
index cfaf67476..31f82a4b4 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -32,7 +32,10 @@ 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
+temp-no-extra-generic: config-no-extra temp-generic
+ perl merge.pl $^ > $@
+
+temp-arm-generic: config-arm-generic temp-no-extra-generic
perl merge.pl $^ > $@
temp-armv7-generic: config-armv7-generic temp-arm-generic
diff --git a/config-no-extra b/config-no-extra
new file mode 100644
index 000000000..7539a173f
--- /dev/null
+++ b/config-no-extra
@@ -0,0 +1,27 @@
+### config-no-extra: only (to a first approximation) modules listed in
+### mod-extra.list should be listed here.
+
+# CONFIG_ISDN is not set
+# CONFIG_RDS is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATALK is not set
+# CONFIG_HAMRADIO is not set
+
+# CONFIG_DEV_APPLETALK is not set
+
+# CONFIG_FUSION is not set
+# CONFIG_I2O is not set
+
+# CONFIG_NET_TULIP is not set
+
+# CONFIG_HERMES is not set
+
+# CONFIG_OCFS2_FS is not set
+# CONFIG_CUSE is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
diff --git a/kernel.spec b/kernel.spec
index 21780de2d..708f0f167 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -391,6 +391,7 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%endif
+%define with_extra 0
%endif
%ifarch aarch64
@@ -400,6 +401,7 @@ Summary: The Linux kernel
%define make_target Image.gz
%define kernel_image arch/arm64/boot/Image.gz
%define image_install_path boot
+%define with_extra 0
%endif
# Should make listnewconfig fail if there's config options
@@ -2249,6 +2251,11 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Oct 03 2013 Kyle McMartin <kyle@fedoraproject.org>
+- Add config-no-extra and disable with_extra on ARM and AArch64 to reduce
+ time building untestable code (because the hardware doesn't exist, or it
+ would be futile.)
+
* Thu Oct 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git3.1
- Linux v3.12-rc3-253-ge6e7fb1