From 43216f86ba58aceebb032808a7e3ac49c9562dc7 Mon Sep 17 00:00:00 2001
From: Hang Zhao <zhao.hang@linux.alibaba.com>
Date: Fri, 2 Jun 2023 08:37:43 +0800
Subject: [PATCH 1/2] unity:download sysak.ko in run,sh

Signed-off-by: Hang Zhao <zhao.hang@linux.alibaba.com>
---
 source/tools/monitor/unity/beeQ/run.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/tools/monitor/unity/beeQ/run.sh b/source/tools/monitor/unity/beeQ/run.sh
index 1c138451..1f228ae7 100755
--- a/source/tools/monitor/unity/beeQ/run.sh
+++ b/source/tools/monitor/unity/beeQ/run.sh
@@ -17,5 +17,8 @@ export LUA_CPATH="./lib/?.so;../../lib/?.so;../../lib/loadall.so;"
 yaml_path=$1
 [ ! $yaml_path ] && yaml_path="/etc/sysak/base.yaml"
 
+#download sysak.ko
+sysak -oss -d
+
 echo $yaml_yaml_path
 ./unity-mon $yaml_path
-- 
Gitee


From 0baefd5569edad4022baa38ec9434cc8877e09b6 Mon Sep 17 00:00:00 2001
From: Hang Zhao <zhao.hang@linux.alibaba.com>
Date: Fri, 2 Jun 2023 08:44:36 +0800
Subject: [PATCH 2/2] unity: cp yaml to /etc/sysak/

Signed-off-by: Hang Zhao <zhao.hang@linux.alibaba.com>
---
 rpm/sysak-build-nodep.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rpm/sysak-build-nodep.sh b/rpm/sysak-build-nodep.sh
index be156a0c..d43a1852 100755
--- a/rpm/sysak-build-nodep.sh
+++ b/rpm/sysak-build-nodep.sh
@@ -14,6 +14,8 @@ build_rpm()
 	mkdir -p "${RPMBUILD_DIR}"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 echo "cat"
 cat > $RPMBUILD_DIR/sysak.spec <<EOF
+%global __filter_GLIBC_PRIVATE 1
+%define __requires_exclude libc.so.6(GLIBC_PRIVATE)
 Name: sysak
 Summary: system analyse kit
 Version: ${RPM_VERSION}
@@ -45,7 +47,7 @@ mkdir -p \$RPM_BUILD_ROOT/usr/lib/systemd/system/
 /bin/cp -rf $BUILD_DIR/sysak \$RPM_BUILD_ROOT/usr/bin/
 /bin/cp -f $BUILD_DIR/.sysak_components/tools/monitor/sysakmon.conf \$RPM_BUILD_ROOT/usr/local/sysak
 /bin/cp -f $BUILD_DIR/.sysak_components/tools/monitor/monctl.conf \$RPM_BUILD_ROOT/usr/local/sysak
-/bin/cp -f $BUILD_DIR/.sysak_components/tools/dist/app/collector/plugin.yaml \$RPM_BUILD_ROOT/etc/sysak/
+/bin/cp -f $BUILD_DIR/.sysak_components/tools/dist/app/etc/* \$RPM_BUILD_ROOT/etc/sysak/
 /bin/cp $SOURCE_DIR/rpm/sysak.service \$RPM_BUILD_ROOT/usr/lib/systemd/system/
 /bin/cp $SOURCE_DIR/rpm/sysak_server.conf \$RPM_BUILD_ROOT/usr/local/sysak/
 
@@ -77,6 +79,8 @@ rpmbuild --define "%linux_version $LINUX_VERSION" \
 	 --define "%_topdir ${RPMBUILD_DIR}"       \
 	 --define "%source_dir $SOURCE_DIR" \
 	 --define "%target $TARGET_LIST" \
+	 --define "%global __filter_GLIBC_PRIVATE 1" \
+	 --define "%define __requires_exclude libc.so.6(GLIBC_PRIVATE)" \
 	 -bb $RPMBUILD_DIR/sysak.spec
 }
 
-- 
Gitee