merging by 22.03-LTS

0005-add-fpi_tail-param-for-grub.patch

@@ -0,0 +1,71 @@
+From 3b813b13637065c76184f6e57d0fa76d2571b1ca Mon Sep 17 00:00:00 2001
+From: gitee-cmd <chemingdao@huawei.com>
+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
+

0006-support-usb-flash-drive-mode.patch

@@ -0,0 +1,40 @@
+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
+

0007-restore-env-after-selinux-status-changes.patch

@@ -0,0 +1,157 @@
+From f075bae9bb9f32c4559cb48f51dd83d42f581a79 Mon Sep 17 00:00:00 2001
+From: xyn-coder <xiangyuning@huawei.com>
+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 @@
++:<<!
++ * Copyright (c) Huawei Technologies Co., Ltd. 2022-2022. All rights reserved.
++ * oemaker licensed under the Mulan PSL v2.
++ * You can use this software according to the terms and conditions of the Mulan PSL v2.
++ * You may obtain a copy of Mulan PSL v2 at:
++ *     http://license.coscl.org.cn/MulanPSL2
++ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
++ * PURPOSE.
++ * See the Mulan PSL v2 for more details.
++ * Author:
++ * Create: 2022-03-08
++ * Description: provide container buffer functions
++!
++
++#!/bin/bash
++
++set -e
++function env_record()
++{
++    # 记录环境
++    selinux_flag=-1
++    se_status=$(getenforce)
++    if [ "$se_status" == "Enforcing" ]; then
++        selinux_flag=1
++    elif [ "$se_status" == "Permissive" ]; then
++        selinux_flag=0
++    else
++        echo "Selinux status is $se_status, can't restore"
++        return 0
++    fi
++
++    env_value_name="SELINUX_FLAG"
++    if [ "$selinux_flag" -ne -1 ]; then
++        # 先删除(/d)环境变量，再添加环境变量
++        sed -i "/${env_value_name}=.*/d" /etc/profile
++        echo "export ${env_value_name}=${selinux_flag}" >> /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 @@
++:<<!
++ * Copyright (c) Huawei Technologies Co., Ltd. 2022-2022. All rights reserved.
++ * oemaker licensed under the Mulan PSL v2.
++ * You can use this software according to the terms and conditions of the Mulan PSL v2.
++ * You may obtain a copy of Mulan PSL v2 at:
++ *     http://license.coscl.org.cn/MulanPSL2
++ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
++ * PURPOSE.
++ * See the Mulan PSL v2 for more details.
++ * Author:
++ * Create: 2022-03-08
++ * Description: provide container buffer functions
++!
++
++#!/bin/bash
++
++set -e
++function env_restore()
++{
++    # 使用环境变量执行恢复
++    source /etc/profile >> /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
+

0008-add-parse_everything_deb_exclude.patch

@@ -0,0 +1,31 @@
+From efcc2fd150f9fe625a03b4b5d9c492f6691b1ba1 Mon Sep 17 00:00:00 2001
+From: small_leek <xiasenlin1@huawei.com>
+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
+

0009-automated-kickstart-function.patch

@@ -0,0 +1,32 @@
+From 399955bd41020fc3de9528372c797714a4f7d6f5 Mon Sep 17 00:00:00 2001
+From: xyn-coder <xiangyuninig@huawei.com>
+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
+

README.en.md

@@ -53,7 +53,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
 ##### isocut
 
-isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
 
   positional arguments:
 
@@ -64,4 +64,5 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origi
 
     -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

README.md

@@ -54,7 +54,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
 ##### isocut
 
-isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
 
   positional arguments:
 
@@ -65,4 +65,5 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origi
 
     -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

edge_normal_aarch64.xml

@@ -102,6 +102,30 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>edge</id>
+    <name>Edge</name>
+    <name xml:lang="zh_CN">边缘场景</name>
+    <description>Package for edge scene</description>
+    <description xml:lang="zh_CN">边缘场景相关包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+      <packagereq type="default">kubernetes-client</packagereq>
+      <packagereq type="default">kubernetes-help</packagereq>
+      <packagereq type="default">kubernetes-kubeadm</packagereq>
+      <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">mdadm</packagereq>
+      <packagereq type="default">mdadm-help</packagereq>
+    </packagelist>
+  </group>
   <environment>
     <id>minimal-environment</id>
     <name>Minimal Install</name>
@@ -116,4 +140,19 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>edge-cloud-environment</id>
+    <name>Edge Cloud</name>
+    <name xml:lang="zh_CN">边缘云</name>
+    <description>For edge computing scenarios</description>
+    <description xml:lang="zh_CN">用于边缘计算场景</description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>edge</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+    </optionlist>
+  </environment>
 </comps>

edge_normal_x86_64.xml

@@ -102,6 +102,30 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>edge</id>
+    <name>Edge</name>
+    <name xml:lang="zh_CN">边缘场景</name>
+    <description>Package for edge scene</description>
+    <description xml:lang="zh_CN">边缘场景相关包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+      <packagereq type="default">kubernetes-client</packagereq>
+      <packagereq type="default">kubernetes-help</packagereq>
+      <packagereq type="default">kubernetes-kubeadm</packagereq>
+      <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">mdadm</packagereq>
+      <packagereq type="default">mdadm-help</packagereq>
+    </packagelist>
+  </group>
   <environment>
     <id>minimal-environment</id>
     <name>Minimal Install</name>
@@ -116,4 +140,19 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>edge-cloud-environment</id>
+    <name>Edge Cloud</name>
+    <name xml:lang="zh_CN">边缘云</name>
+    <description>For edge computing scenarios</description>
+    <description xml:lang="zh_CN">用于边缘计算场景</description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>edge</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+    </optionlist>
+  </environment>
 </comps>

normal_aarch64.xml

@@ -33,7 +33,6 @@
       <packagereq type="mandatory">libcurl-devel</packagereq>
       <packagereq type="mandatory">libffi-devel</packagereq>
       <packagereq type="mandatory">libgcrypt-devel</packagereq>
-      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
       <packagereq type="mandatory">libnl3-devel</packagereq>
       <packagereq type="mandatory">libselinux-devel</packagereq>
       <packagereq type="mandatory">libusbx-devel</packagereq>
@@ -838,8 +837,6 @@
       <packagereq type="mandatory">numactl</packagereq>
       <packagereq type="mandatory">numad</packagereq>
       <packagereq type="default">hwloc</packagereq>
-      <packagereq type="default">libhugetlbfs</packagereq>
-      <packagereq type="default">libhugetlbfs-utils</packagereq>
       <packagereq type="default">mstflint</packagereq>
       <packagereq type="default">qperf</packagereq>
       <packagereq type="optional">libvma</packagereq>
@@ -1013,7 +1010,6 @@
       <packagereq type="default">pcp-import-mrtg2pcp</packagereq>
       <packagereq type="default">pcp-libs</packagereq>
       <packagereq type="default">pcp-libs-devel</packagereq>
-      <packagereq type="default">pcp-manager</packagereq>
       <packagereq type="default">pcp-pmda-apache</packagereq>
       <packagereq type="default">pcp-pmda-bash</packagereq>
       <packagereq type="default">pcp-pmda-bonding</packagereq>
@@ -1048,13 +1044,11 @@
       <packagereq type="default">pcp-pmda-nfsclient</packagereq>
       <packagereq type="default">pcp-pmda-nvidia-gpu</packagereq>
       <packagereq type="default">pcp-pmda-oracle</packagereq>
-      <packagereq type="default">pcp-pmda-papi</packagereq>
       <packagereq type="default">pcp-pmda-pdns</packagereq>
       <packagereq type="default">pcp-pmda-perfevent</packagereq>
       <packagereq type="default">pcp-pmda-prometheus</packagereq>
       <packagereq type="default">pcp-pmda-redis</packagereq>
       <packagereq type="default">pcp-pmda-roomtemp</packagereq>
-      <packagereq type="default">pcp-pmda-rpm</packagereq>
       <packagereq type="default">pcp-pmda-rsyslog</packagereq>
       <packagereq type="default">pcp-pmda-samba</packagereq>
       <packagereq type="default">pcp-pmda-sendmail</packagereq>
@@ -1066,7 +1060,6 @@
       <packagereq type="default">pcp-pmda-systemd</packagereq>
       <packagereq type="default">pcp-pmda-trace</packagereq>
       <packagereq type="default">pcp-pmda-unbound</packagereq>
-      <packagereq type="default">pcp-pmda-vmware</packagereq>
       <packagereq type="default">pcp-pmda-weblog</packagereq>
       <packagereq type="default">pcp-pmda-zimbra</packagereq>
       <packagereq type="default">pcp-pmda-zswap</packagereq>
@@ -1074,11 +1067,6 @@
       <packagereq type="default">pcp-system-tools</packagereq>
       <packagereq type="default">pcp-testsuite</packagereq>
       <packagereq type="default">pcp-webapi</packagereq>
-      <packagereq type="default">pcp-webapp-blinkenlights</packagereq>
-      <packagereq type="default">pcp-webapp-grafana</packagereq>
-      <packagereq type="default">pcp-webapp-graphite</packagereq>
-      <packagereq type="default">pcp-webapp-vector</packagereq>
-      <packagereq type="default">pcp-webjs</packagereq>
       <packagereq type="default">pcp-zeroconf</packagereq>
       <packagereq type="default">perl-PCP-LogImport</packagereq>
       <packagereq type="default">perl-PCP-LogSummary</packagereq>
@@ -1278,7 +1266,6 @@
       <packagereq type="mandatory">crontabs</packagereq>
       <packagereq type="mandatory">cyrus-sasl</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">ed</packagereq>
       <packagereq type="mandatory">file</packagereq>
       <packagereq type="mandatory">iptstate</packagereq>

normal_x86_64.xml

@@ -33,7 +33,6 @@
       <packagereq type="mandatory">libcurl-devel</packagereq>
       <packagereq type="mandatory">libffi-devel</packagereq>
       <packagereq type="mandatory">libgcrypt-devel</packagereq>
-      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
       <packagereq type="mandatory">libnl3-devel</packagereq>
       <packagereq type="mandatory">libselinux-devel</packagereq>
       <packagereq type="mandatory">libusbx-devel</packagereq>
@@ -152,7 +151,6 @@
       <packagereq type="mandatory">crontabs</packagereq>
       <packagereq type="mandatory">cyrus-sasl</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">dbus-broker</packagereq>
       <packagereq type="mandatory">ed</packagereq>
       <packagereq type="mandatory">file</packagereq>
       <packagereq type="mandatory">iptstate</packagereq>
@@ -841,8 +839,6 @@
       <packagereq type="mandatory">numactl</packagereq>
       <packagereq type="mandatory">numad</packagereq>
       <packagereq type="default">hwloc</packagereq>
-      <packagereq type="default">libhugetlbfs</packagereq>
-      <packagereq type="default">libhugetlbfs-utils</packagereq>
       <packagereq type="default">mstflint</packagereq>
       <packagereq type="default">qperf</packagereq>
       <packagereq type="optional">libvma</packagereq>
@@ -1016,7 +1012,6 @@
       <packagereq type="default">pcp-import-mrtg2pcp</packagereq>
       <packagereq type="default">pcp-libs</packagereq>
       <packagereq type="default">pcp-libs-devel</packagereq>
-      <packagereq type="default">pcp-manager</packagereq>
       <packagereq type="default">pcp-pmda-apache</packagereq>
       <packagereq type="default">pcp-pmda-bash</packagereq>
       <packagereq type="default">pcp-pmda-bonding</packagereq>
@@ -1051,13 +1046,11 @@
       <packagereq type="default">pcp-pmda-nfsclient</packagereq>
       <packagereq type="default">pcp-pmda-nvidia-gpu</packagereq>
       <packagereq type="default">pcp-pmda-oracle</packagereq>
-      <packagereq type="default">pcp-pmda-papi</packagereq>
       <packagereq type="default">pcp-pmda-pdns</packagereq>
       <packagereq type="default">pcp-pmda-perfevent</packagereq>
       <packagereq type="default">pcp-pmda-prometheus</packagereq>
       <packagereq type="default">pcp-pmda-redis</packagereq>
       <packagereq type="default">pcp-pmda-roomtemp</packagereq>
-      <packagereq type="default">pcp-pmda-rpm</packagereq>
       <packagereq type="default">pcp-pmda-rsyslog</packagereq>
       <packagereq type="default">pcp-pmda-samba</packagereq>
       <packagereq type="default">pcp-pmda-sendmail</packagereq>
@@ -1069,7 +1062,6 @@
       <packagereq type="default">pcp-pmda-systemd</packagereq>
       <packagereq type="default">pcp-pmda-trace</packagereq>
       <packagereq type="default">pcp-pmda-unbound</packagereq>
-      <packagereq type="default">pcp-pmda-vmware</packagereq>
       <packagereq type="default">pcp-pmda-weblog</packagereq>
       <packagereq type="default">pcp-pmda-zimbra</packagereq>
       <packagereq type="default">pcp-pmda-zswap</packagereq>
@@ -1077,11 +1069,6 @@
       <packagereq type="default">pcp-system-tools</packagereq>
       <packagereq type="default">pcp-testsuite</packagereq>
       <packagereq type="default">pcp-webapi</packagereq>
-      <packagereq type="default">pcp-webapp-blinkenlights</packagereq>
-      <packagereq type="default">pcp-webapp-grafana</packagereq>
-      <packagereq type="default">pcp-webapp-graphite</packagereq>
-      <packagereq type="default">pcp-webapp-vector</packagereq>
-      <packagereq type="default">pcp-webjs</packagereq>
       <packagereq type="default">pcp-zeroconf</packagereq>
       <packagereq type="default">perl-PCP-LogImport</packagereq>
       <packagereq type="default">perl-PCP-LogSummary</packagereq>

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.0
+Version:        2.0.3
-Release:        18
+Release:        14
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -28,7 +28,11 @@ 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-support-usb-flash-drive-mode.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
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -74,6 +78,8 @@ 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 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 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
 install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
@@ -130,60 +136,90 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
-* Thu Apr 28 2022 tianwei <tianwei12@h-partners.com> - 2.0.3-18
+* Wed Apr 20 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-14
 - ID:NA
 - SUG:NA
-- DESC:delete latrace package
+- DESC: restore the automated kickstart function
 
-* Thu Apr 28 2022 hanhui <hanhui15@h-partners.com> - 2.0.0-17
+* Thu Mar 31 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.3-13
-- ID:NA
-- SUG:NA
-- DESC: delete gamin and openjpeg;add openjpeg2
-
-* Thu Apr 14 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.0-16
 - ID:NA
 - SUG:NA
 - DESC: add linux-firmware subpackage
 
-* Thu Mar 24 2022 wuchaochao <cyanrose@yeah.net> - 2.0.0-15
+* Mon Mar 28 2022 Senlin <xiasenlin1@huawei.com> - 2.0.3-12
 - ID:NA
 - SUG:NA
-- DESC:  add rsyslog-gnutls package
+- DESC: add exclude list for everything
 
-* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-14
+* Mon Mar 7 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-11
+- ID:NA
+- SUG:NA
+- DESC: modify restore env mode
+
+* Fri Mar 4 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-10
+- ID:NA
+- SUG:NA
+- DESC: lorax cmd add printed log
+
+* Fri Mar 4 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-9
+- ID:NA
+- SUG:NA
+- DESC: fix build oemaker failed issue
+
+* Wed Mar 2 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-8
+- ID:NA
+- SUG:NA
+- DESC: restore env after selinux status changes 
+
+* Wed Feb 23 2022 zhuyuncheng <zhuyuncheng@huawei.com> - 2.0.3-7
+- ID:NA
+- SUG:NA
+- DESC: add Server install mode and packages for edge computing iso
+
+* Wed Feb 23 2022 hanhui <hanhui15@h-partners.com> - 2.0.3-6
+- DESC: delete gamin and openjpeg
+        add rsyslog-gnutls and edk2-ovmf packages
+        rename hisi_rde to hisi_trng_v2,libkae to uadk_engine
+
+* Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.3-5
 - ID:NA
 - SUG:NA
 - DESC: delete nscd package
 
-* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.0-13
+* Mon Feb 14 2022 wangchong <952173335@qq.com> - 2.0.3-4
 - ID:NA
 - SUG:NA
-- DESC: support usb flash drive mode
+- DESC: upgrade to 2.0.3 and support usb flash drive mode and delete some packages
 
-* Fri Jan 21 2022 zhang_xubo <2578876417@qq.com> - 2.0.0-12
+* Fri Jan 21 2022 zhang_xubo <2578876417@qq.com> - 2.0.0-13
 - ID:NA
 - SUG:NA
 - DESC: add opengauss server pakcage
 
-* Fri Dec 03 2021 licunlong <licunlong1@huawei.com> - 2.0.0-11
+* Thu Jan 20 2022 yaokai13 <yaokai13@huawei.com> - 2.0.0-12
 - ID:NA
 - SUG:NA
-- DESC: add dbus-broker to Base Group.
+- DESC: delete decay package
 
-* Fri Nov 19 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-10
+* Thu Oct 14 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-11
-- ID:NA
-- SUG:NA
-- DESC: delete openssh-ldap because it has been removed from openssh
-
-* Thu Oct 14 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-9
 - ID:NA
 - SUG:NA
 - DESC: bugfix I3OGUT
 
-* Tue Sep 28 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-8
+* Tue Sep 28 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-10
 - ID:NA
 - SUG:NA
-- DESC: add methed for edge computing iso
+- DESC: change for edge computing iso
+
+* Tue Aug 26 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-9
+- ID:NA
+- SUG:NA
+- DESC: change exclude list
+
+* Tue Aug 17 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-8
+- ID:NA
+- SUG:NA
+- DESC: delete decay package
 
 * Thu Jul 15 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-7
 - ID:NA

rpmlist.xml

@@ -32,42 +32,41 @@
         <packagereq>texlive-scheme-gust</packagereq>
         <packagereq>texlive-scheme-medium</packagereq>
         <packagereq>texlive-scheme-tetex</packagereq>
-        <packagereq>totem</packagereq>
+        <packagereq>drbd</packagereq>
-        <packagereq>totem-debuginfo</packagereq>
+        <packagereq>drbd-bash-completion</packagereq>
-        <packagereq>totem-debugsource</packagereq>
+        <packagereq>drbd-pacemaker</packagereq>
-        <packagereq>totem-devel</packagereq>
+        <packagereq>drbd-rgmanager</packagereq>
-        <packagereq>totem-help</packagereq>
+        <packagereq>drbd-udev</packagereq>
-        <packagereq>totem-nautilus</packagereq>
+        <packagereq>drbd-utils</packagereq>
-        <packagereq>gimp</packagereq>
+        <packagereq>gnome-boxes</packagereq>
-        <packagereq>gimp-libs</packagereq>
+        <packagereq>nodejs-grunt-contrib-watch</packagereq>
-        <packagereq>gimp-devel</packagereq>
-        <packagereq>gimp-help</packagereq>
-        <packagereq>gimp-debuginfo</packagereq>
-        <packagereq>gimp-debugsource</packagereq>
-        <packagereq>python3-nni</packagereq>
-        <packagereq>ceph-mgr-rook</packagereq>
-        <packagereq>ceph-mgr-ssh</packagereq>
-        <packagereq>ceph-mgr-dashboard</packagereq>
-        <packagereq>ceph-mgr-k8sevents</packagereq>
     </packagelist>
     <packagelist type="src_exclude">
-        <packagereq>totem</packagereq>
+        <packagereq>drbd</packagereq>
-        <packagereq>gimp</packagereq>
+        <packagereq>gnome-boxes</packagereq>
+        <packagereq>nodejs-grunt-contrib-watch</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>
     </packagelist>
     <packagelist type="aarch64">
         <packagereq>edk2-aarch64</packagereq>
         <packagereq>grub2-efi-aa64</packagereq>
         <packagereq>grub2-efi-aa64-modules</packagereq>
         <packagereq>hisi_hpre</packagereq>
-        <packagereq>hisi_rde</packagereq>
+        <packagereq>hisi_trng_v2</packagereq>
         <packagereq>hisi_sec2</packagereq>
         <packagereq>hisi_zip</packagereq>
-        <packagereq>libkae</packagereq>
+        <packagereq>uadk_engine</packagereq>
         <packagereq>libwd</packagereq>
         <packagereq>shim-aa64</packagereq>
         <packagereq>uacce</packagereq>
     </packagelist>
     <packagelist type="x86_64">
+        <packagereq>edk2-ovmf</packagereq>
         <packagereq>grub2-efi-x64</packagereq>
         <packagereq>grub2-efi-x64-modules</packagereq>
         <packagereq>shim</packagereq>
@@ -137,7 +136,6 @@
         <packagereq>bc-help</packagereq>
         <packagereq>bind-chroot</packagereq>
         <packagereq>bind-dyndb-ldap</packagereq>
-        <packagereq>bind-export-libs</packagereq>
         <packagereq>bind-libs</packagereq>
         <packagereq>bind-utils</packagereq>
         <packagereq>binutils</packagereq>
@@ -250,7 +248,6 @@
         <packagereq>cyrus-sasl-ntlm</packagereq>
         <packagereq>cyrus-sasl-scram</packagereq>
         <packagereq>dbus</packagereq>
-        <packagereq>dbus-broker</packagereq>
         <packagereq>dbus-glib</packagereq>
         <packagereq>dbus-help</packagereq>
         <packagereq>dbus-python-help</packagereq>
@@ -351,8 +348,6 @@
         <packagereq>geocode-glib-help</packagereq>
         <packagereq>GeoIP</packagereq>
         <packagereq>GeoIP-help</packagereq>
-        <packagereq>geolite2-city</packagereq>
-        <packagereq>geolite2-country</packagereq>
         <packagereq>gettext</packagereq>
         <packagereq>gettext-help</packagereq>
         <packagereq>gettext-libs</packagereq>
@@ -532,8 +527,6 @@
         <packagereq>libcomps</packagereq>
         <packagereq>libcomps-help</packagereq>
         <packagereq>libconfig</packagereq>
-        <packagereq>libcroco</packagereq>
-        <packagereq>libcroco-help</packagereq>
         <packagereq>libcurl</packagereq>
         <packagereq>libdaemon</packagereq>
         <packagereq>libdaemon-help</packagereq>
@@ -594,9 +587,6 @@
         <packagereq>libgweather-help</packagereq>
         <packagereq>libgxps</packagereq>
         <packagereq>libgxps-help</packagereq>
-        <packagereq>libhugetlbfs</packagereq>
-        <packagereq>libhugetlbfs-help</packagereq>
-        <packagereq>libhugetlbfs-utils</packagereq>
         <packagereq>libical</packagereq>
         <packagereq>libicu-devel</packagereq>
         <packagereq>libidn</packagereq>
@@ -943,8 +933,8 @@
         <packagereq>open-iscsi</packagereq>
         <packagereq>open-iscsi-help</packagereq>
         <packagereq>open-isns-help</packagereq>
-        <packagereq>openjpeg2-help</packagereq>
         <packagereq>openjpeg2</packagereq>
+        <packagereq>openjpeg2-help</packagereq>
         <packagereq>openldap</packagereq>
         <packagereq>openldap-clients</packagereq>
         <packagereq>openldap-help</packagereq>
@@ -1196,7 +1186,7 @@
         <packagereq>rsyslog-mmsnmptrapd</packagereq>
         <packagereq>rsyslog-mysql</packagereq>
         <packagereq>rsyslog-snmp</packagereq>
-	<packagereq>rsyslog-gnutls</packagereq>
+        <packagereq>rsyslog-gnutls</packagereq>
         <packagereq>rtkit</packagereq>
         <packagereq>rtkit-help</packagereq>
         <packagereq>samba-common-tools</packagereq>