From dfc0eb66b515fe1262f64bb78257f76ed3dd7bd0 Mon Sep 17 00:00:00 2001 From: jiang-dawei15 Date: Tue, 15 Mar 2022 10:35:21 +0800 Subject: [PATCH 1/2] help: modify some help information Signed-off-by: jiang-dawei15 Signed-off-by: yezengruan --- help-modify-some-help-information.patch | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 help-modify-some-help-information.patch diff --git a/help-modify-some-help-information.patch b/help-modify-some-help-information.patch new file mode 100644 index 0000000..2dde4ae --- /dev/null +++ b/help-modify-some-help-information.patch @@ -0,0 +1,38 @@ +From b7bd30b1ff5408e52cb67cee6ef0f8df73e5f802 Mon Sep 17 00:00:00 2001 +From: jiang-dawei15 +Date: Wed, 9 Mar 2022 11:50:02 +0800 +Subject: [PATCH] help: modify some help information + +--- + src/kpatch_user.c | 1 - + src/libcare-patch-make | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/kpatch_user.c b/src/kpatch_user.c +index 0bcc219..add74ea 100644 +--- a/src/kpatch_user.c ++++ b/src/kpatch_user.c +@@ -376,7 +376,6 @@ static int usage(const char *err) + fprintf(stderr, " patch - apply patch to a user-space process\n"); + fprintf(stderr, " unpatch- unapply patch from a user-space process\n"); + fprintf(stderr, " info - show info on applied patches\n"); +- fprintf(stderr, " server - listen on a unix socket for commands\n"); + return -1; + } + +diff --git a/src/libcare-patch-make b/src/libcare-patch-make +index ad1b566..9a75e1f 100755 +--- a/src/libcare-patch-make ++++ b/src/libcare-patch-make +@@ -20,7 +20,7 @@ install with specified DESTDIR. + working on patch utils. + -d --destdir specify variable makefile system uses to specify destination + directory for the installation +- -i --id>-give this patch an unique id (less than 7 char) ++ -i --id give this patch an unique id (less than 7 char) + -b --buildid give this patch an unique build-id + -j --jobs specify variable makefile system jobs of compile, for example + `make -j 4` is startup `4` jobs to compile. +-- +2.27.0 + From a3cb0a988973a050c94d06197294e6c522a797f4 Mon Sep 17 00:00:00 2001 From: yezengruan Date: Tue, 15 Mar 2022 10:45:17 +0800 Subject: [PATCH 2/2] update spec with openeuler !26 Signed-off-by: yezengruan --- libcareplus.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libcareplus.spec b/libcareplus.spec index c5e3449..6fb86ca 100644 --- a/libcareplus.spec +++ b/libcareplus.spec @@ -3,7 +3,7 @@ Version: 1.0.0 Name: libcareplus Summary: LibcarePlus tools -Release: 5 +Release: 6 Group: Applications/System License: GPLv2 Url: https://gitee.com/openeuler/libcareplus @@ -17,6 +17,7 @@ Patch0005: gitignore-ignore-some-tests-and-binary.patch Patch0006: libcare-patch-make-adapt-libcare-patch-make-to-meson.patch Patch0007: kpatch_elf-compatible-with-older-versions-of-the-so-.patch Patch0008: kpatch_parse-fix-failed-to-recognize-.cold.patch +Patch0009: help-modify-some-help-information.patch BuildRequires: elfutils-libelf-devel libunwind-devel gcc systemd @@ -148,7 +149,10 @@ exit 0 %endif %changelog -* Wed Mar 02 2033 imxcc - 1.0.0.5 +* Tue Mar 15 2022 yezengruan 1.0.0.6 +- help: modify some help information + +* Wed Mar 02 2022 imxcc - 1.0.0.5 - kpatch_elf: compatible with older versions of the so naming rules - kpatch_parse: fix failed to recognize .cold