Skip to content

Commit 723f06b

Browse files
DataEraserCDataEraserC
committed
merge
1 parent 93869de commit 723f06b

10 files changed

+34
-5
lines changed

‎.github/workflows/Lineage19.1_pstar_docker.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
echo "USE_CUSTOM_GCC_64=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_64" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
3939
echo "CUSTOM_GCC_64_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4040
echo "CUSTOM_GCC_64_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
41+
echo "CUSTOM_GCC_64_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4142
echo "USE_CUSTOM_GCC_32=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_32" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4243
echo "CUSTOM_GCC_32_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4344
echo "CUSTOM_GCC_32_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
45+
echo "CUSTOM_GCC_32_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4446
echo "ENABLE_KERNELSU=$(cat $CONFIG_ENV | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4547
echo "KERNELSU_TAG=$(cat $CONFIG_ENV | grep -w "KERNELSU_TAG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4648
echo "ADD_KPROBES_CONFIG=$(cat $CONFIG_ENV | grep -w "ADD_KPROBES_CONFIG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -129,9 +131,10 @@ jobs:
129131
mkdir gcc-64
130132
unzip gcc-64.zip -d gcc-64/
131133
fi
134+
echo "GCC_64=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-64/bin/${{ env.CUSTOM_GCC_64_BIN }}" >> $GITHUB_ENV
132135
fi
133136
134-
if [ ${{ env.USE_CUSTOM_GCC_64 }} = true ]; then
137+
if [ ${{ env.USE_CUSTOM_GCC_32 }} = true ]; then
135138
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} =~ git ]]; then
136139
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} == *'.tar.gz' ]]; then
137140
wget -O gcc-32.tar.gz ${{ env.CUSTOM_CLANG_SOURCE }}
@@ -145,6 +148,7 @@ jobs:
145148
mkdir gcc-32
146149
unzip gcc-32.zip -d gcc-32/
147150
fi
151+
echo "GCC_32=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-32/bin/${{ env.CUSTOM_GCC_32_BIN }}" >> $GITHUB_ENV
148152
fi
149153
150154
- name: Download mkbootimg tools

‎.github/workflows/Lineage19.1_pstar_kernelsu.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
echo "USE_CUSTOM_GCC_64=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_64" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
3939
echo "CUSTOM_GCC_64_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4040
echo "CUSTOM_GCC_64_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
41+
echo "CUSTOM_GCC_64_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4142
echo "USE_CUSTOM_GCC_32=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_32" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4243
echo "CUSTOM_GCC_32_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4344
echo "CUSTOM_GCC_32_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
45+
echo "CUSTOM_GCC_32_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4446
echo "ENABLE_KERNELSU=$(cat $CONFIG_ENV | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4547
echo "KERNELSU_TAG=$(cat $CONFIG_ENV | grep -w "KERNELSU_TAG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4648
echo "ADD_KPROBES_CONFIG=$(cat $CONFIG_ENV | grep -w "ADD_KPROBES_CONFIG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -129,9 +131,10 @@ jobs:
129131
mkdir gcc-64
130132
unzip gcc-64.zip -d gcc-64/
131133
fi
134+
echo "GCC_64=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-64/bin/${{ env.CUSTOM_GCC_64_BIN }}" >> $GITHUB_ENV
132135
fi
133136
134-
if [ ${{ env.USE_CUSTOM_GCC_64 }} = true ]; then
137+
if [ ${{ env.USE_CUSTOM_GCC_32 }} = true ]; then
135138
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} =~ git ]]; then
136139
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} == *'.tar.gz' ]]; then
137140
wget -O gcc-32.tar.gz ${{ env.CUSTOM_CLANG_SOURCE }}
@@ -145,6 +148,7 @@ jobs:
145148
mkdir gcc-32
146149
unzip gcc-32.zip -d gcc-32/
147150
fi
151+
echo "GCC_32=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-32/bin/${{ env.CUSTOM_GCC_32_BIN }}" >> $GITHUB_ENV
148152
fi
149153
150154
- name: Download mkbootimg tools

