diff --git a/0001-Bump-kubeos-version-to-1.0.6.patch b/0001-Bump-kubeos-version-to-1.0.6.patch deleted file mode 100644 index eb3ccd744061acc1f04342dfae76680080d0de3c..0000000000000000000000000000000000000000 --- a/0001-Bump-kubeos-version-to-1.0.6.patch +++ /dev/null @@ -1,134 +0,0 @@ -From dbabd83278e84e21a4e3493150add216012ba230 Mon Sep 17 00:00:00 2001 -From: Yuhang Wei -Date: Mon, 17 Jun 2024 10:30:52 +0800 -Subject: [PATCH 1/2] Bump kubeos version to 1.0.6 - -Signed-off-by: Yuhang Wei ---- - KubeOS-Rust/Cargo.lock | 8 ++++---- - KubeOS-Rust/agent/Cargo.toml | 2 +- - KubeOS-Rust/cli/Cargo.toml | 2 +- - KubeOS-Rust/manager/Cargo.toml | 2 +- - KubeOS-Rust/proxy/Cargo.toml | 6 +++--- - VERSION | 2 +- - 6 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/KubeOS-Rust/Cargo.lock b/KubeOS-Rust/Cargo.lock -index 4e1619aa..93e3d07d 100644 ---- a/KubeOS-Rust/Cargo.lock -+++ b/KubeOS-Rust/Cargo.lock -@@ -189,7 +189,7 @@ dependencies = [ - - [[package]] - name = "cli" --version = "1.0.5" -+version = "1.0.6" - dependencies = [ - "anyhow", - "jsonrpc", -@@ -1226,7 +1226,7 @@ dependencies = [ - - [[package]] - name = "manager" --version = "1.0.5" -+version = "1.0.6" - dependencies = [ - "anyhow", - "env_logger", -@@ -1438,7 +1438,7 @@ dependencies = [ - - [[package]] - name = "os-agent" --version = "1.0.5" -+version = "1.0.6" - dependencies = [ - "anyhow", - "env_logger", -@@ -1601,7 +1601,7 @@ dependencies = [ - - [[package]] - name = "proxy" --version = "1.0.5" -+version = "1.0.6" - dependencies = [ - "anyhow", - "assert-json-diff", -diff --git a/KubeOS-Rust/agent/Cargo.toml b/KubeOS-Rust/agent/Cargo.toml -index 739bbbc7..83e1b7c0 100644 ---- a/KubeOS-Rust/agent/Cargo.toml -+++ b/KubeOS-Rust/agent/Cargo.toml -@@ -3,7 +3,7 @@ description = "KubeOS os-agent" - edition = "2021" - license = "MulanPSL-2.0" - name = "os-agent" --version = "1.0.5" -+version = "1.0.6" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -diff --git a/KubeOS-Rust/cli/Cargo.toml b/KubeOS-Rust/cli/Cargo.toml -index c3c14c6f..78d5fd51 100644 ---- a/KubeOS-Rust/cli/Cargo.toml -+++ b/KubeOS-Rust/cli/Cargo.toml -@@ -3,7 +3,7 @@ description = "KubeOS os-agent client" - edition = "2021" - license = "MulanPSL-2.0" - name = "cli" --version = "1.0.5" -+version = "1.0.6" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -diff --git a/KubeOS-Rust/manager/Cargo.toml b/KubeOS-Rust/manager/Cargo.toml -index e694090c..f60a7c08 100644 ---- a/KubeOS-Rust/manager/Cargo.toml -+++ b/KubeOS-Rust/manager/Cargo.toml -@@ -3,7 +3,7 @@ description = "KubeOS os-agent manager" - edition = "2021" - license = "MulanPSL-2.0" - name = "manager" --version = "1.0.5" -+version = "1.0.6" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dev-dependencies] -diff --git a/KubeOS-Rust/proxy/Cargo.toml b/KubeOS-Rust/proxy/Cargo.toml -index 3b5d96d1..d804ac77 100644 ---- a/KubeOS-Rust/proxy/Cargo.toml -+++ b/KubeOS-Rust/proxy/Cargo.toml -@@ -3,7 +3,7 @@ description = "KubeOS os-proxy" - edition = "2021" - license = "MulanPSL-2.0" - name = "proxy" --version = "1.0.5" -+version = "1.0.6" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [lib] -@@ -17,14 +17,14 @@ path = "src/main.rs" - [dependencies] - anyhow = "1.0.44" - async-trait = "0.1" --cli = { version = "1.0.5", path = "../cli" } -+cli = { version = "1.0.6", path = "../cli" } - env_logger = "0.9.0" - futures = "0.3.17" - h2 = "=0.3.16" - k8s-openapi = { version = "0.13.1", features = ["v1_22"] } - kube = { version = "0.66.0", features = ["derive", "runtime"] } - log = "=0.4.15" --manager = { version = "1.0.5", path = "../manager" } -+manager = { version = "1.0.6", path = "../manager" } - regex = "=1.7.3" - reqwest = { version = "=0.12.2", default-features = false, features = [ - "json", -diff --git a/VERSION b/VERSION -index 90a27f9c..af0b7ddb 100644 ---- a/VERSION -+++ b/VERSION -@@ -1 +1 @@ --1.0.5 -+1.0.6 --- -2.39.3 (Apple Git-146) - diff --git a/0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch b/0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch deleted file mode 100644 index aac10404c1b4fe4fee281af2101596499b6960e7..0000000000000000000000000000000000000000 --- a/0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e77d86d37c9320547b98b5639dfa328f1b0542fb Mon Sep 17 00:00:00 2001 -From: Yuhang Wei -Date: Mon, 17 Jun 2024 10:34:37 +0800 -Subject: [PATCH 2/2] fix: update bootloader.sh paths for EFI boot - -Signed-off-by: Yuhang Wei ---- - scripts/bootloader.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/bootloader.sh b/scripts/bootloader.sh -index 75096a38..df4be329 100644 ---- a/scripts/bootloader.sh -+++ b/scripts/bootloader.sh -@@ -19,7 +19,7 @@ function install_grub2_x86 () - cp -r /usr/lib/grub/x86_64-efi boot/efi/EFI/openEuler - eval "grub2-mkimage -d /usr/lib/grub/x86_64-efi -O x86_64-efi --output=/boot/efi/EFI/openEuler/grubx64.efi '--prefix=(,gpt1)/EFI/openEuler' fat part_gpt part_msdos linux" - -- mkdir -p /boot/EFI/BOOT/ -+ mkdir -p /boot/efi/EFI/BOOT/ - cp -f /boot/efi/EFI/openEuler/grubx64.efi /boot/efi/EFI/BOOT/BOOTX64.EFI - fi - } -@@ -29,7 +29,7 @@ function install_grub2_efi () - cp -r /usr/lib/grub/arm64-efi /boot/efi/EFI/openEuler/ - eval "grub2-mkimage -d /usr/lib/grub/arm64-efi -O arm64-efi --output=/boot/efi/EFI/openEuler/grubaa64.efi '--prefix=(,gpt1)/EFI/openEuler' fat part_gpt part_msdos linux" - -- mkdir -p /boot/EFI/BOOT/ -+ mkdir -p /boot/efi/EFI/BOOT/ - cp -f /boot/efi/EFI/openEuler/grubaa64.efi /boot/efi/EFI/BOOT/BOOTAA64.EFI - } - --- -2.39.3 (Apple Git-146) - diff --git a/KubeOS.spec b/KubeOS.spec index da3ec8432f106b32511d90799b6d8fe2ddc9e4b3..6ab25a199ef5c33bb295ea891bf64f6925ba3e90 100644 --- a/KubeOS.spec +++ b/KubeOS.spec @@ -1,13 +1,11 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2021. All rights reserved. Name: KubeOS -Version: 1.0.6 -Release: 2 +Version: 1.0.8 +Release: 1 Summary: O&M platform used to update the whole OS as an entirety License: Mulan PSL v2 Source0: https://gitee.com/openeuler/KubeOS/repository/archive/v%{version}.tar.gz -Patch1: 0001-Bump-kubeos-version-to-1.0.6.patch -Patch2: 0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: make rust cargo openssl-devel @@ -32,14 +30,14 @@ The scripts package includes scripts which could build the os image and binaries %{nil} %build -mkdir ./KubeOS-Rust/.cargo -cat << EOF >> ./KubeOS-Rust/.cargo/config +mkdir ./.cargo +cat << EOF >> ./.cargo/config.toml [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] -directory = "vendor" +directory = "KubeOS-Rust/vendor" EOF make @@ -51,74 +49,33 @@ install -d -m 0740 %{buildroot}/opt/kubeOS/bin install -p -m 0500 ./bin/rust/release/os-agent %{buildroot}/opt/kubeOS/bin install -p -m 0500 ./bin/rust/release/proxy %{buildroot}/opt/kubeOS/bin install -p -m 0500 ./bin/operator %{buildroot}/opt/kubeOS/bin +install -d -m 0740 %{buildroot}/opt/kubeOS/scripts +install -p -m 0500 ./bin/rust/release/kbimg %{buildroot}/opt/kubeOS/scripts #install artifacts -install -d -m 0740 %{buildroot}/opt/kubeOS/scripts -install -p -m 0600 ./scripts/rpmlist %{buildroot}/opt/kubeOS/scripts -install -p -m 0500 ./scripts/kbimg.sh %{buildroot}/opt/kubeOS/scripts -install -p -m 0500 ./scripts/set_in_chroot.sh %{buildroot}/opt/kubeOS/scripts -install -p -m 0600 ./scripts/grub.cfg %{buildroot}/opt/kubeOS/scripts -install -p -m 0500 ./scripts/bootloader.sh %{buildroot}/opt/kubeOS/scripts -install -p -m 0500 ./scripts/Dockerfile %{buildroot}/opt/kubeOS/scripts - -install -d -m 0740 %{buildroot}/opt/kubeOS/scripts/common -install -p -m 0500 ./scripts/common/globalVariables.sh %{buildroot}/opt/kubeOS/scripts/common -install -p -m 0500 ./scripts/common/log.sh %{buildroot}/opt/kubeOS/scripts/common -install -p -m 0500 ./scripts/common/utils.sh %{buildroot}/opt/kubeOS/scripts/common - -install -d -m 0740 %{buildroot}/opt/kubeOS/scripts/create -install -p -m 0500 ./scripts/create/imageCreate.sh %{buildroot}/opt/kubeOS/scripts/create -install -p -m 0500 ./scripts/create/rootfsCreate.sh %{buildroot}/opt/kubeOS/scripts/create - -install -d -m 0740 %{buildroot}/opt/kubeOS/scripts/00bootup -install -p -m 0600 ./scripts/00bootup/Global.cfg %{buildroot}/opt/kubeOS/scripts/00bootup -install -p -m 0500 ./scripts/00bootup/module-setup.sh %{buildroot}/opt/kubeOS/scripts/00bootup -install -p -m 0500 ./scripts/00bootup/mount.sh %{buildroot}/opt/kubeOS/scripts/00bootup - -install -d -m 0740 %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/boot-efi.mount %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/etc.mount %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/persist.mount %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/var.mount %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/os-agent.service %{buildroot}/opt/kubeOS/files -install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files +install -p -m 0600 ./KubeOS-Rust/kbimg/kbimg.toml %{buildroot}/opt/kubeOS/scripts %files %defattr(-,root,root,0500) %attr(0500,root,root) /opt/kubeOS/bin/os-agent -%attr(0600,root,root) /opt/kubeOS/files/boot-efi.mount -%attr(0600,root,root) /opt/kubeOS/files/etc.mount -%attr(0600,root,root) /opt/kubeOS/files/persist.mount -%attr(0600,root,root) /opt/kubeOS/files/var.mount -%attr(0600,root,root) /opt/kubeOS/files/os-agent.service -%attr(0600,root,root) /opt/kubeOS/files/os-release %files scripts %attr(0500,root,root) /opt/kubeOS/bin/proxy %attr(0500,root,root) /opt/kubeOS/bin/operator %defattr(-,root,root,0500) -%attr(0600,root,root) /opt/kubeOS/scripts/rpmlist -%attr(0500,root,root) /opt/kubeOS/scripts/kbimg.sh -%attr(0500,root,root) /opt/kubeOS/scripts/set_in_chroot.sh -%attr(0600,root,root) /opt/kubeOS/scripts/grub.cfg -%attr(0500,root,root) /opt/kubeOS/scripts/bootloader.sh -%attr(0500,root,root) /opt/kubeOS/scripts/Dockerfile - -%attr(0500,root,root) /opt/kubeOS/scripts/common/globalVariables.sh -%attr(0500,root,root) /opt/kubeOS/scripts/common/log.sh -%attr(0500,root,root) /opt/kubeOS/scripts/common/utils.sh - -%attr(0500,root,root) /opt/kubeOS/scripts/create/imageCreate.sh -%attr(0500,root,root) /opt/kubeOS/scripts/create/rootfsCreate.sh - -%attr(0600,root,root) /opt/kubeOS/scripts/00bootup/Global.cfg -%attr(0500,root,root) /opt/kubeOS/scripts/00bootup/module-setup.sh -%attr(0500,root,root) /opt/kubeOS/scripts/00bootup/mount.sh +%attr(0600,root,root) /opt/kubeOS/scripts/kbimg.toml +%attr(0500,root,root) /opt/kubeOS/scripts/kbimg %clean rm -rfv %{buildroot} %changelog +* Tue Dec 10 2024 Yuhang Wei - 1.0.8-1 +- Type:requirement +- CVE:NA +- SUG:restart +- DESC:update version to 1.0.8 + * Tue Jun 11 2024 Yuhang Wei - 1.0.6-2 - Type:requirement - CVE:NA diff --git a/v1.0.6.tar.gz b/v1.0.8.tar.gz similarity index 79% rename from v1.0.6.tar.gz rename to v1.0.8.tar.gz index 08a71593643b124bbc90cfa3911b6ac1e6b56f6b..fba1f7827e65104858d8ec872d2e8b0bc54b0bbe 100644 Binary files a/v1.0.6.tar.gz and b/v1.0.8.tar.gz differ