From fc6f69982e57f0f0af3505bd9cd60b0522769eca Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Tue, 19 Mar 2024 18:32:44 +0800 Subject: [PATCH 1/4] delete gnome group packages --- normal_aarch64.xml | 77 ---------------------------------------------- normal_x86_64.xml | 77 ---------------------------------------------- oemaker.spec | 7 ++++- rpmlist.xml | 15 --------- 4 files changed, 6 insertions(+), 170 deletions(-) diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 9397e42..6e09238 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -64,7 +64,6 @@ gpm-devel gstreamer1-devel gstreamer1-plugins-base-devel - gvfs-devel hunspell-devel java-1.8.0-openjdk-devel libXau-devel @@ -621,69 +620,6 @@ false - - - gnome-desktop - GNOME - GNOME - GNOME is a highly intuitive and user friendly desktop environment. - GNOME 是一个非常直观且用户友好的桌面环境。 - false - false - - at-spi2-atk - at-spi2-core - avahi - control-center - dconf - eog - evince - evince-nautilus - file-roller - file-roller-nautilus - firewall-config - fprintd-pam - gdm - glib-networking - gnome-bluetooth - gnome-color-manager - gnome-dictionary - gnome-font-viewer - gnome-getting-started-docs - gnome-icon-theme - gnome-packagekit - gnome-packagekit-updater - gnome-screenshot - gnome-session - gnome-session-xsession - gnome-settings-daemon - gnome-shell - gnome-themes-standard - gnome-user-docs - gvfs-afc - gvfs-afp - gvfs-archive - gvfs-fuse3 - gvfs-goa - gvfs-gphoto2 - gvfs-mtp - gvfs-smb - initial-setup-gui - libcanberra-gtk2 - libcanberra-gtk3 - librsvg2 - metacity - nautilus - nm-connection-editor - PackageKit-command-not-found - PackageKit-gtk3-module - sane-backends-drivers-scanners - vinagre - vino - xdg-user-dirs-gtk - yelp - vim-X11 - guest-desktop-agents @@ -1441,18 +1377,6 @@ vinagre - - smart-card - Smart Card Support - 智能卡支持 - Support for using smart card authentication. - 支持使用智能卡验证。 - true - true - - esc - - web-server Basic Web Server @@ -1646,7 +1570,6 @@ - diff --git a/normal_x86_64.xml b/normal_x86_64.xml index 756c7a9..77cb06c 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -64,7 +64,6 @@ gpm-devel gstreamer1-devel gstreamer1-plugins-base-devel - gvfs-devel hunspell-devel java-1.8.0-openjdk-devel libXau-devel @@ -620,69 +619,6 @@ false - - - gnome-desktop - GNOME - GNOME - GNOME is a highly intuitive and user friendly desktop environment. - GNOME 是一个非常直观且用户友好的桌面环境。 - false - false - - at-spi2-atk - at-spi2-core - avahi - control-center - dconf - eog - evince - evince-nautilus - file-roller - file-roller-nautilus - firewall-config - fprintd-pam - gdm - glib-networking - gnome-bluetooth - gnome-color-manager - gnome-dictionary - gnome-font-viewer - gnome-getting-started-docs - gnome-icon-theme - gnome-packagekit - gnome-packagekit-updater - gnome-screenshot - gnome-session - gnome-session-xsession - gnome-settings-daemon - gnome-shell - gnome-themes-standard - gnome-user-docs - gvfs-afc - gvfs-afp - gvfs-archive - gvfs-fuse3 - gvfs-goa - gvfs-gphoto2 - gvfs-mtp - gvfs-smb - initial-setup-gui - libcanberra-gtk2 - libcanberra-gtk3 - librsvg2 - metacity - nautilus - nm-connection-editor - PackageKit-command-not-found - PackageKit-gtk3-module - sane-backends-drivers-scanners - vinagre - vino - xdg-user-dirs-gtk - yelp - vim-X11 - guest-desktop-agents @@ -1443,18 +1379,6 @@ vinagre - - smart-card - Smart Card Support - 智能卡支持 - Support for using smart card authentication. - 支持使用智能卡验证。 - true - true - - esc - - web-server Basic Web Server @@ -1648,7 +1572,6 @@ - diff --git a/oemaker.spec b/oemaker.spec index 0d293e1..17295ce 100644 --- a/oemaker.spec +++ b/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: 3.1.0 -Release: 4 +Release: 5 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -172,6 +172,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Mar 19 2024 sunhai - 3.1.0-5 +- ID:NA +- SUG:NA +- DESC: delete gnome group packages + * Sun Feb 4 2024 wangchong - 3.1.0-4 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index 484b6e3..c67d4af 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -85,7 +85,6 @@ adobe-mappings-cmap-help adobe-mappings-pdf adobe-mappings-pdf-help - adwaita-gtk2-theme aide aide-help alsa-firmware @@ -306,7 +305,6 @@ elfutils-devel ethtool ethtool-help - evolution-data-server exempi exempi-help expat @@ -398,7 +396,6 @@ grubby-help gssproxy gssproxy-help - gvfs gzip gzip-help haveged @@ -514,8 +511,6 @@ libblkid libbonobo libbonobo-help - libbonoboui - libbonoboui-help libcanberra-gtk2 libcanberra-help libcap @@ -571,15 +566,9 @@ libgcc libgcrypt libgcrypt-help - libgdata - libgdata-help libgee libgee-help libgmem - libgnome - libgnomecanvas - libgnomecanvas-help - libgnome-help libgnomekbd libgomp libgpg-error @@ -876,11 +865,7 @@ mtr-help multipath-tools multipath-tools-help - mutter - mutter-help mysql - nautilus - nautilus-help ncompress ncompress-help ncurses -- Gitee From 3c5920b535ed96225991c8a556ef7ae1d0543474 Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Wed, 20 Mar 2024 10:58:50 +0800 Subject: [PATCH 2/4] delete initial-setup-gui --- normal_aarch64.xml | 1 - normal_x86_64.xml | 1 - oemaker.spec | 7 ++++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 6e09238..1fa1cda 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1404,7 +1404,6 @@ false glx-utils - initial-setup-gui mesa-dri-drivers plymouth-system-theme spice-vdagent diff --git a/normal_x86_64.xml b/normal_x86_64.xml index 77cb06c..6444dc6 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1406,7 +1406,6 @@ false glx-utils - initial-setup-gui mesa-dri-drivers plymouth-system-theme spice-vdagent diff --git a/oemaker.spec b/oemaker.spec index 17295ce..c1b6ce0 100644 --- a/oemaker.spec +++ b/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: 3.1.0 -Release: 5 +Release: 6 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -172,6 +172,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Mar 20 2024 sunhai - 3.1.0-6 +- ID:NA +- SUG:NA +- DESC: delete initial-setup-gui + * Tue Mar 19 2024 sunhai - 3.1.0-5 - ID:NA - SUG:NA -- Gitee From b18bb8c455d1665412cd0324efafc30986759fb3 Mon Sep 17 00:00:00 2001 From: MaYunlong Date: Wed, 27 Mar 2024 10:05:54 +0800 Subject: [PATCH 3/4] delete libvirt package --- normal_aarch64.xml | 4 +--- normal_x86_64.xml | 4 +--- oemaker.spec | 7 ++++++- rpmlist.xml | 4 +--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 1fa1cda..942d222 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1313,8 +1313,6 @@ false libvirt - libvirt-admin - libvirt-bash-completion libvirt-client libvirt-daemon libvirt-daemon-config-network @@ -1336,11 +1334,11 @@ libvirt-daemon-driver-storage-rbd libvirt-daemon-driver-storage-scsi libvirt-daemon-kvm + libvirt-daemon-plugin-sanlock libvirt-daemon-qemu libvirt-devel libvirt-docs libvirt-libs - libvirt-lock-sanlock libvirt-nss python3-libvirt edk2-aarch64 diff --git a/normal_x86_64.xml b/normal_x86_64.xml index 6444dc6..26baaf2 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1317,8 +1317,6 @@ false libvirt - libvirt-admin - libvirt-bash-completion libvirt-client libvirt-daemon libvirt-daemon-config-network @@ -1340,11 +1338,11 @@ libvirt-daemon-driver-storage-rbd libvirt-daemon-driver-storage-scsi libvirt-daemon-kvm + libvirt-daemon-plugin-sanlock libvirt-daemon-qemu libvirt-devel libvirt-docs libvirt-libs - libvirt-lock-sanlock libvirt-nss python3-libvirt qemu-help diff --git a/oemaker.spec b/oemaker.spec index c1b6ce0..f1c0189 100644 --- a/oemaker.spec +++ b/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: 3.1.0 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -172,6 +172,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Thu Mar 28 2024 mayunlong - 3.1.0-7 +- ID:NA +- SUG:NA +- DESC: delete libvirt package + * Wed Mar 20 2024 sunhai - 3.1.0-6 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index c67d4af..5e553ce 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -717,8 +717,6 @@ libverto-glib libverto-libevent libvirt - libvirt-admin - libvirt-bash-completion libvirt-client libvirt-daemon libvirt-daemon-config-network @@ -739,7 +737,7 @@ libvirt-daemon-driver-storage-mpath libvirt-daemon-driver-storage-rbd libvirt-daemon-driver-storage-scsi - libvirt-daemon-kvm + libvirt-daemon-kvm libvirt-daemon-qemu libvirt-devel libvirt-docs -- Gitee From 6f0081b401266ae22d332c9e8719a1bef34eaf3c Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Mon, 22 Apr 2024 16:01:45 +0800 Subject: [PATCH 4/4] fix(isomaker): cannot ejejct CD/DVD --- ...er-fix-isomaker-cannot-ejejct-CD-DVD.patch | 25 +++++++++++++++++++ oemaker.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 oemaker-fix-isomaker-cannot-ejejct-CD-DVD.patch diff --git a/oemaker-fix-isomaker-cannot-ejejct-CD-DVD.patch b/oemaker-fix-isomaker-cannot-ejejct-CD-DVD.patch new file mode 100644 index 0000000..75eeb00 --- /dev/null +++ b/oemaker-fix-isomaker-cannot-ejejct-CD-DVD.patch @@ -0,0 +1,25 @@ +From bec7cb9bc4878381ac1581637879e8c6723e4617 Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Mon, 22 Apr 2024 15:54:58 +0800 +Subject: [PATCH] fix(isomaker): cannot ejejct CD/DVD + +--- + isomaker/80-openeuler/runtime-cleanup.tmpl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl +index 256d013..e69ebf0 100644 +--- a/isomaker/80-openeuler/runtime-cleanup.tmpl ++++ b/isomaker/80-openeuler/runtime-cleanup.tmpl +@@ -17,7 +17,7 @@ removefrom ${product.name}-logos /usr/share/plymouth/* + ## We also need dracut-shutdown.service and dracut-initramfs-restore to reboot + removefrom dracut --allbut /usr/lib/dracut/modules.d/30convertfs/convertfs.sh \ + /usr/lib/dracut/modules.d/99base/dracut-lib.sh \ +- /usr/lib/systemd/* /usr/lib/dracut/modules.d/98systemd/*.service \ ++ /usr/lib/systemd/* /usr/lib/dracut/modules.d/98dracut-systemd/*.service \ + /usr/lib/dracut/dracut-initramfs-restore + ## we don't run SELinux (not in enforcing, anyway) + removepkg checkpolicy selinux-policy libselinux-utils +-- +2.33.0 + diff --git a/oemaker.spec b/oemaker.spec index f1c0189..b9ed5b0 100644 --- a/oemaker.spec +++ b/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: 3.1.0 -Release: 7 +Release: 8 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -27,6 +27,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 # Patch here +Patch0001: oemaker-fix-isomaker-cannot-ejejct-CD-DVD.patch %description a building tool for DVD ISO making and ISO cutting @@ -172,6 +173,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Mon Apr 22 2024 yueyuankun - 3.1.0-8 +- ID:NA +- SUG:NA +- DESC: fix(isomaker): cannot ejejct CD/DVD + * Thu Mar 28 2024 mayunlong - 3.1.0-7 - ID:NA - SUG:NA -- Gitee