From 1d209b976b022a5895faedba769f37d0c9226472 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Fri, 3 May 2024 23:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_action-aarch64.sh | 20 ++++++----- build_action.sh | 60 ++++++++++++++------------------- build_action_xanmod.sh | 60 ++++++++++++++------------------- config | 2 +- config-4.19.0-10-amd64 | 2 +- config-6.1.11-amd64-desktop-hwe | 2 +- config-aarch64 | 2 +- config-arm64 | 2 +- config-xanmod | 2 +- 9 files changed, 68 insertions(+), 84 deletions(-) diff --git a/build_action-aarch64.sh b/build_action-aarch64.sh index 2d8cb35..ad49431 100644 --- a/build_action-aarch64.sh +++ b/build_action-aarch64.sh @@ -11,8 +11,9 @@ VERSION=`cat /tmp/kernelversion.txt` URL=`cat /tmp/kernelurl.txt` MAINVERSION=`expr substr $VERSION 1 1` SHOWVERSION=$VERSION-arm64 -curl https://github.com/gfdgd-xi/dclc-kernel/raw/main/$SHOWVERSION/index.html | grep 404 -if [[ $? == 0 ]]; then +curl https://github.com/gfdgd-xi/gxde-kernel-manager/raw/main/l/linux-headers-$VERSION-arm64-gfdgdxi-desktop/lock | grep 404 +result=$? +if [[ $result != 0 ]]; then exit fi # install dep @@ -66,8 +67,9 @@ sudo make bindeb-pkg ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j"$CPU_CORES" cd .. mkdir "artifact" #cp ./*.deb artifact/ -git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/dclc-kernel +git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel #cd dclc-kernel +mkdir dclc-kernel mkdir dclc-kernel/$VERSION-aarch64 rm -rfv *dbg*.deb mv ./*.deb dclc-kernel/$VERSION-aarch64 @@ -85,7 +87,7 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-arm64-desktop, linux-image-$VERSION-arm64-desktop +Depends: linux-headers-$VERSION-arm64-gfdgdxi-desktop, linux-image-$VERSION-arm64-gfdgdxi-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） @@ -101,16 +103,18 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-arm64-desktop, linux-image-$VERSION-arm64-desktop +Depends: linux-headers-$VERSION-arm64-gfdgdxi-desktop, linux-image-$VERSION-arm64-gfdgdxi-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） EOF dpkg -b deb linux-kernel-dclc-gfdgdxi_${VERSION}_arm64.deb dpkg -b deb-$MAINVERSION linux-kernel-dclc-gfdgdxi-$MAINVERSION_${VERSION}_arm64.deb -cd .. -bash ./repack-zstd --scan . -./build.py +cd ../../gxde-linux-kernel +#bash ./repack-zstd --scan . +#./build.py +./move-letter-path.py ../dclc-kernel/$VERSION-aarch64/*.deb +touch l/linux-headers-$VERSION-arm64-gfdgdxi-desktop/lock git add . git config --global user.email 3025613752@qq.com git config --global user.name gfdgd-xi diff --git a/build_action.sh b/build_action.sh index a45ec59..5903e88 100644 --- a/build_action.sh +++ b/build_action.sh @@ -15,8 +15,14 @@ SHOWVERSION=$VERSION if [[ $2 == 1 ]]; then SHOWVERSION=$VERSION-hwe fi -curl https://github.com/gfdgd-xi/dclc-kernel/raw/main/$SHOWVERSION/index.html | grep 404 -if [[ $? != 0 ]]; then +if [[ $2 == 1 ]]; then + curl https://github.com/gfdgd-xi/gxde-kernel-manager/raw/main/l/linux-headers-$VERSION-amd64-gfdgdxi-desktop-hwe/lock | grep 404 + result=$? +else + curl https://github.com/gfdgd-xi/gxde-kernel-manager/raw/main/l/linux-headers-$VERSION-amd64-gfdgdxi-desktop/lock | grep 404 + result=$? +fi +if [[ $result != 0 ]]; then exit fi # install dep @@ -78,8 +84,8 @@ if [[ $2 == 1 ]]; then mkdir "artifact" #cp ./*.deb artifact/ rm -rfv "${GITHUB_WORKSPACE}/linux-$VERSION*" - git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/dclc-kernel --depth=1 - #cd dclc-kernel + git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel --depth=1 + mkdir dclc-kernel mkdir dclc-kernel/$SHOWVERSION rm -rfv *dbg*.deb mv ./*.deb dclc-kernel/$SHOWVERSION @@ -97,7 +103,7 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop-hwe, linux-image-$VERSION-amd64-desktop-hwe +Depends: linux-headers-$VERSION-amd64-gfdgdxi-desktop-hwe, linux-image-$VERSION-amd64-gfdgdxi-desktop-hwe Section: utils Installed-Size: 0 Description: 内核（虚包） @@ -116,26 +122,18 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop-hwe, linux-image-$VERSION-amd64-desktop-hwe +Depends: linux-headers-$VERSION-amd64-gfdgdxi-desktop-hwe, linux-image-$VERSION-amd64-gfdgdxi-desktop-hwe Section: utils Installed-Size: 0 Description: 内核（虚包） EOF dpkg-deb -Z xz -b deb linux-kernel-dclc-gfdgdxi-hwe_${VERSION}_amd64.deb dpkg-deb -Z xz -b deb-$MAINVERSION linux-kernel-dclc-gfdgdxi-$MAINVERSION-hwe_${VERSION}_amd64.deb - cd .. - bash ./repack-zstd --scan . - rm Packages || echo "Failed to remove packages file" - rm Packages.gz || echo "Failed to remove packages.gz file" - rm Release || echo "Failed to remove release file" - rm Release.gpg || echo "Failed to remove release.gpg file" - rm InRelease || echo "Failed to remove inrelease file" - dpkg-scanpackages --multiversion . > Packages - gzip -k -f Packages - apt-ftparchive release . > Release - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" - ./build.py + cd ../../gxde-linux-kernel + #bash ./repack-zstd --scan . + #./build.py + ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb + touch l/linux-headers-$VERSION-amd64-gfdgdxi-desktop-hwe/lock git add . #git pull git config --global user.email 3025613752@qq.com @@ -148,8 +146,9 @@ else mkdir "artifact" #cp ./*.deb artifact/ rm -rfv "${GITHUB_WORKSPACE}/linux-$VERSION*" - git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/dclc-kernel --depth=1 + git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel --depth=1 #cd dclc-kernel + mkdir dclc-kernel mkdir dclc-kernel/$VERSION rm -rfv *dbg*.deb mv ./*.deb dclc-kernel/$VERSION @@ -167,7 +166,7 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop, linux-image-$VERSION-amd64-desktop +Depends: linux-headers-$VERSION-amd64-gfdgdxi-desktop, linux-image-$VERSION-amd64-gfdgdxi-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） @@ -186,27 +185,18 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop, linux-image-$VERSION-amd64-desktop +Depends: linux-headers-$VERSION-amd64-gfdgdxi-desktop, linux-image-$VERSION-amd64-gfdgdxi-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） EOF dpkg-deb -Z xz -b deb linux-kernel-dclc-gfdgdxi_${VERSION}_amd64.deb dpkg-deb -Z xz -b deb-$MAINVERSION linux-kernel-dclc-gfdgdxi-${MAINVERSION}_${VERSION}_amd64.deb - cd .. - bash ./repack-zstd --scan . + cd ../../gxde-linux-kernel + #bash ./repack-zstd --scan . #./build.py - rm Packages || echo "Failed to remove packages file" - rm Packages.gz || echo "Failed to remove packages.gz file" - rm Release || echo "Failed to remove release file" - rm Release.gpg || echo "Failed to remove release.gpg file" - rm InRelease || echo "Failed to remove inrelease file" - dpkg-scanpackages --multiversion . > Packages - gzip -k -f Packages - apt-ftparchive release . > Release - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" - ./build.py + ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb + touch l/linux-headers-$VERSION-amd64-gfdgdxi-desktop/lock git add . #git pull git config --global user.email 3025613752@qq.com diff --git a/build_action_xanmod.sh b/build_action_xanmod.sh index 386bcaa..6d3fa46 100644 --- a/build_action_xanmod.sh +++ b/build_action_xanmod.sh @@ -20,8 +20,14 @@ SHOWVERSION=$VERSION if [[ $2 == 1 ]]; then SHOWVERSION=$VERSION-hwe fi -curl https://github.com/gfdgd-xi/dclc-kernel/raw/main/$SHOWVERSION/index.html | grep 404 -if [[ $? != 0 ]]; then +if [[ $2 == 1 ]]; then + curl https://github.com/gfdgd-xi/gxde-kernel-manager/raw/main/l/linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe/lock | grep 404 + result=$? +else + curl https://github.com/gfdgd-xi/gxde-kernel-manager/raw/main/l/linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop/lock | grep 404 + result=$? +fi +if [[ $result != 0 ]]; then exit fi # install dep @@ -65,8 +71,8 @@ if [[ $2 == 1 ]]; then cd .. mkdir "artifact" #cp ./*.deb artifact/ - git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/dclc-kernel --depth=1 - #cd dclc-kernel + git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel --depth=1 + mkdir dclc-kernel mkdir dclc-kernel/$SHOWVERSION rm -rfv *dbg*.deb mv ./*.deb dclc-kernel/$SHOWVERSION @@ -84,7 +90,7 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop-hwe, linux-image-$VERSION-amd64-desktop-hwe +Depends: linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe, linux-image-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe Section: utils Installed-Size: 0 Description: 内核（虚包） @@ -103,26 +109,18 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop-hwe, linux-image-$VERSION-amd64-desktop-hwe +Depends: linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe, linux-image-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe Section: utils Installed-Size: 0 Description: 内核（虚包） EOF dpkg-deb -Z xz -b deb linux-kernel-dclc-gfdgdxi-xanmod-hwe_${VERSION}_amd64.deb dpkg-deb -Z xz -b deb-$MAINVERSION-xanmod linux-kernel-dclc-gfdgdxi-xanmod-$MAINVERSION-hwe_${VERSION}_amd64.deb - cd .. - bash ./repack-zstd --scan . - rm Packages || echo "Failed to remove packages file" - rm Packages.gz || echo "Failed to remove packages.gz file" - rm Release || echo "Failed to remove release file" - rm Release.gpg || echo "Failed to remove release.gpg file" - rm InRelease || echo "Failed to remove inrelease file" - dpkg-scanpackages --multiversion . > Packages - gzip -k -f Packages - apt-ftparchive release . > Release - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" - ./build.py + cd ../../gxde-linux-kernel + #bash ./repack-zstd --scan . + #./build.py + ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb + touch l/linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe/lock git add . #git pull git config --global user.email 3025613752@qq.com @@ -134,7 +132,7 @@ else cd .. mkdir "artifact" #cp ./*.deb artifact/ - git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/dclc-kernel --depth=1 + git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-kernel-manager --depth=1 #cd dclc-kernel mkdir dclc-kernel/$VERSION rm -rfv *dbg*.deb @@ -153,7 +151,7 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop, linux-image-$VERSION-amd64-desktop +Depends: linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop, linux-image-$VERSION-amd64-xanmod-gfdgdxi-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） @@ -172,26 +170,18 @@ Certainty: possible Check: binaries Type: binary, udeb Priority: optional -Depends: linux-headers-$VERSION-amd64-desktop, linux-image-$VERSION-amd64-desktop +Depends: linux-headers-$VERSION-amd64-xanmod-desktop, linux-image-$VERSION-amd64-xanmod-desktop Section: utils Installed-Size: 0 Description: 内核（虚包） EOF dpkg-deb -Z xz -b deb linux-kernel-dclc-gfdgdxi-xanmod_${VERSION}_amd64.deb dpkg-deb -Z xz -b deb-$MAINVERSION-xanmod linux-kernel-dclc-gfdgdxi-xanmod-$MAINVERSION_${VERSION}_amd64.deb - cd .. - bash ./repack-zstd --scan . - rm Packages || echo "Failed to remove packages file" - rm Packages.gz || echo "Failed to remove packages.gz file" - rm Release || echo "Failed to remove release file" - rm Release.gpg || echo "Failed to remove release.gpg file" - rm InRelease || echo "Failed to remove inrelease file" - dpkg-scanpackages --multiversion . > Packages - gzip -k -f Packages - apt-ftparchive release . > Release - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" -abs -o - Release > Release.gpg || error "failed to sign Release.gpg with gpg " - gpg --default-key "3025613752@qq.com" --batch --pinentry-mode="loopback" --passphrase="$KEYPASSWORD" --clearsign -o - Release > InRelease || error "failed to sign InRelease with gpg" - ./build.py + cd ../../gxde-linux-kernel + #bash ./repack-zstd --scan . + #./build.py + ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb + touch l/linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop/lock git add . #git pull git config --global user.email 3025613752@qq.com diff --git a/config b/config index d6cc355..4f95ac3 100644 --- a/config +++ b/config @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-amd64-desktop" +CONFIG_LOCALVERSION="-amd64-gfdgdxi-desktop" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="6.3.5-amd64-desktop" CONFIG_HAVE_KERNEL_GZIP=y diff --git a/config-4.19.0-10-amd64 b/config-4.19.0-10-amd64 index a1635fd..c25eff2 100644 --- a/config-4.19.0-10-amd64 +++ b/config-4.19.0-10-amd64 @@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-amd64-desktop" +CONFIG_LOCALVERSION="-amd64-gfdgdxi-desktop" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="4.19.0-10-amd64-desktop" CONFIG_HAVE_KERNEL_GZIP=y diff --git a/config-6.1.11-amd64-desktop-hwe b/config-6.1.11-amd64-desktop-hwe index 8a7e5c9..a0d3ed8 100644 --- a/config-6.1.11-amd64-desktop-hwe +++ b/config-6.1.11-amd64-desktop-hwe @@ -29,7 +29,7 @@ CONFIG_TT_SCHED=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set -CONFIG_LOCALVERSION="-amd64-desktop-hwe" +CONFIG_LOCALVERSION="-amd64-gfdgdxi-desktop-hwe" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="6.1.0-amd64-desktop-hwe" CONFIG_HAVE_KERNEL_GZIP=y diff --git a/config-aarch64 b/config-aarch64 index c114296..4cf2e53 100644 --- a/config-aarch64 +++ b/config-aarch64 @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-arm64-desktop" +CONFIG_LOCALVERSION="-arm64-gfdgdxi-desktop" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="6.3.5-arm64-desktop" CONFIG_HAVE_KERNEL_GZIP=y diff --git a/config-arm64 b/config-arm64 index 0e3a3b5..849fe44 100644 --- a/config-arm64 +++ b/config-arm64 @@ -19,7 +19,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="arm64-desktop" +CONFIG_LOCALVERSION="arm64-gfdgdxi-desktop" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="4.19.0-6-arm64" CONFIG_DEFAULT_HOSTNAME="(none)" diff --git a/config-xanmod b/config-xanmod index e265a50..5c15348 100644 --- a/config-xanmod +++ b/config-xanmod @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-amd64-xanmod-desktop" +CONFIG_LOCALVERSION="-amd64-xanmod-gfdgdxi-desktop" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="6.3.5-amd64-xanmod-desktop" CONFIG_HAVE_KERNEL_GZIP=y