Skip to content

Commit

Permalink
added LXC config diff for reference
Browse files Browse the repository at this point in the history
  • Loading branch information
rvalyi committed Sep 21, 2024
1 parent 9cbfe2f commit d7a6060
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 10 deletions.
25 changes: 15 additions & 10 deletions .github/workflows/android14-5.15-SM-X910.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ jobs:
run: |
cd $GITHUB_WORKSPACE
git clone https://github.com/rvalyi/GKI-Custom.git gki-patch
cp ./gki-patch/config/gki_defconfig-android13-5.15 ./android-kernel/common/arch/arm64/configs/gki_defconfig
# FIXME FIXME FIXME: inject the LXC settings properly, see the diff I put in config...
# cp ./gki-patch/config/gki_defconfig-android13-5.15 ./android-kernel/common/arch/arm64/configs/gki_defconfig
cd ./android-kernel/common
git apply $GITHUB_WORKSPACE/gki-patch/patchs/*.patch
Expand All @@ -94,20 +95,24 @@ jobs:
head -n 10 common/Makefile
# BUILD_CONFIG=common/build.config.gki.aarch64 build/config.sh savedefconfig
# LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
# BUILD_CONFIG=common/arch/arm64/configs/kalama_gki_defconfig build/config.sh savedefconfig
# cd common
# echo "will do make mrproper"
# make mrproper
# cd ..
export ARCH=arm64
#export CROSS_COMPILE=aarch64-linux-android-
sed -i 's/CONFIG_DEBUG_INFO_BTF=y/CONFIG_DEBUG_INFO_BTF=n/' common/arch/arm64/configs/kalama_gki_defconfig
sed -i 's/CONFIG_DEBUG_INFO_BTF_MODULES=y/CONFIG_DEBUG_INFO_BTF_MODULES=n/' common/arch/arm64/configs/kalama_gki_defconfig
echo "will do savedefconfig"
BUILD_CONFIG=common/build.config.gki.aarch64 KERNEL_DEFCONFIG=kalama_gki_defconfig build/config.sh savedefconfig
echo "will do build/config.sh"
#BUILD_CONFIG=common/build.config.gki.aarch64 build/config.sh savedefconfig
BUILD_CONFIG=common/build.config.gki.aarch64 build/config.sh kalama_gki_defconfig
# BUILD_CONFIG=common/build.config.gki.aarch64 KERNEL_DEFCONFIG=kalama_gki_defconfig build/config.sh savedefconfig
ls -la .
echo "build.sh --config done"
pahole --version
echo "will build sign-file.c"
# gcc common/scripts/sign-file.c -o /home/runner/work/GKI-Custom/GKI-Custom/android-kernel/out/android13-5.15/common/scripts/sign-file -lssl -lcrypto
# ls -la /home/runner/work/GKI-Custom/GKI-Custom/android-kernel/out/android13-5.15/common/scripts/sign-file
echo "-----------------------------------"
sed -i '/build_system_dlkm/i gcc /home/runner/work/GKI-Custom/GKI-Custom/android-kernel/out/android13-5.15/common/scripts/sign-file.c -o /home/runner/work/GKI-Custom/GKI-Custom/android-kernel/out/android13-5.15/common/scripts/sign-file -lssl -lcrypto' build/build.sh
cat build/build.sh
ls /home/runner/work/GKI-Custom/GKI-Custom/android-kernel/build/
ls build
echo "***********************************"
KCFLAGS="-g0 -Wno-error" LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh -j2
- name: Prepare artifacts
Expand Down
38 changes: 38 additions & 0 deletions config/gki_defconfig-android12-5.10.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
❯ diff gki_defconfig-android12-5.10 arch/arm64/configs/gki_defconfig (from https://github.com/aosp-mirror/kernel_common/tree/android12-5.10-2024-05)
1,2d0
< CONFIG_SYSVIPC=y
< CONFIG_POSIX_MQUEUE=y
27d24
< CONFIG_CGROUP_DEVICE=y
31c28
< CONFIG_USER_NS=y
---
> # CONFIG_PID_NS is not set
100c97
< CONFIG_LTO_CLANG_THIN=y
---
> CONFIG_LTO_CLANG_FULL=y
104a102
> CONFIG_MODULE_SCMVERSION=y
169d166
< CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
184d180
< CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
233,234d228
< CONFIG_IP6_NF_NAT=y
< CONFIG_IP6_NF_TARGET_MASQUERADE=y
285d278
< CONFIG_BT_HCIVHCI=y
297d289
< CONFIG_DEVTMPFS=y
344,345d335
< # CONFIG_USB_NET_AX8817X is not set
< # CONFIG_USB_NET_AX88179_178A is not set
376a367
> # CONFIG_VT is not set
392d382
< CONFIG_NULL_TTY=y
488a479
> CONFIG_USB_XHCI_PCI_RENESAS=y
705d695
< # CONFIG_DEBUG_PREEMPT is not set

0 comments on commit d7a6060

Please sign in to comment.