packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!334 fix bug IABY7K

Browse Source 
From: @wangchong1995924 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2024-07-11 03:35:44 +00:00 committed by Gitee
commit d26080a498
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0009-bugfix-IABY7K.patch Normal file
View File

@ -0,0 +1,31 @@
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

8
oemaker.spec
View File

@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting
License: Mulan PSL v2
Group: System/Management
Version: 2.0.3
Release: 11
Release: 12
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -32,6 +32,7 @@ Patch0005: 0005-add-fpi_tail-param-for-grub.patch
Patch0006: 0006-support-usb-flash-drive-mode.patch
Patch0007: 0007-restore-env-after-selinux-status-changes.patch
Patch0008: 0008-automated-kickstart-function.patch
Patch0009: 0009-bugfix-IABY7K.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -135,6 +136,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 2.0.3-12
- ID:NA
- SUG:NA
- DESC: fix issue IABY7K
* Mon Oct 23 2023 chenhuihan <chenhuihan@huawei.com> - 2.0.3-11
- ID:NA
- SUG:NA