From 5a2568d27bec67ad4096619aa8d682679fa8c2f3 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sun, 5 May 2024 13:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhwe=E5=86=85=E6=A0=B8?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8E=A8=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_action-aarch64.sh |  4 +++-
 build_action.sh         | 10 +++++++---
 build_action_xanmod.sh  | 10 +++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build_action-aarch64.sh b/build_action-aarch64.sh
index 3787e85..5811090 100644
--- a/build_action-aarch64.sh
+++ b/build_action-aarch64.sh
@@ -71,11 +71,13 @@ git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel
 #cd dclc-kernel
 mkdir dclc-kernel
 mkdir dclc-kernel/$VERSION-aarch64
+mkdir dclc-kernel/head
 rm -rfv *dbg*.deb
 mv ./*.deb dclc-kernel/$VERSION-aarch64
 cd dclc-kernel/$VERSION-aarch64
 cd ..
 cd head
+mkdir deb/DEBIAN -vp
 cat > deb-/DEBIAN/control <<EOF
 Package: linux-kernel-dclc-gfdgdxi
 Version: $VERSION
@@ -110,7 +112,7 @@ 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 ..//gxde-linux-kernel
+cd ../../gxde-linux-kernel
 #bash ./repack-zstd --scan .
 #./build.py
 ./move-letter-path.py ../dclc-kernel/$VERSION-aarch64/*.deb
diff --git a/build_action.sh b/build_action.sh
index d93fa34..4be0e19 100644
--- a/build_action.sh
+++ b/build_action.sh
@@ -86,11 +86,13 @@ if [[ $2 == 1 ]]; then
     git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel --depth=1
     mkdir dclc-kernel
     mkdir dclc-kernel/$SHOWVERSION
+    mkdir dclc-kernel/head
     rm -rfv *dbg*.deb
     mv ./*.deb dclc-kernel/$SHOWVERSION
     cd dclc-kernel/$SHOWVERSION
     cd ..
     cd head
+    mkdir deb/DEBIAN -vp
     cat > deb/DEBIAN/control <<EOF
 Package: linux-kernel-gxde-gfdgdxi-hwe
 Version: $VERSION
@@ -128,10 +130,10 @@ 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 ../gxde-linux-kernel
+    cd ../../gxde-linux-kernel
     #bash ./repack-zstd --scan .
     #./build.py
-    ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb
+    ./move-letter-path.py ../dclc-kernel/$SHOWVERSION/*.deb
     ./move-letter-path.py ../dclc-kernel/head/*.deb
     touch l/linux-headers-$VERSION-amd64-gfdgdxi-desktop-hwe/lock
     rm -rfv l/linux-libc-dev/
@@ -151,11 +153,13 @@ else
     #cd dclc-kernel
     mkdir dclc-kernel
     mkdir dclc-kernel/$VERSION
+    mkdir dclc-kernel/head
     rm -rfv *dbg*.deb
     mv ./*.deb dclc-kernel/$VERSION
     cd dclc-kernel/$VERSION
     cd ..
     cd head
+    mkdir deb/DEBIAN -vp
     cat > deb/DEBIAN/control <<EOF
 Package: linux-kernel-dclc-gfdgdxi
 Version: $VERSION
@@ -193,7 +197,7 @@ 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 ../gxde-linux-kernel
+    cd ../../gxde-linux-kernel
     #bash ./repack-zstd --scan .
     #./build.py
     ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb
diff --git a/build_action_xanmod.sh b/build_action_xanmod.sh
index 9a39895..043d0bb 100644
--- a/build_action_xanmod.sh
+++ b/build_action_xanmod.sh
@@ -73,11 +73,13 @@ if [[ $2 == 1 ]]; then
     git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-linux-kernel --depth=1
     mkdir dclc-kernel
     mkdir dclc-kernel/$SHOWVERSION
+    mkdir dclc-kernel/head
     rm -rfv *dbg*.deb
     mv ./*.deb dclc-kernel/$SHOWVERSION
     cd dclc-kernel/$SHOWVERSION
     cd ..
     cd head
+    mkdir deb/DEBIAN -vp
     cat > deb/DEBIAN/control <<EOF
 Package: linux-kernel-gxde-gfdgdxi-xanmod-hwe
 Version: $VERSION
@@ -115,10 +117,10 @@ 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 ../gxde-linux-kernel
+    cd ../../gxde-linux-kernel
     #bash ./repack-zstd --scan .
     #./build.py
-    ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb
+    ./move-letter-path.py ../dclc-kernel/$SHOWVERSION/*.deb
     ./move-letter-path.py ../dclc-kernel/head/*.deb
     rm -rfv l/linux-libc-dev/
     touch l/linux-headers-$VERSION-amd64-xanmod-gfdgdxi-desktop-hwe/lock
@@ -136,11 +138,13 @@ else
     git clone https://gfdgd-xi:$PASSWORD@github.com/gfdgd-xi/gxde-kernel-manager --depth=1
     #cd dclc-kernel
     mkdir dclc-kernel/$VERSION
+    mkdir dclc-kernel/head
     rm -rfv *dbg*.deb
     mv ./*.deb dclc-kernel/$VERSION
     cd dclc-kernel/$VERSION
     cd ..
     cd head
+    mkdir deb/DEBIAN -vp
     cat > deb/DEBIAN/control <<EOF
 Package: linux-kernel-dclc-gfdgdxi-xanmod
 Version: $VERSION
@@ -178,7 +182,7 @@ 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 ../gxde-linux-kernel
+    cd ../../gxde-linux-kernel
     #bash ./repack-zstd --scan .
     #./build.py
     ./move-letter-path.py ../dclc-kernel/$VERSION/*.deb