Skip to content

Commit

Permalink
proton-builder: clean up builder
Browse files Browse the repository at this point in the history
* Made changes in make command, only invocations were now stored in make.txt.
* Removed antman from neutron-clang, as it wasn't really necessary now.

Signed-off-by: Carlo Dandan <carlodandan.personal@proton.me>
  • Loading branch information
carlodandan committed Aug 28, 2023
1 parent a250e92 commit 1000328
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/kernel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,13 @@ jobs:
- name: Packages
run: |
sudo apt-get update
sudo apt-get install libarchive-tools git ccache automake flex lzop bison gperf build-essential zip curl zlib1g-dev g++-multilib libxml2-utils bzip2 libbz2-dev libbz2-1.0 libghc-bzlib-dev squashfs-tools pngcrush schedtool dpkg-dev liblz4-tool make optipng maven libssl-dev pwgen libswitch-perl policycoreutils minicom libxml-sax-base-perl libxml-simple-perl bc libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libgl1-mesa-dev xsltproc unzip device-tree-compiler python2 python3
sudo apt-get install git ccache automake flex lzop bison gperf build-essential zip curl zlib1g-dev g++-multilib libxml2-utils bzip2 libbz2-dev libbz2-1.0 libghc-bzlib-dev squashfs-tools pngcrush schedtool dpkg-dev liblz4-tool make optipng maven libssl-dev pwgen libswitch-perl policycoreutils minicom libxml-sax-base-perl libxml-simple-perl bc libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libgl1-mesa-dev xsltproc unzip device-tree-compiler python2 python3
- name: Setup Proton
run: |
mkdir -p android && cd android
git config --global advice.detachedHead false
git clone --depth=1 https://github.com/kdrag0n/proton-clang -b ${{ github.event.inputs.PROTON_RELEASE }} ./toolchains/proton-clang
cd toolchains/proton-clang
curl -LO "https://raw.githubusercontent.com/Neutron-Toolchains/antman/main/antman"
bash antman --patch=glibc
- name: Clone Kernel Tree
run: |
Expand All @@ -62,8 +60,8 @@ jobs:
run: |
PATH="${GITHUB_WORKSPACE}/android/toolchains/proton-clang/bin:/bin:$PATH"
cd android/kernel
${{ env.MAKE }} ${{ github.event.inputs.KERNEL_DEFCONFIG }}
${{ env.MAKE }} -j"$(nproc --all)"
make ${{ env.MAKE }} ${{ github.event.inputs.KERNEL_DEFCONFIG }}
make ${{ env.MAKE }} -j"$(nproc --all)"
- name: Check Kernel
run: |
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ Compile your first custom kernel using [proton-clang](https://github.com/kdrag0n

### Builder Notes
* The last proton-clang release is the current branch, `master`. If you want to build with much older release, choose your own tag.
* The builder uses antman from [neutron-clang](https://github.com/Neutron-Toolchains) to patch glibc incase clang requires v2.36+ in compiling, since the default glibc package from Debian/Ubuntu (latest, in gitaction) were at 2.35 only.
* To change invocations for make command, just edit make.txt, change it how ever you want.
* Builder uses osm0sis' AnyKernel3 template but with modified (just a bit) anykernel.sh - device checking were set to 0. Flash at your own risk.
2 changes: 1 addition & 1 deletion make.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
make O=out ARCH=arm64 LLVM=1 CROSS_COMPILE=aarch64-linux-gnu CROSS_COMPILE_COMPAT=arm-linux-gnueabi
O=out ARCH=arm64 LLVM=1 CROSS_COMPILE=aarch64-linux-gnu CROSS_COMPILE_COMPAT=arm-linux-gnueabi

0 comments on commit 1000328

Please sign in to comment.