Compare commits
12 Commits
f2c73129f6
...
4dba3ece89
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4dba3ece89 | ||
|
|
8da5a6e6dd | ||
|
|
475dfbada0 | ||
|
|
3b80a3f481 | ||
|
|
d1c23fad05 | ||
|
|
b4b9341fc1 | ||
|
|
ab5ff75901 | ||
|
|
b35914f2f4 | ||
|
|
d9d16031f6 | ||
|
|
d26080a498 | ||
|
|
0d8a194e13 | ||
|
|
485f3973a8 |
31
0009-bugfix-IABY7K.patch
Normal file
31
0009-bugfix-IABY7K.patch
Normal 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
|
||||
|
||||
32
oemaker.spec
32
oemaker.spec
@ -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: 16
|
||||
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,31 @@ rm -rf %{buildroot}
|
||||
rm -rf $RPM_BUILD_DIR/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Dec 5 2024 zhaolichang <zhaolichang@huawei.com> - 2.0.3-16
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: delete oeAware-manager in rpmlist.xml
|
||||
|
||||
* Thu Dec 5 2024 zhaolichang <zhaolichang@huawei.com> - 2.0.3-15
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: delete libkperf in rpmlist.xml
|
||||
|
||||
* Wed Dec 4 2024 zhaolichang <zhaolichang@huawei.com> - 2.0.3-14
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: delete libkperf and oeAware-manager in minimal install
|
||||
|
||||
* Tue Dec 3 2024 zhaolichang <zhaolichang@huawei.com> - 2.0.3-13
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add libkperf and oeAware-manager
|
||||
|
||||
* 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
|
||||
@ -215,12 +241,12 @@ rm -rf $RPM_BUILD_DIR/%{name}
|
||||
- SUG:NA
|
||||
- DESC: bugfix I3QY98
|
||||
|
||||
* TUE May 11 2021 imxcc <xingchaochao@huawei.com> - 2.0.0-3
|
||||
* Tue May 11 2021 imxcc <xingchaochao@huawei.com> - 2.0.0-3
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add qemu-block-iscsi in virtualization-hypervisor group
|
||||
|
||||
* TUE May 11 2021 XuFei <xufei30@huawei.com> - 2.0.0-2
|
||||
* Tue May 11 2021 XuFei <xufei30@huawei.com> - 2.0.0-2
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add stratovirt in virtualization-hypervisor group
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user