diff --git a/.github/workflows/xanmod_main.yml b/.github/workflows/xanmod_main.yml index cc434c604f..4e12f338e1 100644 --- a/.github/workflows/xanmod_main.yml +++ b/.github/workflows/xanmod_main.yml @@ -52,7 +52,7 @@ jobs: echo "XANMOD_PATCH=https://sourceforge.net/projects/xanmod/files/releases/main/${XANMOD_PATCH_VER}/patch-${XANMOD_PATCH_VER}.xz/download" >> $GITHUB_ENV sudo -E rm -rf /usr/share/dotnet /etc/apt/sources.list.d /usr/local/lib/android $AGENT_TOOLSDIRECTORY || true sudo -E apt-get -y purge azure-cli ghc* zulu* llvm* firefox google* dotnet* powershell openjdk* mongodb* moby* || true - sudo -E /bin/bash -c "systemctl daemon-reload; apt-get -y autoremove --purge; apt-get -y clean" || true + sudo -E /bin/bash -c "systemctl daemon-reload; apt-get -y autoremove --purge; apt-get -y clean; apt-get update -y; apt-get -y install libpcap-dev" || true sudo -E timedatectl set-timezone "$TZ" || true - name: Checkout diff --git a/.github/workflows/xanmod_main_cloud.yml b/.github/workflows/xanmod_main_cloud.yml index 18fa115aef..a50e1f2571 100644 --- a/.github/workflows/xanmod_main_cloud.yml +++ b/.github/workflows/xanmod_main_cloud.yml @@ -53,7 +53,7 @@ jobs: echo "XANMOD_PATCH=https://sourceforge.net/projects/xanmod/files/releases/main/${XANMOD_PATCH_VER}/patch-${XANMOD_PATCH_VER}.xz/download" >> $GITHUB_ENV sudo -E rm -rf /usr/share/dotnet /etc/apt/sources.list.d /usr/local/lib/android $AGENT_TOOLSDIRECTORY || true sudo -E apt-get -y purge azure-cli ghc* zulu* llvm* firefox google* dotnet* powershell openjdk* mongodb* moby* || true - sudo -E /bin/bash -c "systemctl daemon-reload; apt-get -y autoremove --purge; apt-get -y clean" || true + sudo -E /bin/bash -c "systemctl daemon-reload; apt-get -y autoremove --purge; apt-get -y clean; apt-get update -y; apt-get -y install libpcap-dev" || true sudo -E timedatectl set-timezone "$TZ" || true - name: Checkout diff --git a/build_xanmod_docker.sh b/build_xanmod_docker.sh index 8f333471bf..13a4b63591 100755 --- a/build_xanmod_docker.sh +++ b/build_xanmod_docker.sh @@ -9,7 +9,7 @@ export PATH="/opt/llvm19_krl/llvm-19.1.4-x86_64/bin/:$PATH" ## https://blobfolio.com/2024/building-a-custom-xanmod-kernel-on-ubuntu-23-10/ apt update -y && apt install -y curl libc6 libgcc-s1 libicu-dev liblzma5 libstdc++6 libxml2 libzstd1 zlib1g xz-utils && \ apt install -y --no-install-recommends fakeroot build-essential git wget openssl libssl-dev ca-certificates libncurses-dev zstd xz-utils flex libelf-dev bison bc debhelper rsync kmod cpio gpg pahole python3 && \ - apt install -y python3 pkg-config libdwarf-dev libdw-dev systemtap-sdt-dev libunwind-dev python3-dev libzstd-dev libcap-dev libnuma-dev libtraceevent-dev uuid-dev libpfm4-dev libbfd-dev libbabeltrace-dev libperl-dev libpci-dev && \ + apt install -y python3 pkg-config libdwarf-dev libdw-dev systemtap-sdt-dev libunwind-dev python3-dev libzstd-dev libcap-dev libnuma-dev libtraceevent-dev uuid-dev libpfm4-dev libbfd-dev libbabeltrace-dev libperl-dev libpci-dev libpcap-dev && \ apt-get clean curl -L https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-19.1.4-x86_64.tar.xz -o /dev/shm/llvm19.tar.xz diff --git a/build_xanmod_kernel.sh b/build_xanmod_kernel.sh index 0031855246..3b51a1b65a 100755 --- a/build_xanmod_kernel.sh +++ b/build_xanmod_kernel.sh @@ -41,8 +41,12 @@ sed -i "s/KBUILD_CFLAGS += -O2/KBUILD_CFLAGS += -O3/g" arch/x86/Makefile cat arch/x86/Makefile | grep KBUILD_CFLAGS # build kernel -cp -a CONFIGS/xanmod/gcc/${XANMOD_CONFIG} .config +[ -e "CONFIGS/xanmod/gcc/${XANMOD_CONFIG}" ] && cp -a CONFIGS/xanmod/gcc/${XANMOD_CONFIG} .config +[ -e "CONFIGS/x86_64/config" ] && cp -a CONFIGS/x86_64/config .config + export MAIN_KCONFIG_FILE=.config +sed -i 's/x64v3/x64v2/g' ${MAIN_KCONFIG_FILE} +sed -i 's/CONFIG_X86_64_VERSION=3/CONFIG_X86_64_VERSION=2/g' ${MAIN_KCONFIG_FILE} sed -i 's/CONFIG_X86_MSR=[mny]/CONFIG_X86_MSR=y/g' ${MAIN_KCONFIG_FILE} sed -i 's/CONFIG_X86_CPUID=[mny]/CONFIG_X86_CPUID=y/g' ${MAIN_KCONFIG_FILE} @@ -94,7 +98,7 @@ sed -i 's/CONFIG_SURFACE_PLATFORMS=[mny]/CONFIG_SURFACE_PLATFORMS=n/g' ${MAIN_K sed -i 's/CONFIG_AGP=[mny]/CONFIG_AGP=n/g' ${MAIN_KCONFIG_FILE} sed -i 's/CONFIG_ACPI_VIDEO=[mny]/CONFIG_ACPI_VIDEO=n/g' ${MAIN_KCONFIG_FILE} sed -i 's/CONFIG_VGA_ARB=[mny]/CONFIG_VGA_ARB=n/g' ${MAIN_KCONFIG_FILE} - + # ktls sed -i 's/CONFIG_TLS=[mny]/CONFIG_TLS=m/g' ${MAIN_KCONFIG_FILE} sed -i 's/CONFIG_CRYPTO_RSA=[mny]/CONFIG_CRYPTO_RSA=m/g' ${MAIN_KCONFIG_FILE} @@ -395,10 +399,10 @@ if [[ "$BUILD_TYPE" == "cloud" ]]; then #sed -i 's/CONFIG_GART_IOMMU=[mny]/CONFIG_GART_IOMMU=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_X86_PLATFORM_DEVICES=[mny]/CONFIG_X86_PLATFORM_DEVICES=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_ACPI_AC=[mny]/CONFIG_ACPI_AC=n/g' ${MAIN_KCONFIG_FILE} - sed -i 's/CONFIG_ACPI_BATTERY=[mny]/CONFIG_ACPI_BATTERY=n/g' ${MAIN_KCONFIG_FILE} + sed -i 's/CONFIG_ACPI_BATTERY=[mny]/CONFIG_ACPI_BATTERY=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_ACPI_IPMI=[mny]/CONFIG_ACPI_IPMI=n/g' ${MAIN_KCONFIG_FILE} - sed -i 's/CONFIG_ACPI_BGRT=[mny]/CONFIG_ACPI_BGRT=n/g' ${MAIN_KCONFIG_FILE} - sed -i 's/CONFIG_ACPI_NHLT=[mny]/CONFIG_ACPI_NHLT=n/g' ${MAIN_KCONFIG_FILE} + sed -i 's/CONFIG_ACPI_BGRT=[mny]/CONFIG_ACPI_BGRT=n/g' ${MAIN_KCONFIG_FILE} + sed -i 's/CONFIG_ACPI_NHLT=[mny]/CONFIG_ACPI_NHLT=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_ACPI_DPTF=[mny]/CONFIG_ACPI_DPTF=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_PCIE_EDR=[mny]/CONFIG_PCIE_EDR=n/g' ${MAIN_KCONFIG_FILE} #sed -i 's/CONFIG_PCI_STUB=[mny]/CONFIG_PCI_STUB=n/g' ${MAIN_KCONFIG_FILE} @@ -786,6 +790,7 @@ sed -i 's/CONFIG_IA32_EMULATION=[mny]/CONFIG_IA32_EMULATION=n/g' ${MAIN_K # reduce size sed -i '/^CONFIG_NETFILTER/s/=y/=m/' ${MAIN_KCONFIG_FILE} +sed -i 's/CONFIG_ACPI_CMPC=[mny]/CONFIG_ACPI_CMPC=n/g' ${MAIN_KCONFIG_FILE} sed -i '/^CONFIG_ACPI_ADXL/s/=y/=m/' ${MAIN_KCONFIG_FILE} sed -i '/^CONFIG_ACPI_APEI_EINJ/s/=y/=m/' ${MAIN_KCONFIG_FILE} sed -i '/^CONFIG_DRM_PRIVACY_SCREEN/s/=y/=n/' ${MAIN_KCONFIG_FILE} @@ -1031,12 +1036,10 @@ KDEB_COMPRESS=xz create_package $tools_packagename $tools_destdir # build x64v3 cp ${MAIN_KCONFIG_FILE} ${MAIN_KCONFIG_FILE}.v2 -if [[ $XANMOD_CONFIG =~ "-v2" ]]; then - sed -i 's/x64v2/x64v3/g' ${MAIN_KCONFIG_FILE} - sed -i 's/CONFIG_X86_64_VERSION=2/CONFIG_X86_64_VERSION=3/g' ${MAIN_KCONFIG_FILE} - make olddefconfig LLVM=1 LLVM_IAS=1 - make KDEB_COMPRESS=xz bindeb-pkg -j${PAREL_BUILD} LLVM=1 LLVM_IAS=1 -fi +sed -i 's/x64v2/x64v3/g' ${MAIN_KCONFIG_FILE} +sed -i 's/CONFIG_X86_64_VERSION=2/CONFIG_X86_64_VERSION=3/g' ${MAIN_KCONFIG_FILE} +make olddefconfig LLVM=1 LLVM_IAS=1 +make KDEB_COMPRESS=xz bindeb-pkg -j${PAREL_BUILD} LLVM=1 LLVM_IAS=1 # dbg info not need rm -f ${WORK_DIR}/*-dbg*.deb || true \ No newline at end of file diff --git a/runner/init_env.sh b/runner/init_env.sh index bd6b4ad600..9b35e04192 100644 --- a/runner/init_env.sh +++ b/runner/init_env.sh @@ -29,7 +29,7 @@ useradd -m docker && echo 'docker ALL=NOPASSWD: ALL' > /etc/sudoers.d/docker # for linux kernel build apt install -y --no-install-suggests --no-install-recommends curl libc6 libgcc-s1 libicu-dev liblzma5 libstdc++6 libxml2 libzstd1 zlib1g xz-utils \ fakeroot build-essential git wget openssl libssl-dev ca-certificates libncurses-dev zstd xz-utils flex libelf-dev bison bc debhelper rsync kmod cpio gpg pahole python3 \ - pkg-config libdwarf-dev libdw-dev systemtap-sdt-dev libunwind-dev python3-dev libzstd-dev libcap-dev libnuma-dev libtraceevent-dev uuid-dev libpfm4-dev libbfd-dev libbabeltrace-dev libperl-dev libpci-dev + pkg-config libdwarf-dev libdw-dev systemtap-sdt-dev libunwind-dev python3-dev libzstd-dev libcap-dev libnuma-dev libtraceevent-dev uuid-dev libpfm4-dev libbfd-dev libbabeltrace-dev libperl-dev libpci-dev libpcap-dev # for openwrt build apt install -y --no-install-suggests --no-install-recommends dosfstools xorriso mtools sudo ack antlr3 asciidoc autoconf make automake autopoint binutils bison btrfs-progs \