From fef762d478eaf78e13824299b28a35867c9a190a Mon Sep 17 00:00:00 2001 From: lw520203 <1823363429@qq.com> Date: Fri, 2 May 2025 19:28:00 +0800 Subject: [PATCH] get os release version --- 0024-add-mcp-server-dependency.patch | 2 +- 0025-get-os-release-version.patch | 72 ++++++++++++++++++++++++++++ calamares.spec | 6 ++- 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 0025-get-os-release-version.patch diff --git a/0024-add-mcp-server-dependency.patch b/0024-add-mcp-server-dependency.patch index d3dd6d7..e67250c 100644 --- a/0024-add-mcp-server-dependency.patch +++ b/0024-add-mcp-server-dependency.patch @@ -20,7 +20,7 @@ index 40b1ac6d7..52a96336a 100644 # screenshot: ":/images/Plasma.png" - id: gnome - packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools] -+ packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools, roo-code, uv, python3-mcp] ++ packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools, roo-code, uv, python3-mcp, euler-copilot-web, euler-copilot-desktop] name: DevStation name[zh]: DevStation description: GNU Networked Object Modeling Environment Desktop diff --git a/0025-get-os-release-version.patch b/0025-get-os-release-version.patch new file mode 100644 index 0000000..5cc3daf --- /dev/null +++ b/0025-get-os-release-version.patch @@ -0,0 +1,72 @@ +From f69963d210e516b707a8974a4d628147787926b9 Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Fri, 2 May 2025 16:46:56 +0800 +Subject: [PATCH] get os release version + +--- + src/branding/default/branding.desc | 2 +- + src/calamares/CalamaresApplication.cpp | 28 ++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc +index 9f0843385..f4e6e2a7c 100644 +--- a/src/branding/default/branding.desc ++++ b/src/branding/default/branding.desc +@@ -121,7 +121,7 @@ navigation: widget + # are visible as buttons there if the corresponding *show* keys + # are set to "true" (they can also be overridden). + strings: +- productName: "${NAME}" ++ productName: @OS_VERSION@ + shortProductName: Generic + version: 24.09 + shortVersion: 24.09 +diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp +index 6b62fd67d..60cc815fc 100644 +--- a/src/calamares/CalamaresApplication.cpp ++++ b/src/calamares/CalamaresApplication.cpp +@@ -34,6 +34,8 @@ + #include + #include + #include ++#include ++#include + + /// @brief Convenience for "are the settings in debug mode" + static bool +@@ -158,6 +160,32 @@ CalamaresApplication::initQmlPath() + void + CalamaresApplication::initBranding() + { ++ ++ auto rse = Calamares::System::runCommand({"cat", "/etc/os-release"}, std::chrono::seconds(30)); ++ QString osVersion = rse.getOutput().split("PRETTY_NAME=\"")[1].split("\"\n")[0].replace(" ", "-"); ++ cDebug() << "osVersion is " << osVersion; ++ QFile descFile("/usr/share/calamares/branding/default/branding.desc"); ++ if (descFile.open(QIODevice::ReadOnly | QIODevice::Text)) { // 改为只读模式 ++ // 读取内容 ++ QTextStream inStream(&descFile); ++ QString content = inStream.readAll(); ++ descFile.close(); // 关闭文件 ++ ++ // 执行替换 ++ content.replace("@OS_VERSION@", osVersion); ++ ++ // 重新打开文件写入 ++ if (descFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { ++ QTextStream outStream(&descFile); ++ outStream << content; ++ descFile.close(); ++ } else { ++ qDebug() << "写入失败：" << descFile.errorString(); ++ } ++ } else { ++ qDebug() << "打开失败：" << descFile.errorString(); ++ } ++ + QString brandingComponentName = Calamares::Settings::instance()->brandingComponentName(); + if ( brandingComponentName.simplified().isEmpty() ) + { +-- +2.46.0 + diff --git a/calamares.spec b/calamares.spec index 6a51397..1886d3e 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 14 +Release: 15 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -66,6 +66,7 @@ Patch20: 0021-aarch64-start-desktop-failed.patch Patch21: 0022-add-gnome-user-docs-dependency.patch Patch22: 0023-add-module-dependency.patch Patch23: 0024-add-mcp-server-dependency.patch +Patch24: 0025-get-os-release-version.patch # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the arches where grub2-efi is used to boot the system @@ -358,6 +359,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Wed Jun 04 2025 Liu Wang <1823363429@qq.com> - 3.3.7-15 +- Get os release version + * Fri Apr 18 2025 Liu Wang <1823363429@qq.com> - 3.3.7-14 - Add roo-code, uv, python3-mcp dependency for mcp server -- Gitee