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

Compare commits

base: packages:c4d4b48844dd7ecdb51df0da50e28c604110fd25
Branches Tags
packages:main
...
compare: packages:fa238cf4f30aecee02d8b0e7ca094320a898dc74
Branches Tags
packages:main

10 Commits
c4d4b48844 ... fa238cf4f3

Author SHA1 Message Date
openeuler-ci-bot
fa238cf4f3
!369 fix riscv64 livecd grub2-efi.cfg not found 
From: @ouuleilei 
Reviewed-by: @zhuchunyi, @Jingwiw 
Signed-off-by: @zhuchunyi, @Jingwiw
 2024-12-24 08:29:37 +00:00
ouuleilei
8c59dbbb3c fix riscv64 livecd grub2-efi.cfg not found 2024-12-24 15:10:46 +08:00
openeuler-ci-bot
154fbf1f9c
!368 add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt and haoc-kernel to the exclude tag 
From: @wangchong1995924 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi
 2024-12-20 09:20:12 +00:00
wangchong1995924
9dd3207606 add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt and haoc-kernel to the exclude tag 2024-12-20 16:05:15 +08:00
openeuler-ci-bot
ff773ed41a
!367 【轻量级 PR】：edge_ISO change kubeedge to k3s 
From: @yang-chaohao 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi
 2024-12-06 10:22:07 +00:00
杨超豪
0b168cc34f
edge_ISO change kubeedge to k3s 
Signed-off-by: 杨超豪 <yangchaohao@huawei.com>
 2024-12-06 10:00:00 +00:00
openeuler-ci-bot
89b7e5c5b2
!361 delete libkperf in rpmlist.xml 
From: @zhao-lichang 
Reviewed-by: @shenyangyang01 
Signed-off-by: @shenyangyang01
 2024-12-05 07:20:39 +00:00
zhaolichang
167692189e delete libkperf in rpmlist.xml 2024-12-05 15:08:40 +08:00
openeuler-ci-bot
43a36df9a8
!356 delete libkperf and oeAware-manager in minimal install 
From: @zhao-lichang 
Reviewed-by: @shenyangyang01 
Signed-off-by: @shenyangyang01
 2024-12-04 07:57:48 +00:00
zhaolichang
510fc63d8e delete libkperf and oeAware-manager in minimal install 2024-12-04 14:24:28 +08:00
7 changed files with 84 additions and 18 deletions
Show Stats Expand all files Collapse all files

23
0001-fix-livecd-grub2-efi.cfg-not-found.patch Normal file
View File

@ -0,0 +1,23 @@
From 54a698db663b89b826b0f2ef183b95a8730e1d03 Mon Sep 17 00:00:00 2001
From: ouuleilei <wangliu@iscas.ac.cn>
Date: Mon, 23 Dec 2024 15:07:22 +0800
Subject: [PATCH] fix livecd grub2-efi.cfg not found
---
.../livecd/live/config_files/riscv64/{grub.cfg => grub.conf} | 0
.../live/config_files/riscv64/{grub-efi.cfg => grub2-efi.cfg} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename isomaker/config/riscv64/livecd/live/config_files/riscv64/{grub.cfg => grub.conf} (100%)
rename isomaker/config/riscv64/livecd/live/config_files/riscv64/{grub-efi.cfg => grub2-efi.cfg} (100%)
diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.cfg b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf
similarity index 100%
rename from isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.cfg
rename to isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf
diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub-efi.cfg b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg
similarity index 100%
rename from isomaker/config/riscv64/livecd/live/config_files/riscv64/grub-efi.cfg
rename to isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg
--
2.47.1

8
edge_normal_aarch64.xml
View File

@ -117,10 +117,10 @@
<packagereq type="default">kubernetes-kubelet</packagereq>
<packagereq type="default">kubernetes-master</packagereq>
<packagereq type="default">kubernetes-node</packagereq>
<packagereq type="default">kubeedge-cloudcore</packagereq>
<packagereq type="default">kubeedge-edgecore</packagereq>
<packagereq type="default">kubeedge-edgesite</packagereq>
<packagereq type="default">kubeedge-keadm</packagereq>
<packagereq type="default">k3s</packagereq>
<packagereq type="default">k3s-selinux</packagereq>
<packagereq type="default">k3s-plugins</packagereq>
<packagereq type="default">k3s-containerd</packagereq>
<packagereq type="default">mdadm</packagereq>
<packagereq type="default">mdadm-help</packagereq>
</packagelist>

8
edge_normal_x86_64.xml
View File

@ -117,10 +117,10 @@
<packagereq type="default">kubernetes-kubelet</packagereq>
<packagereq type="default">kubernetes-master</packagereq>
<packagereq type="default">kubernetes-node</packagereq>
<packagereq type="default">kubeedge-cloudcore</packagereq>
<packagereq type="default">kubeedge-edgecore</packagereq>
<packagereq type="default">kubeedge-edgesite</packagereq>
<packagereq type="default">kubeedge-keadm</packagereq>
<packagereq type="default">k3s</packagereq>
<packagereq type="default">k3s-selinux</packagereq>
<packagereq type="default">k3s-plugins</packagereq>
<packagereq type="default">k3s-containerd</packagereq>
<packagereq type="default">mdadm</packagereq>
<packagereq type="default">mdadm-help</packagereq>
</packagelist>

2
normal_aarch64.xml
View File

