From f716b98280956e198d0c3fb6e4de6b4179ae0300 Mon Sep 17 00:00:00 2001 From: c30025131 Date: Tue, 21 Nov 2023 10:48:59 +0800 Subject: [PATCH] support for livecd and isocut optimize --- README.en.md | 2 +- README.md | 2 +- oemaker.spec | 56 ++++++++++++++++------------------------------------ 3 files changed, 19 insertions(+), 41 deletions(-) diff --git a/README.en.md b/README.en.md index 7f63c6e..9da70e2 100644 --- a/README.en.md +++ b/README.en.md @@ -78,7 +78,7 @@ isocut _[-h] [-t temporary path] [-r extern rpm path] [-k k -h Show the help message and exit - -c cut packages, yes/no, default is yes + -c Cut packages, yes/no, default is yes isocut 详细文档请查看《镜像裁剪定制工具使用指南》： diff --git a/README.md b/README.md index aa7ac32..56b0712 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ isocut _[-h] [-t temporary path] [-r extern rpm path] [-k k -h Show the help message and exit - -c cut packages, yes/no, default is yes + -c Cut packages, yes/no, default is yes ##### envmaker diff --git a/oemaker.spec b/oemaker.spec index 2e6cba9..c8cfed4 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -67,16 +67,12 @@ cd %{_builddir}/%{name}-%{version}/%{name} %autopatch -p1 %install +sys_arch=$(uname -m) mkdir -p %{buildroot}/opt/ mkdir -p %{buildroot}/opt/oemaker mkdir -p %{buildroot}/opt/oemaker/config -%ifarch x86_64 -mkdir -p %{buildroot}/opt/oemaker/config/x86_64 -mkdir -p %{buildroot}/opt/oemaker/config/x86_64/livecd/live/config_files/x86_64 -%else -mkdir -p %{buildroot}/opt/oemaker/config/aarch64 -mkdir -p %{buildroot}/opt/oemaker/config/aarch64/livecd/live/config_files/aarch64 -%endif +mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch} +mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch} mkdir -p %{buildroot}/opt/oemaker/config/common mkdir -p %{buildroot}/opt/oemaker/config/common/livecd/live mkdir -p %{buildroot}/opt/oemaker/docs @@ -94,64 +90,46 @@ install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_record.sh install -m 700 %{name}/isomaker/env_restore.sh %{buildroot}/opt/oemaker/env_restore.sh install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml +install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/ +install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks +install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/rpmlist +install -m 400 %{name}/isomaker/config/${sys_arch}/desktop_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/desktop_normal.xml +install -m 400 %{name}/isomaker/config/${sys_arch}/edge_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/edge_normal.xml +install -m 400 %{name}/isomaker/config/${sys_arch}/normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/normal.xml +install -m 400 %{name}/isomaker/config/${sys_arch}/standard.conf %{buildroot}/opt/oemaker/config/${sys_arch}/standard.conf %ifarch x86_64 -install -m 640 %{name}/isomaker/config/x86_64/livecd/live/config_files/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/livecd/live/config_files/x86_64/ install -m 700 %{name}/isomaker/config/x86_64/livecd/live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/live/x86.tmpl -install -m 400 %{name}/isomaker/config/x86_64/livecd/livecd_x86_64.ks %{buildroot}/opt/oemaker/config/x86_64/livecd/livecd_x86_64.ks -install -m 600 %{name}/isomaker/config/x86_64/livecd/rpmlist %{buildroot}/opt/oemaker/config/x86_64/livecd/rpmlist -install -m 400 %{name}/isomaker/config/x86_64/desktop_normal.xml %{buildroot}/opt/oemaker/config/x86_64/desktop_normal.xml -install -m 400 %{name}/isomaker/config/x86_64/edge_normal.xml %{buildroot}/opt/oemaker/config/x86_64/edge_normal.xml install -m 400 %{name}/isomaker/config/x86_64/ks.cfg %{buildroot}/opt/oemaker/config/x86_64/ks.cfg -install -m 400 %{name}/isomaker/config/x86_64/normal.xml %{buildroot}/opt/oemaker/config/x86_64/normal.xml -install -m 400 %{name}/isomaker/config/x86_64/standard.conf %{buildroot}/opt/oemaker/config/x86_64/standard.conf %else -install -m 640 %{name}/isomaker/config/aarch64/livecd/live/config_files/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/livecd/live/config_files/aarch64/ install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl -install -m 400 %{name}/isomaker/config/aarch64/livecd/livecd_aarch64.ks %{buildroot}/opt/oemaker/config/aarch64/livecd/livecd_aarch64.ks -install -m 600 %{name}/isomaker/config/aarch64/livecd/rpmlist %{buildroot}/opt/oemaker/config/aarch64/livecd/rpmlist -install -m 400 %{name}/isomaker/config/aarch64/desktop_normal.xml %{buildroot}/opt/oemaker/config/aarch64/desktop_normal.xml -install -m 400 %{name}/isomaker/config/aarch64/edge_normal.xml %{buildroot}/opt/oemaker/config/aarch64/edge_normal.xml -install -m 400 %{name}/isomaker/config/aarch64/normal.xml %{buildroot}/opt/oemaker/config/aarch64/normal.xml -install -m 400 %{name}/isomaker/config/aarch64/standard.conf %{buildroot}/opt/oemaker/config/aarch64/standard.conf %endif install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/ install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/ cp -ar %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/ -%ifarch x86_64 -cp -ar %{buildroot}/opt/oemaker/config/common/* %{buildroot}/opt/oemaker/config/x86_64/ -%else -cp -ar %{buildroot}/opt/oemaker/config/common/* %{buildroot}/opt/oemaker/config/aarch64/ -%endif +cp -ar %{buildroot}/opt/oemaker/config/common/* %{buildroot}/opt/oemaker/config/${sys_arch}/ install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/ -%if 0%{?efi_aa64} - install -m 600 %{name}/isocut/config/aarch64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/ - install -m 600 %{name}/isocut/config/aarch64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/ -%endif -%if 0%{?efi_x64} - install -m 600 %{name}/isocut/config/x86_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/ - install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/ -%endif +install -m 600 %{name}/isocut/config/${sys_arch}/rpmlist %{buildroot}/%{_sysconfdir}/isocut/ +install -m 600 %{name}/isocut/config/${sys_arch}/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/ + mkdir -p %{buildroot}/opt/envmaker mkdir -p %{buildroot}/opt/envmaker/config -mkdir -p %{buildroot}/opt/envmaker/config/x86_64 -mkdir -p %{buildroot}/opt/envmaker/config/aarch64 +mkdir -p %{buildroot}/opt/envmaker/config/${sys_arch} mkdir -p %{buildroot}/opt/envmaker/utils install -m 700 %{name}/envmaker/envmaker.sh %{buildroot}/opt/envmaker/envmaker.sh install -m 700 %{name}/envmaker/utils/chroot.sh %{buildroot}/opt/envmaker/utils/chroot.sh install -m 700 %{name}/envmaker/utils/common_fun.sh %{buildroot}/opt/envmaker/utils/common_fun.sh install -m 700 %{name}/envmaker/utils/parse_rpmlist_xml.sh %{buildroot}/opt/envmaker/utils/parse_rpmlist_xml.sh -install -m 400 %{name}/envmaker/config/aarch64/openEuler_repo.conf %{buildroot}/opt/envmaker/config/aarch64/openEuler_repo.conf -install -m 400 %{name}/envmaker/config/x86_64/openEuler_repo.conf %{buildroot}/opt/envmaker/config/x86_64/openEuler_repo.conf -install -m 400 %{name}/envmaker/config/compile_env_rpmlist.xml %{buildroot}/opt/envmaker/config/compile_env_rpmlist.xml +install -m 600 %{name}/envmaker/config/${sys_arch}/openEuler_repo.conf %{buildroot}/opt/envmaker/config/${sys_arch}/openEuler_repo.conf +install -m 600 %{name}/envmaker/config/compile_env_rpmlist.xml %{buildroot}/opt/envmaker/config/compile_env_rpmlist.xml %pre