diff --git a/.github/actions/action.yml b/.github/actions/action.yml index befba1c1..a967dfc3 100644 --- a/.github/actions/action.yml +++ b/.github/actions/action.yml @@ -736,6 +736,8 @@ runs: KSU_VERSION=$(expr $COMMITS_COUNT "+" $BASE_VERSION) sed -i "s/DKSU_VERSION=11998/DKSU_VERSION=${KSU_VERSION}/" Makefile + sed -i 's/#if defined(CONFIG_STACKPROTECTOR) && (defined(CONFIG_ARM64) && !defined(CONFIG_STACKPROTECTOR_PER_TASK))/#if 0/' ksu.c + if [ "$KSU_VERSION" -lt 12884 ]; then echo "NEED_HOOKS=true" >> $GITHUB_ENV else @@ -772,6 +774,8 @@ runs: KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION) sed -i "s/DKSU_VERSION=16/DKSU_VERSION=${KSU_VERSION}/" Makefile + sed -i 's/#if defined(CONFIG_STACKPROTECTOR) && (defined(CONFIG_ARM64) && !defined(CONFIG_STACKPROTECTOR_PER_TASK))/#if 0/' ksu.c + echo "NEED_HOOKS=false" >> $GITHUB_ENV cd .. @@ -1382,7 +1386,7 @@ runs: make O="$OUT" olddefconfig - KCFLAGS="$KCFLAGS -Wno-error -pipe -fno-stack-protector ${KCFLAGS_EXTRA}" + KCFLAGS="$KCFLAGS -Wno-error -pipe ${KCFLAGS_EXTRA}" KCPPFLAGS="$KCPPFLAGS -DCONFIG_OPTIMIZE_INLINING" echo "============================================"