@ -309,8 +309,6 @@
<packagereq type="optional">dracut-network</packagereq>
<packagereq type="optional">rdma-core</packagereq>
<packagereq type="optional">selinux-policy-mls</packagereq>
<packagereq type="default">oeAware-manager</packagereq>
<packagereq type="default">libkperf</packagereq>
</packagelist>
</group>
<group>

2
normal_x86_64.xml
View File

@ -309,8 +309,6 @@
<packagereq type="optional">dracut-network</packagereq>
<packagereq type="optional">rdma-core</packagereq>
<packagereq type="optional">selinux-policy-mls</packagereq>
<packagereq type="default">oeAware-manager</packagereq>
<packagereq type="default">libkperf</packagereq>
</packagelist>
</group>
<group>

26
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: 3.2.0
Release: 5
Release: 10
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@ -30,6 +30,7 @@ Requires: lorax >= 19.6.78-1
# Patch here
Patch0001: 0001-bugfix-IABY7K.patch
Patch0002: 0001-fix-livecd-grub2-efi.cfg-not-found.patch
%description
a building tool for DVD ISO making and ISO cutting
@ -186,6 +187,29 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
* Tue Dec 24 2024 Ouuleilei <wangliu@iscas.ac.cn> - 3.2.0-10
- fix riscv64 livecd grub2-efi.cfg not found
* Fri Dec 20 2024 wangchong <wangchong56@huawei.com> - 3.2.0-9
- ID:NA
- SUG:NA
- DESC: add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt and haoc-kernel to the exclude tag
* Fri Dec 6 2024 yangchaohao <yangchaohao@huawei.com> - 3.2.0-8
- ID:NA
- SUG:NA
- DESC: edge_ISO change kubeedge to k3s
* Thu Dec 5 2024 zhaolichang <zhaolichang@huawei.com> - 3.2.0-7
- ID:NA
- SUG:NA
- DESC: delete libkperf in rpmlist.xml
* Wed Dec 4 2024 zhaolichang <zhaolichang@huawei.com> - 3.2.0-6
- ID:NA
- SUG:NA
- DESC: delete libkperf and oeAware-manager in minimal install
* Tue Dec 3 2024 sunsuwan <sunsuwan3@huawei.com> - 3.2.0-5
- ID:NA
- SUG:NA

33
rpmlist.xml
View File

@ -40,17 +40,41 @@
<packagereq>drbd-utils</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>nodejs-grunt-contrib-watch</packagereq>
<packagereq>kernel-rt</packagereq>
<packagereq>kernel-rt-tools</packagereq>
<packagereq>kernel-rt-source</packagereq>
<packagereq>kernel-rt-devel</packagereq>
<packagereq>kernel-rt-headers</packagereq>
<packagereq>kernel-rt-tools-devel</packagereq>
<packagereq>raspberrypi-kernel</packagereq>
<packagereq>raspberrypi-kernel-devel</packagereq>
<packagereq>raspberrypi-kernel-rt</packagereq>
<packagereq>raspberrypi-kernel-rt-devel</packagereq>
<packagereq>haoc-kernel</packagereq>
<packagereq>haoc-kernel-source</packagereq>
<packagereq>haoc-kernel-tools</packagereq>
<packagereq>haoc-kernel-tools-devel</packagereq>
<packagereq>haoc-kernel-devel</packagereq>
<packagereq>haoc-kernel-headers</packagereq>
</packagelist>
<packagelist type="src_exclude">
<packagereq>drbd</packagereq>
<packagereq>gnome-boxes</packagereq>
<packagereq>nodejs-grunt-contrib-watch</packagereq>
<packagereq>haoc-kernel</packagereq>
<packagereq>kernel-rt</packagereq>
<packagereq>raspberrypi-kernel</packagereq>
<packagereq>raspberrypi-kernel-rt</packagereq>
</packagelist>
<packagelist type="everything_debug_exclude">
<packagereq>drbd-debuginfo</packagereq>
<packagereq>drbd-debugsource</packagereq>
<packagereq>gnome-boxes-debuginfo</packagereq>
<packagereq>gnome-boxes-debugsource</packagereq>
<packagereq>kernel-rt-debuginfo</packagereq>
<packagereq>kernel-rt-debugsource</packagereq>
<packagereq>kernel-rt-tools-debuginfo</packagereq>
<packagereq>haoc-kernel-debugsource</packagereq>
</packagelist>
<packagelist type="aarch64">
<packagereq>edk2-aarch64</packagereq>
@ -1381,7 +1405,6 @@
<packagereq>DCF</packagereq>
<packagereq>opengauss</packagereq>
<packagereq>oeAware-manager</packagereq>
<packagereq>libkperf</packagereq>
</packagelist>
<packagelist type="edge_aarch64">
<packagereq>grub2-efi-aa64</packagereq>
@ -1401,10 +1424,10 @@
<packagereq>kubernetes-kubelet</packagereq>
<packagereq>kubernetes-master</packagereq>
<packagereq>kubernetes-node</packagereq>
<packagereq>kubeedge-cloudcore</packagereq>
<packagereq>kubeedge-edgecore</packagereq>
<packagereq>kubeedge-edgesite</packagereq>
<packagereq>kubeedge-keadm</packagereq>
<packagereq>k3s</packagereq>
<packagereq>k3s-selinux</packagereq>
<packagereq>k3s-plugins</packagereq>
<packagereq>k3s-containerd</packagereq>
<packagereq>grub2-common</packagereq>
<packagereq>grub2-tools-minimal</packagereq>
<packagereq>grub2-tools-extra</packagereq>