‎.github/workflows/Lineage19.1_pstar_kernelsu_docker.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
echo "USE_CUSTOM_GCC_64=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_64" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
3939
echo "CUSTOM_GCC_64_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4040
echo "CUSTOM_GCC_64_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
41+
echo "CUSTOM_GCC_64_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4142
echo "USE_CUSTOM_GCC_32=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_32" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4243
echo "CUSTOM_GCC_32_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4344
echo "CUSTOM_GCC_32_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
45+
echo "CUSTOM_GCC_32_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4446
echo "ENABLE_KERNELSU=$(cat $CONFIG_ENV | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4547
echo "KERNELSU_TAG=$(cat $CONFIG_ENV | grep -w "KERNELSU_TAG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4648
echo "ADD_KPROBES_CONFIG=$(cat $CONFIG_ENV | grep -w "ADD_KPROBES_CONFIG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -124,9 +126,10 @@ jobs:
124126
mkdir gcc-64
125127
unzip gcc-64.zip -d gcc-64/
126128
fi
129+
echo "GCC_64=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-64/bin/${{ env.CUSTOM_GCC_64_BIN }}" >> $GITHUB_ENV
127130
fi
128131
129-
if [ ${{ env.USE_CUSTOM_GCC_64 }} = true ]; then
132+
if [ ${{ env.USE_CUSTOM_GCC_32 }} = true ]; then
130133
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} =~ git ]]; then
131134
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} == *'.tar.gz' ]]; then
132135
wget -O gcc-32.tar.gz ${{ env.CUSTOM_CLANG_SOURCE }}

‎.github/workflows/Lineage20_pstar.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
echo "USE_CUSTOM_GCC_64=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_64" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
3939
echo "CUSTOM_GCC_64_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4040
echo "CUSTOM_GCC_64_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
41+
echo "CUSTOM_GCC_64_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4142
echo "USE_CUSTOM_GCC_32=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_32" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4243
echo "CUSTOM_GCC_32_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4344
echo "CUSTOM_GCC_32_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
45+
echo "CUSTOM_GCC_32_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4446
echo "ENABLE_KERNELSU=$(cat $CONFIG_ENV | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4547
echo "KERNELSU_TAG=$(cat $CONFIG_ENV | grep -w "KERNELSU_TAG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4648
echo "ADD_KPROBES_CONFIG=$(cat $CONFIG_ENV | grep -w "ADD_KPROBES_CONFIG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -129,9 +131,10 @@ jobs:
129131
mkdir gcc-64
130132
unzip gcc-64.zip -d gcc-64/
131133
fi
134+
echo "GCC_64=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-64/bin/${{ env.CUSTOM_GCC_64_BIN }}" >> $GITHUB_ENV
132135
fi
133136
134-
if [ ${{ env.USE_CUSTOM_GCC_64 }} = true ]; then
137+
if [ ${{ env.USE_CUSTOM_GCC_32 }} = true ]; then
135138
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} =~ git ]]; then
136139
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} == *'.tar.gz' ]]; then
137140
wget -O gcc-32.tar.gz ${{ env.CUSTOM_CLANG_SOURCE }}
@@ -145,6 +148,7 @@ jobs:
145148
mkdir gcc-32
146149
unzip gcc-32.zip -d gcc-32/
147150
fi
151+
echo "GCC_32=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-32/bin/${{ env.CUSTOM_GCC_32_BIN }}" >> $GITHUB_ENV
148152
fi
149153
150154
- name: Download mkbootimg tools

‎.github/workflows/Lineage20_pstar_kernelsu.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ jobs:
3838
echo "USE_CUSTOM_GCC_64=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_64" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
3939
echo "CUSTOM_GCC_64_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4040
echo "CUSTOM_GCC_64_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
41+
echo "CUSTOM_GCC_64_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_64_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4142
echo "USE_CUSTOM_GCC_32=$(cat $CONFIG_ENV | grep -w "USE_CUSTOM_GCC_32" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4243
echo "CUSTOM_GCC_32_SOURCE=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_SOURCE" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4344
echo "CUSTOM_GCC_32_BRANCH=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BRANCH" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
45+
echo "CUSTOM_GCC_32_BIN=$(cat $CONFIG_ENV | grep -w "CUSTOM_GCC_32_BIN" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4446
echo "ENABLE_KERNELSU=$(cat $CONFIG_ENV | grep -w "ENABLE_KERNELSU" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4547
echo "KERNELSU_TAG=$(cat $CONFIG_ENV | grep -w "KERNELSU_TAG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
4648
echo "ADD_KPROBES_CONFIG=$(cat $CONFIG_ENV | grep -w "ADD_KPROBES_CONFIG" | head -n 1 | cut -d "=" -f 2)" >> $GITHUB_ENV
@@ -129,9 +131,10 @@ jobs:
129131
mkdir gcc-64
130132
unzip gcc-64.zip -d gcc-64/
131133
fi
134+
echo "GCC_64=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-64/bin/${{ env.CUSTOM_GCC_64_BIN }}" >> $GITHUB_ENV
132135
fi
133136
134-
if [ ${{ env.USE_CUSTOM_GCC_64 }} = true ]; then
137+
if [ ${{ env.USE_CUSTOM_GCC_32 }} = true ]; then
135138
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} =~ git ]]; then
136139
if [[ ${{ env.CUSTOM_GCC_32_SOURCE }} == *'.tar.gz' ]]; then
137140
wget -O gcc-32.tar.gz ${{ env.CUSTOM_CLANG_SOURCE }}
@@ -145,6 +148,7 @@ jobs:
145148
mkdir gcc-32
146149
unzip gcc-32.zip -d gcc-32/
147150
fi
151+
echo "GCC_32=CROSS_COMPILE=$GITHUB_WORKSPACE/kernel_workspace/gcc-32/bin/${{ env.CUSTOM_GCC_32_BIN }}" >> $GITHUB_ENV
148152
fi
149153
150154
- name: Download mkbootimg tools

