summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-01-09 11:15:35 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-01-09 11:15:35 -0600
commit490fa4af43c5df980cfd0029aec8e028b10529cd (patch)
tree016744de8c308b986e05f1f06a702eff0f84075d
parent7b24f02e10c73c3517836f3596ff68fce4c88cae (diff)
downloadkernel-490fa4af43c5df980cfd0029aec8e028b10529cd.tar.gz
kernel-490fa4af43c5df980cfd0029aec8e028b10529cd.tar.xz
kernel-490fa4af43c5df980cfd0029aec8e028b10529cd.zip
Enable EROFS as it has been promoted from staging
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS2
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT1
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_DEBUG1
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL1
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_SECURITY1
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_XATTR1
-rw-r--r--configs/fedora/generic/CONFIG_EROFS_FS_ZIP1
-rw-r--r--kernel-aarch64-debug-fedora.config8
-rw-r--r--kernel-aarch64-fedora.config8
-rw-r--r--kernel-armv7hl-debug-fedora.config8
-rw-r--r--kernel-armv7hl-fedora.config8
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config8
-rw-r--r--kernel-armv7hl-lpae-fedora.config8
-rw-r--r--kernel-i686-debug-fedora.config8
-rw-r--r--kernel-i686-fedora.config8
-rw-r--r--kernel-ppc64le-debug-fedora.config8
-rw-r--r--kernel-ppc64le-fedora.config8
-rw-r--r--kernel-s390x-debug-fedora.config8
-rw-r--r--kernel-s390x-fedora.config8
-rw-r--r--kernel-x86_64-debug-fedora.config8
-rw-r--r--kernel-x86_64-fedora.config8
21 files changed, 105 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS b/configs/fedora/generic/CONFIG_EROFS_FS
index 4bdace556..0394e57c2 100644
--- a/configs/fedora/generic/CONFIG_EROFS_FS
+++ b/configs/fedora/generic/CONFIG_EROFS_FS
@@ -1 +1 @@
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS=m
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT
new file mode 100644
index 000000000..585602e4a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT
@@ -0,0 +1 @@
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG
new file mode 100644
index 000000000..5363c0f0a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG
@@ -0,0 +1 @@
+# CONFIG_EROFS_FS_DEBUG is not set
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL
new file mode 100644
index 000000000..fe4f9a826
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL
@@ -0,0 +1 @@
+CONFIG_EROFS_FS_POSIX_ACL=y
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY
new file mode 100644
index 000000000..f24b07262
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY
@@ -0,0 +1 @@
+CONFIG_EROFS_FS_SECURITY=y
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_XATTR b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR
new file mode 100644
index 000000000..751034acd
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR
@@ -0,0 +1 @@
+CONFIG_EROFS_FS_XATTR=y
diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_ZIP b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP
new file mode 100644
index 000000000..fe558502b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP
@@ -0,0 +1 @@
+CONFIG_EROFS_FS_ZIP=y
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index abaa7be5b..2400460c1 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1779,7 +1779,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index cca6b1044..354c2978a 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1771,7 +1771,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6e1533d41..ff057c577 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1805,7 +1805,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index a125864d4..33c099088 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1798,7 +1798,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 1b1aa2a5d..f9d290319 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1757,7 +1757,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index c89cc0c23..c2df2bb7f 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1750,7 +1750,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 4cadd5b3c..1e283b782 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1515,7 +1515,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index dcd44528b..7fac39dc3 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1506,7 +1506,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 01a13d8c4..11e4e59bd 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1376,7 +1376,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 92f68e4c6..08e26c67c 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1367,7 +1367,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 0cf5397dc..3ea9bba6a 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1384,7 +1384,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index b5da410cb..8fa117548 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1375,7 +1375,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
# CONFIG_ETHOC is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 38bafb00d..05d5e24c7 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1555,7 +1555,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index b5a79015f..270c227d5 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1546,7 +1546,13 @@ CONFIG_ENVELOPE_DETECTOR=m
CONFIG_EPIC100=m
CONFIG_EPOLL=y
CONFIG_EQUALIZER=m
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_ZIP=y
CONFIG_ET131X=m
CONFIG_ETHERNET=y
CONFIG_ETHOC=m