.gear/rpi-imager.spec | 75 ++++++++++++++++++++++++++++ .gear/rules | 3 ++ .gear/tags/list | 8 +++ src/CMakeLists.txt | 5 -- src/dependencies/drivelist/src/drivelist.hpp | 1 + src/main.qml | 11 ++++ 6 files changed, 98 insertions(+), 5 deletions(-) diff --git a/.gear/rpi-imager.spec b/.gear/rpi-imager.spec new file mode 100644 index 0000000..44b65c8 --- /dev/null +++ b/.gear/rpi-imager.spec @@ -0,0 +1,75 @@ +Name: rpi-imager +Version: 1.7.3 +Release: alt2 +Summary: Raspberry Pi Imaging Utility +Group: System/Configuration/Other + +License: Apache-2.0 +URL: https://github.com/raspberrypi/rpi-imager +Source: %name-%version.tar +Patch: %name-%version-alt.patch + +BuildRequires: qt5-base-devel +BuildRequires: qt5-svg-devel qt5-declarative-devel qt5-tools-devel +BuildRequires: libarchive-devel libcurl-devel libssl-devel lsblk +BuildRequires: cmake gcc-c++ + +Requires: qt5-quickcontrols2 +Requires: udisks2 + +%description +Graphical user-interface to write disk images and format SD cards. +Use Raspberry Pi Imager for an easy way to install Raspberry Pi OS and other +operating systems to an SD card ready to use with your Raspberry Pi. + +%prep +%setup -n %name-%version +%patch -p1 + +%build +%cmake ./src +%cmake_build + +%install +%cmakeinstall_std + +%files +%_bindir/%name +%_datadir/applications/%name.desktop +%_datadir/icons/hicolor/*/apps/%name.png +%_datadir/metainfo/rpi-imager.metainfo.xml + + +%changelog +* Wed Jul 5 2023 Artyom Bystrov 1.7.3-alt2 +- Fix build on GCC13 + +* Wed Jan 11 2023 Dmitry Terekhin 1.7.3-alt1 +- Update to new release 1.7.3 + +* Mon Mar 21 2022 Dmitry Terekhin 1.7.1-alt1 +- Update to new release 1.7.1 + +* Wed Jun 16 2021 Dmitry Terekhin 1.6.2-alt1 +- Update to new release 1.6.2 + +* Thu Apr 08 2021 Dmitry Terekhin 1.6.1-alt1 +- Update to new release 1.6.1 +- Move added menu item ALT to 2-nd place + +* Wed Mar 10 2021 Dmitry Terekhin 1.5-alt1 +- Update to new release 1.5 + +* Tue Aug 18 2020 Evgeny Sinelnikov 1.4-alt1 +- Update to new release 1.4 +- Add support ALT images list directly from: + https://getalt.org/raspi/os_list_imagingutility_alt.json + It will work until the "Add ALT image link" issue closes: + https://github.com/raspberrypi/rpi-imager/issues/95 + +* Fri Jul 17 2020 Evgeny Sinelnikov 1.3-alt1 +- Fix version and update to official release + +* Sat May 30 2020 Evgeny Sinelnikov 1.3-alt1.git.f3bc47a309 +- Initial build for Sisyphus + diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..e6ec252 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +tar: v@version@:. +diff: v@version@:. . name=@name@-@version@-alt.patch +spec: .gear/rpi-imager.spec diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..ac83eed --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1,8 @@ +f3bc47a309d0342962fd23e071e5e4a61179b2fd qml +7506d5b35a5dc33fa29814f3775f05d678f56ecc v1.3 +385ee6d742b71f2b50840bb68119065c1d86cc47 v1.4 +d129d12b004f9097d8fd930bb27f7f6b9b3d1d8b v1.5 +a82fe15d5467cf6af5bd382524dd83da285ab54f 1.6.1 +4a039b78853a87b665b7ab89d819f36af591a1b1 v1.6.2 +d91f8d95b1c9eab3153d0a6f32abeaeb95f87104 v1.7.1 +ce0b02b823a40ada3cd4a12a257da9506e46dda1 v1.7.3 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51546e3..a3ba270 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -288,11 +288,6 @@ else() if (NOT LSBLK) message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") endif() - - execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) - if (ret EQUAL "1") - message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") - endif() endif() configure_file( diff --git a/src/dependencies/drivelist/src/drivelist.hpp b/src/dependencies/drivelist/src/drivelist.hpp index 1de452f..24bc7eb 100644 --- a/src/dependencies/drivelist/src/drivelist.hpp +++ b/src/dependencies/drivelist/src/drivelist.hpp @@ -20,6 +20,7 @@ #include #include #include +#include namespace Drivelist { diff --git a/src/main.qml b/src/main.qml index b9f605c..5f4367a 100644 --- a/src/main.qml +++ b/src/main.qml @@ -1137,8 +1137,19 @@ ApplicationWindow { var oslist = oslistFromJson(o) if (oslist === false) return + var alt_not_found = true for (var i in oslist) { osmodel.insert(osmodel.count-2, oslist[i]) + if (oslist[i].name.indexOf("ALT") != -1) + alt_not_found = false + } + if (alt_not_found) { + var alt_os_string = '{"name": "ALT", + "description": "Choose from ALT images", + "icon": "https://getalt.org/raspi/logo-alt-ext.png", + "subitems_url": "https://getalt.org/raspi/os_list_imagingutility_alt.json"}' + var alt_os = JSON.parse(alt_os_string) + osmodel.insert(1, alt_os) } if ("imager" in o) {