From b9a77b3f37d6c149778be8745c8fd630b17e946e Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 9 Apr 2018 10:09:44 -0700 Subject: [PATCH] Enable JFFS2 and some MTD modules (rhbz 1474493) --- .../armv7 => }/CONFIG_JFFS2_COMPRESSION_OPTIONS | 0 configs/fedora/generic/CONFIG_JFFS2_FS | 2 +- .../{arm/armv7 => }/CONFIG_JFFS2_FS_DEBUG | 0 .../{arm/armv7 => }/CONFIG_JFFS2_FS_POSIX_ACL | 0 .../{arm/armv7 => }/CONFIG_JFFS2_FS_SECURITY | 0 .../{arm/armv7 => }/CONFIG_JFFS2_FS_WBUF_VERIFY | 0 .../{arm/armv7 => }/CONFIG_JFFS2_FS_WRITEBUFFER | 0 .../{arm/armv7 => }/CONFIG_JFFS2_FS_XATTR | 0 .../generic/{arm/armv7 => }/CONFIG_JFFS2_LZO | 0 .../generic/{arm/armv7 => }/CONFIG_JFFS2_RTIME | 0 .../generic/{arm/armv7 => }/CONFIG_JFFS2_RUBIN | 0 .../generic/{arm/armv7 => }/CONFIG_JFFS2_SUMMARY | 0 .../generic/{arm/armv7 => }/CONFIG_JFFS2_ZLIB | 0 configs/fedora/generic/CONFIG_MTD_BLOCK2MTD | 2 +- configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS | 1 - filter-modules.sh | 2 +- kernel-aarch64-debug.config | 16 ++++++++++++++-- kernel-aarch64.config | 16 ++++++++++++++-- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 16 ++++++++++++++-- kernel-i686-PAEdebug.config | 16 ++++++++++++++-- kernel-i686-debug.config | 16 ++++++++++++++-- kernel-i686.config | 16 ++++++++++++++-- kernel-ppc64-debug.config | 16 ++++++++++++++-- kernel-ppc64.config | 16 ++++++++++++++-- kernel-ppc64le-debug.config | 16 ++++++++++++++-- kernel-ppc64le.config | 16 ++++++++++++++-- kernel-s390x-debug.config | 16 ++++++++++++++-- kernel-s390x.config | 16 ++++++++++++++-- kernel-x86_64-debug.config | 16 ++++++++++++++-- kernel-x86_64.config | 16 ++++++++++++++-- kernel.spec | 3 +++ 35 files changed, 206 insertions(+), 36 deletions(-) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_COMPRESSION_OPTIONS (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_DEBUG (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_POSIX_ACL (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_SECURITY (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_WBUF_VERIFY (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_WRITEBUFFER (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_FS_XATTR (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_LZO (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_RTIME (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_RUBIN (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_SUMMARY (100%) rename configs/fedora/generic/{arm/armv7 => }/CONFIG_JFFS2_ZLIB (100%) delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS b/configs/fedora/generic/CONFIG_JFFS2_COMPRESSION_OPTIONS similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_COMPRESSION_OPTIONS rename to configs/fedora/generic/CONFIG_JFFS2_COMPRESSION_OPTIONS diff --git a/configs/fedora/generic/CONFIG_JFFS2_FS b/configs/fedora/generic/CONFIG_JFFS2_FS index 1093b2329..4ccb0a39c 100644 --- a/configs/fedora/generic/CONFIG_JFFS2_FS +++ b/configs/fedora/generic/CONFIG_JFFS2_FS @@ -1 +1 @@ -# CONFIG_JFFS2_FS is not set +CONFIG_JFFS2_FS=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG b/configs/fedora/generic/CONFIG_JFFS2_FS_DEBUG similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_DEBUG rename to configs/fedora/generic/CONFIG_JFFS2_FS_DEBUG diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL b/configs/fedora/generic/CONFIG_JFFS2_FS_POSIX_ACL similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_POSIX_ACL rename to configs/fedora/generic/CONFIG_JFFS2_FS_POSIX_ACL diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY b/configs/fedora/generic/CONFIG_JFFS2_FS_SECURITY similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_SECURITY rename to configs/fedora/generic/CONFIG_JFFS2_FS_SECURITY diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY b/configs/fedora/generic/CONFIG_JFFS2_FS_WBUF_VERIFY similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WBUF_VERIFY rename to configs/fedora/generic/CONFIG_JFFS2_FS_WBUF_VERIFY diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER b/configs/fedora/generic/CONFIG_JFFS2_FS_WRITEBUFFER similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_WRITEBUFFER rename to configs/fedora/generic/CONFIG_JFFS2_FS_WRITEBUFFER diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_XATTR b/configs/fedora/generic/CONFIG_JFFS2_FS_XATTR similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS_XATTR rename to configs/fedora/generic/CONFIG_JFFS2_FS_XATTR diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_LZO b/configs/fedora/generic/CONFIG_JFFS2_LZO similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_LZO rename to configs/fedora/generic/CONFIG_JFFS2_LZO diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RTIME b/configs/fedora/generic/CONFIG_JFFS2_RTIME similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RTIME rename to configs/fedora/generic/CONFIG_JFFS2_RTIME diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RUBIN b/configs/fedora/generic/CONFIG_JFFS2_RUBIN similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_RUBIN rename to configs/fedora/generic/CONFIG_JFFS2_RUBIN diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_SUMMARY b/configs/fedora/generic/CONFIG_JFFS2_SUMMARY similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_SUMMARY rename to configs/fedora/generic/CONFIG_JFFS2_SUMMARY diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_ZLIB b/configs/fedora/generic/CONFIG_JFFS2_ZLIB similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_JFFS2_ZLIB rename to configs/fedora/generic/CONFIG_JFFS2_ZLIB diff --git a/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD b/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD index 4a942ccb5..3f0d93a89 100644 --- a/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD +++ b/configs/fedora/generic/CONFIG_MTD_BLOCK2MTD @@ -1 +1 @@ -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS b/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS deleted file mode 100644 index 4ccb0a39c..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_JFFS2_FS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_JFFS2_FS=m diff --git a/filter-modules.sh b/filter-modules.sh index 03f01ec95..50585d5be 100755 --- a/filter-modules.sh +++ b/filter-modules.sh @@ -28,7 +28,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2 usbdrvs="atm image misc serial wusbcore" -fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" +fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp wireless" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0f74ab089..3c3408ae2 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2649,7 +2649,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3347,7 +3359,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 0ca665675..1d5b269a7 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2631,7 +2631,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3325,7 +3337,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 193ed24f4..324b19d14 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3543,7 +3543,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index b03df5b83..6de303fbf 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3375,7 +3375,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2da45d6f8..6a0ae601e 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3353,7 +3353,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 8b274ee60..dbbeb6038 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3521,7 +3521,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_AFS_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI_ADV_OPTIONS is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index de72c69b0..9a7b5f58c 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2510,7 +2510,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3182,7 +3194,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 6fa6ac1fc..3dc857c8d 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2529,7 +2529,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3203,7 +3215,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 0e817d541..98dc32b91 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2529,7 +2529,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3203,7 +3215,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-i686.config b/kernel-i686.config index 602b8aa58..fc21a4e40 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2510,7 +2510,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3182,7 +3194,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9fcab38f0..f8b3fdaf2 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2373,7 +2373,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3028,7 +3040,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index ab9ea4ff5..d6ed8259c 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2354,7 +2354,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3005,7 +3017,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 47c7eec0d..747f57f36 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2318,7 +2318,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -2972,7 +2984,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 6f9b43b14..34e62466d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2299,7 +2299,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -2949,7 +2961,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 03fd65f13..903b3d7c9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2272,7 +2272,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -2915,7 +2927,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 5c466efac..c0fce7828 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2253,7 +2253,19 @@ CONFIG_IXGBEVF=m CONFIG_IXGB=m # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -2892,7 +2904,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set # CONFIG_MTD_BLKDEVS is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 2b2f89ecb..e5a16ed02 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2589,7 +2589,19 @@ CONFIG_IXGB=m # CONFIG_JAILHOUSE_GUEST is not set CONFIG_JBD2_DEBUG=y CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3255,7 +3267,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ea1e38ed7..b3b140ffb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2570,7 +2570,19 @@ CONFIG_IXGB=m # CONFIG_JAILHOUSE_GUEST is not set # CONFIG_JBD2_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_POSIX_ACL=y +CONFIG_JFFS2_FS_SECURITY=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_FS_XATTR=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_ZLIB=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_FS=m CONFIG_JFS_POSIX_ACL=y @@ -3234,7 +3246,7 @@ CONFIG_MT76x2E=m # CONFIG_MTD_ABSENT is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=m -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set CONFIG_MTD_CFI_I1=y diff --git a/kernel.spec b/kernel.spec index 35dca4be0..fcaa77966 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1856,6 +1856,9 @@ fi # # %changelog +* Wed Apr 11 2018 Laura Abbott +- Enable JFFS2 and some MTD modules (rhbz 1474493) + * Wed Apr 11 2018 Justin M. Forbes - 4.17.0-0.rc0.git7.1 - Linux v4.16-11490-gb284d4d5a678