summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@fedoraproject.org>2014-02-28 13:41:08 -0500
committerKyle McMartin <kyle@fedoraproject.org>2014-02-28 13:41:08 -0500
commite00b66b7e3bafaed82bd3c05fb1b071bb1e6245a (patch)
tree623c8f7b79a1e03a5e2ac25b0036f0aae9b92368
parent2edcdbfc985724b57a74b996ef5cac8ca1698423 (diff)
downloadkernel-e00b66b7e3bafaed82bd3c05fb1b071bb1e6245a.tar.gz
kernel-e00b66b7e3bafaed82bd3c05fb1b071bb1e6245a.tar.xz
kernel-e00b66b7e3bafaed82bd3c05fb1b071bb1e6245a.zip
enable appropriate CONFIG_XZ_DEC_$arch options
-rw-r--r--config-generic6
-rw-r--r--kernel.spec4
2 files changed, 7 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 775858cbb..fd1351de7 100644
--- a/config-generic
+++ b/config-generic
@@ -5089,10 +5089,10 @@ CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
CONFIG_TEST_KSTRTOX=y
CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
+CONFIG_XZ_DEC_ARM=y
# CONFIG_XZ_DEC_ARMTHUMB is not set
# CONFIG_XZ_DEC_SPARC is not set
# CONFIG_XZ_DEC_TEST is not set
diff --git a/kernel.spec b/kernel.spec
index bca5c883c..55b8a7634 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2072,6 +2072,10 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Feb 28 2014 Kyle McMartin <kyle@fedoraproject.org>
+- Enable appropriate CONFIG_XZ_DEC_$arch options to ensure we can mount
+ squashfs images on supported architectures.
+
* Fri Feb 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-0102 keyctl_link can be used to cause an oops (rhbz 1071396)