diff --git a/0001-rename-source-iso.patch b/0001-rename-source-iso.patch deleted file mode 100644 index 8885134..0000000 --- a/0001-rename-source-iso.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e11a1ff002fdc7aab81f40b99fcea2fc86eba85b Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Fri, 2 Apr 2021 10:23:47 +0800 -Subject: [PATCH] rename source iso - ---- - isomaker/init.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/isomaker/init.sh b/isomaker/init.sh -index f708555..2603bfb 100755 ---- a/isomaker/init.sh -+++ b/isomaker/init.sh -@@ -112,7 +112,7 @@ function global_var_init() - DBG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-debug-${ARCH}-dvd.iso" - EVE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-${ARCH}-dvd.iso" - EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-debug-${ARCH}-dvd.iso" -- EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-source-dvd.iso" -+ EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-source-dvd.iso" - NETINST_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-netinst-${ARCH}-dvd.iso" - else - RELEASE_NAME="${PRODUCT}-${VERSION}-${ARCH}" -@@ -121,7 +121,7 @@ function global_var_init() - DBG_ISO_NAME="${PRODUCT}-${VERSION}-debug-${ARCH}-dvd.iso" - EVE_ISO_NAME="${PRODUCT}-${VERSION}-everything-${ARCH}-dvd.iso" - EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-everything-debug-${ARCH}-dvd.iso" -- EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-everything-source-dvd.iso" -+ EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-source-dvd.iso" - NETINST_ISO_NAME="${PRODUCT}-${VERSION}-netinst-${ARCH}-dvd.iso" - fi - --- -2.30.0 - diff --git a/0002-bugfix-I3QY98.patch b/0002-bugfix-I3QY98.patch deleted file mode 100644 index aa91672..0000000 --- a/0002-bugfix-I3QY98.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1907bdefd7fc8c4e1ef2db78d3e38dc3d6b6a32c Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Wed, 12 May 2021 03:34:44 +0000 -Subject: [PATCH] bugfix I3QY98 - ---- - isomaker/rpm.sh | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index e5fad1f..e3feaab 100755 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -165,8 +165,11 @@ 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 -- echo "${rpmname}" >> conflict_list -+ cat ava_every_lst | grep "^${rpmname}\." -+ if [ $? -eq 0 ];then -+ sed -i "/^${rpmname}\./d" ava_every_lst -+ echo "${rpmname}" >> conflict_list -+ fi - done - fi - parse_rpmlist_xml "everything_conflict" -@@ -174,8 +177,11 @@ 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 -- echo "${rpmname}" >> conflict_list -+ cat ava_every_lst | grep "^${rpmname}\." -+ if [ $? -eq 0 ];then -+ sed -i "/^${rpmname}\./d" ava_every_lst -+ echo "${rpmname}" >> conflict_list -+ fi - done - fi - } --- -1.8.3.1 - diff --git a/0003-change-for-edge-computing.patch b/0003-change-for-edge-computing.patch deleted file mode 100644 index eaeec29..0000000 --- a/0003-change-for-edge-computing.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 5883a7f40fe7fc8cce44c7a709eaa890e1fe43d3 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Mon, 27 Sep 2021 15:31:58 +0800 -Subject: [PATCH] change for edge computing - ---- - isomaker/img_repo.sh | 13 ++++++++++++- - isomaker/init.sh | 4 +++- - isomaker/iso.sh | 16 ++++++++++++++++ - isomaker/oemaker.sh | 7 +++++++ - isomaker/rpm.sh | 19 +++++++++++++++++++ - 5 files changed, 57 insertions(+), 2 deletions(-) - -diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh -index 5403724..0865815 100755 ---- a/isomaker/img_repo.sh -+++ b/isomaker/img_repo.sh -@@ -18,7 +18,18 @@ - set -e - function create_install_img() - { -- echo "$YUMREPO" > yumrepo.file -+ tmprep='' -+ repos=($(echo "$YUMREPO" | sed 's/-s//g')) -+ for rep in ${repos[@]} -+ do -+ if [[ "${rep}" =~ "Epol" ]];then -+ continue -+ else -+ tmprep="-s ${rep} ${tmprep}" -+ fi -+ done -+ -+ echo "${tmprep}" > yumrepo.file - lorax --isfinal -p "${PRODUCT}" -v "${VERSION}${RELEASE}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1 - - if [ $? != 0 ] ; then -diff --git a/isomaker/init.sh b/isomaker/init.sh -index 2603bfb..ca39d48 100755 ---- a/isomaker/init.sh -+++ b/isomaker/init.sh -@@ -78,7 +78,7 @@ function parse_cmd_line() - esac - done - -- for typename in standard source debug everything_debug everything everything_src netinst -+ for typename in standard source debug everything_debug everything everything_src netinst edge - do - if [ "${typename}" == "${ISO_TYPE}" ];then - return 0 -@@ -114,6 +114,7 @@ function global_var_init() - EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-debug-${ARCH}-dvd.iso" - EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-source-dvd.iso" - NETINST_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-netinst-${ARCH}-dvd.iso" -+ EDGE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-edge-${ARCH}-dvd.iso" - else - RELEASE_NAME="${PRODUCT}-${VERSION}-${ARCH}" - STANDARD_ISO_NAME="${PRODUCT}-${VERSION}-${ARCH}-dvd.iso" -@@ -123,6 +124,7 @@ function global_var_init() - EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-everything-debug-${ARCH}-dvd.iso" - EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-source-dvd.iso" - NETINST_ISO_NAME="${PRODUCT}-${VERSION}-netinst-${ARCH}-dvd.iso" -+ EDGE_ISO_NAME="${PRODUCT}-${VERSION}-edge-${ARCH}-dvd.iso" - fi - - [ ! -d "${BUILD}" ] && mkdir -p "${BUILD}" -diff --git a/isomaker/iso.sh b/isomaker/iso.sh -index b15b394..20a6245 100755 ---- a/isomaker/iso.sh -+++ b/isomaker/iso.sh -@@ -47,6 +47,22 @@ function gen_standard_iso() - return 0 - } - -+function gen_edge_iso() -+{ -+ set +e -+ mkdir -p "${BUILD}"/iso/repodata/ -+ cp "config/${ARCH}/edge_normal.xml" "${BUILD}"/iso/repodata/ -+ createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ if [ "$ARCH" == "x86_64" ]; then -+ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 -+ elif [ "$ARCH" == "aarch64" ]; then -+ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 -+ fi -+ implantisomd5 "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -+ return 0 -+} - - function gen_src_iso() - { -diff --git a/isomaker/oemaker.sh b/isomaker/oemaker.sh -index 74d923e..37196e5 100755 ---- a/isomaker/oemaker.sh -+++ b/isomaker/oemaker.sh -@@ -144,6 +144,13 @@ function mk_euleros_main() - return 1 - fi - ls "${OUTPUT_DIR}/${EVE_SRC_ISO_NAME}" -+ elif [ "${ISO_TYPE}" == "edge" ]; then -+ gen_edge_iso -+ if [ $? -ne 0 ]; then -+ echo "create edge iso failed" -+ return 1 -+ fi -+ ls "${OUTPUT_DIR}/${EDGE_ISO_NAME}" - fi - mkclean - return 0 -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index e3feaab..85b1042 100755 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -26,6 +26,10 @@ function parse_rpmlist_xml() - - function download_rpms() - { -+ if [ "${ISO_TYPE}" == "edge" ]; then -+ get_edge_rpms -+ return 0 -+ fi - cat "${CONFIG}" | grep packagereq | cut -d ">" -f 2 | cut -d "<" -f 1 > _all_rpms.lst - parse_rpmlist_xml "${ARCH}" - cat parsed_rpmlist_${ARCH} >> _all_rpms.lst -@@ -146,6 +150,21 @@ function get_rpm_pub_key() - rm -rf "${BUILD}"/iso/GPG_tmp - } - -+function get_edge_rpms() -+{ -+ parse_rpmlist_xml "edge_${ARCH}" -+ cat parsed_rpmlist_edge_${ARCH} > _edge_rpms.lst -+ parse_rpmlist_xml "edge_common" -+ cat parsed_rpmlist_edge_common >> _edge_rpms.lst -+ cat "config/${ARCH}/edge_normal.xml" | grep packagereq | cut -d ">" -f 2 | cut -d "<" -f 1 >> _edge_rpms.lst -+ sort -r -u _edge_rpms.lst -o _edge_rpms.lst -+ yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${BUILD}"/iso/Packages/ $(cat _edge_rpms.lst | tr '\n' ' ') -+ if [ $? != 0 ] || [ $(ls "${BUILD}"/iso/Packages/ | wc -l) == 0 ]; then -+ echo "Download rpms failed!" -+ exit 133 -+ fi -+} -+ - 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 --- -2.30.0 - diff --git a/0004-bugfix-I3OGUT.patch b/0004-bugfix-I3OGUT.patch deleted file mode 100644 index f8e519f..0000000 --- a/0004-bugfix-I3OGUT.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50e167a8084b3130835cc18a6b67f448a1fe02f1 Mon Sep 17 00:00:00 2001 -From: miao_kaibo -Date: Thu, 14 Oct 2021 09:18:30 +0800 -Subject: [PATCH] bugfix I3OGUT - ---- - isomaker/img_repo.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh -index 0865815..cfb35f8 100755 ---- a/isomaker/img_repo.sh -+++ b/isomaker/img_repo.sh -@@ -30,7 +30,12 @@ function create_install_img() - done - - echo "${tmprep}" > yumrepo.file -- lorax --isfinal -p "${PRODUCT}" -v "${VERSION}${RELEASE}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1 -+ if [ -n "${RELEASE}" ];then -+ vertmp="${VERSION}-${RELEASE}" -+ else -+ vertmp=${VERSION} -+ fi -+ lorax --isfinal -p "${PRODUCT}" -v "${vertmp}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1 - - if [ $? != 0 ] ; then - cat lorax.logfile --- -2.30.0 - diff --git a/0005-add-fpi_tail-param-for-grub.patch b/0005-add-fpi_tail-param-for-grub.patch deleted file mode 100644 index a2f5a4f..0000000 --- a/0005-add-fpi_tail-param-for-grub.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3b813b13637065c76184f6e57d0fa76d2571b1ca Mon Sep 17 00:00:00 2001 -From: gitee-cmd -Date: Fri, 31 Dec 2021 15:11:32 +0800 -Subject: [PATCH] add fpi_tail param for grub - ---- - isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 8 ++++---- - isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -index 43b0e74..2d165e1 100644 ---- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -@@ -27,20 +27,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### - menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me -+ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me -+ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me -+ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me -+ linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - } -diff --git a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -index 5001156..fe2bc03 100644 ---- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -@@ -21,20 +21,20 @@ search --no-floppy --set=root -l '@ISOLABEL@' - - ### BEGIN /etc/grub.d/10_linux ### - menuentry 'Install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ quiet -+ linuxefi @KERNELPATH@ @ROOT@ fpi_to_tail=off - initrdefi @INITRDPATH@ - } - menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet -+ linuxefi @KERNELPATH@ @ROOT@ rd.live.check fpi_to_tail=off - initrdefi @INITRDPATH@ - } - submenu 'Troubleshooting -->' { - menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet -+ linuxefi @KERNELPATH@ @ROOT@ nomodeset fpi_to_tail=off - initrdefi @INITRDPATH@ - } - menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rescue quiet -+ linuxefi @KERNELPATH@ @ROOT@ rescue fpi_to_tail=off - initrdefi @INITRDPATH@ - } - } --- -2.27.0 - diff --git a/0006-support-usb-flash-drive-mode.patch b/0006-support-usb-flash-drive-mode.patch deleted file mode 100644 index fb7c8ed..0000000 --- a/0006-support-usb-flash-drive-mode.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bb1688a8e8c8dc18ccd3c2ed778a0c5c0bd52633 Mon Sep 17 00:00:00 2001 -From: wangchong1995924 <15229716099@163.com> -Date: Wed, 26 Jan 2022 14:13:00 +0800 -Subject: [PATCH 1/1] support usb flash drive mode - ---- - isomaker/iso.sh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/isomaker/iso.sh b/isomaker/iso.sh -index b15b394..379c538 100755 ---- a/isomaker/iso.sh -+++ b/isomaker/iso.sh -@@ -39,6 +39,7 @@ function gen_standard_iso() - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -+ isohybrid -u "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" - elif [ "$ARCH" == "aarch64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -75,6 +76,7 @@ function gen_everything_iso() - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -+ isohybrid -u /result/"${EVE_ISO_NAME}" - elif [ "$ARCH" == "aarch64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -126,6 +128,7 @@ function gen_netinst_iso() - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -+ isohybrid -u /result/"${NETINST_ISO_NAME}" - elif [ "$ARCH" == "aarch64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - fi --- -2.27.0 - diff --git a/0007-restore-env-after-selinux-status-changes.patch b/0007-restore-env-after-selinux-status-changes.patch deleted file mode 100644 index 6133eb2..0000000 --- a/0007-restore-env-after-selinux-status-changes.patch +++ /dev/null @@ -1,157 +0,0 @@ -From f075bae9bb9f32c4559cb48f51dd83d42f581a79 Mon Sep 17 00:00:00 2001 -From: xyn-coder -Date: Tue, 8 Mar 2022 20:19:42 +0800 -Subject: [PATCH] restore env after selinux status changes - ---- - isomaker/env_record.sh | 49 +++++++++++++++++++++++++++++++++++++++++ - isomaker/env_restore.sh | 30 +++++++++++++++++++++++++ - isomaker/img_repo.sh | 3 +++ - isomaker/oemaker.sh | 9 +++++++- - 4 files changed, 90 insertions(+), 1 deletion(-) - create mode 100644 isomaker/env_record.sh - create mode 100644 isomaker/env_restore.sh - -diff --git a/isomaker/env_record.sh b/isomaker/env_record.sh -new file mode 100644 -index 0000000..f4ed024 ---- /dev/null -+++ b/isomaker/env_record.sh -@@ -0,0 +1,49 @@ -+:<> /etc/profile -+ fi -+ -+ echo "the current env has been recorded. " -+ echo "If oemaker run failed, run the following cmd restore current env" -+ echo "sh ${CPATH}/env_restore.sh" -+} -+ -+ -+function env_restore() -+{ -+ sh "${CPATH}"/env_restore.sh -+} -\ No newline at end of file -diff --git a/isomaker/env_restore.sh b/isomaker/env_restore.sh -new file mode 100644 -index 0000000..15f6311 ---- /dev/null -+++ b/isomaker/env_restore.sh -@@ -0,0 +1,30 @@ -+:<> /dev/null -+ if [ "$SELINUX_FLAG" -eq 0 ] || [ "$SELINUX_FLAG" -eq 1 ]; then -+ setenforce "${SELINUX_FLAG}" -+ else -+ echo "/etc/profile have no value: SELINUX_FLAG" -+ fi -+} -+ -+env_restore -diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh -index 9135b39..5e956c7 100644 ---- a/isomaker/img_repo.sh -+++ b/isomaker/img_repo.sh -@@ -35,12 +35,15 @@ function create_install_img() - else - vertmp=${VERSION} - fi -+ -+ set +e - lorax --isfinal -p "${PRODUCT}" -v "${vertmp}" -r "${RELEASE}" -t "${VARIANT}" --sharedir 80-openeuler --rootfs-size=4 --buildarch="$ARCH" $(cat yumrepo.file) --nomacboot --noupgrade "${BUILD}"/iso > lorax.logfile 2>&1 - - if [ $? != 0 ] ; then - cat lorax.logfile - exit 1 - fi -+ set -e - } - - function create_repos() -diff --git a/isomaker/oemaker.sh b/isomaker/oemaker.sh -index c5d85fb..9fa8e08 100644 ---- a/isomaker/oemaker.sh -+++ b/isomaker/oemaker.sh -@@ -29,6 +29,7 @@ source "${CPATH}"/iso.sh - source "${CPATH}"/rpm.sh - source "${CPATH}"/img_repo.sh - source "${CPATH}"/make_debug.sh -+source "${CPATH}"/env_record.sh - - function mkclean() - { -@@ -156,8 +157,14 @@ function mk_oe_main() - return 0 - } - -+env_record -+ - mk_oe_main "$@" --if [ $? -ne 0 ]; then -+main_ret="$?" -+ -+env_restore -+ -+if [ "$main_ret" -ne 0 ]; then - echo "make iso failed" - exit 1 - fi --- -2.33.0 - diff --git a/0008-add-parse_everything_deb_exclude.patch b/0008-add-parse_everything_deb_exclude.patch deleted file mode 100644 index 9d6090e..0000000 --- a/0008-add-parse_everything_deb_exclude.patch +++ /dev/null @@ -1,31 +0,0 @@ -From efcc2fd150f9fe625a03b4b5d9c492f6691b1ba1 Mon Sep 17 00:00:00 2001 -From: small_leek -Date: Fri, 18 Mar 2022 11:19:07 +0800 -Subject: [PATCH] add parse_everything_deb_exclude - ---- - isomaker/rpm.sh | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index e5fad1f..fa6167b 100644 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -217,6 +217,14 @@ 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 -+ parse_rpmlist_xml "everything_debug_exclude" -+ cat parsed_rpmlist_everything_debug_exclude -+ if [ -s parsed_rpmlist_everything_debug_exclude ];then -+ for rpmname in $(cat parsed_rpmlist_everything_debug_exclude) -+ do -+ sed -i "/^${rpmname}\./d" ava_debug_lst -+ done -+ fi - 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 - diff --git a/0009-automated-kickstart-function.patch b/0009-automated-kickstart-function.patch deleted file mode 100644 index 39bd487..0000000 --- a/0009-automated-kickstart-function.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 399955bd41020fc3de9528372c797714a4f7d6f5 Mon Sep 17 00:00:00 2001 -From: xyn-coder -Date: Wed, 20 Apr 2022 15:34:08 +0800 -Subject: [PATCH] automated kickstart function - ---- - isocut/isocut.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/isocut/isocut.py b/isocut/isocut.py -index fb6ab4a..75dc45d 100755 ---- a/isocut/isocut.py -+++ b/isocut/isocut.py -@@ -138,13 +138,14 @@ def check_input(): - parser.add_argument("dest_iso", help="destination iso image") - parser.add_argument("-t", metavar="temporary_path", default="/tmp", help="temporary path") - parser.add_argument("-r", metavar="rpm_path", help="extern rpm packages path") -+ parser.add_argument("-k", metavar="file_path", help="kickstart file") - - args = parser.parse_args() - ICONFIG.src_iso = args.source_iso - ICONFIG.dest_iso = args.dest_iso - ICONFIG.temp_path = args.t - ICONFIG.rpm_path = args.r -- ICONFIG.ks_file = None -+ ICONFIG.ks_file = args.k - - if ICONFIG.src_iso is None or ICONFIG.dest_iso is None: - print("Must specify source iso image and destination iso image") --- -2.33.0 - diff --git a/0010-do-not-cleanup-pkg.patch b/0010-do-not-cleanup-pkg.patch deleted file mode 100644 index 62d7455..0000000 --- a/0010-do-not-cleanup-pkg.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 90c2319b0fbde5e263f999288627cc67ec5fc9c0 Mon Sep 17 00:00:00 2001 -From: wangchong1995924 <15229716099@163.com> -Date: Thu, 14 Jul 2022 17:44:21 +0800 -Subject: Don't clean up libdiff and libcairo-script* - ---- - isomaker/80-openeuler/runtime-cleanup.tmpl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl -index 35b2c83..5bce798 100644 ---- a/isomaker/80-openeuler/runtime-cleanup.tmpl -+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl -@@ -67,7 +67,7 @@ removefrom iptables --allbut \ - - removepkg libXxf86misc - removepkg libasyncns libhbaapi libhbalinux --removepkg libmcpp libtiff linux-atm-libs -+removepkg libmcpp linux-atm-libs - removepkg lvm2-libs m4 mailx makebootfat mcpp - removepkg mingetty mobile-broadband-provider-info pkgconfig ppp pth - removepkg rmt rpcbind squashfs-tools system-config-firewall-base -@@ -146,7 +146,7 @@ removefrom bind-utils /usr/bin/dig /usr/bin/host /usr/bin/nsupdate - removefrom bitmap-fangsongti-fonts /usr/share/fonts/* - removefrom ca-certificates /etc/pki/java/* - removefrom ca-certificates /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/* --removefrom cairo /usr/${libdir}/libcairo-script* /usr/bin/cairo-sphinx -+removefrom cairo /usr/bin/cairo-sphinx - removefrom coreutils /etc/* /usr/bin/link /usr/bin/nice /usr/bin/stty /usr/bin/su /usr/bin/unlink - removefrom coreutils /usr/sbin/runuser /usr/bin/[ /usr/bin/base64 /usr/bin/chcon - removefrom coreutils /usr/bin/cksum /usr/bin/comm /usr/bin/csplit --- -2.27.0 - diff --git a/0011-change-rescue-parameter-with-new-anaconda.patch b/0011-change-rescue-parameter-with-new-anaconda.patch deleted file mode 100644 index 96fd4c1..0000000 --- a/0011-change-rescue-parameter-with-new-anaconda.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 827754f12b73541273197eec7ba7a8a4b3eb2271 Mon Sep 17 00:00:00 2001 -From: sun_hai_10 -Date: Thu, 8 Dec 2022 17:14:16 +0800 -Subject: [PATCH] change rescue parameter with new anaconda - ---- - isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 2 +- - isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 2 +- - isomaker/80-openeuler/config_files/x86/isolinux.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -index 2d165e1..2cc19a8 100644 ---- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -@@ -40,7 +40,7 @@ submenu 'Troubleshooting -->' { - initrd @INITRDPATH@ - } - menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off -+ linux @KERNELPATH@ @ROOT@ inst.rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - } -diff --git a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -index fe2bc03..c7cb824 100644 ---- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -@@ -34,7 +34,7 @@ submenu 'Troubleshooting -->' { - initrdefi @INITRDPATH@ - } - menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rescue fpi_to_tail=off -+ linuxefi @KERNELPATH@ @ROOT@ inst.rescue fpi_to_tail=off - initrdefi @INITRDPATH@ - } - } -diff --git a/isomaker/80-openeuler/config_files/x86/isolinux.cfg b/isomaker/80-openeuler/config_files/x86/isolinux.cfg -index 0471f42..1b3fae2 100644 ---- a/isomaker/80-openeuler/config_files/x86/isolinux.cfg -+++ b/isomaker/80-openeuler/config_files/x86/isolinux.cfg -@@ -93,7 +93,7 @@ label rescue - and edit config files to try to get it booting again. - endtext - kernel vmlinuz -- append initrd=initrd.img @ROOT@ rescue quiet -+ append initrd=initrd.img @ROOT@ inst.rescue quiet - - label memtest - menu label Run a ^memory test --- -2.23.0 - diff --git a/0012-enable-eject-in-install.img.patch b/0012-enable-eject-in-install.img.patch deleted file mode 100644 index d0e1745..0000000 --- a/0012-enable-eject-in-install.img.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 40e9deb6d6ba1d8ad07c9903ce326d2053afdeff Mon Sep 17 00:00:00 2001 -From: sun_hai_10 -Date: Mon, 19 Dec 2022 21:32:23 +0800 -Subject: [PATCH] enable eject in install.img - ---- - 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 5bce798..256d013 100644 ---- a/isomaker/80-openeuler/runtime-cleanup.tmpl -+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl -@@ -305,7 +305,7 @@ removefrom sysvinit-tools /usr/bin/* - removefrom tar /usr/share/locale/* - removefrom usbutils /usr/bin/* - removefrom util-linux --allbut \ -- /usr/bin/{dmesg,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ -+ /usr/bin/{dmesg,eject,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ - /etc/mtab /etc/pam.d/login /etc/pam.d/remote \ - /usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \ - /usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \ --- -2.23.0 - diff --git a/0013-fix-make-edge-iso-error.patch b/0013-fix-make-edge-iso-error.patch deleted file mode 100644 index 0f8a227..0000000 --- a/0013-fix-make-edge-iso-error.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6d04f0dd0695b0408ed499fb98213eb6ba52139b Mon Sep 17 00:00:00 2001 -From: wangchong1995924 <15229716099@163.com> -Date: Wed, 19 Apr 2023 15:18:17 +0800 -Subject: [PATCH] fix make edge iso error - - -diff --git a/isomaker/80-openeuler/runtime-install.tmpl b/isomaker/80-openeuler/runtime-install.tmpl -index 1856aff..a6144bf 100644 ---- a/isomaker/80-openeuler/runtime-install.tmpl -+++ b/isomaker/80-openeuler/runtime-install.tmpl -@@ -22,7 +22,7 @@ installpkg --optional *-firmware --except alsa* --except midisport-firmware \ - --except crystalhd-firmware --except ivtv-firmware \ - --except cx18-firmware --except iscan-firmware \ - --except uhd-firmware --except lulzbot-marlin-firmware \ -- --except arm-trusted-firmware -+ --except arm-trusted-firmware --except raspberrypi-firmware - installpkg b43-openfwwf - - ## install all of the glibc langpacks since otherwise we get no locales --- -2.27.0 - diff --git a/README.en.md b/README.en.md index 41c3a5f..17201bc 100644 --- a/README.en.md +++ b/README.en.md @@ -2,29 +2,36 @@ #### Description -The source package `oemaker` has two functions: iso making and iso cutting. Correspondingly, two binary RPM packages are generated: `oemaker` and `isocut`. +The source package `oemaker` has three functions: ISO making and splitting and compile_env making. Accordingly, three software packages are generated: `oemaker` and `isocut` and `envmaker`. -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, edge computing iso and netinst iso. +The generated binary RPM `oemaker` is a build tool for making DVD ISOs, including the Standard ISO, Debug ISO, Source ISO, Everything ISO, Everything Source ISO, Everything Debug ISO, and Netinstall ISO. -The generated binary RPM package `isocut` is a building tool for iso cutting which supports only RPM package-level. +The generated binary RPM `isocut` is a build tool for ISO splitting, which supports only package-level RPM. + +The generated binary RPM `envmaker` is a build tool for making compile_env. #### Installation -To install `oemaker` and `isocut`, you can use `rpm` or `dnf` package manager command with openEuler repository. +To install `oemaker` and `isocut` and `envmaker`, you can use the `rpm` or `dnf` package manager command with the openEuler repository. -Install `oemaker` with dnf +Install `oemaker` with `dnf` ```sh dnf install -y oemaker ``` -Install `isocut` with dnf +Install `isocut` with `dnf` ```sh dnf install -y isocut ``` -#### Instructions +使用 `dnf` 安装 `envmaker` +```sh +dnf install -y envmaker +``` -Generally, the disk space is more than 50g. +#### Instruction + +Generally, the disk space must be more than 50 GB. #### Usage @@ -32,37 +39,55 @@ Generally, the disk space is more than 50g. oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_ - optional arguments: - -t Type - ISO Type include standard debug source everything everything_debug everything_src and netinst + Optional arguments: - -p Product - Product Name, such as: openEuler + -t ISO type, including standard, debug, source, everything, everything_debug, everything_src, and netinst - -v Version - version identifier + -p Product name, for example, openEuler - -r RELEASE - release information + -v Version number - -s REPOSITORY - source dnf repository address link(may be listed multiple times) + -r Release information - -h - show the help message and exit + -s 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: + Positional arguments: - origin-iso origin iso image - dest-iso destination iso image + origin-iso Origin ISO image + dest-iso Destination ISO image - optional arguments: + 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 + -t The temporary path, which must be an absolute path and must be greater than 8 GB + + -r The external RPM package path + + -k The kickstart file path + + -i The isolinux cfg file path + + -g The grub cfg file path + + -p The anaconda pixmaps file path + + -h Show the help message and exit + + isocut 详细文档请查看《镜像裁剪定制工具使用指南》： + + https://gitee.com/openeuler/docs/blob/9d89e4e41e7824f984ebc7a00b5f1241b84d1f85/docs/zh/docs/Isocut/%E9%95%9C%E5%83%8F%E8%A3%81%E5%89%AA%E5%AE%9A%E5%88%B6%E5%B7%A5%E5%85%B7%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97.md + +##### envmaker + +envmaker _[-p Product] [-v Version]_ + + Optional arguments: + + -p Product name,for example, openEuler_compile_env + + -v Version identifier \ No newline at end of file diff --git a/README.md b/README.md index b941cd4..0a0805c 100644 --- a/README.md +++ b/README.md @@ -2,30 +2,36 @@ #### 介绍 -源码包oemaker包括两部分功能：iso制作和iso裁剪。相应的，会构建生成两个二进制RPM包：oemaker和isocut. +`oemaker`源码包拥有三部分功能：iso 格式光盘映像的制作和裁剪和通用编译环境制作。相应地，`oemaker` 源码包会生成三个软件包：`oemaker` 和 `isocut` 和 `envmaker`。 -生成的二进制RPM包oemaker是一款用于构建DVD iso的工具，包括标准iso，debug iso, source iso, everything iso, everything debug iso, everything source, edge computing iso and netinst iso等 +生成的二进制 RPM 包 `oemaker` 是用于制作 DVD 光盘映像的构建工具，可制作的映像包括 standard iso、debug iso、source iso、everything iso、everything source iso、everything debug iso 和 netinst iso。 -生成的二进制RPM包isocut是一款用于iso裁剪的构建工具，支持RPM包级别的裁剪。 +生成的二进制 RPM 包 `isocut` 是用于裁剪光盘映像的构建工具，支持在 RPM 包级别进行裁剪。 + +生成的二进制 RPM 包 `envmaker` 是用于制作通用编译环境的构建工具。 #### 安装教程 -可以用`rpm`或`dnf`命令通过openEuler repository来安装`oemaker`和`isocut`包。 +可以使用 `rpm` 或 `dnf` 软件包管理器命令通过 openEuler repository 来安装 `oemaker` 和 `isocut` 和 `envmaker`。 -用dnf命令安装`oemaker`方式： +使用 `dnf` 安装 `oemaker` ```sh dnf install -y oemaker ``` -用dnf命令安装`isocut`方式： +使用 `dnf` 安装 `isocut` ```sh dnf install -y isocut ``` +使用 `dnf` 安装 `envmaker` +```sh +dnf install -y envmaker +``` + #### 使用说明 -一般要求磁盘空间大于50G - +一般要求磁盘空间大于 50G。 #### 使用方法 @@ -33,37 +39,51 @@ dnf install -y isocut oemaker _[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_ - optional arguments: - -t Type - ISO Type include standard debug source everything everything_debug everything_src and netinst + Optional arguments: - -p Product - Product Name, such as: openEuler + -t ISO type, including standard, debug, source, everything, everything_debug, everything_src, and netinst - -v Version - version identifier + -p Product name, for example, openEuler - -r RELEASE - release information + -v Version number - -s REPOSITORY - source dnf repository address link(may be listed multiple times) + -r Release information - -h - show the help message and exit + -s 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: + Positional arguments: origin-iso origin iso image dest-iso destination iso image - optional arguments: + 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 + -t The temporary path, which must be an absolute path and must be greater than 8 GB + + -r The external RPM package path + + -k The kickstart file path + + -i The isolinux cfg file path + + -g The grub cfg file path + + -p The anaconda pixmaps file path + + -h Show the help message and exit + +##### envmaker + +envmaker _[-p Product] [-v Version]_ + + Optional arguments: + + -p Product name,for example, openEuler_compile_env + + -v Version identifier \ No newline at end of file diff --git a/oemaker-2.0.3.tar.gz b/oemaker-2.0.3.tar.gz deleted file mode 100644 index 1c01912..0000000 Binary files a/oemaker-2.0.3.tar.gz and /dev/null differ diff --git a/oemaker-2.0.5.tar.gz b/oemaker-2.0.5.tar.gz new file mode 100644 index 0000000..b3825c4 Binary files /dev/null and b/oemaker-2.0.5.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index 8aa8095..3067471 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -10,8 +10,8 @@ Name: oemaker Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 2.0.3 -Release: 20 +Version: 2.0.5 +Release: 1 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -24,19 +24,6 @@ Source5: edge_normal_x86_64.xml Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 Requires: lorax >= 19.6.78-1 -Patch0001: 0001-rename-source-iso.patch -Patch0002: 0002-bugfix-I3QY98.patch -Patch0003: 0003-change-for-edge-computing.patch -Patch0004: 0004-bugfix-I3OGUT.patch -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-add-parse_everything_deb_exclude.patch -Patch0009: 0009-automated-kickstart-function.patch -Patch0010: 0010-do-not-cleanup-pkg.patch -Patch0011: 0011-change-rescue-parameter-with-new-anaconda.patch -Patch0012: 0012-enable-eject-in-install.img.patch -Patch0013: 0013-fix-make-edge-iso-error.patch %description a building tool for DVD ISO making and ISO cutting @@ -49,6 +36,14 @@ BuildRequires: bash %description -n isocut a building tool for ISO cutting +%package -n envmaker +Summary: a building tool for compile_env making +Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2 +BuildRequires: bash + +%description -n envmaker +a building tool for compile_env making + %prep %setup -c rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml @@ -62,7 +57,7 @@ cp %{SOURCE4} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/ed rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/edge_normal.xml cp %{SOURCE5} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/edge_normal.xml cd %{_builddir}/%{name}-%{version}/%{name} -%autopatch -p1 + %install mkdir -p %{buildroot}/opt/ @@ -104,6 +99,20 @@ install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdi install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/ %endif +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/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 + %pre %post @@ -133,6 +142,11 @@ fi %dir %{_sysconfdir}/isocut %{_sysconfdir}/isocut/* +%files -n envmaker +%defattr(-,root,root) +%dir /opt +%dir /opt/envmaker +/opt/envmaker/* %clean rm -rf $RPM_BUILD_ROOT/* @@ -140,6 +154,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue May 16 2023 chenhuihan - 2.0.5-1 +- ID:NA +- SUG:NA +- DESC: support envmaker + * Wed Apr 19 2023 wangchong - 2.0.3-20 - ID:NA - SUG:NA