From 76900e0234cf9d80da8f99f4a1ec6e3b5312669b Mon Sep 17 00:00:00 2001
From: mecyanned <99465700+mecyanned@users.noreply.github.com>
Date: Wed, 8 Apr 2026 13:33:41 +0400
Subject: [PATCH 1/5] Update q2q.sh to use fold4 as source

---
 objectives/q2q/q2q.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/objectives/q2q/q2q.sh b/objectives/q2q/q2q.sh
index 3cf71169..41c9e0a6 100644
--- a/objectives/q2q/q2q.sh
+++ b/objectives/q2q/q2q.sh
@@ -26,13 +26,13 @@ PLATFORM="sm8350"
 
 # Stock firmware details for download
 STOCK_MODEL="SM-F926B"
-STOCK_CSC="EUX"
+STOCK_CSC="XSG"
 STOCK_IMEI="353249141751335"
 
 # Source firmware details for download
-MODEL="SM-F926B"
-CSC="EUX"
-IMEI="353249141751335"
+MODEL="SM-F936B"
+CSC="XSG"
+IMEI="351843261422552"
 
 # Extra firmware (Optional) details for download
 EXTRA_MODEL=""

From dee559ebd8fd97f105c77ed4075fb1f83f164990 Mon Sep 17 00:00:00 2001
From: mecyanned <99465700+mecyanned@users.noreply.github.com>
Date: Wed, 8 Apr 2026 13:36:38 +0400
Subject: [PATCH 2/5] Update q2q.sh

---
 objectives/q2q/q2q.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/objectives/q2q/q2q.sh b/objectives/q2q/q2q.sh
index 41c9e0a6..ae0a618b 100644
--- a/objectives/q2q/q2q.sh
+++ b/objectives/q2q/q2q.sh
@@ -63,17 +63,17 @@ FILESYSTEM=ext4
 # DEVICE_MDNIE_MODE=""                          # Samsung mDnie color profile
 
 ### Audio
-# DEVICE_HAVE_DUAL_SPEAKER=""                   # true for Stereo, false for Mono
+DEVICE_HAVE_DUAL_SPEAKER="true"                   # true for Stereo, false for Mono
 
 ### Extra features
-# DEVICE_HAVE_SPEN_SUPPORT=""                   # Device have SPen support
-# DEVICE_HAVE_ESIM_SUPPORT=""                   # Device have esim support
+DEVICE_HAVE_SPEN_SUPPORT="true"                   # Device have SPen support
+DEVICE_HAVE_ESIM_SUPPORT="true"                   # Device have esim support
 # DEVICE_HAVE_NPU=""                            # Device have NPU
 
 ### Build Properties
 # DEVICE_FIRST_API_VERSION=""                   # ro.vendor.build.version.release
 # DEVICE_FIRST_SDK_VERSION=""                   # ro.vendor.build.version.sdk
-# DEVICE_VNDK_VERSION=""                        # VNDK version
+DEVICE_VNDK_VERSION="30"                        # VNDK version
 # DEVICE_SINGLE_SYSTEM_IMAGE=""                 # ro.product.system.device
 
 ### External

From 8a64a3ded3b0091a911f9c61f1cbf38970384e77 Mon Sep 17 00:00:00 2001
From: mecyanned <99465700+mecyanned@users.noreply.github.com>
Date: Fri, 10 Apr 2026 16:23:03 +0400
Subject: [PATCH 3/5] Update q2q.sh

---
 objectives/q2q/q2q.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/objectives/q2q/q2q.sh b/objectives/q2q/q2q.sh
index ae0a618b..07b429fd 100644
--- a/objectives/q2q/q2q.sh
+++ b/objectives/q2q/q2q.sh
@@ -53,9 +53,9 @@ FILESYSTEM=ext4
 # DEVICE_SIOP_POLICY_FILENAME=""                # Thermal/SIOP policy filename
 
 ### Display
-  DEVICE_DISPLAY_HFR_MODE="2"                   # High Frame Rate Mode (0=60Hz)
+# DEVICE_DISPLAY_HFR_MODE="2"                   # High Frame Rate Mode (0=60Hz)
 # DEVICE_HAVE_HIGH_REFRESH_RATE=""              # Device have high refresh rate or not
-  DEVICE_DISPLAY_REFRESH_RATE_VALUES_HZ="60,120" # Supported rates by display (e.g., 60,120)
+# DEVICE_DISPLAY_REFRESH_RATE_VALUES_HZ="60,120" # Supported rates by display (e.g., 60,120)
 # DEVICE_DEFAULT_REFRESH_RATE=""                # Initial boot refresh rate
 # DEVICE_HAVE_QHD_PANEL=""                      # True if QHD display device
 # DEVICE_HAVE_AMOLED_DISPLAY=""                 # True if amoled display device
