KubeOS: modify version display and fix the path for EFI boot in bootloader.sh
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
This commit is contained in:
Yuhang Wei
parent
97885d892d
commit
f2280776cf
134
0001-Bump-kubeos-version-to-1.0.6.patch
Normal file
134
0001-Bump-kubeos-version-to-1.0.6.patch
Normal file
@ -0,0 +1,134 @@
|
||||
From dbabd83278e84e21a4e3493150add216012ba230 Mon Sep 17 00:00:00 2001
|
||||
From: Yuhang Wei <weiyuhang3@huawei.com>
|
||||
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 <weiyuhang3@huawei.com>
|
||||
---
|
||||
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)
|
||||
|
||||
35
0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch
Normal file
35
0002-fix-update-bootloader.sh-paths-for-EFI-boot.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From e77d86d37c9320547b98b5639dfa328f1b0542fb Mon Sep 17 00:00:00 2001
|
||||
From: Yuhang Wei <weiyuhang3@huawei.com>
|
||||
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 <weiyuhang3@huawei.com>
|
||||
---
|
||||
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)
|
||||
|
||||
10
KubeOS.spec
10
KubeOS.spec
@ -2,10 +2,12 @@
|
||||
|
||||
Name: KubeOS
|
||||
Version: 1.0.6
|
||||
Release: 1
|
||||
Release: 2
|
||||
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
|
||||
@ -117,6 +119,12 @@ install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files
|
||||
rm -rfv %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Tue Jun 18 2024 Yuhang Wei<weiyuhang3@huawei.com> - 1.0.6-2
|
||||
- Type:requirement
|
||||
- CVE:NA
|
||||
- SUG:restart
|
||||
- DESC:modify version display and fix the path for EFI boot in bootloader.sh
|
||||
|
||||
* Mon Apr 01 2024 Yuhang Wei<weiyuhang3@huawei.com> - 1.0.6-1
|
||||
- Type:requirement
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user