Update for upstream btrfs

config.yaml

@@ -19,6 +19,7 @@ actions:
       - type: "source"
         name: "almalinuxnvidia1.x509"
         number: 107
+
       - type: "patch"
         name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch"
         number: 2001
@@ -44,6 +45,10 @@ actions:
         name: "0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch"
         number: 2009
 
+      - type: "patch"
+        name: "0001-Keep-fs-btrfs-files-in-modules-package.patch"
+        number: 2010
+
   - replace:
       - target: "kernel*.config"
         find: |
@@ -97,18 +102,57 @@ actions:
               CONFIG_MLX4_CORE_GEN2=y
               CONFIG_MLX4_CORE=m
         count: 1
-      - target: "kernel*.config"
+
+      - target: "kernel*aarch64*.config"
         find: |
               # CONFIG_BTRFS_FS is not set
         replace: |
-              # CONFIG_BTRFS_ASSERT is not set
-              # CONFIG_BTRFS_DEBUG is not set
               CONFIG_BTRFS_FS=m
               # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-              CONFIG_BTRFS_FS_POSIX_ACL=y
-              # CONFIG_BTRFS_FS_REF_VERIFY is not set
-              # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
         count: 1
+      - target: "kernel*s390x-zfcpdump-rhel.config"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+      - target: "kernel-s390x-debug-rhel.config"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+      - target: "kernel-ppc64le-debug-rhel.config"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+      - target: "kernel-riscv64-debug-rhel.config"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+      - target: "kernel-x86_64-debug-rhel.config"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+      - target: "kernel-x86_64-rt*"
+        find: |
+              # CONFIG_BTRFS_FS is not set
+        replace: |
+              CONFIG_BTRFS_FS=m
+              # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+        count: 1
+
       - target: "kernel*.config"
         find: |
               # CONFIG_FSI is not set
@@ -378,6 +422,10 @@ actions:
       - target: "kernel*zfcpdump*.config"
         lines:
           - "# CONFIG_FS_POSIX_ACL is not set"
+      - target: "def_variants.yaml.rhel"
+        lines:
+
+          - "- fs/btrfs/.*: modules-internal"
 
   - delete_files:
       - file_name: "redhatsecureboot504.cer"

files/0001-Keep-fs-btrfs-files-in-modules-package.patch

@@ -0,0 +1,24 @@
+From 32b5df3d57caf5ab17a5161bbe152403ca9d0147 Mon Sep 17 00:00:00 2001
+From: eabdullin <eabdullin@almalinux.org>
+Date: Wed, 4 Feb 2026 14:08:11 +0300
+Subject: [PATCH] Keep fs/btrfs/.* files in modules package
+
+---
+ redhat/rhel_files/def_variants.yaml.rhel | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel
+index 27e1aca80..61018dd69 100644
+--- a/redhat/rhel_files/def_variants.yaml.rhel
++++ b/redhat/rhel_files/def_variants.yaml.rhel
+@@ -372,7 +372,6 @@ rules:
+   - fs/bcachefs/.*: modules-core
+   - fs/befs/befs.*: modules-extra
+   - fs/binfmt_misc.ko: modules-core
+-  - fs/btrfs/.*: modules-internal
+   - fs/cachefiles/.*: modules-core
+   - fs/ceph/.*: modules-core
+   - fs/coda/coda.*: modules-extra
+-- 
+2.51.0
+