32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 6c40ee80b6b3e5a723506cad70571347e5bae53e Mon Sep 17 00:00:00 2001
|
|
From: wangchong1995924 <15229716099@163.com>
|
|
Date: Thu, 11 Jul 2024 10:41:41 +0800
|
|
Subject: [PATCH] fix issue IABY7K
|
|
|
|
|
|
diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
|
|
index 85b1042..fde30a0 100644
|
|
--- a/isomaker/rpm.sh
|
|
+++ b/isomaker/rpm.sh
|
|
@@ -167,7 +167,7 @@ function get_edge_rpms()
|
|
|
|
function get_everything_rpms()
|
|
{
|
|
- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst
|
|
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo\." | grep -v "debugsource\." > ava_every_lst
|
|
parse_rpmlist_xml "exclude"
|
|
cat parsed_rpmlist_exclude
|
|
if [ -s parsed_rpmlist_exclude ];then
|
|
@@ -241,7 +241,7 @@ function everything_source_rpms_download()
|
|
function everything_debug_rpms_download()
|
|
{
|
|
mkdir ${EVERY_DEBUG_DIR}
|
|
- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst
|
|
+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo\.|debugsource\." > ava_debug_lst
|
|
yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_DEBUG_DIR}" $(cat ava_debug_lst | tr '\n' ' ')
|
|
if [ $? != 0 ] || [ $(ls ${EVERY_DEBUG_DIR} | wc -l) == 0 ]; then
|
|
echo "yumdownloader with --resolve failed, trying to yumdownloader without --resolve"
|
|
--
|
|
2.27.0
|
|
|