调整依赖关系

update debian/control.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-08-06 12:03:58 +08:00 · 2024-11-14 22:24:13 +08:00 · 2024-11-14 12:46:27 +00:00 · 2024-11-12 23:03:55 +08:00 · 2024-11-12 22:54:17 +08:00 · 2024-11-12 22:46:45 +08:00
8 changed files with 163 additions and 16 deletions
@@ -208,7 +208,7 @@ jobs:

      - name: Configure Base System
        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://packages.gxde.org/debian-loong64/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://deb.debian.org/debian-ports/
          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/

      - name: Building ${{ GITHUB.repository }}
@@ -0,0 +1,123 @@
+name: Building GXDE Testing SID Package
+run-name: Building SID ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_call:
+    secrets:
+      PASSWD:
+        required: true
+      USERS:
+        required: true
+      HOST: 
+        required: true
+      UPATH: 
+        required: true
+      UPROGRAM: 
+        required: true
+      UPORT: 
+        required: true
+
+env:
+  REPOSITORY: https://github.com/GXDE-OS/GXDE  
+  BOTTLEPATH: system-bottle
+
+jobs:  
+  loong64:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          #apt update
+          #apt install sudo git -y
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b
+
+      - name: Remove Debug Package
+        run: |
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb
+
+      - name: Pack tar
+        run: |
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb 
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH
+          sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
+
+  
+
+  riscv64:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone Repository To Get Script
+        run: |
+          #apt update
+          #apt install sudo git -y
+          git clone $REPOSITORY --depth=1
+          mv $(basename $REPOSITORY)/* . -v
+          mv $(basename $REPOSITORY)/.* . -v | true
+
+      - name: Configure Base System
+        run: |
+          bash .github/workflows/configure-building-enviroment-base-system.sh riscv64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY 
+
+      - name: Building ${{ GITHUB.repository }}
+        run: |
+          set +e
+          env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh env GO111MODULE=off dpkg-buildpackage -b 
+
+      - name: Remove Debug Package
+        run: |
+          set +e
+          env env gitPath=$(basename $GITHUB_REPOSITORY) bash .github/workflows/run-command-in-chroot.sh rm -rfv ../*dbg*.deb 
+
+      - name: Pack tar
+        run: |
+          set +e
+          cd $BOTTLEPATH
+          sudo tar -cvf ../deb-$(date +%s).tar *.deb
+
+      - name: Push
+        env: 
+          UPASSWD: ${{ secrets.PASSWD }}
+          UUSERS: ${{ secrets.USERS }}
+          UHOST: ${{ secrets.HOST }}
+          UPATH: ${{ secrets.UPATH }}
+          UPROGRAM: ${{ secrets.UPROGRAM }}
+          UPORT: ${{ secrets.UPORT }}
+        run: |
+          set +e
+          sudo apt update
+          sudo apt install sshpass -y
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p $UPORT -H $UHOST >> ~/.ssh/known_hosts
+          tarName=$(ls | grep .tar | head -n 1)
+          if [[ $tarName != "" ]]; then
+            sshpass -p "$UPASSWD" rsync -e "ssh -p $UPORT" $tarName $UUSERS@$UHOST:$UPATH > /dev/null
+            sshpass -p "$UPASSWD" ssh $UUSERS@$UHOST -p $UPORT $UPROGRAM tianlu $UPATH/$tarName > /dev/null
+          fi
+
@@ -209,8 +209,8 @@ jobs:

      - name: Configure Base System
        run: |
-          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://packages.gxde.org/debian-loong64/
-          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 unstable $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/
+          #bash .github/workflows/configure-building-enviroment-base-system.sh loong64 sid $REPOSITORY https://github.com/$GITHUB_REPOSITORY https://deb.debian.org/debian-ports/

      - name: Building ${{ GITHUB.repository }}
        run: |
@@ -1,4 +1,4 @@
-name: Building Testing
+name: Building Program
 run-name: Building ${{ GITHUB.REPOSITORY }}

 on:
@@ -27,7 +27,10 @@ else
        useDebianPort
    fi
 fi
-sudo debootstrap --arch=$1 $2 $bottlePath $5
+sudo debootstrap --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5
+#if [[ $? != 0 ]]; then
+#    sudo debootstrap --foreign --include=git,gcc,make,debian-ports-archive-keyring,debian-archive-keyring,g++,dpkg-dev,qtbase5-dev,ca-certificates --arch=$1 $2 $bottlePath $5 
+#fi
 if [[ $? != 0 ]] && [[ $1 == loong64 ]]; then
    sudo apt install squashfs-tools git -y
    wget https://github.com/GXDE-OS/GXDE/releases/download/resources/debian-base-loong64.squashfs
@@ -42,6 +45,7 @@ if [[ $6 == "backport" ]]; then
    sudo cp -rv .github/workflows/90bookworm-backports $bottlePath/etc/apt/preferences.d/
 fi
 # 配置 git
+#echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" | sudo tee $bottlePath/etc/apt/sources.list.d/debian-unreleased.list
 sudo chroot $bottlePath apt update
 sudo chroot $bottlePath apt full-upgrade -y
 sudo chroot $bottlePath apt install git -y
@@ -23,9 +23,9 @@ else
    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/tianlu ./" >> /etc/apt/sources.list.d/gxde-os.list
    echo "deb [trusted=true] https://repo1.gxde.top/gxde-os/bixie ./" >> /etc/apt/sources.list.d/gxde-os.list
 fi
-if [[ $(dpkg --print-architecture) == "loong64" ]]; then
-    echo "deb [trusted=true] https://packages.gxde.org/debian-loong64/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
-fi
+#if [[ $(dpkg --print-architecture) == "loong64" ]]; then
+#    echo "deb [trusted=true] https://deb.debian.org/debian-ports/ unreleased main" > /etc/apt/sources.list.d/debian-unreleased.list
+#fi
 apt install debian-ports-archive-keyring debian-archive-keyring -y
 for i in {1..8};
 do
@@ -35,8 +35,8 @@ do
    fi
    sleep 1
 done
-apt install dpkg-dev sudo neofetch debian-ports-archive-keyring debian-archive-keyring -y
-neofetch
+apt install dpkg-dev sudo debian-ports-archive-keyring debian-archive-keyring -y
+#neofetch
 #if [[ `arch` != "x86_64" ]]; then
 #    apt source qemu
 #    cd qemu-*/
