README.md

@@ -1,39 +1,30 @@
 # zincati
 
 #### 介绍
-Zincati is an auto-update agent for NestOS hosts.
+Zincati is an auto-update agent for NestOS hosts..
 
-It works as a client for Cincinnati and rpm-ostree, taking care of automatically updating/rebooting machines.
+#### 软件架构
-
+软件架构说明
-#### Features:
--Agent for continuous auto-updates, with support for phased rollouts
--Configuration via TOML dropins and overlaid directories
--Multiple update strategies for finalization/reboot
--Local maintenance windows on a weekly schedule for planned upgrades
--Internal metrics exposed over a local endpoint in Prometheus format
--Logging with configurable priority levels
--Support for complex update-graphs via Cincinnati protocol (with rollout wariness, barriers, dead-ends and more)
--Support for cluster-wide reboot orchestration, via an external lock-manager
 
 
 #### 安装教程
 
-Install zincati rpm package:
+1.  xxxx
-
+2.  xxxx
-yum install zincati
+3.  xxxx
 
 #### 使用说明
 
-详细使用说明请参考[zincati官网](https://coreos.github.io/zincati/)以及[NestOS主页](https://gitee.com/openeuler/NestOS)
+1.  xxxx
+2.  xxxx
+3.  xxxx
 
 #### 参与贡献
 
-master分支使用最新的上游版本，如果检测到上游有最新版本发布，先形成issue后再提交对应PR更新，流程如下。
+1.  Fork 本仓库
-1.  提交issue
+2.  新建 Feat_xxx 分支
-2.  Fork 本仓库
+3.  提交代码
-3.  新建 Feat_xxx 分支
+4.  新建 Pull Request
-4.  提交代码
-5.  新建 Pull Request
 
 
 #### 特技

base-cincinnati-url-for-nestos.patch

@@ -0,0 +1,8 @@
+diff -Nur zincati-0.0.18/dist/config.d/50-fedora-coreos-cincinnati.toml zincati-0.0.18-new/dist/config.d/50-fedora-coreos-cincinnati.toml
+--- zincati-0.0.18/dist/config.d/50-fedora-coreos-cincinnati.toml	2021-02-28 06:16:41.000000000 +0800
++++ zincati-0.0.18-new/dist/config.d/50-fedora-coreos-cincinnati.toml	2022-05-17 11:27:14.242121619 +0800
+@@ -1,3 +1,2 @@
+-# Fedora CoreOS Cincinnati backend
+ [cincinnati]
+-base_url= "https://updates.coreos.fedoraproject.org"
++base_url= "http://nestos.org.cn:8080"

change-cincinnati-url-for-nestos.patch

@@ -1,33 +0,0 @@
-From bd31264e125d4350380996957a2ae4d27b711747 Mon Sep 17 00:00:00 2001
-From: jianli-97 <lijian2@kylinos.cn>
-Date: Mon, 16 Oct 2023 16:03:49 +0800
-Subject: [PATCH] change cincinnati url for nestos
-
----
- dist/config.d/50-fedora-coreos-cincinnati.toml | 3 ---
- dist/config.d/50-nestos-cincinnati.toml        | 3 +++
- 2 files changed, 3 insertions(+), 3 deletions(-)
- delete mode 100644 dist/config.d/50-fedora-coreos-cincinnati.toml
- create mode 100644 dist/config.d/50-nestos-cincinnati.toml
-
-diff --git a/dist/config.d/50-fedora-coreos-cincinnati.toml b/dist/config.d/50-fedora-coreos-cincinnati.toml
-deleted file mode 100644
-index fe259f3..0000000
---- a/dist/config.d/50-fedora-coreos-cincinnati.toml
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Fedora CoreOS Cincinnati backend
--[cincinnati]
--base_url= "https://updates.coreos.fedoraproject.org"
-diff --git a/dist/config.d/50-nestos-cincinnati.toml b/dist/config.d/50-nestos-cincinnati.toml
-new file mode 100644
-index 0000000..7a01c68
---- /dev/null
-+++ b/dist/config.d/50-nestos-cincinnati.toml
-@@ -0,0 +1,3 @@
-+# NestOS Cincinnati backend
-+[cincinnati]
-+base_url= "http://www.nestos.org.cn:8080"
--- 
-2.33.0
-

rust-zincati.spec

@@ -1,18 +1,19 @@
 %bcond_without check
 %global __cargo_skip_build 0
+%define debug_package %{nil}
 %global crate zincati
 %global zcuid 986
 
 Name:           rust-%{crate}
 Version:        0.0.24
-Release:        6
+Release:        2
 Summary:        Update agent for NestOS
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://crates.io/crates/%{crate}
 Source0:        %{crate}-%{version}.crate
 Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
 Source2:        zincati-systemd-sysusers.conf
-Patch1:         change-cincinnati-url-for-nestos.patch
+Patch1:         base-cincinnati-url-for-nestos.patch
 Patch2:         modify-as-nestos-stream.patch
 
 BuildRequires:  rust-packaging
@@ -126,18 +127,6 @@ install -Dpm644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/zincati.conf
 %endif
 
 %changelog
-* Mon Oct 16 2023 lijian <lijian2@kylinos.cn> - 0.0.24-6
-- add change-cincinnati-url-for-nestos.patch
-
-* Mon May 29 2023 duyiwei <duyiwei@kylinos.cn> - 0.0.24-5
-- modify base-cincinnati-url-for-nestos.patch
-
-* Thu Dec 15 2022 dingdingaaaaa <dingziwei@kylinos.cn> - 0.0.24-4
-- License compliance rectification
-
-* Thu Dec 08 2022 fushanqing <fushanqing@kylinos.cn> - 0.0.24-3
-- Enable debuginfo for fix strip
-
 * Thu Nov 10 2022 duyiwei <duyiwei@kylinos.cn> - 0.0.24-2
 - sync master and fix some bug