Skip to content

Commit 8e1bf42

Browse files
Fix Build Issues
Fix comments, variables and refactor --------- Co-authored-by: fatalcoder524 <[email protected]>
1 parent 2a4a00c commit 8e1bf42

File tree

1 file changed

+27
-11
lines changed

1 file changed

+27
-11
lines changed

.github/actions/action.yml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,18 @@ runs:
4040
export DEBIAN_FRONTEND=noninteractive
4141
echo "DEBIAN_FRONTEND=noninteractive" >> "$GITHUB_ENV"
4242
df -h
43-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/local/.ghcup /opt/hostedtoolcache/CodeQL /usr/local/share/powershell /usr/share/swift || true
43+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc \
44+
/usr/local/.ghcup /opt/hostedtoolcache/CodeQL /usr/local/share/powershell \
45+
/usr/share/swift || true
4446
sudo docker image prune --all --force
4547
echo "Unused directories cleared"
46-
sudo apt-get purge -y \
47-
aria2 ansible azure-cli shellcheck rpm xorriso zsync esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable google-cloud-sdk imagemagick libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl mercurial apt-transport-https mono-complete libmysqlclient unixodbc-dev yarn chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev snmp pollinate libpq-dev postgresql-client powershell ruby-full sphinxsearch subversion mongodb-org microsoft-edge-stable || true
48+
sudo apt-get purge -y aria2 ansible azure-cli shellcheck rpm xorriso zsync \
49+
esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable google-cloud-sdk \
50+
imagemagick libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional \
51+
kubectl mercurial apt-transport-https mono-complete libmysqlclient unixodbc-dev \
52+
yarn chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 \
53+
libfontconfig1-dev snmp pollinate libpq-dev postgresql-client powershell ruby-full \
54+
sphinxsearch subversion mongodb-org microsoft-edge-stable || true
4855
sudo apt-get purge -y "$(dpkg-query -W -f='${binary:Package}\n' | grep -E '^mysql|^php|^dotnet' || true)" || true
4956
sudo apt-get autoremove -y
5057
sudo apt-get autoclean -y
@@ -57,7 +64,7 @@ runs:
5764
sudo rm -f /var/lib/apt/lists/lock /var/lib/dpkg/lock
5865
sudo apt update -qq
5966
sudo DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends \
60-
python3 git curl libelf-dev lld \
67+
python3 git curl libelf-dev libelf1 lld \
6168
build-essential flex bison libssl-dev \
6269
libncurses-dev liblz4-tool zlib1g-dev \
6370
libxml2-utils rsync unzip python3 python-is-python3
@@ -254,10 +261,11 @@ runs:
254261
echo "CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y" >> ./common/arch/arm64/configs/gki_defconfig
255262
echo "CONFIG_KSU_SUSFS_OPEN_REDIRECT=y" >> ./common/arch/arm64/configs/gki_defconfig
256263
echo "CONFIG_KSU_SUSFS_SUS_SU=n" >> ./common/arch/arm64/configs/gki_defconfig
264+
# Mountify Support
257265
echo "CONFIG_TMPFS_XATTR=y" >> ./common/arch/arm64/configs/gki_defconfig
258266
echo "CONFIG_TMPFS_POSIX_ACL=y" >> ./common/arch/arm64/configs/gki_defconfig
259267
260-
- name: Add BBR Support
268+
- name: Add BBR v1 Support
261269
shell: bash
262270
run: |
263271
echo "Changing to configuration directory: $CONFIG..."
@@ -281,6 +289,16 @@ runs:
281289
echo "CONFIG_IP6_NF_TARGET_HL=y" >> ./common/arch/arm64/configs/gki_defconfig
282290
echo "CONFIG_IP6_NF_MATCH_HL=y" >> ./common/arch/arm64/configs/gki_defconfig
283291
292+
- name: Add Build based configs
293+
shell: bash
294+
run: |
295+
echo "Changing to configuration directory: $CONFIG..."
296+
cd "$CONFIG/kernel_platform"
297+
echo "CONFIG_LTO_CLANG_THIN=y" >> ./common/arch/arm64/configs/gki_defconfig
298+
echo "CONFIG_LTO_CLANG=y" >> ./common/arch/arm64/configs/gki_defconfig
299+
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y" >> "./common/arch/arm64/configs/gki_defconfig"
300+
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=n" >> "./common/arch/arm64/configs/gki_defconfig"
301+
284302
- name: Save Build Metadata
285303
shell: bash
286304
id: save_metadata
@@ -342,8 +360,6 @@ runs:
342360
sed -i 's/CONFIG_LTO=n/CONFIG_LTO=y/' "./common/arch/arm64/configs/gki_defconfig"
343361
sed -i 's/CONFIG_LTO_CLANG_FULL=y/CONFIG_LTO_CLANG_THIN=y/' "./common/arch/arm64/configs/gki_defconfig"
344362
sed -i 's/CONFIG_LTO_CLANG_NONE=y/CONFIG_LTO_CLANG_THIN=y/' "./common/arch/arm64/configs/gki_defconfig"
345-
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y" >> "./common/arch/arm64/configs/gki_defconfig"
346-
echo "CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=n" >> "./common/arch/arm64/configs/gki_defconfig"
347363
348364
sed -i 's/check_defconfig//' ./common/build.config.gki
349365
tac ./common/scripts/setlocalversion | sed '0,/echo "\$res"/s//res="-${{ env.ANDROID_VER }}-OP-Wild"\;echo "\$res"\;/' | tac > ./common/scripts/setlocalversion.tmp && mv ./common/scripts/setlocalversion.tmp ./common/scripts/setlocalversion
@@ -456,17 +472,17 @@ runs:
456472
USE_LLVM_IAS=true
457473
fi
458474
cd "$KERNEL_PATH/common" || exit 1
459-
MAKE_ARGS="LLVM=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- \
475+
MAKE_ARGS="LLVM=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- \
460476
RUSTC=$KERNEL_PATH/prebuilts/rust/linux-x86/1.73.0b/bin/rustc \
461477
PAHOLE=$KERNEL_PATH/prebuilts/kernel-build-tools/linux-x86/bin/pahole \
462478
LD=ld.lld HOSTLD=ld.lld"
463479
if [[ -v USE_LLVM_IAS ]]; then
464480
MAKE_ARGS="LLVM_IAS=1 $MAKE_ARGS"
465481
fi
466482
467-
make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin" gki_defconfig || exit 1
468-
make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin" || exit 1
469-
483+
make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" gki_defconfig || exit 1
484+
make -j$(nproc --all) O=out $MAKE_ARGS KCFLAGS+="-Wno-error -O2 -flto=thin -fno-stack-protector" || exit 1
485+
470486
- name: Create Kernel ZIP
471487
id: create_zip
472488
shell: bash

0 commit comments

Comments
 (0)