@@ -1,9 +1,10 @@
-gxde (2024.11.10) UNRELEASED; urgency=medium
+gxde (2024.11.14gxde1) UNRELEASED; urgency=medium

  * Change package: dde-calendar --> gxde-calendar
  * Add package: gparted
+  * Change gxde-desktop depends, gxde-desktop-extra, gxde-desktop-android depends and conflicts

- -- gfdgd_xi <3025613752@qq.com>  Sun, 10 Nov 2024 11:14:38 +0800
+ -- gfdgd_xi <3025613752@qq.com>  Thu, 14 Nov 2024 22:23:21 +0800

 gxde (2024.10.20) UNRELEASED; urgency=medium

@@ -32,7 +32,9 @@ Recommends: ${misc:Depends},
 system-config-printer,
 deepin-system-monitor,
 gxde-downloader,
- gparted
+ gparted,
+ fantascene-dynamic-wallpaper,
+ x11vnc,
 Description: GXDE New Desktop Environment Extra - Next
 This is a meta package depends GXDE New Desktop Envrionment Extra.
 .
@@ -44,8 +46,20 @@ Depends:
 ${misc:Depends},
 gxde-daemon,
 gxde-desktop,
-Recommends:
- gxde-desktop-extra
+ gxde-calculator, 
+ gxde-terminal, 
+ gxde-deb-installer, 
+ gxde-editor, 
+ gxde-image-viewer, 
+ gxde-ocr, 
+ gxde-music, 
+ gxde-font-installer, 
+ gxde-movie, 
+ gxde-quick-hash, 
+ spark-store | aptss, 
+ deepin-system-monitor,
+ dde-control-center,
+ dde-file-manager,
 Conflicts:
 plymouth-theme-gxde-logo,
 linux-kernel-gxde-i386,
@@ -58,6 +72,9 @@ Conflicts:
 linux-kernel-oldstable-gxde-mips64el,
 linux-kernel-gxde-loong64,
 linux-kernel-oldstable-gxde-loong64,
+ plymouth,
+ tela-grub2-themes,
+ plymouth-theme-gxde-logo,
 Description: GXDE New Desktop Environment For PRoot - Next
 This is a meta package depends GXDE New Desktop Envrionment in Android PRoot.
 .
@@ -132,7 +149,9 @@ Recommends:
 tela-grub2-themes,
 plymouth-theme-gxde-logo,
 fcitx5,
- fcitx5-table
+ fcitx5-table,
+ fantascene-dynamic-wallpaper,
+ x11vnc,
 Conflicts:
 dde-control-center(<< 2.90.5),
 deepin-desktop-environment-desktop,
Author	SHA1	Message	Date
gfdgd-xi	d618d56312	调整依赖关系	2024-11-14 22:24:13 +08:00
shenmo7192andGitee	ab22b376b6	update debian/control. Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-14 12:46:27 +00:00
gfdgd-xi	92dab943d5	三调	2024-11-12 23:03:55 +08:00
gfdgd-xi	da202ec80b	三调	2024-11-12 22:54:17 +08:00
gfdgd-xi	060c93511f	三调	2024-11-12 22:46:45 +08:00
gfdgd-xi	7bb6b497f6	二调	2024-11-12 22:27:39 +08:00
gfdgd-xi	041520a003	调整动态构建部分包安装方式	2024-11-12 22:07:17 +08:00
gfdgd-xiandGitee	a0b1e96888	!7 remove neofetch to reduce unnecessary configure cost Merge pull request !7 from shenmo/N/A	2024-11-12 13:57:25 +00:00
shenmo7192andGitee	5a2e0ca3e0	remove neofetch to reduce unnecessary configure cost Signed-off-by: shenmo <jifengshenmo@outlook.com>	2024-11-12 07:29:37 +00:00
gfdgd-xi	17300ff510	调整发行版代号	2024-11-12 13:13:16 +08:00
gfdgd-xi	d0b88cd451	新增滚动构建	2024-11-12 12:56:00 +08:00