‎Lineage19.1_pstar_docker.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ ENABLE_GCC_ARM32=true
2626
USE_CUSTOM_GCC_64=false
2727
CUSTOM_GCC_64_SOURCE=
2828
CUSTOM_GCC_64_BRANCH=
29+
CUSTOM_GCC_64_BIN=aarch64-linux-android-
2930
USE_CUSTOM_GCC_32=false
3031
CUSTOM_GCC_32_SOURCE=
3132
CUSTOM_GCC_32_BRANCH=
33+
CUSTOM_GCC_32_BIN=arm-linux-androideabi-
3234

3335
# KernelSU flags
3436
ENABLE_KERNELSU=false

‎Lineage19.1_pstar_kernelsu.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ ENABLE_GCC_ARM32=true
2626
USE_CUSTOM_GCC_64=false
2727
CUSTOM_GCC_64_SOURCE=
2828
CUSTOM_GCC_64_BRANCH=
29+
CUSTOM_GCC_64_BIN=aarch64-linux-android-
2930
USE_CUSTOM_GCC_32=false
3031
CUSTOM_GCC_32_SOURCE=
3132
CUSTOM_GCC_32_BRANCH=
33+
CUSTOM_GCC_32_BIN=arm-linux-androideabi-
3234

3335
# KernelSU flags
3436
ENABLE_KERNELSU=true

‎Lineage19.1_pstar_kernelsu_docker.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ ENABLE_GCC_ARM32=true
2626
USE_CUSTOM_GCC_64=false
2727
CUSTOM_GCC_64_SOURCE=
2828
CUSTOM_GCC_64_BRANCH=
29+
CUSTOM_GCC_64_BIN=aarch64-linux-android-
2930
USE_CUSTOM_GCC_32=false
3031
CUSTOM_GCC_32_SOURCE=
3132
CUSTOM_GCC_32_BRANCH=
33+
CUSTOM_GCC_32_BIN=arm-linux-androideabi-
3234

3335
# KernelSU flags
3436
ENABLE_KERNELSU=true

‎Lineage20_pstar.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ ENABLE_GCC_ARM32=true
2626
USE_CUSTOM_GCC_64=false
2727
CUSTOM_GCC_64_SOURCE=
2828
CUSTOM_GCC_64_BRANCH=
29+
CUSTOM_GCC_64_BIN=aarch64-linux-android-
2930
USE_CUSTOM_GCC_32=false
3031
CUSTOM_GCC_32_SOURCE=
3132
CUSTOM_GCC_32_BRANCH=
33+
CUSTOM_GCC_32_BIN=arm-linux-androideabi-
3234

3335
# KernelSU flags
3436
ENABLE_KERNELSU=false

‎Lineage20_pstar_kernelsu.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ ENABLE_GCC_ARM32=true
2626
USE_CUSTOM_GCC_64=false
2727
CUSTOM_GCC_64_SOURCE=
2828
CUSTOM_GCC_64_BRANCH=
29+
CUSTOM_GCC_64_BIN=aarch64-linux-android-
2930
USE_CUSTOM_GCC_32=false
3031
CUSTOM_GCC_32_SOURCE=
3132
CUSTOM_GCC_32_BRANCH=
33+
CUSTOM_GCC_32_BIN=arm-linux-androideabi-
3234

3335
# KernelSU flags
3436
ENABLE_KERNELSU=true

0 commit comments

Comments
 (0)