From 77c0f84054944363239f6c9a668f532edc196275 Mon Sep 17 00:00:00 2001
From: hongjinghao <hongjinghao@huawei.com>
Date: Tue, 5 Mar 2024 20:47:33 +0800
Subject: [PATCH] Delete the commented code

(cherry picked from commit 9bce82384fe901e0e01d9ccf8214b808d076fe6b)
---
 Delete-the-commented-code.patch | 62 +++++++++++++++++++++++++++++++++
 backport-kmp-feature.patch      | 16 ++++-----
 openEuler-rpm-config.spec       |  6 +++-
 3 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 Delete-the-commented-code.patch

diff --git a/Delete-the-commented-code.patch b/Delete-the-commented-code.patch
new file mode 100644
index 0000000..8f27e4e
--- /dev/null
+++ b/Delete-the-commented-code.patch
@@ -0,0 +1,62 @@
+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 -
+ macros          | 7 -------
+ 2 files changed, 8 deletions(-)
+
+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
+diff --git a/macros b/macros
+index 52df0f6..bf672e2 100644
+--- a/macros
++++ b/macros
+@@ -16,10 +16,8 @@
+ %_fmoddir		%{_libdir}/gfortran/modules
+ 
+ %_enable_debug_packages 1
+-#%_include_minidebuginfo 1
+ %_include_gdb_index     1
+ %_debugsource_packages  1
+-#%_debuginfo_subpackages 1
+ 
+ %_build_id_links none
+ 
+@@ -188,11 +186,9 @@
+ # Fail linking if there are undefined symbols.  Required for proper
+ # ELF symbol versioning support.  Disabled by default.
+ # Use "%define _ld_strict_symbol_defs 1" to enable.
+-#%_ld_strict_symbol_defs		1
+ %_ld_symbols_flags		%{?_ld_strict_symbol_defs:-Wl,-z,defs}
+ 
+ # use "%define _ld_as_needed 1" to enable.
+-#%_ld_as_needed		1
+ %_ld_as_needed_flags	%{?_ld_as_needed:-Wl,--as-needed}
+ 
+ %__global_compiler_flags	-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} 
+@@ -304,9 +300,6 @@ Requires:       man info \
+ %description help \
+ Man pages and other related documents for %{name}.
+ 
+-#%sbin_installinfo_rm bc.info
+-#%sbin_installinfo_rm bc.info.gz
+-
+ %install_info() \
+ /sbin/install-info %1 %{_infodir}/dir || :
+ 
+-- 
+2.33.0
+
diff --git a/backport-kmp-feature.patch b/backport-kmp-feature.patch
index fc3133a..6525efb 100644
--- a/backport-kmp-feature.patch
+++ b/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
diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec
index ce278e7..b2485c2 100644
--- a/openEuler-rpm-config.spec
+++ b/openEuler-rpm-config.spec
@@ -3,7 +3,7 @@
 
 Name:		%{vendor}-rpm-config
 Version:	30
-Release:	39
+Release:	40
 License:	GPL+
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/openeuler/openEuler-rpm-config
@@ -32,6 +32,7 @@ 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
 
 Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -139,6 +140,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
 %{rpmvdir}/find-requires.ksyms
 
 %changelog
+* 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
 
-- 
Gitee