diff --git a/Delete-the-commented-code.patch b/Delete-the-commented-code.patch new file mode 100644 index 0000000000000000000000000000000000000000..aa8ff6d1a9881b7749b7eaae70a87f9c6755b32f --- /dev/null +++ b/Delete-the-commented-code.patch @@ -0,0 +1,62 @@ +From c7605385b9d838be78a87de02a48eaaa6e69b4b2 Mon Sep 17 00:00:00 2001 +From: hongjinghao +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 + + + # 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 c295cf7f9c732c556d807df734141cf0d074c6df..abc78e89306c8d93b210366c3b389ffdcc8550dc 100644 --- a/backport-kmp-feature.patch +++ b/backport-kmp-feature.patch @@ -5,7 +5,7 @@ Subject: [PATCH] backport kmp feature Signed-off-by: yangyanchao --- - kmodtool | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + kmodtool | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kmodtool.py | 83 ----------------- macros.kmp | 83 ++++++++++++----- 3 files changed, 354 insertions(+), 104 deletions(-) @@ -17,7 +17,7 @@ new file mode 100644 index 0000000..c3217e6 --- /dev/null +++ b/kmodtool -@@ -0,0 +1,292 @@ +@@ -0,0 +1,286 @@ +#!/usr/bin/bash + +# kmodtool - Helper script for building kernel module RPMs @@ -157,11 +157,6 @@ index 0000000..c3217e6 +Requires(postun): /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" @@ -200,7 +195,6 @@ index 0000000..c3217e6 + if [ ! -z "$kmp" ]; then + cat < 30-21 +- Delete the commented code + * Tue Nov 21 2023 xujing - 30-20 - add brp script to delete rpath fix the ELF file cannot be found due to escape of '\'