Skip to content

Commit 6fead4b

Browse files
authored
Update sultan.yml: Sync with latest SUSFS and NEXT
1 parent bd61c5f commit 6fead4b

File tree

1 file changed

+5
-22
lines changed

1 file changed

+5
-22
lines changed

.github/workflows/sultan.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ jobs:
111111
112112
cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_rules.c.patch ./
113113
patch -p1 --forward --fuzz=3 < fix_rules.c.patch
114+
115+
cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_sucompat.c.patch ./
116+
patch -p1 --forward --fuzz=3 < fix_sucompat.c.patch
114117
115118
# Change to common directory and apply SUSFS patch
116119
cd ..
@@ -134,18 +137,6 @@ jobs:
134137
cp ../kernel_patches/69_hide_stuff.patch ./
135138
patch -p1 -F 3 < 69_hide_stuff.patch
136139
137-
#- name: Apply KernelSU & SUSFS Sultan Fixes
138-
# run: |
139-
# echo "Changing to configuration directory: $CONFIG..."
140-
# cd "$CONFIG"
141-
# # Apply additional patch
142-
# #sed -i "s/poofed_size: '%u'/poofed_size: '%llu'/g" ./fs/susfs.c
143-
# #sed -i "s/length of string: %u/length of string: %lu/g" ./fs/susfs.c
144-
# sed -i '1i\
145-
# #ifndef FUSE_SUPER_MAGIC\n\
146-
# #define FUSE_SUPER_MAGIC 0x65735546\n\
147-
# #endif\n' ./include/linux/susfs_def.h
148-
149140
- name: Add SUSFS Configuration Settings
150141
run: |
151142
echo "Changing to configuration directory: $CONFIG..."
@@ -198,7 +189,7 @@ jobs:
198189
cd "$CONFIG"
199190
200191
echo "Running sed commands..."
201-
sed -i 's/CONFIG_LOCALVERSION="-Sultan"/CONFIG_LOCALVERSION="-Sultan-Wild"/' ./arch/arm64/configs/${{ inputs.codename }}_defconfig
192+
sed -i 's/CONFIG_LOCALVERSION="-Sultan"/CONFIG_LOCALVERSION="-Wild"/' ./arch/arm64/configs/${{ inputs.codename }}_defconfig
202193
203194
- name: Build the Kernel
204195
run: |
@@ -219,15 +210,7 @@ jobs:
219210
220211
echo "Copying Image.lz4 and concatenating DTB files..."
221212
cp ./out/arch/arm64/boot/Image.lz4 ../AnyKernel3/Image.lz4
222-
223-
if [ "${{ inputs.codename }}" == "gs201" ]; then
224-
cat ./out/google-devices/gs201/dts/*.dtb > ../AnyKernel3/dtb
225-
#cp ./out/google-devices/gs201/dts/dtbo.img ../AnyKernel3/dtbo.img
226-
elif [ "${{ inputs.codename }}" == "zuma" ]; then
227-
cat ./out/google-devices/zuma/dts/*.dtb > ../AnyKernel3/dtb
228-
elif [ "${{ inputs.codename }}" == "zumapro" ]; then
229-
cat ./out/google-devices/zumapro/dts/*.dtb > ../AnyKernel3/dtb
230-
fi
213+
cat ./out/google-devices/${{ inputs.codename }}/dts/*.dtb > ../AnyKernel3/dtb
231214
232215
- name: Create ZIP Files for Different Formats
233216
run: |

0 commit comments

Comments
 (0)