@@ -63,17 +63,17 @@ FILESYSTEM=ext4
 # DEVICE_MDNIE_MODE=""                          # Samsung mDnie color profile
 
 ### Audio
-DEVICE_HAVE_DUAL_SPEAKER="true"                   # true for Stereo, false for Mono
+# DEVICE_HAVE_DUAL_SPEAKER="true"                   # true for Stereo, false for Mono
 
 ### Extra features
-DEVICE_HAVE_SPEN_SUPPORT="true"                   # Device have SPen support
-DEVICE_HAVE_ESIM_SUPPORT="true"                   # Device have esim support
+# DEVICE_HAVE_SPEN_SUPPORT="true"                   # Device have SPen support
+# DEVICE_HAVE_ESIM_SUPPORT="true"                   # Device have esim support
 # DEVICE_HAVE_NPU=""                            # Device have NPU
 
 ### Build Properties
 # DEVICE_FIRST_API_VERSION=""                   # ro.vendor.build.version.release
 # DEVICE_FIRST_SDK_VERSION=""                   # ro.vendor.build.version.sdk
-DEVICE_VNDK_VERSION="30"                        # VNDK version
+# DEVICE_VNDK_VERSION="30"                        # VNDK version
 # DEVICE_SINGLE_SYSTEM_IMAGE=""                 # ro.product.system.device
 
 ### External

From bbfe3b93f9a0dc5ec8ab3e3829c6e77800b38109 Mon Sep 17 00:00:00 2001
From: mecyanned <99465700+mecyanned@users.noreply.github.com>
Date: Sat, 11 Apr 2026 00:19:52 +0400
Subject: [PATCH 4/5] f946b base cos of f2fs (gay fs)

---
 objectives/q2q/q2q.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/objectives/q2q/q2q.sh b/objectives/q2q/q2q.sh
index 07b429fd..2e94f68c 100644
--- a/objectives/q2q/q2q.sh
+++ b/objectives/q2q/q2q.sh
@@ -30,9 +30,9 @@ STOCK_CSC="XSG"
 STOCK_IMEI="353249141751335"
 
 # Source firmware details for download
-MODEL="SM-F936B"
+MODEL="SM-F946B"
 CSC="XSG"
-IMEI="351843261422552"
+IMEI="357509153259931"
 
 # Extra firmware (Optional) details for download
 EXTRA_MODEL=""

From 2d079cdd461dbaeb409466fc2f32bd3c88f13085 Mon Sep 17 00:00:00 2001
From: mecyanned <99465700+mecyanned@users.noreply.github.com>
Date: Wed, 27 May 2026 09:38:55 +0400
Subject: [PATCH 5/5] Update build_images.sh

fix build for cachyos
---
 scripts/build_images.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/build_images.sh b/scripts/build_images.sh
index a4f4e40a..a9bdb58f 100644
--- a/scripts/build_images.sh
+++ b/scripts/build_images.sh
@@ -19,7 +19,7 @@
 PARTITION_HEADROOM_PERCENT=9
 MINIMUM_RESIZE_THRESHOLD_KB=2048
 # Optics is very tiny and need much extra space to repack fine.
-OPTICS_PARTITION_EXTRA_SIZE_KB=5120
+OPTICS_PARTITION_EXTRA_SIZE_KB=51200
 
 REPACK_PARTITION()
 {
@@ -93,7 +93,13 @@ REPACK_PARTITION()
 
             # Build ext4 image using mke2fs, populate with e2fsdroid, and then make size minimum as possible
             # https://android.googlesource.com/platform/prebuilts/fullsdk-linux/platform-tools/+/83a183b4bced4377eb5817074db82885cfcae393/e2fsdroid
-            local BUILD_COMMAND="$PREBUILTS/android-tools/mke2fs.android -t ext4 -b $EXT4_BLOCK_SIZE -L '$PARTITION_MOUNT_POINT' -O ^has_journal '$OUTPUT_DIR/$PARTITION_NAME.img' $EXT4_BLOCK_COUNT"
+local BUILD_COMMAND="MKE2FS_CONFIG=/tmp/mke2fs.conf $PREBUILTS/android-tools/mke2fs.android \
+-t ext4 \
+-b $EXT4_BLOCK_SIZE \
+-L '$PARTITION_MOUNT_POINT' \
+-O sparse_super,filetype,resize_inode,dir_index,ext_attr,^has_journal \
+'$OUTPUT_DIR/$PARTITION_NAME.img' \
+$EXT4_BLOCK_COUNT"
 
             BUILD_COMMAND+=" && $PREBUILTS/android-tools/e2fsdroid -e -T 1230735600 -C '$FS_CONFIG_FILE' -S '$FILE_CONTEXTS_FILE' -a '$PARTITION_MOUNT_POINT' -f '$FIRMWARE_WORK_DIR/$PARTITION_NAME' '$OUTPUT_DIR/$PARTITION_NAME.img'"