rename process1 to sysmaster and move pctrl to /usr/bin

README.en.md

@@ -1,4 +1,4 @@
-# process1
+# sysmaster
 
 #### Description
 redesign and reimplement process1

README.md

@@ -1,4 +1,4 @@
-# process1
+# sysmaster
 
 #### 介绍
 redesign and reimplement process1

backport-rename-to-sysmaster.patch

@@ -0,0 +1,42 @@
+From fcc12481bd9240489cd21c71df50fb1dfdbe9ad5 Mon Sep 17 00:00:00 2001
+From: overweight <hexiaowen@huawei.com>
+Date: Mon, 19 Sep 2022 21:48:31 +0800
+Subject: [PATCH] rename to sysmaster
+
+---
+ Cargo.toml                          | 11 +++++------
+ src/{process1 => sysmaster}/main.rs |  0
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+ rename src/{process1 => sysmaster}/main.rs (100%)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index c1d3f70..804feee 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -1,14 +1,13 @@
+ [package]
+-name = "Process1"
+-version = "0.1.0"
+-authors = ["overweight <hexiaowen@huawei.com>"]
++name = "sysmaster"
++version = "0.2.2"
++authors = ["sysmaster"]
+ edition = "2018"
+-default-run = "process1"
+ 
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ [[bin]]
+-name = "process1"
+-path = "src/process1/main.rs"
++name = "sysmaster"
++path = "src/sysmaster/main.rs"
+ 
+ [[bin]]
+ name = "pctrl"
+diff --git a/src/process1/main.rs b/src/sysmaster/main.rs
+similarity index 100%
+rename from src/process1/main.rs
+rename to src/sysmaster/main.rs
+-- 
+2.33.0
+

sysmaster.spec

@@ -3,23 +3,24 @@
 %global _debugsource_packages 1
 %global _debuginfo_subpackages 1
 %define _unpackaged_files_terminate_build 0
-%global process1_install_source target/release
+%global sysmaster_install_source target/release
-%global process1_install_target %{buildroot}/usr/lib/process1
+%global sysmaster_install_target %{buildroot}/usr/lib/process1
 %global __cargo_common_opts %{?__cargo_common_opts} --all
 
-Name:           process1 
+Name:           sysmaster 
 Version:        0.2.1
-Release:        1
+Release:        2
 Summary:        redesign and reimplement process1.
 
 License:        Mulan PSL v2
-URL:            https://gitee.com/openeuler/process1
+URL:            https://gitee.com/openeuler/sysmaster
 Source0:        %{name}-%{version}.tar.gz
 
 Patch0001:      backport-replaced-argv0-with-the-absolute-path.patch
 Patch0002:      backport-fix-dropin-get-real-file-name.patch
 Patch0003:      backport-if-Type-item-is-not-configured-set-it-to-default-Sim.patch
 Patch0004:      backport-fix-start-and-stop-repeatly-if-the-unit-is-already-i.patch
+Patch0005:      backport-rename-to-sysmaster.patch
 
 ExclusiveArch:  x86_64 aarch64
 
@@ -33,7 +34,8 @@ redesign and reimplement process1.
 
 Summary:        %{summary}
 
-%files      
+%files
+/usr/bin/pctrl
 /usr/lib/process1/*
 
 %prep
@@ -55,24 +57,27 @@ sed -i 's/rustflags = \[/rustflags = \["-Clink-arg=-lgcc", /g' ./.cargo/config
 %cargo_build -a
 
 %install
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/init
+install -Dm0755 -t %{buildroot}/usr/bin %{sysmaster_install_source}/pctrl
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/process1
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/init
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/pctrl
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/sysmaster
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/fstab
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/fstab
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/sysmonitor
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/sysmonitor
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/random_seed
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/random_seed
-install -Dm0755 -t %{process1_install_target} %{process1_install_source}/rc-local-generator
+install -Dm0755 -t %{sysmaster_install_target} %{sysmaster_install_source}/rc-local-generator
 
-strip %{process1_install_source}/lib*.so
+strip %{sysmaster_install_source}/lib*.so
 
-install -Dm0644 -t %{process1_install_target}/plugin %{process1_install_source}/libmount.so
+install -Dm0644 -t %{sysmaster_install_target}/plugin %{sysmaster_install_source}/libmount.so
-install -Dm0644 -t %{process1_install_target}/plugin %{process1_install_source}/libservice.so
+install -Dm0644 -t %{sysmaster_install_target}/plugin %{sysmaster_install_source}/libservice.so
-install -Dm0644 -t %{process1_install_target}/plugin %{process1_install_source}/libsocket.so
+install -Dm0644 -t %{sysmaster_install_target}/plugin %{sysmaster_install_source}/libsocket.so
-install -Dm0644 -t %{process1_install_target}/plugin %{process1_install_source}/libtarget.so
+install -Dm0644 -t %{sysmaster_install_target}/plugin %{sysmaster_install_source}/libtarget.so
-install -Dm0644 -t %{process1_install_target}/plugin config/plugin.conf
+install -Dm0644 -t %{sysmaster_install_target}/plugin config/plugin.conf
 
 
 %changelog
+* Tue Sep 20 2022 licunlong<licunlong1@huawei.com> - 0.2.1-2
+- rename process1 to sysmaster, and remove pctrl to /usr/bin
+
 * Tue Sep 13 2022 licunlong<licunlong1@huawei.com> - 0.2.1-1
 - sync patches from upstream
 

sysmaster.yaml

@@ -1,4 +1,4 @@
 version_control: gitee
-src_repo: openEuler/process1
+src_repo: openEuler/sysmaster
 tag_prefix: ^v
 separator: .