adding arm64 debian package

mariotaku · Mar 19, 2024 · 2be0836 · 2be0836
1 parent 957d851
commit 2be0836
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -104,9 +104,13 @@ jobs:
         run: webosbrew-ipk-verify -f markdown -d -o $GITHUB_STEP_SUMMARY dist/*.ipk
 
   build-raspi:
-    name: Build (Raspberry Pi)
+    name: Build (Raspberry Pi ${{ matrix.arch }})
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        arch: [ armhf, arm64 ]
+
     steps:
       - name: Set Short Commit ID
         shell: bash
@@ -124,14 +128,15 @@ jobs:
 
       - name: Prepare Sysroot
         id: pi-sysroot
-        uses: mariotaku/raspbian-sysroot-action@main
+        uses: mariotaku/raspbian-sysroot-action@v1.3
         with:
           release: bullseye
           packages: ${{github.workspace}}/scripts/raspi/sysroot-packages.list
+          arch: ${{ matrix.arch }}
 
       - name: Install Build Tools
         shell: bash
-        run: sudo apt-get -y -qq install crossbuild-essential-armhf cmake gettext
+        run: sudo apt-get -y -qq install crossbuild-essential-${{ matrix.arch }} cmake gettext
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,9 +59,13 @@ jobs:
           artifacts: dist/*.ipk,dist/*_dbgsym.tar.gz,dist/*.manifest.json
 
   release-raspi:
-    name: Release (Raspberry Pi)
+    name: Release (Raspberry Pi ${{ matrix.arch }})
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        arch: [ armhf, arm64 ]
+
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -74,14 +78,15 @@ jobs:
 
       - name: Prepare Sysroot
         id: pi-sysroot
-        uses: mariotaku/raspbian-sysroot-action@main
+        uses: mariotaku/raspbian-sysroot-action@v1.3
         with:
           release: bullseye
           packages: ${{github.workspace}}/scripts/raspi/sysroot-packages.list
+          arch: ${{ matrix.arch }}
 
       - name: Install Build Tools
         shell: bash
-        run: sudo apt-get -y -qq install crossbuild-essential-armhf cmake gettext
+        run: sudo apt-get -y -qq install crossbuild-essential-${{ matrix.arch }} cmake gettext
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
@@ -97,12 +102,6 @@ jobs:
         shell: bash
         run: cmake --build . --config $BUILD_TYPE
 
-      - name: Package
-        working-directory: ${{github.workspace}}/build
-        run: |
-          cpack
-          dpkg-scanpackages . > Release
-
       - name: Create Release (Raspberry Pi)
         id: create_release_raspi
         uses: ncipollo/release-action@v1

diff --git a/cmake/PackageDebian.cmake b/cmake/PackageDebian.cmake
@@ -45,14 +45,11 @@ set(CPACK_DEBIAN_PACKAGE_RECOMMENDS_LIST
         )
 set(CPACK_DEBIAN_PACKAGE_SUGGESTS_LIST
         "libcec6 (>= 6.0)"
+        "moonlight-embedded"
         )
 
 if (TARGET ss4s-module-mmal)
-    list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS_LIST "libraspberrypi0")
-endif ()
-
-if (TARGET ss4s-module-ffmpeg)
-    list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS_LIST "libavcodec58 (>= 7:4.0)" "libavutil56 (>= 7:4.0)")
+    list(APPEND CPACK_DEBIAN_PACKAGE_RECOMMENDS_LIST "libraspberrypi0")
 endif ()
 
 if (TARGET ss4s-module-alsa)
@@ -63,6 +60,10 @@ if (TARGET ss4s-module-pulse)
     list(APPEND CPACK_DEBIAN_PACKAGE_RECOMMENDS_LIST "libpulse0 (>= 0.99.1)")
 endif ()
 
+if (TARGET ss4s-module-ffmpeg)
+    list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS_LIST "libavcodec58 (>= 7:4.0)" "libavutil56 (>= 7:4.0)")
+endif ()
+
 string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS_LIST}")
 string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_PACKAGE_RECOMMENDS_LIST}")
 string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_SUGGESTS "${CPACK_DEBIAN_PACKAGE_SUGGESTS_LIST}")