diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index ded98b2c..1aeec1f4 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -24,7 +24,8 @@ body: label: Version description: What version of our software are you running? options: - - 1.9.0 (Default) + - 1.9.2 (Default) + - 1.9.0 - 1.8.5 - 1.8.4 - 1.8.3 diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 68292e67..0c794a2f 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -47,7 +47,8 @@ body: label: Version description: What version of our software did you last run? options: - - 1.9.0 (Default) + - 1.9.2 (Default) + - 1.9.0 - 1.8.5 - 1.8.4 - 1.8.3 diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml deleted file mode 100644 index d7af6b53..00000000 --- a/.github/workflows/build-macos.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Build MacOS - -on: - push: - branches: [ "qml" ] - pull_request: - branches: [ "qml" ] - -env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) - BUILD_TYPE: Release - -jobs: - build: - runs-on: macos-latest - - defaults: - run: - working-directory: src - - steps: - - uses: actions/checkout@v3 - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/.github/workflows/build-ubuntu-deb.yml b/.github/workflows/build-ubuntu-deb.yml deleted file mode 100644 index cde42e01..00000000 --- a/.github/workflows/build-ubuntu-deb.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Build Ubuntu .deb - -on: - push: - branches: [ "qml" ] - pull_request: - branches: [ "qml" ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Install dependencies - run: sudo apt install -y --no-install-recommends build-essential devscripts debhelper cmake git libarchive-dev libcurl4-gnutls-dev - qtbase5-dev qtbase5-dev-tools qtdeclarative5-dev libqt5svg5-dev qttools5-dev libgnutls28-dev - qml-module-qtquick2 qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-templates2 qml-module-qtquick-window2 qml-module-qtgraphicaleffects - - - name: Build - run: debuild -uc -us diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 8ebfc18d..00000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: "CodeQL" - -on: - push: - branches: [ "qml" ] - pull_request: - branches: [ "qml" ] - schedule: - - cron: '44 19 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: 'ubuntu-latest' - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'cpp' ] - - steps: - - name: Install dependencies - run: sudo apt install -y --no-install-recommends build-essential devscripts debhelper cmake git libarchive-dev libcurl4-gnutls-dev - qtbase5-dev qtbase5-dev-tools qtdeclarative5-dev libqt5svg5-dev qttools5-dev libgnutls28-dev - qml-module-qtquick2 qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtquick-templates2 qml-module-qtquick-window2 qml-module-qtgraphicaleffects - - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - queries: security-and-quality - - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" diff --git a/.gitignore b/.gitignore index e5bb6b84..67a3574e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ src/build/** obj-** debian/rpi-imager/** debian/.debhelper** +debian/*.debhelper** debian/files debian/*.substvars debian/debhelper** +debian/tmp .DS_Store *.DS_Store # editor backups diff --git a/appimagecraft.yml b/appimagecraft.yml index a99b8716..28cf81d6 100644 --- a/appimagecraft.yml +++ b/appimagecraft.yml @@ -2,7 +2,7 @@ version: 1 project: name: org.raspberrypi.rpi-imager - version: 1.9.1 + version: 1.9.2 build: cmake: diff --git a/debian/changelog b/debian/changelog index bc4d6516..bcfb7686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -rpi-imager (1.9.1) unstable; urgency=medium +rpi-imager (1.9.2) unstable; urgency=medium + * Drive List: Expose only physical devices - not volumes * i18n: German, Taiwanese, Catalan, Spanish, Slovak translations updated * i18n: Added Hebrew translation @@ -8,7 +9,7 @@ rpi-imager (1.9.1) unstable; urgency=medium * qml: MessagePopup: Constrain text, align to the center * packaging: debian: Ignore AppImages and ci scripts - -- Tom Dewey Wed, 18 Sep 2024 18:57:00 +0000 + -- Tom Dewey Wed, 02 Oct 2024 18:57:00 +0000 rpi-imager (1.9.0) unstable; urgency=medium diff --git a/debian/control b/debian/control index e69abeb1..3f46efc1 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: rpi-imager Section: admin Priority: optional Maintainer: Tom Dewey -Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev +Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev, dh-exec Standards-Version: 4.1.2 Homepage: https://www.raspberrypi.com/software Package: rpi-imager Architecture: arm64 -Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2 +Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2, util-linux (>= 2.38) Recommends: udisks2 Description: Raspberry Pi Imaging utility A user-friendly tool for creating bootable media for Raspberry Pi Devices. diff --git a/debian/org.raspberrypi.rpi-imager.desktop b/debian/org.raspberrypi.rpi-imager.desktop index be232288..291a4e35 100644 --- a/debian/org.raspberrypi.rpi-imager.desktop +++ b/debian/org.raspberrypi.rpi-imager.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.9.0 +Version=1.9.2 Name=Raspberry Pi Imager Name[zh_CN]=树莓派启动盘制作工具 Comment=Raspberry Pi Imager diff --git a/debian/postinst b/debian/postinst index 0063a9b5..c3faabf6 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,9 @@ #!/bin/sh +set -e + if [ ! -x /usr/bin/rpi-imager ]; then chmod +x /usr/bin/rpi-imager -fi \ No newline at end of file +fi + +#DEBHELPER# diff --git a/debian/rpi-imager.install b/debian/rpi-imager.install old mode 100644 new mode 100755 diff --git a/debian/rpi-imager.metainfo.xml b/debian/rpi-imager.metainfo.xml index ec956e6a..94cda8ef 100644 --- a/debian/rpi-imager.metainfo.xml +++ b/debian/rpi-imager.metainfo.xml @@ -55,7 +55,7 @@ rpi-imager - + moderate diff --git a/debian/rules b/debian/rules index 2c5c0551..0ac75d3b 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,6 @@ export DH_VERBOSE = 1 %: dh $@ -.PHONY: override_dh_usrlocal -override_dh_usrlocal: - .PHONY: override_dh_strip override_dh_strip: - dh_strip --exclude=AppImage + dh_strip --exclude=AppImage --exclude=rpi-imager diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0a4fd54d..ef0a6a87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,8 +11,9 @@ set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Which macOS architectur project(rpi-imager LANGUAGES CXX C) set(IMAGER_VERSION_MAJOR 1) set(IMAGER_VERSION_MINOR 9) -set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.0") -set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},0,0") +set(IMAGER_VERSION_PATCH 2) +set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.${IMAGER_VERSION_PATCH}") +set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},${IMAGER_VERSION_PATCH},0") add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}") add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV}) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/src/linux/linuxdrivelist.cpp b/src/linux/linuxdrivelist.cpp index f97920ad..2fcf8521 100644 --- a/src/linux/linuxdrivelist.cpp +++ b/src/linux/linuxdrivelist.cpp @@ -52,6 +52,7 @@ namespace Drivelist "--bytes", "--json", "--paths", + "--tree", "--output", "kname,type,subsystems,ro,rm,hotplug,size,phy-sec,log-sec,label,vendor,model,mountpoint", "--exclude", "7" };