init

From: @openeuler-sync-bot 
Reviewed-by: @xujing99 
Signed-off-by: @xujing99

Delete-the-commented-code.patch

@@ -0,0 +1,24 @@
+From c7605385b9d838be78a87de02a48eaaa6e69b4b2 Mon Sep 17 00:00:00 2001
+From: hongjinghao <hongjinghao@huawei.com> 
+Date: Tue, 5 Mar 2024 20:22:59 +0800
+Subject: [PATCH] Delete the commented code
+
+---
+ brp-digest-list | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/brp-digest-list b/brp-digest-list
+index 77248c9..7de42b7 100644
+--- a/brp-digest-list
++++ b/brp-digest-list
+@@ -9,7 +9,6 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+ fi
+ 
+ # Create temporary file listing files in the manifest
+-#[ -n "$TMPDIR" ] || TMPDIR="/tmp"
+ TMPDIR="/tmp"
+ BIN_PKG_FILES=${TMPDIR}/${3%%.rpm}
+ cat - > $BIN_PKG_FILES
+-- 
+2.33.0
+

add-brp-scripts-to-delete-rpath.patch

@@ -3,23 +3,25 @@ From: yangmingtaip <yangmingtai@huawei.com>
 Date: Sat, 4 Sep 2021 14:14:54 +0800
 Subject: [PATCH] add brp scripts to delete rpath
 
+Signed-off-by: xujing <xujing125@huawei.com>
 ---
- brp-chrpath | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ brp-chrpath | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  macros      |   2 +
- 2 files changed, 105 insertions(+)
+ 2 files changed, 106 insertions(+)
  create mode 100755 brp-chrpath
 
 diff --git a/brp-chrpath b/brp-chrpath
 new file mode 100755
