diff --git a/0001-change-source-iso-method.patch b/0001-change-source-iso-method.patch deleted file mode 100644 index 582a26715c2f0d797c3049fa480f53ba81c8ddf1..0000000000000000000000000000000000000000 --- a/0001-change-source-iso-method.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d2181a8bd05e2761827f0cc9451992d137828095 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Wed, 10 Mar 2021 09:16:00 +0800 -Subject: [PATCH] change source iso method - ---- - config/rpmlist.xml | 11 +++++++++++ - rpm.sh | 21 +++++++++++++-------- - 2 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/config/rpmlist.xml b/config/rpmlist.xml -index d5fcf8a..a6ac01b 100644 ---- a/config/rpmlist.xml -+++ b/config/rpmlist.xml -@@ -32,6 +32,17 @@ - texlive-scheme-gust - texlive-scheme-medium - texlive-scheme-tetex -+ totem -+ gimp -+ python3-nni -+ ceph-mgr-rook -+ ceph-mgr-ssh -+ ceph-mgr-dashboard -+ ceph-mgr-k8sevents -+ -+ -+ totem -+ gimp - - - edk2-aarch64 -diff --git a/rpm.sh b/rpm.sh -index 7e4a7e2..f8cf92e 100755 ---- a/rpm.sh -+++ b/rpm.sh -@@ -154,7 +154,7 @@ function get_everything_rpms() - if [ -s parsed_rpmlist_exclude ];then - for rpmname in $(cat parsed_rpmlist_exclude) - do -- sed -i "/^${rpmname}/d" ava_every_lst -+ sed -i "/^${rpmname}\./d" ava_every_lst - done - fi - if [ -s conflict_list ];then -@@ -165,7 +165,7 @@ function get_everything_rpms() - if [ -s parsed_rpmlist_conflict ];then - for rpmname in $(cat parsed_rpmlist_conflict) - do -- sed -i "/^${rpmname}/d" ava_every_lst -+ sed -i "/^${rpmname}\./d" ava_every_lst - echo "${rpmname}" >> conflict_list - done - fi -@@ -174,7 +174,7 @@ function get_everything_rpms() - if [ -s parsed_rpmlist_everything_conflict ];then - for rpmname in $(cat parsed_rpmlist_everything_conflict) - do -- sed -i "/^${rpmname}/d" ava_every_lst -+ sed -i "/^${rpmname}\./d" ava_every_lst - echo "${rpmname}" >> conflict_list - done - fi -@@ -197,15 +197,20 @@ function everything_rpms_download() - function everything_source_rpms_download() - { - mkdir ${EVERY_SRC_DIR} -- get_everything_rpms -- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ') -+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep ".src" > ava_every_lst -+ parse_rpmlist_xml "src_exclude" -+ cat parsed_rpmlist_src_exclude -+ if [ -s parsed_rpmlist_src_exclude ];then -+ for rpmname in $(cat parsed_rpmlist_src_exclude) -+ do -+ sed -i "/^${rpmname}\./d" ava_every_lst -+ done -+ fi -+ yumdownloader --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ') - if [ $? != 0 ] || [ $(ls ${EVERY_SRC_DIR} | wc -l) == 0 ]; then - echo "Download rpms failed!" - exit 133 - fi -- if [ -s conflict_list ];then -- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat conflict_list | tr '\n' ' ') -- fi - } - - function everything_debug_rpms_download() --- -2.27.0 - diff --git a/0002-bug-fix-I3B7CH.patch b/0002-bug-fix-I3B7CH.patch deleted file mode 100644 index 6880f6aa836172fd386e331f76bde4bc7aeed4b0..0000000000000000000000000000000000000000 --- a/0002-bug-fix-I3B7CH.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 78879f08b31ea910e7b39b512a74986788645769 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Sat, 13 Mar 2021 10:11:53 +0800 -Subject: [PATCH] bug fix I3B7CH - ---- - rpm.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rpm.sh b/rpm.sh -index 7e4a7e2..9a255a7 100755 ---- a/rpm.sh -+++ b/rpm.sh -@@ -148,7 +148,7 @@ function get_rpm_pub_key() - - 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 --- -2.27.0 - diff --git a/0003-add-exclude-rpm-sub-of-gimp-and-totem.patch b/0003-add-exclude-rpm-sub-of-gimp-and-totem.patch deleted file mode 100644 index 699275072a4987701557d66f2ae7ad327665a08e..0000000000000000000000000000000000000000 --- a/0003-add-exclude-rpm-sub-of-gimp-and-totem.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4196eb9e39094158183f46e47efbe2864e90bdb7 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Tue, 16 Mar 2021 11:53:57 +0800 -Subject: [PATCH] add exclude rpm sub of gimp and totem - ---- - config/rpmlist.xml | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/config/rpmlist.xml b/config/rpmlist.xml -index a6ac01b..649aac1 100644 ---- a/config/rpmlist.xml -+++ b/config/rpmlist.xml -@@ -33,7 +33,17 @@ - texlive-scheme-medium - texlive-scheme-tetex - totem -+ totem-debuginfo -+ totem-debugsource -+ totem-devel -+ totem-help -+ totem-nautilus - gimp -+ gimp-libs -+ gimp-devel -+ gimp-help -+ gimp-debuginfo -+ gimp-debugsource - python3-nni - ceph-mgr-rook - ceph-mgr-ssh --- -2.30.0 - diff --git a/0004-delete-or-replace-rpms-which-are-not-exist.patch b/0004-delete-or-replace-rpms-which-are-not-exist.patch deleted file mode 100644 index 4d797b3098e281fb8712b8ca3970078a6bb89f12..0000000000000000000000000000000000000000 --- a/0004-delete-or-replace-rpms-which-are-not-exist.patch +++ /dev/null @@ -1,414 +0,0 @@ -From a7ec3063ac10f0a2bbb2a2d074cde4181cd7d038 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Wed, 17 Mar 2021 18:27:22 +0800 -Subject: [PATCH] delete or replace rpms which are not exist - ---- - config/aarch64/normal.xml | 44 +++++++++++++++----------------------- - config/rpmlist.xml | 14 ++---------- - config/x86_64/normal.xml | 45 ++++++++++++++++----------------------- - 3 files changed, 37 insertions(+), 66 deletions(-) - -diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml -index 7e61eba..35350f7 100644 ---- a/config/aarch64/normal.xml -+++ b/config/aarch64/normal.xml -@@ -130,7 +130,7 @@ - mdadm - realmd - shim-aa64 -- teamd -+ libteam - tmux - xfsprogs - authselect-compat -@@ -151,7 +151,7 @@ - bc - cpio - crontabs -- cyrus-sasl-plain -+ cyrus-sasl - dbus - ed - file -@@ -197,7 +197,7 @@ - smartmontools - sssd - strace -- teamd -+ libteam - time - unzip - usbutils -@@ -282,9 +282,8 @@ - rpm - selinux-policy-targeted - setup -- shadow-utils -- sssd-common -- sssd-kcm -+ shadow -+ sssd - sudo - systemd - tuned -@@ -297,14 +296,12 @@ - openEuler-performance - openEuler-latest-release - NetworkManager -- NetworkManager-team -- NetworkManager-tui - NetworkManager-config-server - authselect - dnf-plugins-core - dracut-config-rescue - kernel-tools -- libsysfs -+ sysfsutils - linux-firmware - lshw - lsscsi -@@ -355,11 +352,9 @@ - make - patch - pkgconf -- pkgconf-m4 -- pkgconf-pkg-config - openEuler-rpm-config - rpm-build -- rpm-sign -+ rpm - asciidoc - byacc - ctags -@@ -446,7 +441,6 @@ - samba-winbind - samba-winbind-clients - sssd-dbus -- sssd-kcm - sssd-tools - sssd-winbind-idmap - -@@ -732,11 +726,7 @@ - true - - PackageKit -- cockpit-packagekit -- cockpit-storaged -- cockpit-bridge -- cockpit-system -- cockpit-ws -+ cockpit - openssh-server - sscg - -@@ -923,7 +913,7 @@ - libreswan - radvd - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-mysql - rsyslog-pgsql - rsyslog-relp -@@ -949,7 +939,7 @@ - libreswan - radvd - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-mysql - rsyslog-pgsql - rsyslog-relp -@@ -967,7 +957,7 @@ - NetworkManager-bluetooth - NetworkManager-wifi - NetworkManager-wwan -- dhcp-client -+ dhcp - iptables - dnsmasq - -@@ -1232,9 +1222,9 @@ - openEuler-release - openEuler-performance - timedatex -- dhcp-client -+ dhcp - NetworkManager-config-server -- NetworkManager-team -+ NetworkManager - - - -@@ -1266,7 +1256,7 @@ - bc - cpio - crontabs -- cyrus-sasl-plain -+ cyrus-sasl - dbus - ed - file -@@ -1307,7 +1297,7 @@ - smartmontools - sssd - strace -- teamd -+ libteam - time - unzip - usbutils -@@ -1327,9 +1317,9 @@ - nano - rng-tools - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-relp -- nmap-ncat -+ nmap - pinfo - plymouth - tcpdump -diff --git a/config/rpmlist.xml b/config/rpmlist.xml -index 649aac1..23671de 100644 ---- a/config/rpmlist.xml -+++ b/config/rpmlist.xml -@@ -205,10 +205,7 @@ - clutter-gtk-help - clutter-help - cockpit -- cockpit-bridge - cockpit-help -- cockpit-storaged -- cockpit-ws - cogl - cogl-help - color-filesystem -@@ -251,7 +248,6 @@ - cyrus-sasl-lib - cyrus-sasl-md5 - cyrus-sasl-ntlm -- cyrus-sasl-plain - cyrus-sasl-scram - dbus - dbus-glib -@@ -259,7 +255,7 @@ - dbus-python-help - device-mapper - device-mapper-event -- dhcp-client -+ dhcp - dhcp-common - dhcp-libs - dhcp-server -@@ -1049,8 +1045,6 @@ - pkcs11-helper-help - pkgconf - pkgconf-help -- pkgconf-m4 -- pkgconf-pkg-config - plymouth - plymouth-help - policycoreutils -@@ -1185,14 +1179,12 @@ - rpm-plugin-systemd-inhibit - rpmrebuild - rpmrebuild-help -- rpm-sign - rsync - rsync-help - rsyslog - rsyslog-crypto - rsyslog-elasticsearch - rsyslog-gnutls -- rsyslog-gssapi - rsyslog-help - rsyslog-mmaudit - rsyslog-mmjsonparse -@@ -1227,7 +1219,7 @@ - sgml-common - sgml-common-help - shadow-help -- shadow-utils -+ shadow - shared-mime-info - shared-mime-info-help - sharutils -@@ -1251,9 +1243,7 @@ - squid - sssd - sssd-client -- sssd-common - sssd-help -- sssd-kcm - sssd-nfs-idmap - strace - strongswan -diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml -index fe68bae..588e66e 100644 ---- a/config/x86_64/normal.xml -+++ b/config/x86_64/normal.xml -@@ -130,7 +130,7 @@ - mdadm - realmd - shim -- teamd -+ libteam - tmux - xfsprogs - authselect-compat -@@ -151,7 +151,7 @@ - bc - cpio - crontabs -- cyrus-sasl-plain -+ cyrus-sasl - dbus - ed - file -@@ -197,7 +197,7 @@ - smartmontools - sssd - strace -- teamd -+ libteam - time - unzip - usbutils -@@ -285,9 +285,8 @@ - rpm - selinux-policy-targeted - setup -- shadow-utils -- sssd-common -- sssd-kcm -+ shadow -+ sssd - sudo - systemd - tuned -@@ -297,14 +296,12 @@ - yum - wget - NetworkManager -- NetworkManager-team -- NetworkManager-tui - NetworkManager-config-server - authselect - dnf-plugins-core - dracut-config-rescue - kernel-tools -- libsysfs -+ sysfsutils - linux-firmware - lshw - lsscsi -@@ -355,11 +352,9 @@ - make - patch - pkgconf -- pkgconf-m4 -- pkgconf-pkg-config - openEuler-rpm-config - rpm-build -- rpm-sign -+ rpm - asciidoc - byacc - ctags -@@ -446,7 +441,6 @@ - samba-winbind - samba-winbind-clients - sssd-dbus -- sssd-kcm - sssd-tools - sssd-winbind-idmap - -@@ -732,11 +726,8 @@ - true - - PackageKit -- cockpit-packagekit -- cockpit-storaged -- cockpit-bridge -- cockpit-system -- cockpit-ws -+ cockpit -+ cockpit - openssh-server - sscg - -@@ -925,7 +916,7 @@ - libreswan - radvd - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-mysql - rsyslog-pgsql - rsyslog-relp -@@ -951,7 +942,7 @@ - libreswan - radvd - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-mysql - rsyslog-pgsql - rsyslog-relp -@@ -969,7 +960,7 @@ - NetworkManager-bluetooth - NetworkManager-wifi - NetworkManager-wwan -- dhcp-client -+ dhcp - iptables - dnsmasq - -@@ -1234,9 +1225,9 @@ - openEuler-performance - openEuler-latest-release - timedatex -- dhcp-client -+ dhcp - NetworkManager-config-server -- NetworkManager-team -+ NetworkManager - - - -@@ -1268,7 +1259,7 @@ - bc - cpio - crontabs -- cyrus-sasl-plain -+ cyrus-sasl - dbus - ed - file -@@ -1310,7 +1301,7 @@ - smartmontools - sssd - strace -- teamd -+ libteam - time - unzip - usbutils -@@ -1330,9 +1321,9 @@ - nano - rng-tools - rsyslog-gnutls -- rsyslog-gssapi -+ rsyslog - rsyslog-relp -- nmap-ncat -+ nmap - pinfo - plymouth - tcpdump --- -2.30.0 - diff --git a/README.en.md b/README.en.md index 9b442e21117e8773c3eafddfb3f70e7cbc9b595d..6d597a9666ae3b0c6f3eaf6ee53fcab9bccf2e4c 100644 --- a/README.en.md +++ b/README.en.md @@ -2,28 +2,37 @@ #### Description -`oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso. -`oemaker` uses local arch when building, did not support cross building. -currently, `oemaker` support the arch of aarch64 and x86_64 for iso making. +The source package `oemaker` has two functions: iso making and iso cutting. Correspondingly, two binary RPM packages are generated: `oemaker` and `isocut`. + +The generated binary RPM package `oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything source iso,everything debug iso and netinst iso. + +The generated binary RPM package `isocut` is a building tool for iso cutting which supports only RPM package-level. #### Installation -To install `oemaker`, you can use `rpm` or `dnf` package manager command with openEuler repository. +To install `oemaker` and `isocut`, you can use `rpm` or `dnf` package manager command with openEuler repository. -Install oemaker with dnf +Install `oemaker` with dnf ```sh dnf install -y oemaker ``` +Install `isocut` with dnf +```sh +dnf install -y isocut +``` + #### Instructions -Generally, the disk space is more than 50g +Generally, the disk space is more than 50g. + +#### Usage -#### Contribution +##### oemaker oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_ - optional arguments: + optional arguments: -t Type ISO Type include standard debug source everything everything_debug everything_src and netinst @@ -38,3 +47,22 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA -s REPOSITORY source dnf repository address link(may be listed multiple times) + + -h + show the help message and exit + +##### isocut + +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ + + positional arguments: + + origin-iso origin iso image + dest-iso destination iso image + + optional arguments: + + -t the temporary path which must be an absolute path and must be greater than 8g + -r extern rpm packages path + -k kickstart file path + -h show the help message and exit diff --git a/README.md b/README.md index 95533deb5e4d11c418450f414660040c4c3603a6..e59b8cfe18e1a1aad2483439c3da6658be7c8f31 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,27 @@ # oemaker #### 介绍 -oemaker是一款用于构建DVD iso的工具，包括标准iso，debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso等。 -oemaker采用的是本地架构的方式进行构建，不支持交叉编译环境构建。 -目前，oemkaer支持aarch64和x86_64两个架构的iso制作。 + +源码包oemaker保护两部分功能：iso制作和iso裁剪。相应的，会构建生成两个二进制RPM包：oemaker和isocut. + +生成的二进制RPM包oemaker是一款用于构建DVD iso的工具，包括标准iso，debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso等。 + +生成的二进制RPM包isocut是一款用于iso裁剪的构建工具，支持RPM包级别的裁剪。 #### 安装教程 -可以用rpm命令或dnf包管理命令通过openEuler repository安装oemaker包。 +可以用`rpm`或`dnf`命令通过openEuler repository来安装`oemaker`和`isocut`包。 -用dnf命令安装方式： +用dnf命令安装`oemaker`方式： ```sh dnf install -y oemaker ``` +用dnf命令安装`isocut`方式： +```sh +dnf install -y isocut +``` + #### 使用说明 一般要求磁盘空间大于50G @@ -21,6 +29,8 @@ dnf install -y oemaker #### 使用方法 +##### oemaker + oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_ optional arguments: @@ -41,3 +51,19 @@ oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEA -h show the help message and exit + +##### isocut + +isocut _[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_ + + positional arguments: + + origin-iso origin iso image + dest-iso destination iso image + + optional arguments: + + -t the temporary path which must be an absolute path and must be greater than 8g + -r extern rpm packages path + -k kickstart file path + -h show the help message and exit diff --git a/add-qemu-block-iscsi-in-virtualization-group.patch b/add-qemu-block-iscsi-in-virtualization-group.patch deleted file mode 100644 index 3979e42e74c603f6efd676545b4827a4428e8a1d..0000000000000000000000000000000000000000 --- a/add-qemu-block-iscsi-in-virtualization-group.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9f22b2c591b2b0baf97c55473d2d13e4b72f3063 Mon Sep 17 00:00:00 2001 -From: Chen Qun -Date: Wed, 10 Mar 2021 18:52:57 +0800 -Subject: [PATCH] add qemu-block-iscsi in virtualization group - -Signed-off-by: Chen Qun ---- - config/aarch64/normal.xml | 1 + - config/x86_64/normal.xml | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml -index 3582974..7e61eba 100644 ---- a/config/aarch64/normal.xml -+++ b/config/aarch64/normal.xml -@@ -1425,6 +1425,7 @@ - edk2-help - qemu-help - qemu -+ qemu-block-iscsi - qemu-img - stratovirt - -diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml -index 60c4704..fe68bae 100644 ---- a/config/x86_64/normal.xml -+++ b/config/x86_64/normal.xml -@@ -1427,6 +1427,7 @@ - python3-libvirt - qemu-help - qemu -+ qemu-block-iscsi - qemu-img - stratovirt - --- -2.25.1 - diff --git a/add-stratovirt-in-virtualization-group.patch b/add-stratovirt-in-virtualization-group.patch deleted file mode 100644 index 12b6fe7eaf014588deb82b6a49291bace7a4cc3b..0000000000000000000000000000000000000000 --- a/add-stratovirt-in-virtualization-group.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 13b5d81210a6174bd71ce558777ce98981520170 Mon Sep 17 00:00:00 2001 -From: Chen Qun -Date: Mon, 1 Mar 2021 09:51:01 +0800 -Subject: [PATCH] add stratovirt in virtualization group - -Signed-off-by: Chen Qun ---- - config/aarch64/normal.xml | 1 + - config/x86_64/normal.xml | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml -index cab5406..3582974 100644 ---- a/config/aarch64/normal.xml -+++ b/config/aarch64/normal.xml -@@ -1426,6 +1426,7 @@ - qemu-help - qemu - qemu-img -+ stratovirt - - - -diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml -index 4ef88de..60c4704 100644 ---- a/config/x86_64/normal.xml -+++ b/config/x86_64/normal.xml -@@ -1428,6 +1428,7 @@ - qemu-help - qemu - qemu-img -+ stratovirt - - - --- -2.25.1 - diff --git a/oemaker-1.1.2.tar.gz b/oemaker-1.1.2.tar.gz deleted file mode 100644 index 2cee59f2ac3d83181d3aa777537788299903b62a..0000000000000000000000000000000000000000 Binary files a/oemaker-1.1.2.tar.gz and /dev/null differ diff --git a/oemaker-2.0.0.tar.gz b/oemaker-2.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..815e1067b95a4a30361b3bfd03ed8b72edfd4309 Binary files /dev/null and b/oemaker-2.0.0.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index bbd2e73ca17517ba2b6cc129717e48dfb153bec1..60f6034c1c9998f9b63c50e4b87726c9305a2036 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -1,29 +1,35 @@ +%ifarch aarch64 +%global efi_aa64 1 +%endif + +%ifarch x86_64 +%global efi_x64 1 +%endif + Name: oemaker -Summary: a duilding tool for making DVD ISO +Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 1.1.2 -Release: 7 +Version: 2.0.0 +Release: 1 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildArch: noarch Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 Requires: lorax >= 19.6.78-1 -Patch0001: add-stratovirt-in-virtualization-group.patch -Patch0002: 0001-change-source-iso-method.patch -Patch0003: add-qemu-block-iscsi-in-virtualization-group.patch -Patch0004: 0002-bug-fix-I3B7CH.patch -Patch0005: 0003-add-exclude-rpm-sub-of-gimp-and-totem.patch -Patch0006: 0004-delete-or-replace-rpms-which-are-not-exist.patch - %description -a building tool for making DVD ISO +a building tool for DVD ISO making and ISO cutting + +%package -n isocut +Summary: a building tool for ISO cutting +Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2 +BuildRequires: bash + +%description -n isocut +a building tool for ISO cutting %prep %setup -c -cd %{_builddir}/%{name}-%{version}/%{name} -%autopatch -p1 %install mkdir -p %{buildroot}/opt/ @@ -32,38 +38,66 @@ mkdir -p %{buildroot}/opt/oemaker/config mkdir -p %{buildroot}/opt/oemaker/config/x86_64 mkdir -p %{buildroot}/opt/oemaker/config/aarch64 mkdir -p %{buildroot}/opt/oemaker/docs - -cd %{name} -install -m 700 oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh -install -m 700 make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh -install -m 700 img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh -install -m 700 init.sh %{buildroot}/opt/oemaker/init.sh -install -m 700 iso.sh %{buildroot}/opt/oemaker/iso.sh -install -m 700 rpm.sh %{buildroot}/opt/oemaker/rpm.sh -install -m 400 config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml -install -m 400 config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/ -install -m 400 config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/ -install -m 700 docs/* %{buildroot}/opt/oemaker/docs/ -cp -a 80-openeuler %{buildroot}/opt/oemaker/ -cd - +mkdir -p %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{_sysconfdir}/isocut +chmod 750 %{buildroot}/%{_sysconfdir}/isocut + +install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh +install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/%{_bindir}/oemaker +install -m 700 %{name}/isomaker/make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh +install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh +install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh +install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh +install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh +install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml +install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/ +install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/ +install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/ +cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/ + + +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 %pre %post -ln -s /opt/oemaker/oemaker.sh /bin/oemaker %preun %postun -rm -r /bin/oemaker -rm -rf /opt/oemaker +%postun -n isocut +if [ "$1" = "0" ]; then + rm -rf %{_sysconfdir}/isocut/* +fi %files %defattr(-,root,root) %dir /opt %dir /opt/oemaker /opt/oemaker/* +%{_bindir}/oemaker + +%files -n isocut +%defattr(-,root,root) +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg +%{_bindir}/isocut +%dir %{_sysconfdir}/isocut +%{_sysconfdir}/isocut/* + %clean rm -rf $RPM_BUILD_ROOT/* @@ -71,36 +105,46 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog -* Sat Mar 17 2021 miao_kaibo - 1.1.2-7 +* Fri Mar 19 2021 zhuchunyi - 2.0.0-1 +- ID:NA +- SUG:NA +- DESC: upgrade version + +* Sat Mar 17 2021 miao_kaibo - 1.1.2-7 - ID:NA - SUG:NA - DESC: delete or replace rpms which are not exist -* Sat Mar 16 2021 miao_kaibo - 1.1.2-6 +* Sat Mar 13 2021 miao_kaibo - 1.1.2-6 - ID:NA - SUG:NA -- DESC: add exclude rpm +- DESC: add exclude rpm to rpmlist -* Sat Mar 11 2021 miao_kaibo - 1.1.2-5 +* Sat Mar 13 2021 miao_kaibo - 1.1.2-5 - ID:NA - SUG:NA -- DESC: add qemu-block-iscsi in virtualization-hypervisor group +- DESC: fix bug I3B7CH * Thu MAR 10 2021 Chen Qun - 1.1.2-4 - ID:NA - SUG:NA - DESC: add qemu-block-iscsi in virtualization-hypervisor group -* Thu Mar 11 2021 miao_kaibo - 1.1.2-3 +* Mon MAR 08 2021 miao_kaibo - 1.1.2-3 - ID:NA - SUG:NA -- DESC: update +- DESC: change method of creating source iso -* Thu MAR 01 2021 Chen Qun - 1.1.1-2 +* Thu MAR 01 2021 Chen Qun - 1.1.2-2 - ID:NA - SUG:NA - DESC: add stratovirt in virtualization-hypervisor group +* Thu Feb 25 2021 miao_kaibo - 1.1.2-1 +- ID:NA +- SUG:NA +- DESC:upgrade version + * Mon Feb 08 2021 miao_kaibo - 1.1.1-1 - ID:NA - SUG:NA