Improve package filenames

virtualsquare · Nov 13, 2024 · 55e9fbb · 55e9fbb
1 parent f47a316
commit 55e9fbb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,6 @@ jobs:
           cd build
           cmake ..
           cpack -G DEB
-          for filename in *.deb; do mv $filename ${filename%.*}-ubuntu.deb; done;
       - uses: actions/upload-artifact@v4
         with:
           name: build-ubuntu
@@ -39,7 +38,6 @@ jobs:
           cd build
           cmake ..
           cpack -G DEB
-          for filename in *.deb; do mv $filename ${filename%.*}-debian.deb; done;
       - uses: actions/upload-artifact@v4
         with:
           name: build-debian
@@ -60,7 +58,6 @@ jobs:
           cd build
           cmake -DRISCV_TOOL_PREFIX="riscv64-linux-gnu-" ..
           cpack -G RPM
-          for filename in *.rpm; do mv $filename ${filename%.*}-fedora.rpm; done;
       - uses: actions/upload-artifact@v4
         with:
           name: build-fedora

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.22)
 
 project(uriscv VERSION 3.0.0)
 
@@ -66,6 +66,11 @@ add_subdirectory(app)
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6widgets6, libqt6svg6, libsigc++-2.0-0v5")
 set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "gcc-riscv64-unknown-elf")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "VirtualSquare")
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+cmake_host_system_information(RESULT DISTRO QUERY DISTRIB_INFO)
+set(CPACK_DEBIAN_PACKAGE_RELEASE ${DISTRO_ID})
 set(CPACK_RPM_PACKAGE_SUGGESTS "gcc-riscv64-linux-gnu")
 set(CPACK_RPM_SPEC_MORE_DEFINE "%define __spec_install_post /bin/true")
+set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
+set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
 include(CPack)