From 808f8557fa1c29b0348463e1717026060562f4d5 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Fri, 28 Feb 2025 11:18:12 +0800
Subject: [PATCH] Fix: bogus golang-vendor-provides script

find-provides.golang-vendor-bundled now check if golang downstream
pacakge is being built currently, before producing provides.
---
 find-provides.golang-vendor-bundled | 18 ++++++++++++++++++
 openEuler-rpm-config.spec           | 10 ++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 find-provides.golang-vendor-bundled

diff --git a/find-provides.golang-vendor-bundled b/find-provides.golang-vendor-bundled
old mode 100644
new mode 100755
index 4fd1422..89c433f
--- a/find-provides.golang-vendor-bundled
+++ b/find-provides.golang-vendor-bundled
@@ -21,10 +21,28 @@ provides=""
 
 dir="${1:-.}"
 
+if [ ! -f /usr/bin/go ] || [ ! -x /usr/bin/go ]; then
+  exit 0
+fi
+
+have_go_executable=0
+while read line; do
+  /usr/bin/go version $line 2>&1 | grep -v 'not a Go executable' > /dev/null
+  if [ $? == 0 ]; then
+    have_go_executable=1
+  fi
+done
+
+if [ $have_go_executable == 0 ]; then
+  exit 0
+fi
+
 for bundle in $(find $dir -name modules.txt); do
         provides="$provides\n$(cat "$bundle" |
                 grep "^# " |
                 grep -v "# explicit" |
+                grep -v "^#.*=> \.\./" |
+                grep -v "^#.*=> \./" |
                 sed -r s/"^#.* => "// |
                 sed -r "s/# //" |
                 sed -r "s:(.*) v(.*):bundled(golang(\1)) = \2:" |
diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec
index 1ea4b23..9397e68 100644
--- a/openEuler-rpm-config.spec
+++ b/openEuler-rpm-config.spec
@@ -3,7 +3,7 @@
 
 Name:		%{vendor}-rpm-config
 Version:	31
-Release:	18
+Release:	19
 License:	GPL+ AND MIT
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/src-openeuler/openEuler-rpm-config
@@ -190,6 +190,7 @@ sed -i "s/@VENDOR@/%{vendor}/g" `grep "@VENDOR@" -rl %{buildroot}%{_rpmconfigdir
 %{_rpmconfigdir}/generic-*
 %{_rpmconfigdir}/fix-libtool-from-moving-options-after-libs
 %{_fileattrsdir}/*.attr
+%{_rpmconfigdir}/kabi.sh
 %{_rpmconfigdir}/macros.d/
 %{_rpmluadir}/%{_vendor}/*.lua
 %exclude %{_rpmconfigdir}/macros.d/macros.kmp
@@ -199,11 +200,12 @@ sed -i "s/@VENDOR@/%{vendor}/g" `grep "@VENDOR@" -rl %{buildroot}%{_rpmconfigdir
 %{_rpmconfigdir}/macros.d/macros.kmp
 %{rpmvdir}/find-requires
 %{rpmvdir}/find-requires.ksyms
-%{_rpmconfigdir}/kabi.sh
-%{_fileattrsdir}/kabi.attr
-%{_fileattrsdir}/kmod.attr
 
 %changelog
+* Tue Feb 25 2025 Funda Wang <fundawang@yeah.net> - 31-19
+- fix golang-vendor-provides script for kubernetes
+- move kabi and kmod attr into system-rpm-config so that it could be used when building kernel
+
 * Thu Feb 20 2025 Funda Wang <fundawang@yeah.net> - 31-18
 - Produce "bundled(golang(MODULE_NAME)) = VERSION" provides if there are
   vendored sources inside source directory
-- 
Gitee