-index 0000000..6dd37de
+index 0000000..dc48351
 --- /dev/null
 +++ b/brp-chrpath
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,104 @@
 +#!/usr/bin/sh
 +# remove rpath specified
 +
 +rpathSuffix=(
-+	"/home/abuild/rpmbuild/BUILD"
++	"/home/abuild/rpmbuild/BUILD",
++	"/home/lkp/rpmbuild/BUILD"
 +)
 +
 +rpath=(
@@ -119,7 +121,7 @@ index 0000000..6dd37de
 +
 +exit 0
 diff --git a/macros b/macros
-index 7cde63f..ee0c126 100644
+index 36621df..a316be9 100644
 --- a/macros
 +++ b/macros
 @@ -89,6 +89,7 @@
@@ -130,14 +132,14 @@ index 7cde63f..ee0c126 100644
  %__brp_ldconfig /usr/lib/rpm/brp-ldconfig
  %__brp_compress /usr/lib/rpm/brp-compress
  %__brp_strip /usr/lib/rpm/brp-strip %{__strip}
-@@ -107,6 +108,7 @@
-     %{?__brp_strip_static_archive} \
-     %{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \
-     %{?__brp_python_hardlink} \
-+    %{?__vendor_delete_rpath:%{?__brp_chrpath}} \
- %{nil}
+@@ -111,6 +112,7 @@
  
  %__spec_install_post\
+     %{?__debug_package:%{__debug_install_post}}\
++    %{?__vendor_delete_rpath:%{?__brp_chrpath}} \
+     %{__arch_install_post}\
+     %{__os_install_post}\
+ %{nil}
 -- 
-2.23.0
+2.33.0
 

add-powerpc64le-and-ppc64le-support.patch

@@ -0,0 +1,38 @@
+From fc04d33640534f5046210b4cb60fd4c595955781 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E9=82=B9=E9=B9=8F?= <peng.zou@shingroup.cn>
+Date: Thu, 22 Feb 2024 14:42:38 +0800
+Subject: [PATCH] add powerpc64le and ppc64le support
+
+---
+ macros | 2 +-
+ rpmrc  | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/macros b/macros
+index d241ce3..ddee753 100644
+--- a/macros
++++ b/macros
+@@ -241,7 +241,7 @@
+ %pkg_vcmp() (%{expand:%%{pkg_version_cmp %1 %3}} %2 0)
+ 
+ #arches macros
+-%generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 loongarch64
++%generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 loongarch64 powerpc64le ppc64le
+ %ldc_arches %{generic_arches}
+ %valgrind_arches %{generic_arches}
+ %nodejs_arches %{generic_arches}
+diff --git a/rpmrc b/rpmrc
+index 8ba756d..6a29bcb 100644
+--- a/rpmrc
++++ b/rpmrc
+@@ -7,6 +7,7 @@ optflags: x86_64 %{__global_compiler_flags} -m64 -mtune=generic -fasynchronous-u
+ 
+ optflags: aarch64 %{__global_compiler_flags} -fasynchronous-unwind-tables -fstack-clash-protection
+ optflags: riscv64 %{__global_compiler_flags} -fasynchronous-unwind-tables -fstack-clash-protection
++optflags: ppc64le %{__global_compiler_flags} -fasynchronous-unwind-tables -fstack-clash-protection
+ 
+ buildarchtranslate: athlon: i686
+ buildarchtranslate: geode: i686
+-- 
+2.33.0
+

add-riscv64-to-some-arches-macro.patch

@@ -0,0 +1,41 @@
+From 7332245a8f59de83485208282f2a15beaf5e544f Mon Sep 17 00:00:00 2001
+From: laokz <zhangkai@iscas.ac.cn>
+Date: Tue, 7 May 2024 10:21:52 +0800
+Subject: [PATCH] add riscv64 to some arches macro
+
+---
+ macros | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/macros b/macros
+index ddee753..bf82bc5 100644
+--- a/macros
++++ b/macros
+@@ -244,7 +244,7 @@
+ %generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 loongarch64 powerpc64le ppc64le
+ %ldc_arches %{generic_arches}
+ %valgrind_arches %{generic_arches}
+-%nodejs_arches %{generic_arches}
++%nodejs_arches %{generic_arches} riscv64
+ %ldc_arches %{generic_arches}
+ %mono_arches %{generic_arches}
+ %fpc_arches %{generic_arches}
+@@ -253,11 +253,10 @@
+ %GNAT_arches %{GPRbuild_arches} %{generic_arches}
+ %GPRbuild_arches  %{generic_arches}
+ %nim_arches	 %{generic_arches}
+-%nodejs_arches	 %{generic_arches}
+-%ocaml_native_compiler   %{generic_arches}
+-%ocaml_natdynlink        %{generic_arches}
+-%ocaml_native_profiling  %{generic_arches}
+-%openblas_arches 	 %{generic_arches}
++%ocaml_native_compiler   %{generic_arches} riscv64
++%ocaml_natdynlink        %{generic_arches} riscv64
++%ocaml_native_profiling  %{generic_arches} riscv64
++%openblas_arches 	 %{generic_arches} riscv64
+ 
+ #%ldconfig /sbin/ldconfig
+ %ldconfig_post(n:) %{?ldconfig:%post -p %ldconfig %{?*} %{-n:-n %{-n*}}\
+-- 
+2.39.2
+

backport-kmp-feature.patch

@@ -1,10 +1,12 @@
-From 20213f22f2b32d36c993be8200d3989bc9fc9e29 Mon Sep 17 00:00:00 2001
+From 3e65c85831be0b8f8e1cd43869b4991a76e14d9b Mon Sep 17 00:00:00 2001
 From: Yang Yanchao <yangyanchao6@huawei.com>
-Date: Tue, 28 Mar 2023 03:38:28 +0000
+Date: Fri, 17 Mar 2023 01:09:09 +0000
 Subject: [PATCH] backport kmp feature
 
+Signed-off-by: Yang Yanchao <yangyanchao6@huawei.com>
+Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
 ---
- kmodtool    | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ kmodtool    | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  kmodtool.py |  83 ---------------
  macros.kmp  |  85 ++++++++++++----
  3 files changed, 350 insertions(+), 105 deletions(-)
@@ -16,7 +18,7 @@ new file mode 100644
 index 0000000..427d1df
 --- /dev/null
 +++ b/kmodtool
-@@ -0,0 +1,287 @@
+@@ -0,0 +1,281 @@
 +#!/usr/bin/bash
 +
 +# kmodtool - Helper script for building kernel module RPMs
@@ -152,11 +154,6 @@ index 0000000..427d1df
 +Requires(postun): /usr/sbin/depmod
 +EOF
 +
-+#if [ "no" != "$kmp_nobuildreqs" ]
-+#then
-+ #   echo "BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}"
-+#fi
-+
 +if [ "" != "$kmp_override_preamble" ]
 +then
 +    cat "$kmp_override_preamble"
@@ -195,7 +192,6 @@ index 0000000..427d1df
 +    if [ ! -z "$kmp" ]; then
 +        cat <<EOF
 +modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) )
-+#rm /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules
 +if [ -x "/sbin/weak-modules" ]; then
 +    printf '%s\n' "\${modules[@]}" \
 +    | /sbin/weak-modules --remove-modules

fix-the-ELF-file-cannot-be-found-due-to-escape-of.patch

@@ -0,0 +1,25 @@
+From 4e1adcc36b0c2e379d6080ceb874f2413644c535 Mon Sep 17 00:00:00 2001
+From: xujing <xujing125@huawei.com>
+Date: Wed, 15 Nov 2023 17:16:22 +0800
+Subject: [PATCH] fix the ELF file cannot be found due to escape of '\'
+
+---
+ macros | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/macros b/macros
+index 7cde63f..36621df 100644
+--- a/macros
++++ b/macros
+@@ -275,7 +275,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -delete
+ 
+ %delete_la  find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+ 
+-%chrpath_delete find $RPM_BUILD_ROOT/ -type f -exec file {} ';' | grep "\<ELF\>" | awk -F ':' '{print $1}' | xargs -i chrpath --delete {}
++%chrpath_delete find $RPM_BUILD_ROOT/ -type f -exec file {} ';' | grep "\\<ELF\\>" | awk -F ':' '{print $1}' | xargs -i chrpath --delete {}
+ 
+ %package_help        \
+ %package        help \
+-- 
+2.33.0
+

openEuler-rpm-config.spec

@@ -1,9 +1,9 @@
-%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
+%global vendor {os_name}
 %global rpmvdir /usr/lib/rpm/%{vendor}
 
 Name:		%{vendor}-rpm-config
-Version:	30
-Release:	37
+Version:	300
+Release:	42
 License:	GPL+
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/openeuler/openEuler-rpm-config
@@ -30,6 +30,10 @@ Patch16:	fix-config-error-for-loongarch64.patch
 Patch17:	Feature-support-EBS-sign-for-IMA-digest-list.patch
 Patch18:        fix-brp-ldconfig-riscv-default-library-directory.patch
 Patch19:        check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch
+Patch20:	fix-the-ELF-file-cannot-be-found-due-to-escape-of.patch
+Patch21:        add-powerpc64le-and-ppc64le-support.patch
+Patch22:        Delete-the-commented-code.patch
+Patch23:        add-riscv64-to-some-arches-macro.patch
 
 Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -137,6 +141,23 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
 %{rpmvdir}/find-requires.ksyms
 
 %changelog
+* Tue May 07 2024 laokz <zhangkai@iscas.ac.cn> - 30-42
+- add riscv64 to some arches macro
+
+* Mon Apr 29 2024 xujing <xujing125@huawei.com> - 30-41
+- don't delete the commented code in macros
+
+* Tue Mar 5 2024 hongjinghao <hongjinghao@huawei.com> - 30-40
+- Delete the commented code
+
+* Thu Feb 22 2024 peng.zou <peng.zou@shingroup.cn> - 30-39
+- add powerpc64le and ppc64le support
+
+* Tue Nov 21 2023 xujing <xujing125@huawei.com> - 30-38
+- add the scanning path of the rpath
+  fix the ELF file cannot be found due to escape of '\'
+  excute brp_chrpath before arch_install_post
+
 * Fri Nov 03 2023 fuanan <fuanan3@h-partners.com> - 30-37
 - check if the file is a symbolic link in brp-digest-list