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

fix bug IABY7K

Browse Source
This commit is contained in:
wangchong1995924 2024-07-10 16:21:28 +08:00
parent d6387e4bdd
commit e88e42002c
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,31 @@
From 52f60354b4d48a0b3c2a25ddabb10a47073bfb0c Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Wed, 10 Jul 2024 15:28:00 +0800
Subject: [PATCH] fix issue IABY7K
diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
index a9efe4b..b2ba4de 100644
--- a/isomaker/rpm.sh
+++ b/isomaker/rpm.sh
@@ -185,7 +185,7 @@ function get_desktop_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
@@ -259,7 +259,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
parse_rpmlist_xml "everything_debug_exclude"
cat parsed_rpmlist_everything_debug_exclude
if [ -s parsed_rpmlist_everything_debug_exclude ];then
--
2.27.0

8
oemaker.spec
View File

@ -15,7 +15,7 @@ Summary: a building tool for DVD ISO making and ISO cutting
License: Mulan PSL v2
Group: System/Management
Version: 3.1.0
Release: 12
Release: 13
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -51,6 +51,7 @@ Patch0006: 0001-init-support-for-arch-ppc64le.patch
Patch0007: 0002-add-config-for-arch-ppc64le.patch
Patch0008: 0003-add-support-for-ppc64le-runtime-install.patch
%endif
Patch0009: 0004-bugfix-IABY7K.patch
%description
@ -234,6 +235,11 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 3.1.0-13
- ID:NA
- SUG:NA
- DESC: fix issue IABY7K
* Mon Jun 24 2024 jiahua yu <jiahua.yu@shingroup.cn> - 3.1.0-12
- ID:NA
- SUG:NA