From 38ec9addfdef7e93fffc0a48362324e794e470db Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Sep 2024 01:36:46 +0800 Subject: [PATCH] add sw64 patch --- 0014-oemaker-Add-sw64-architecture.patch | 2608 ++++++++++++++++++++++ oemaker.spec | 16 +- 2 files changed, 2622 insertions(+), 2 deletions(-) create mode 100644 0014-oemaker-Add-sw64-architecture.patch diff --git a/0014-oemaker-Add-sw64-architecture.patch b/0014-oemaker-Add-sw64-architecture.patch new file mode 100644 index 0000000..7164818 --- /dev/null +++ b/0014-oemaker-Add-sw64-architecture.patch @@ -0,0 +1,2608 @@ +diff -uNar oemaker.org/isocut/config/sw_64/anaconda-ks.cfg oemaker.sw/isocut/config/sw_64/anaconda-ks.cfg +--- oemaker.org/isocut/config/sw_64/anaconda-ks.cfg 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isocut/config/sw_64/anaconda-ks.cfg 2024-09-28 01:02:10.649466465 +0800 +@@ -0,0 +1,375 @@ ++#version=DEVEL ++# Use CDROM installation media ++cdrom ++# Use graphical install ++graphical ++# Run the Setup Agent on first boot ++firstboot --enable ++ignoredisk --only-use=sda ++# Keyboard layouts ++keyboard --vckeymap=us --xlayouts='us' ++# System language ++lang en_US.UTF-8 ++ ++# Network information ++network --bootproto=dhcp --device=ens3 --onboot=off --ipv6=auto ++network --hostname=localhost.localdomain ++ ++# Root password ++rootpw --iscrypted $6$xcWWTkm29Zd5V8hv$MrbjVgQ.BCaRXoTGcpq2snPnGx36HUuC7uqH0IEMV3QQXDT6lacPX32Zwdn3yeq4aywymTlaO6anqzZ8tnKFA1 ++# System timezone ++timezone Asia/Beijing --isUtc ++# Reboot after install ++reboot ++# System bootloader configuration ++bootloader --append=" net.ifnames=0 biosdevname=0" --location=mbr --boot-drive=sda ++autopart --type=lvm ++# Partition clearing information ++clearpart --all --initlabel --drives=sda ++ ++%addon com_huawei_grub_safe --iscrypted --password="grub.pbkdf2.sha512.10000.6AC672F8E4878F60901C6ED574DA0EC315D4F2921DA5908BCDEE9F255963C8DECF1F542F6E6034A630D5A24221E7A530501797C0DE2CA182F6CDFDB45126DB6C.DAAB2E43C744AF5034093D9909679C4F4637848CE574F92B37E29CE4423A873398D88CE6E399A4090D17552641B037BA6426803EF8E5E56259D6F45705DF6731" ++%end ++ ++%packages --multilib --ignoremissing ++acl.sw_64 ++aide.sw_64 ++audit-libs.sw_64 ++audit.sw_64 ++autogen-libopts.sw_64 ++avahi-libs.sw_64 ++basesystem.noarch ++bash.sw_64 ++bind-libs-lite.sw_64 ++bind-libs.sw_64 ++bind-utils.sw_64 ++blktrace.sw_64 ++bridge-utils.sw_64 ++bzip2-libs.sw_64 ++bzip2.sw_64 ++chkconfig.sw_64 ++cifs-utils.sw_64 ++coreutils.sw_64 ++cpio.sw_64 ++cracklib-dicts.sw_64 ++cracklib.sw_64 ++cronie-anacron.sw_64 ++cronie.sw_64 ++crontabs.noarch ++cryptsetup-libs.sw_64 ++cups-libs.sw_64 ++curl.sw_64 ++cyrus-sasl-lib.sw_64 ++dbus-glib.sw_64 ++dbus-libs.sw_64 ++dbus.sw_64 ++deltarpm.sw_64 ++device-mapper-event-libs.sw_64 ++device-mapper-event.sw_64 ++device-mapper-libs.sw_64 ++device-mapper-persistent-data.sw_64 ++device-mapper.sw_64 ++dhcp-libs.sw_64 ++diffutils.sw_64 ++dmidecode.sw_64 ++dos2unix.sw_64 ++dracut-network.sw_64 ++dracut.sw_64 ++dump_mem_tool.sw_64 ++e2fsprogs-libs.sw_64 ++e2fsprogs.sw_64 ++elfutils-libelf.sw_64 ++elfutils-libs.sw_64 ++ethtool.sw_64 ++euleros-release.sw_64 ++expat-devel.sw_64 ++expat.sw_64 ++expect.sw_64 ++file-libs.sw_64 ++filesystem.sw_64 ++file.sw_64 ++findutils.sw_64 ++fipscheck-lib.sw_64 ++fipscheck.sw_64 ++freetype.sw_64 ++fuse.sw_64 ++gawk.sw_64 ++gdbm.sw_64 ++genisoimage.sw_64 ++gettext-libs.sw_64 ++gettext.sw_64 ++glib2.sw_64 ++glibc-common.sw_64 ++glibc.sw_64 ++gmp.sw_64 ++gnupg2.sw_64 ++gobject-introspection.sw_64 ++gpgme.sw_64 ++gpm-libs.sw_64 ++grep.sw_64 ++grub2-tools.sw_64 ++grubby.sw_64 ++gssproxy.sw_64 ++gzip.sw_64 ++hardlink.sw_64 ++hdparm.sw_64 ++hostname.sw_64 ++hwdata.noarch ++info.sw_64 ++initscripts.sw_64 ++iotop.noarch ++ipmitool.sw_64 ++iproute.sw_64 ++iptables.sw_64 ++iputils.sw_64 ++irqbalance.sw_64 ++json-c.sw_64 ++kbox-kmod.sw_64 ++kernel-tools-libs.sw_64 ++kernel-tools.sw_64 ++kernel.sw_64 ++kexec-tools.sw_64 ++keyutils-libs.sw_64 ++keyutils.sw_64 ++kmod-libs.sw_64 ++kmod.sw_64 ++kpartx.sw_64 ++kpatch-runtime.noarch ++krb5-libs.sw_64 ++less.sw_64 ++libacl.sw_64 ++libaio.sw_64 ++libalarm.sw_64 ++libassuan.sw_64 ++libattr.sw_64 ++libbasicobjects.sw_64 ++libblkid.sw_64 ++libcap-ng.sw_64 ++libcap.sw_64 ++libcgroup-tools.sw_64 ++libcgroup.sw_64 ++libcollection.sw_64 ++libcom_err.sw_64 ++libcroco.sw_64 ++libcurl.sw_64 ++libdb-utils.sw_64 ++libdb.sw_64 ++libedit.sw_64 ++libestr.sw_64 ++libevent.sw_64 ++libffi.sw_64 ++libgcc.sw_64 ++libgcrypt.sw_64 ++libgomp.sw_64 ++libgpg-error.sw_64 ++libidn.sw_64 ++libini_config.sw_64 ++libldb.sw_64 ++libmnl.sw_64 ++libmount.sw_64 ++libnetfilter_conntrack.sw_64 ++libnfnetlink.sw_64 ++libnfsidmap.sw_64 ++libpath_utils.sw_64 ++libpcap.sw_64 ++libpciaccess.sw_64 ++libpwquality.sw_64 ++libref_array.sw_64 ++libsecurec.sw_64 ++libselinux.sw_64 ++libsemanage.sw_64 ++libsepol.sw_64 ++libssh2.sw_64 ++libss.sw_64 ++libstdc++.sw_64 ++libsysfs.sw_64 ++libtalloc.sw_64 ++libtasn1.sw_64 ++libtdb.sw_64 ++libtevent.sw_64 ++libtirpc.sw_64 ++libunistring.sw_64 ++libusal.sw_64 ++libuser.sw_64 ++libutempter.sw_64 ++libuuid.sw_64 ++libverto.sw_64 ++libwbclient.sw_64 ++libxml2.sw_64 ++libxslt.sw_64 ++linux-firmware.noarch ++lm_sensors-libs.sw_64 ++logrotate.sw_64 ++lsof.sw_64 ++lsscsi.sw_64 ++lua.sw_64 ++lvm2-libs.sw_64 ++lvm2.sw_64 ++lzo.sw_64 ++mailcap.noarch ++mailx.sw_64 ++man-db.sw_64 ++mtools.sw_64 ++ncurses-base.noarch ++ncurses-libs.sw_64 ++ncurses.sw_64 ++net-snmp-libs.sw_64 ++net-tools.sw_64 ++nfs-utils.sw_64 ++nscd.sw_64 ++nspr.sw_64 ++nss-softokn-freebl.sw_64 ++nss-softokn.sw_64 ++nss-sysinit.sw_64 ++nss-tools.sw_64 ++nss-util.sw_64 ++nss.sw_64 ++ntpdate.sw_64 ++numactl-libs.sw_64 ++numactl.sw_64 ++numad.sw_64 ++OpenIPMI-libs.sw_64 ++OpenIPMI.sw_64 ++openldap.sw_64 ++openssh-clients.sw_64 ++openssh-server.sw_64 ++openssh.sw_64 ++openssl-libs.sw_64 ++openssl.sw_64 ++p11-kit-trust.sw_64 ++p11-kit.sw_64 ++pam.sw_64 ++parted.sw_64 ++passwd.sw_64 ++pciutils-libs.sw_64 ++pciutils.sw_64 ++pcre.sw_64 ++perl-Business-ISBN-Data.noarch ++perl-Business-ISBN.noarch ++perl-Carp.noarch ++perl-Compress-Raw-Bzip2.sw_64 ++perl-Compress-Raw-Zlib.sw_64 ++perl-Config-IniFiles.noarch ++perl-constant.noarch ++perl-Data-Dumper.sw_64 ++perl-DBD-SQLite.sw_64 ++perl-DBI.sw_64 ++perl-Digest-MD5.sw_64 ++perl-Digest.noarch ++perl-Digest-SHA.sw_64 ++perl-Encode-Locale.noarch ++perl-Encode.sw_64 ++perl-Exporter.noarch ++perl-File-Listing.noarch ++perl-File-Path.noarch ++perl-File-Temp.noarch ++perl-Filter.sw_64 ++perl-Getopt-Long.noarch ++perl-HTML-Parser.sw_64 ++perl-HTML-Tagset.noarch ++perl-HTTP-Cookies.noarch ++perl-HTTP-Daemon.noarch ++perl-HTTP-Date.noarch ++perl-HTTP-Message.noarch ++perl-HTTP-Negotiate.noarch ++perl-HTTP-Tiny.noarch ++perl-IO-Compress.noarch ++perl-IO-HTML.noarch ++perl-IO-Socket-IP.noarch ++perl-IO-Socket-SSL.noarch ++perl-libs.sw_64 ++perl-libwww-perl.noarch ++perl-List-MoreUtils.noarch ++perl-LWP-MediaTypes.noarch ++perl-macros.sw_64 ++perl-Net-Daemon.noarch ++perl-Net-HTTP.noarch ++perl-Net-LibIDN.sw_64 ++perl-Net-SSLeay.sw_64 ++perl-parent.noarch ++perl-PathTools.sw_64 ++perl-Pod-Escapes.noarch ++perl-podlators.noarch ++perl-Pod-Perldoc.noarch ++perl-Pod-Simple.noarch ++perl-Pod-Usage.noarch ++perl-Scalar-List-Utils.sw_64 ++perl-Socket.sw_64 ++perl-Storable.sw_64 ++perl-Text-ParseWords.noarch ++perl-threads-shared.sw_64 ++perl-threads.sw_64 ++perl-TimeDate.noarch ++perl-Time-HiRes.sw_64 ++perl-Time-Local.noarch ++perl-URI.noarch ++perl-WWW-RobotRules.noarch ++perl.sw_64 ++perl-XML-LibXML.sw_64 ++perl-XML-NamespaceSupport.noarch ++perl-XML-SAX-Base.noarch ++perl-XML-SAX.noarch ++pinentry.sw_64 ++popt.sw_64 ++procps-ng.sw_64 ++psmisc.sw_64 ++qrencode-libs.sw_64 ++quota-nls.noarch ++quota.sw_64 ++rasdaemon.sw_64 ++readline.sw_64 ++rootfiles.noarch ++rpcbind.sw_64 ++rpm-build-libs.sw_64 ++rpm-libs.sw_64 ++rpm.sw_64 ++rsync.sw_64 ++rsyslog.sw_64 ++samba-libs.sw_64 ++screen.sw_64 ++security-tool.sw_64 ++sed.sw_64 ++setup.noarch ++shadow-utils.sw_64 ++smartmontools.sw_64 ++sqlite.sw_64 ++squashfs-tools.sw_64 ++sudo.sw_64 ++sysfsutils.sw_64 ++sysmonitor-kmod.sw_64 ++sysstat.sw_64 ++systemd-libs.sw_64 ++systemd.sw_64 ++tar.sw_64 ++tcp_wrappers-libs.sw_64 ++tcp_wrappers.sw_64 ++teamd.sw_64 ++tuned.noarch ++tzdata.noarch ++unzip.sw_64 ++util-linux.sw_64 ++vim-common.sw_64 ++vim-enhanced.sw_64 ++vim-filesystem.noarch ++vim-minimal.sw_64 ++virt-what.sw_64 ++wget.sw_64 ++which.sw_64 ++xfsprogs.sw_64 ++xz-libs.sw_64 ++xz.sw_64 ++zip.sw_64 ++zlib.sw_64 ++dnf.noarch ++dnf-utils.noarch ++authselect.sw_64 ++authselect-libs.sw_64 ++grub2-efi-aa64.sw_64 ++grub2-efi-aa64-cdboot.sw_64 ++grub2-common.noarch ++grub2-tools.sw_64 ++shim-aa64.sw_64 ++euleros-logos.noarch ++network-scripts.sw_64 ++NetworkManager.sw_64 ++ ++%end +diff -uNar oemaker.org/isocut/config/sw_64/rpmlist oemaker.sw/isocut/config/sw_64/rpmlist +--- oemaker.org/isocut/config/sw_64/rpmlist 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isocut/config/sw_64/rpmlist 2024-09-28 01:02:10.649466465 +0800 +@@ -0,0 +1 @@ ++kernel.sw_64 +diff -uNar oemaker.org/isocut/isocut.py oemaker.sw/isocut/isocut.py +--- oemaker.org/isocut/isocut.py 2024-09-28 01:02:00.023465824 +0800 ++++ oemaker.sw/isocut/isocut.py 2024-09-28 01:02:10.649466465 +0800 +@@ -340,6 +340,8 @@ + pack.text = pack.text.split(".x86_64")[0] + elif os.uname()[-1].strip() == 'aarch64': + pack.text = pack.text.split(".aarch64")[0] ++ elif os.uname()[-1].strip() == 'sw_64': ++ pack.text = pack.text.split(".sw_64")[0] + pack.text = pack.text.split(".noarch")[0] + fp_rpm.close() + +@@ -418,6 +420,11 @@ + make_iso_cmd = "genisoimage -R -J -T -r -l -d -input-charset utf-8 " \ + "-joliet-long -allow-multidot -allow-leading-dots -no-bak -V \"%s\" " \ + "-o \"%s\" -e images/efiboot.img -no-emul-boot \"%s\"" % ( ++ ICONFIG.iso_desc, ICONFIG.dest_iso, ICONFIG.temp_path_new_image) ++ elif os.uname()[-1].strip() == 'sw_64': ++ make_iso_cmd = "genisoimage -R -J -T -r -l -d -input-charset utf-8 " \ ++ "-joliet-long -allow-multidot -allow-leading-dots -no-bak -V \"%s\" " \ ++ "-o \"%s\" -e images/efiboot.img -no-emul-boot \"%s\"" % ( + ICONFIG.iso_desc, ICONFIG.dest_iso, ICONFIG.temp_path_new_image) + dest_iso_path = os.path.dirname(ICONFIG.dest_iso) + if not (dest_iso_path is None or dest_iso_path == +diff -uNar oemaker.org/isomaker/80-openeuler/config_files/sw_64/boot.msg oemaker.sw/isomaker/80-openeuler/config_files/sw_64/boot.msg +--- oemaker.org/isomaker/80-openeuler/config_files/sw_64/boot.msg 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/config_files/sw_64/boot.msg 2024-09-28 01:02:10.648466465 +0800 +@@ -0,0 +1,5 @@ ++ ++splash.lss ++ ++ - Press the 0107 key to begin the installation process. ++ +diff -uNar oemaker.org/isomaker/80-openeuler/config_files/sw_64/grub2-efi.cfg oemaker.sw/isomaker/80-openeuler/config_files/sw_64/grub2-efi.cfg +--- oemaker.org/isomaker/80-openeuler/config_files/sw_64/grub2-efi.cfg 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/config_files/sw_64/grub2-efi.cfg 2024-09-28 01:02:10.648466465 +0800 +@@ -0,0 +1,46 @@ ++set default="1" ++ ++function load_video { ++ if [ x$feature_all_video_module = xy ]; then ++ insmod all_video ++ else ++ insmod efi_gop ++ insmod efi_uga ++ insmod ieee1275_fb ++ insmod vbe ++ insmod vga ++ insmod video_bochs ++ insmod video_cirrus ++ fi ++} ++ ++load_video ++set gfxpayload=keep ++insmod gzio ++insmod part_gpt ++insmod ext2 ++ ++set timeout=60 ++### END /etc/grub.d/00_header ### ++ ++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 ++ 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 ++ 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 ++ 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 ++ initrd @INITRDPATH@ ++ } ++} +diff -uNar oemaker.org/isomaker/80-openeuler/config_files/sw_64/grub.conf oemaker.sw/isomaker/80-openeuler/config_files/sw_64/grub.conf +--- oemaker.org/isomaker/80-openeuler/config_files/sw_64/grub.conf 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/config_files/sw_64/grub.conf 2024-09-28 01:02:10.648466465 +0800 +@@ -0,0 +1,13 @@ ++#debug --graphics ++default=0 ++splashimage=@SPLASHPATH@ ++timeout 5 ++hiddenmenu ++title Install @PRODUCT@ @VERSION@ ++ findiso ++ kernel @KERNELPATH@ @ROOT@ quiet ++ initrd @INITRDPATH@ ++title Test this media & install @PRODUCT@ @VERSION@ ++ findiso ++ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet ++ initrd @INITRDPATH@ +diff -uNar oemaker.org/isomaker/80-openeuler/live/config_files/sw_64/grub2-efi.cfg oemaker.sw/isomaker/80-openeuler/live/config_files/sw_64/grub2-efi.cfg +--- oemaker.org/isomaker/80-openeuler/live/config_files/sw_64/grub2-efi.cfg 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/live/config_files/sw_64/grub2-efi.cfg 2024-09-28 01:02:10.647466465 +0800 +@@ -0,0 +1,42 @@ ++set default="1" ++ ++function load_video { ++ if [ x$feature_all_video_module = xy ]; then ++ insmod all_video ++ else ++ insmod efi_gop ++ insmod efi_uga ++ insmod ieee1275_fb ++ insmod vbe ++ insmod vga ++ insmod video_bochs ++ insmod video_cirrus ++ fi ++} ++ ++load_video ++set gfxpayload=keep ++insmod gzio ++insmod part_gpt ++insmod ext2 ++ ++set timeout=60 ++### END /etc/grub.d/00_header ### ++ ++search --no-floppy --set=root -l '@ISOLABEL@' ++ ++### BEGIN /etc/grub.d/10_linux ### ++menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ rd.live.image quiet console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 ++ initrd @INITRDPATH@ ++} ++menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ rd.live.image rd.live.check quiet console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 ++ initrd @INITRDPATH@ ++} ++submenu 'Troubleshooting -->' { ++ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ rd.live.image nomodeset quiet console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 ++ initrd @INITRDPATH@ ++ } ++} +diff -uNar oemaker.org/isomaker/80-openeuler/live/sw_64.tmpl oemaker.sw/isomaker/80-openeuler/live/sw_64.tmpl +--- oemaker.org/isomaker/80-openeuler/live/sw_64.tmpl 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/live/sw_64.tmpl 2024-09-28 01:02:10.647466465 +0800 +@@ -0,0 +1,83 @@ ++<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> ++<% ++configdir="tmp/config_files/sw_64" ++PXEBOOTDIR="images/pxeboot" ++KERNELDIR=PXEBOOTDIR ++LIVEDIR="LiveOS" ++LORAXDIR="usr/share/lorax/" ++ ++## Don't allow spaces or escape characters in the iso label ++def valid_label(ch): ++ return ch.isalnum() or ch == '_' ++ ++isolabel = ''.join(ch if valid_label(ch) else '-' for ch in isolabel) ++ ++from os.path import basename ++%> ++ ++## Test ${runtime_img} to see if udf is needed ++<% ++ import os ++ from pylorax.sysutils import joinpaths ++ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: ++ udfargs = "-allow-limited-size" ++ else: ++ udfargs = "" ++%> ++ ++mkdir ${LIVEDIR} ++install ${runtime_img} ${LIVEDIR}/squashfs.img ++treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img ++ ++## install kernels ++mkdir ${KERNELDIR} ++%for kernel in kernels: ++ ## normal sw_64 ++ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz ++ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img ++%endfor ++ ++#FIXME: this will need adjusted when we have a real bootloader. ++## WHeeeeeeee, EFI. ++## We could remove the basearch restriction someday.. ++<% efiargs=""; efigraft="" %> ++%if exists("boot/efi/EFI/*/gcdaa64.efi"): ++ <% ++ efiarch32 = None ++ efiarch64 = 'AA64' ++ efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) ++ images = ["images/efiboot.img"] ++ %> ++ %for img in images: ++ <% ++ efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) ++ efigraft += " {0}={1}/{0}".format(img,outroot) ++ %> ++ treeinfo images-${basearch} ${img|basename} ${img} ++ %endfor ++ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> ++%endif ++ ++# Create optional product.img and updates.img ++<% filegraft=""; images=["product", "updates"] %> ++%for img in images: ++ %if exists("%s/%s/" % (LORAXDIR, img)): ++ installimg ${LORAXDIR}/${img}/ images/${img}.img ++ treeinfo images-${basearch} ${img}.img images/${img}.img ++ <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %> ++ %endif ++%endfor ++ ++# Inherit iso-graft/ if it exists from external templates ++<% ++ import os ++ if os.path.exists(workdir + "/iso-graft"): ++ filegraft += " " + workdir + "/iso-graft" ++%> ++ ++# Add the license files ++%for f in glob("/usr/share/licenses/*-release/*"): ++ install ${f} ${f|basename} ++ <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> ++%endfor ++ +diff -uNar oemaker.org/isomaker/80-openeuler/runtime-install.tmpl oemaker.sw/isomaker/80-openeuler/runtime-install.tmpl +--- oemaker.org/isomaker/80-openeuler/runtime-install.tmpl 2024-09-28 01:02:00.021465824 +0800 ++++ oemaker.sw/isomaker/80-openeuler/runtime-install.tmpl 2024-09-28 01:02:10.648466465 +0800 +@@ -47,6 +47,11 @@ + installpkg syslinux + installpkg grub2-tools grub2-tools-minimal grub2-tools-extra + %endif ++%if basearch == "sw_64": ++ installpkg efibootmgr ++ installpkg grub2-efi-aa64-cdboot shim-aa64 ++ installpkg uboot-tools ++%endif + + ## yay, plymouth + installpkg plymouth +diff -uNar oemaker.org/isomaker/80-openeuler/sw_64.tmpl oemaker.sw/isomaker/80-openeuler/sw_64.tmpl +--- oemaker.org/isomaker/80-openeuler/sw_64.tmpl 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/80-openeuler/sw_64.tmpl 2024-09-28 01:02:10.646466465 +0800 +@@ -0,0 +1,77 @@ ++<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> ++<% ++configdir="tmp/config_files/sw_64" ++PXEBOOTDIR="images/pxeboot" ++KERNELDIR=PXEBOOTDIR ++STAGE2IMG="images/install.img" ++LORAXDIR="usr/share/lorax/" ++ ++from os.path import basename ++%> ++ ++## Test ${runtime_img} to see if udf is needed ++<% ++ import os ++ from pylorax.sysutils import joinpaths ++ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: ++ udfargs = "-allow-limited-size" ++ else: ++ udfargs = "" ++%> ++ ++mkdir images ++install ${runtime_img} ${STAGE2IMG} ++treeinfo stage2 mainimage ${STAGE2IMG} ++ ++## install kernels ++mkdir ${KERNELDIR} ++%for kernel in kernels: ++ ## normal sw_64 ++ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz ++ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img ++%endfor ++ ++#FIXME: this will need adjusted when we have a real bootloader. ++## WHeeeeeeee, EFI. ++## We could remove the basearch restriction someday.. ++<% efiargs=""; efigraft="" %> ++%if exists("boot/efi/EFI/*/gcdaa64.efi"): ++ <% ++ efiarch32 = None ++ efiarch64 = 'AA64' ++ efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) ++ images = ["images/efiboot.img"] ++ %> ++ %for img in images: ++ <% ++ efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) ++ efigraft += " {0}={1}/{0}".format(img,outroot) ++ %> ++ treeinfo images-${basearch} ${img|basename} ${img} ++ %endfor ++ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> ++%endif ++ ++# Create optional product.img and updates.img ++<% filegraft=""; images=["product", "updates"] %> ++%for img in images: ++ %if exists("%s/%s/" % (LORAXDIR, img)): ++ installimg ${LORAXDIR}/${img}/ images/${img}.img ++ treeinfo images-${basearch} ${img}.img images/${img}.img ++ <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %> ++ %endif ++%endfor ++ ++# Inherit iso-graft/ if it exists from external templates ++<% ++ import os ++ if os.path.exists(workdir + "/iso-graft"): ++ filegraft += " " + workdir + "/iso-graft" ++%> ++ ++# Add the license files ++%for f in glob("/usr/share/licenses/*-release/*"): ++ install ${f} ${f|basename} ++ <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> ++%endfor ++ +diff -uNar oemaker.org/isomaker/config/rpmlist.xml oemaker.sw/isomaker/config/rpmlist.xml +--- oemaker.org/isomaker/config/rpmlist.xml 2024-09-28 01:02:00.020465824 +0800 ++++ oemaker.sw/isomaker/config/rpmlist.xml 2024-09-28 01:02:10.646466465 +0800 +@@ -71,6 +71,19 @@ + grub2-efi-x64-modules + shim + ++ ++ edk2-sw_64 ++ grub2-efi-aa64 ++ grub2-efi-aa64-modules ++ hisi_hpre ++ hisi_trng_v2 ++ hisi_sec2 ++ hisi_zip ++ uadk_engine ++ libwd ++ shim-aa64 ++ uacce ++ + + abattis-cantarell-fonts + abattis-cantarell-fonts-help +diff -uNar oemaker.org/isomaker/config/sw_64/edge_normal.xml oemaker.sw/isomaker/config/sw_64/edge_normal.xml +--- oemaker.org/isomaker/config/sw_64/edge_normal.xml 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/config/sw_64/edge_normal.xml 2024-09-28 01:02:10.646466465 +0800 +@@ -0,0 +1,119 @@ ++ ++ ++ ++ ++ core ++ Core ++ 核心 ++ Smallest possible installation ++ 最小安装 ++ true ++ false ++ ++ audit ++ kernel ++ basesystem ++ bash ++ coreutils ++ cronie ++ curl ++ dnf ++ e2fsprogs ++ filesystem ++ firewalld ++ glibc ++ grubby ++ hostname ++ initscripts ++ iproute ++ iprutils ++ iputils ++ irqbalance ++ kbd ++ kexec-tools ++ less ++ man-db ++ ncurses ++ openssh ++ openssh-server ++ openssh-clients ++ parted ++ passwd ++ policycoreutils ++ procps-ng ++ rng-tools ++ rootfiles ++ rpm ++ selinux-policy-targeted ++ setup ++ shadow ++ sssd ++ sudo ++ systemd ++ tuned ++ util-linux ++ vim-minimal ++ xfsprogs ++ yum ++ wget ++ openEuler-release ++ openEuler-performance ++ openEuler-latest-release ++ NetworkManager ++ NetworkManager-config-server ++ authselect ++ dnf-plugins-core ++ dracut-config-rescue ++ kernel-tools ++ sysfsutils ++ linux-firmware ++ lshw ++ lsscsi ++ rsyslog ++ security-tool ++ sg3_utils ++ dracut-config-generic ++ dracut-network ++ rdma-core ++ selinux-policy-mls ++ patch ++ patch-help ++ ntp ++ ntp-help ++ ntp-perl ++ iSulad ++ tar ++ socat ++ socat-help ++ conntrack-tools ++ conntrack-tools-help ++ vim-X11 ++ vim-common ++ vim-enhanced ++ vim-filesystem ++ vim-minimal ++ efibootmgr ++ efibootmgr-help ++ cjson ++ cjson-devel ++ mosquitto ++ chrony ++ ++ ++ ++ minimal-environment ++ Minimal Install ++ 最小安装 ++ Basic functionality. ++ 基本功能。 ++ 1 ++ ++ core ++ ++ ++ standard ++ ++ ++ +diff -uNar oemaker.org/isomaker/config/sw_64/normal.xml oemaker.sw/isomaker/config/sw_64/normal.xml +--- oemaker.org/isomaker/config/sw_64/normal.xml 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/config/sw_64/normal.xml 2024-09-28 01:02:10.646466465 +0800 +@@ -0,0 +1,1650 @@ ++ ++ ++ ++ ++ additional-devel ++ Additional Development ++ 附加开发 ++ Additional development headers and libraries for building open-source applications. ++ 用于构建开源应用程序的附加开发标头及程序可。 ++ true ++ false ++ ++ audit-libs-devel ++ bzip2-devel ++ c-ares-devel ++ cyrus-sasl-devel ++ e2fsprogs-devel ++ elfutils-devel ++ elfutils-libelf-devel ++ expat-devel ++ fuse3-devel ++ gmp-devel ++ lksctp-tools-devel ++ iptables-devel ++ libacl-devel ++ libaio-devel ++ libattr-devel ++ libblkid-devel ++ libcap-devel ++ libcap-ng-devel ++ libcurl-devel ++ libffi-devel ++ libgcrypt-devel ++ libnl3-devel ++ libselinux-devel ++ libusbx-devel ++ libuuid-devel ++ lksctp-tools-devel ++ lz4 ++ lz4-devel ++ lzo ++ lzo-devel ++ numactl-devel ++ pciutils-devel ++ pcre-devel ++ polkit-devel ++ popt-devel ++ rdma-core-devel ++ readline-devel ++ sqlite-devel ++ systemd-devel ++ tcl-devel ++ xfsprogs-devel ++ xz-devel ++ SDL-devel ++ alsa-lib-devel ++ binutils-devel ++ boost-devel ++ dbus-glib-devel ++ gd-devel ++ gnutls-devel ++ gpm-devel ++ gstreamer1-devel ++ gstreamer1-plugins-base-devel ++ gvfs-devel ++ hunspell-devel ++ java-1.8.0-openjdk-devel ++ libXau-devel ++ libXaw-devel ++ libXinerama-devel ++ libXmu-devel ++ libXrandr-devel ++ libcanberra-devel ++ libdrm-devel ++ libnotify-devel ++ libpfm-devel ++ libpq-devel ++ librsvg2-devel ++ libsoup-devel ++ libssh-devel ++ libtiff-devel ++ libxslt-devel ++ mariadb-devel ++ mpfr-devel ++ net-snmp-devel ++ newt-devel ++ openscap-devel ++ papi-devel ++ protobuf-c ++ sane-backends-devel ++ slang-devel ++ startup-notification-devel ++ tbb-devel ++ tk-devel ++ unixODBC-devel ++ xorg-x11-proto-devel ++ flatpak ++ ++ ++ ++ anaconda-tools ++ Anaconda tools ++ Anaconda 工具 ++ ++ false ++ false ++ ++ lorax ++ chrony ++ cryptsetup ++ device-mapper-multipath ++ dosfstools ++ dracut-network ++ e2fsprogs ++ efibootmgr ++ fcoe-utils ++ firewalld ++ gfs2-utils ++ glibc-all-langpacks ++ grub2-efi-aa64 ++ grub2-efi-aa64-cdboot ++ grub2-tools ++ grub2-tools-extra ++ iscsi-initiator-utils ++ lvm2 ++ mdadm ++ realmd ++ shim-aa64 ++ libteam ++ tmux ++ xfsprogs ++ kdump-anaconda-addon ++ ++ ++ ++ base ++ Base ++ 基本 ++ The standard installation. ++ true ++ false ++ ++ acl ++ at ++ attr ++ bc ++ cpio ++ crontabs ++ cyrus-sasl ++ dbus ++ ed ++ file ++ iptstate ++ irqbalance ++ kpatch ++ logrotate ++ lsof ++ net-tools ++ pciutils ++ psacct ++ quota ++ openEuler-release ++ openEuler-performance ++ openEuler-latest-release ++ sudo ++ symlinks ++ systemd-udev ++ tar ++ tree ++ util-linux-user ++ bash-completion ++ bpftool ++ bzip2 ++ chrony ++ cockpit ++ cryptsetup ++ dos2unix ++ dosfstools ++ ethtool ++ gnupg2 ++ libstoragemgmt ++ lvm2 ++ mailcap ++ man-pages ++ mdadm ++ mlocate ++ mtr ++ nano ++ realmd ++ rng-tools ++ rsync ++ smartmontools ++ sssd ++ strace ++ libteam ++ time ++ unzip ++ usbutils ++ virt-what ++ which ++ words ++ xfsdump ++ zip ++ cifs-utils ++ cockpit-doc ++ ima-evm-utils ++ nfs-utils ++ traceroute ++ zsh ++ ++ ++ ++ conflicts-baseos ++ Conflicts BaseOS ++ 与 BaseOS 冲突 ++ This group includes packages conflicting with an everything installation from the BaseOS repo ++ 这个组包括了与通过 BaseOS repo 安装的软件冲突的软件包 ++ false ++ false ++ ++ ++ ++ ++ container-management ++ Container Management ++ 容器管理 ++ Tools for managing Linux containers ++ 用于管理 Linux 容器的工具 ++ true ++ true ++ ++ containernetworking-plugins ++ ++ ++ ++ core ++ Core ++ 核心 ++ Smallest possible installation ++ 最小安装 ++ true ++ false ++ ++ audit ++ kernel ++ basesystem ++ bash ++ coreutils ++ cronie ++ curl ++ dnf ++ e2fsprogs ++ filesystem ++ firewalld ++ glibc ++ grubby ++ hostname ++ initscripts ++ iproute ++ iprutils ++ iputils ++ irqbalance ++ kbd ++ kexec-tools ++ less ++ man-db ++ ncurses ++ openssh ++ openssh-server ++ openssh-clients ++ parted ++ passwd ++ policycoreutils ++ procps-ng ++ rng-tools ++ rootfiles ++ rpm ++ selinux-policy-targeted ++ setup ++ shadow ++ sssd ++ sudo ++ systemd ++ tuned ++ util-linux ++ vim-minimal ++ xfsprogs ++ yum ++ wget ++ openEuler-release ++ openEuler-performance ++ openEuler-latest-release ++ NetworkManager ++ NetworkManager-config-server ++ authselect ++ dnf-plugins-core ++ dracut-config-rescue ++ kernel-tools ++ sysfsutils ++ linux-firmware ++ lshw ++ lsscsi ++ rsyslog ++ security-tool ++ sg3_utils ++ dracut-config-generic ++ dracut-network ++ rdma-core ++ selinux-policy-mls ++ ++ ++ ++ desktop-debugging ++ Desktop Debugging and Performance Tools ++ 桌面调试和运行工具 ++ GUI tools for debugging applications and performance. ++ 调试应用程序和性能的 GUI 工具。 ++ true ++ false ++ ++ crash ++ crash-gcore-command ++ crash-trace-command ++ xrestop ++ ++ ++ ++ development ++ Development Tools ++ 开发工具 ++ A basic development environment. ++ 基本开发环境。 ++ true ++ true ++ ++ autoconf ++ automake ++ binutils ++ bison ++ flex ++ gcc ++ gcc-c++ ++ glibc-devel ++ gettext ++ gdb ++ libtool ++ make ++ patch ++ pkgconf ++ openEuler-rpm-config ++ rpm-build ++ rpm ++ asciidoc ++ byacc ++ ctags ++ diffstat ++ elfutils ++ gcc-gfortran ++ git ++ subversion ++ intltool ++ ltrace ++ patchutils ++ perl-Fedora-VSP ++ perl-generators ++ pesign ++ source-highlight ++ systemtap ++ valgrind ++ valgrind-devel ++ babel ++ chrpath ++ expect ++ gcc-objc ++ gcc-objc++ ++ mercurial ++ mod_dav_svn ++ systemtap-sdt-devel ++ systemtap-server ++ cmake ++ rpmdevtools ++ rpmlint ++ ++ ++ ++ dial-up ++ Dial-up Networking Support ++ 拨号网络支持 ++ ++ true ++ false ++ ++ ppp ++ ModemManager ++ NetworkManager-adsl ++ lrzsz ++ minicom ++ ++ ++ ++ dns-server ++ DNS Name Server ++ DNS 名称服务器 ++ This package group allows you to run a DNS name server (BIND) on the system. ++ 该软件包组允许您在系统上运行 DNS 名称服务器(BIND)。 ++ false ++ false ++ ++ bind ++ bind-chroot ++ bind-dyndb-ldap ++ unbound ++ ++ ++ ++ directory-client ++ Directory Client ++ 目录客户端 ++ Clients for integration into a network managed by a directory service. ++ 用于整合到使用目录服务管理的网络的客户端。 ++ false ++ false ++ ++ adcli ++ oddjob-mkhomedir ++ realmd ++ sssd ++ clevis-dracut ++ clevis-udisks2 ++ krb5-pkinit ++ krb5-workstation ++ luksmeta ++ nscd ++ nss-pam-ldapd ++ openldap-clients ++ samba-winbind ++ samba-winbind-clients ++ sssd-dbus ++ sssd-tools ++ sssd-winbind-idmap ++ ++ ++ ++ file-server ++ File and Storage Server ++ 文件及存储服务器 ++ CIFS, SMB, NFS, iSCSI, iSER, and iSNS network storage server. ++ CIFS, SMB, NFS, iSCSI, iSER 及 iSNS 网络存储服务器。 ++ true ++ false ++ ++ cifs-utils ++ gssproxy ++ nfs-utils ++ nfs4-acl-tools ++ samba ++ open-isns ++ ++ ++ ++ fonts ++ Fonts ++ 字体 ++ Fonts packages for rendering text on the desktop. ++ 用于在桌面显示文字的字体软件包。 ++ true ++ false ++ ++ dejavu-sans-fonts ++ dejavu-sans-mono-fonts ++ dejavu-serif-fonts ++ abattis-cantarell-fonts ++ gnu-free-mono-fonts ++ gnu-free-sans-fonts ++ gnu-free-serif-fonts ++ google-noto-sans-cjk-ttc-fonts ++ google-noto-serif-cjk-ttc-fonts ++ jomolhari-fonts ++ julietaula-montserrat-fonts ++ paktype-naskh-basic-fonts ++ paratype-pt-sans-fonts ++ sil-abyssinica-fonts ++ sil-nuosu-fonts ++ sil-padauk-fonts ++ smc-meera-fonts ++ stix-fonts ++ thai-scalable-waree-fonts ++ bpg-algeti-fonts ++ bpg-chveulebrivi-fonts ++ bpg-courier-fonts ++ bpg-courier-s-fonts ++ bpg-elite-fonts ++ bpg-excelsior-fonts ++ bpg-glaho-fonts ++ bpg-ingiri-fonts ++ bpg-nino-medium-cond-fonts ++ bpg-nino-medium-fonts ++ bpg-sans-fonts ++ bpg-sans-medium-fonts ++ bpg-sans-modern-fonts ++ bpg-sans-regular-fonts ++ bpg-serif-fonts ++ bpg-serif-modern-fonts ++ fontawesome-fonts ++ google-droid-kufi-fonts ++ google-droid-sans-fonts ++ google-droid-sans-mono-fonts ++ google-droid-serif-fonts ++ gubbi-fonts ++ kacst-art-fonts ++ kacst-book-fonts ++ kacst-decorative-fonts ++ kacst-digital-fonts ++ kacst-farsi-fonts ++ kacst-letter-fonts ++ kacst-naskh-fonts ++ kacst-office-fonts ++ kacst-one-fonts ++ kacst-pen-fonts ++ kacst-poster-fonts ++ kacst-qurn-fonts ++ kacst-screen-fonts ++ kacst-title-fonts ++ kacst-titlel-fonts ++ kurdit-unikurd-web-fonts ++ lato-fonts ++ madan-fonts ++ nafees-web-naskh-fonts ++ navilu-fonts ++ overpass-fonts ++ paktype-naqsh-fonts ++ paktype-tehreer-fonts ++ saab-fonts ++ samyak-devanagari-fonts ++ samyak-gujarati-fonts ++ samyak-malayalam-fonts ++ samyak-odia-fonts ++ samyak-tamil-fonts ++ sil-scheherazade-fonts ++ smc-anjalioldlipi-fonts ++ smc-dyuthi-fonts ++ smc-kalyani-fonts ++ smc-rachana-fonts ++ smc-raghumalayalam-fonts ++ smc-suruma-fonts ++ stix-math-fonts ++ thai-scalable-garuda-fonts ++ thai-scalable-kinnari-fonts ++ thai-scalable-loma-fonts ++ thai-scalable-norasi-fonts ++ thai-scalable-purisa-fonts ++ thai-scalable-sawasdee-fonts ++ thai-scalable-tlwgmono-fonts ++ thai-scalable-tlwgtypewriter-fonts ++ thai-scalable-tlwgtypist-fonts ++ thai-scalable-tlwgtypo-fonts ++ thai-scalable-umpush-fonts ++ tibetan-machine-uni-fonts ++ wqy-microhei-fonts ++ xorg-x11-fonts-100dpi ++ xorg-x11-fonts-75dpi ++ xorg-x11-fonts-ISO8859-1-100dpi ++ xorg-x11-fonts-ISO8859-1-75dpi ++ xorg-x11-fonts-ISO8859-14-100dpi ++ xorg-x11-fonts-ISO8859-14-75dpi ++ xorg-x11-fonts-ISO8859-15-100dpi ++ xorg-x11-fonts-ISO8859-15-75dpi ++ xorg-x11-fonts-ISO8859-2-100dpi ++ xorg-x11-fonts-ISO8859-2-75dpi ++ xorg-x11-fonts-ISO8859-9-100dpi ++ xorg-x11-fonts-ISO8859-9-75dpi ++ xorg-x11-fonts-Type1 ++ xorg-x11-fonts-cyrillic ++ xorg-x11-fonts-misc ++ ++ ++ ++ ftp-server ++ FTP Server ++ FTP 服务器 ++ These tools allow you to run an FTP server on the system. ++ 这些工具允许您在系统上运行 FTP 服务器。 ++ true ++ false ++ ++ vsftpd ++ ++ ++ ++ gnome-apps ++ GNOME Applications ++ GNOME 应用程序 ++ A set of commonly used GNOME Applications. ++ 一组经常使用的 GNOME 应用程序。 ++ false ++ false ++ ++ ++ ++ ++ gnome-desktop ++ GNOME ++ GNOME ++ GNOME is a highly intuitive and user friendly desktop environment. ++ GNOME 是一个非常直观且用户友好的桌面环境。 ++ false ++ false ++ ++ at-spi2-atk ++ at-spi2-core ++ avahi ++ control-center ++ dconf ++ eog ++ evince ++ evince-nautilus ++ file-roller ++ file-roller-nautilus ++ firewall-config ++ fprintd-pam ++ gdm ++ glib-networking ++ gnome-bluetooth ++ gnome-classic-session ++ gnome-color-manager ++ gnome-dictionary ++ gnome-disk-utility ++ gnome-font-viewer ++ gnome-getting-started-docs ++ gnome-initial-setup ++ gnome-icon-theme ++ gnome-packagekit ++ gnome-packagekit-updater ++ gnome-screenshot ++ gnome-session ++ gnome-session-xsession ++ gnome-settings-daemon ++ gnome-shell ++ gnome-terminal ++ gnome-terminal-nautilus ++ gnome-themes-standard ++ gnome-user-docs ++ gvfs-afc ++ gvfs-afp ++ gvfs-archive ++ gvfs-fuse3 ++ gvfs-goa ++ gvfs-gphoto2 ++ gvfs-mtp ++ gvfs-smb ++ initial-setup-gui ++ libcanberra-gtk2 ++ libcanberra-gtk3 ++ librsvg2 ++ metacity ++ nautilus ++ nm-connection-editor ++ PackageKit-command-not-found ++ PackageKit-gtk3-module ++ sane-backends-drivers-scanners ++ setroubleshoot ++ vinagre ++ vino ++ xdg-user-dirs-gtk ++ yelp ++ dconf-editor ++ vim-X11 ++ ++ ++ ++ guest-desktop-agents ++ Guest Desktop Agents ++ 虚拟机桌面代理 ++ Agents used when running as a virtualized desktop. ++ 作为虚拟桌面运行时使用的代理。 ++ true ++ false ++ ++ qemu-guest-agent ++ spice-vdagent ++ ++ ++ ++ hardware-monitoring ++ Hardware Monitoring Utilities ++ 硬件监控工具 ++ A set of tools to monitor server hardware. ++ 一组用来监控服务器硬件的工具。 ++ true ++ false ++ ++ rasdaemon ++ smartmontools ++ lm_sensors ++ ++ ++ ++ hardware-support ++ Hardware Support ++ This group is a collection of tools for various hardware specific utilities. ++ true ++ false ++ ++ bolt ++ usb_modeswitch ++ linux-firmware ++ lsscsi ++ opensc ++ openssl-pkcs11 ++ pcsc-lite ++ pcsc-lite-ccid ++ ++ ++ ++ headless-management ++ Headless Management ++ 无图形终端系统管理工具 ++ Tools for managing the system without an attached graphical console. ++ 用于管理无图像终端系统的工具。 ++ true ++ true ++ ++ PackageKit ++ cockpit ++ openssh-server ++ sscg ++ ++ ++ ++ infiniband ++ Infiniband Support ++ Infiniband 支持 ++ Software designed for supporting clustering, grid connectivity, and low-latency, high bandwidth storage using RDMA-based InfiniBand, iWARP, RoCE, and OPA fabrics. ++ true ++ false ++ ++ libibverbs ++ libibverbs-utils ++ librdmacm ++ librdmacm-utils ++ rdma-core ++ ibacm ++ iwpmd ++ perftest ++ srp_daemon ++ opensm ++ ++ ++ ++ input-methods ++ Input Methods ++ 输入法 ++ Input method packages for the input of international text. ++ 输入非英文文本的输入法软件包 ++ true ++ false ++ ++ ibus-sayura ++ ibus-table ++ ibus-table-array30 ++ gtk2-immodule-xim ++ gtk3-immodule-xim ++ ibus-gtk2 ++ ibus-gtk3 ++ ++ ++ ++ internet-applications ++ Internet Applications ++ 互联网应用程序 ++ Email, chat, and video conferencing software. ++ 电子邮件、聊天和视频会议软件。 ++ false ++ false ++ ++ ++ ++ ++ internet-browser ++ Internet Browser ++ 互联网浏览器 ++ The Firefox web browser ++ Firefox web 浏览器 ++ true ++ false ++ ++ ++ ++ ++ java-platform ++ Java Platform ++ Java 平台 ++ Java support for the Red Hat Enterprise Linux Server and Desktop Platforms. ++ Red Hat Enterprise Linux 服务器和桌面平台的 Java 支持。 ++ true ++ false ++ ++ java-1.8.0-openjdk ++ ++ ++ ++ large-systems ++ Large Systems Performance ++ 大系统性能 ++ Performance support tools for large systems. ++ 用于大型系统的性能支持工具。 ++ true ++ false ++ ++ numactl ++ numad ++ hwloc ++ mstflint ++ qperf ++ libvma ++ ++ ++ ++ legacy-unix ++ Legacy UNIX Compatibility ++ 传统 UNIX 兼容性 ++ Compatibility programs for migration from or working with legacy UNIX environments. ++ 用于从继承 UNIX 环境中迁移或者可用于该环境的兼容程序。 ++ true ++ true ++ ++ mksh ++ ++ ++ ++ legacy-x ++ Legacy X Window System Compatibility ++ 传统 X Windows 系统的兼容性 ++ Compatibility programs for migration from or working with legacy X Window System environments. ++ 用于从继承 X Windows 环境中迁移或者可用于该环境的兼容程序。 ++ true ++ false ++ ++ libXmu ++ xorg-x11-fonts-ISO8859-1-100dpi ++ xorg-x11-fonts-Type1 ++ xorg-x11-fonts-misc ++ xterm ++ ++ ++ ++ mail-server ++ Mail Server ++ 邮件服务器 ++ These packages allow you to configure an IMAP or SMTP mail server. ++ 这些软件包允许您配置 IMAP 或 Postfix 邮件服务器。 ++ true ++ false ++ ++ cyrus-sasl ++ postfix ++ ++ ++ ++ mainframe-access ++ Mainframe Access ++ 主框架访问 ++ Tools for accessing mainframe computing resources. ++ 访问主框架计算源的工具。 ++ true ++ false ++ ++ x3270-text ++ ++ ++ ++ network-file-system-client ++ Network File System Client ++ 网络文件系统客户端 ++ Enables the system to attach to network storage. ++ 启用该系统附加到网络存储。 ++ true ++ false ++ ++ cifs-utils ++ device-mapper-multipath ++ fcoe-utils ++ gssproxy ++ iscsi-initiator-utils ++ lldpad ++ nfs-utils ++ nfs4-acl-tools ++ samba-client ++ cachefilesd ++ cgdcbxd ++ ++ ++ ++ network-server ++ Network Servers ++ 网络服务器 ++ These packages include network-based servers such as DHCP, Kerberos and NIS. ++ 这些软件包包括基于网络的服务器，例如 DHCP、Kerberos 和 NIS。 ++ true ++ true ++ ++ dhcp-server ++ krb5-server ++ dnsmasq ++ freeradius ++ libreswan ++ radvd ++ rsyslog ++ rsyslog-mysql ++ rsyslog-pgsql ++ rsyslog-relp ++ tang ++ tftp-server ++ ++ ++ ++ network-tools ++ Networking Tools ++ 联网工具 ++ Tools for configuring and analyzing computer networks. ++ 配置和分析计算机网络的工具。 ++ true ++ false ++ ++ arpwatch ++ ipset ++ iptraf-ng ++ iptstate ++ dnsmasq ++ freeradius ++ libreswan ++ radvd ++ rsyslog ++ rsyslog-mysql ++ rsyslog-pgsql ++ rsyslog-relp ++ tang ++ tftp-server ++ ++ ++ ++ networkmanager-submodules ++ Common NetworkManager submodules ++ This group contains NetworkManager submodules that are commonly used, but may not be wanted in some streamlined configurations. ++ true ++ false ++ ++ NetworkManager-bluetooth ++ NetworkManager-wifi ++ NetworkManager-wwan ++ dhcp ++ iptables ++ dnsmasq ++ ++ ++ ++ performance ++ Performance Tools ++ 性能工具 ++ Tools for diagnosing system and application-level performance problems. ++ 诊断系统和程序级别性能问题的工具。 ++ true ++ false ++ ++ iotop ++ perf ++ hdparm ++ tuned ++ sysstat ++ pcp ++ pcp-conf ++ pcp-devel ++ pcp-doc ++ pcp-export-pcp2graphite ++ pcp-export-pcp2influxdb ++ pcp-export-pcp2json ++ pcp-export-pcp2xml ++ pcp-export-pcp2zabbix ++ pcp-export-zabbix-agent ++ pcp-import-collectl2pcp ++ pcp-import-ganglia2pcp ++ pcp-import-iostat2pcp ++ pcp-import-mrtg2pcp ++ pcp-libs ++ pcp-libs-devel ++ pcp-manager ++ pcp-pmda-apache ++ pcp-pmda-bash ++ pcp-pmda-bonding ++ pcp-pmda-cifs ++ pcp-pmda-cisco ++ pcp-pmda-dbping ++ pcp-pmda-dm ++ pcp-pmda-docker ++ pcp-pmda-ds389 ++ pcp-pmda-gfs2 ++ pcp-pmda-gluster ++ pcp-pmda-gpfs ++ pcp-pmda-gpsd ++ pcp-pmda-haproxy ++ pcp-pmda-infiniband ++ pcp-pmda-json ++ pcp-pmda-kvm ++ pcp-pmda-libvirt ++ pcp-pmda-lio ++ pcp-pmda-lmsensors ++ pcp-pmda-logger ++ pcp-pmda-lustre ++ pcp-pmda-lustrecomm ++ pcp-pmda-mailq ++ pcp-pmda-memcache ++ pcp-pmda-mic ++ pcp-pmda-mounts ++ pcp-pmda-mysql ++ pcp-pmda-named ++ pcp-pmda-netfilter ++ pcp-pmda-news ++ pcp-pmda-nfsclient ++ pcp-pmda-nvidia-gpu ++ pcp-pmda-oracle ++ pcp-pmda-papi ++ pcp-pmda-pdns ++ pcp-pmda-perfevent ++ pcp-pmda-prometheus ++ pcp-pmda-redis ++ pcp-pmda-roomtemp ++ pcp-pmda-rpm ++ pcp-pmda-rsyslog ++ pcp-pmda-samba ++ pcp-pmda-sendmail ++ pcp-pmda-shping ++ pcp-pmda-slurm ++ pcp-pmda-smart ++ pcp-pmda-snmp ++ pcp-pmda-summary ++ pcp-pmda-systemd ++ pcp-pmda-trace ++ pcp-pmda-unbound ++ pcp-pmda-vmware ++ pcp-pmda-weblog ++ pcp-pmda-zimbra ++ pcp-pmda-zswap ++ pcp-selinux ++ pcp-system-tools ++ pcp-testsuite ++ pcp-webapi ++ pcp-webapp-blinkenlights ++ pcp-webapp-grafana ++ pcp-webapp-graphite ++ pcp-webapp-vector ++ pcp-webjs ++ pcp-zeroconf ++ perl-PCP-LogImport ++ perl-PCP-LogSummary ++ perl-PCP-MMV ++ perl-PCP-PMDA ++ powertop ++ fio ++ iperf3 ++ libpfm ++ papi ++ tuned-utils ++ ++ ++ ++ platform-devel ++ Platform Development ++ 平台开发 ++ Recommended development headers and libraries for developing applications. ++ 推荐用于开发应用程序的标头及程序库。 ++ true ++ false ++ ++ fontconfig-devel ++ freetype-devel ++ glib2-devel ++ glibc-devel ++ krb5-devel ++ libjpeg-turbo-devel ++ libpng-devel ++ libstdc++-devel ++ ncurses-devel ++ openldap-devel ++ openssl-devel ++ pam-devel ++ zlib-devel ++ atk-devel ++ cairo-devel ++ dbus-devel ++ desktop-file-utils ++ gtk2-devel ++ gtk3-devel ++ libICE-devel ++ libSM-devel ++ libX11-devel ++ libXext-devel ++ libXft-devel ++ libXi-devel ++ libXrender-devel ++ libXt-devel ++ libXtst-devel ++ libXv-devel ++ libXxf86dga-devel ++ libdb-devel ++ libjpeg-turbo-devel ++ libstdc++-devel ++ libvirt-devel ++ libxml2-devel ++ libxshmfence-devel ++ mesa-libGL-devel ++ mesa-libGLU-devel ++ nss-devel ++ pango-devel ++ qt5-qtdoc ++ qt5-qttranslations ++ ++ ++ ++ print-client ++ Printing Client ++ 打印客户端 ++ Tools for printing to a local printer or a remote print server. ++ 在本地打印机和远程打印服务器中打印的工具。 ++ true ++ false ++ ++ ++ ++ ++ python-web ++ Python Web ++ Basic Python web application support. ++ 基本 Python 网页应用程序支持。 ++ true ++ false ++ ++ freetype-devel ++ libcurl ++ libcurl-devel ++ libjpeg-turbo ++ libjpeg-turbo-devel ++ python3-magic ++ ++ ++ ++ remote-system-management ++ Remote Management for Linux ++ Linux 的远程管理 ++ Remote management interface. ++ Linux 的远程管理界面。 ++ true ++ false ++ ++ cockpit ++ net-snmp ++ net-snmp-utils ++ openwsman-client ++ tog-pegasus ++ openwsman-server ++ ++ ++ ++ scientific ++ Scientific Support ++ 科学记数法支持 ++ Tools for mathematical and scientific computations, and parallel computing. ++ 用于数学和科学计算以及平行计算的工具。 ++ true ++ true ++ ++ units ++ fftw ++ fftw-devel ++ fftw-static ++ gsl-devel ++ lapack ++ python3-numpy ++ python3-scipy ++ ++ ++ ++ security-tools ++ Security Tools ++ 安全性工具 ++ Security tools for integrity and trust verification. ++ 用于完整性和可信验证的安全性工具。 ++ true ++ true ++ ++ hmaccalc ++ tpm-quote-tools ++ tpm-tools ++ trousers ++ scap-security-guide ++ aide ++ openscap ++ openscap-engine-sce ++ openscap-utils ++ scap-security-guide-doc ++ ++ ++ ++ server-product ++ Server product core ++ Packages mandatory for the server product. ++ true ++ false ++ ++ chrony ++ polkit ++ realmd ++ openEuler-release ++ openEuler-performance ++ timedatex ++ dhcp ++ NetworkManager-config-server ++ NetworkManager ++ ++ ++ ++ smb-server ++ Windows File Server ++ Windows 文件服务器 ++ This package group allows you to share files between Linux and MS Windows(tm) systems. ++ 该软件包组允许您在 Linux 和 MS Windows(tm) 系统间共享文件。 ++ true ++ false ++ ++ samba ++ samba-client ++ cifs-utils ++ ++ ++ ++ standard ++ Standard ++ 标准 ++ The standard installation. ++ 标准安装。 ++ true ++ false ++ ++ acl ++ at ++ attr ++ bc ++ cpio ++ crontabs ++ cyrus-sasl ++ dbus ++ ed ++ file ++ iptstate ++ irqbalance ++ kpatch ++ logrotate ++ lsof ++ net-tools ++ pciutils ++ quota ++ openEuler-release ++ openEuler-performance ++ sudo ++ symlinks ++ systemd-udev ++ tar ++ tree ++ util-linux-user ++ bash-completion ++ bpftool ++ bzip2 ++ chrony ++ cockpit ++ cryptsetup ++ dos2unix ++ dosfstools ++ ethtool ++ gnupg2 ++ lvm2 ++ mailcap ++ man-pages ++ mdadm ++ mlocate ++ mtr ++ realmd ++ rsync ++ smartmontools ++ sssd ++ strace ++ libteam ++ time ++ unzip ++ usbutils ++ virt-what ++ which ++ words ++ xfsdump ++ zip ++ cifs-utils ++ cockpit-doc ++ ima-evm-utils ++ nfs-utils ++ traceroute ++ zsh ++ psacct ++ libstoragemgmt ++ nano ++ rng-tools ++ rsyslog ++ rsyslog-relp ++ nmap ++ pinfo ++ plymouth ++ tcpdump ++ vim-enhanced ++ wget ++ ++ ++ ++ system-tools ++ System Tools ++ 系统工具 ++ This group is a collection of various tools for the system, such as the client for connecting to SMB shares and tools to monitor network traffic. ++ 这组软件包是各类系统工具的集合，如：连接 SMB 共享的客户；监控网络交通的工具。 ++ true ++ true ++ ++ chrony ++ cifs-utils ++ openldap-clients ++ samba-client ++ setserial ++ tmux ++ zsh ++ arpwatch ++ chrpath ++ fuse ++ iotop ++ lzop ++ xdelta ++ environment-modules ++ libreswan ++ nmap ++ tigervnc ++ PackageKit-command-not-found ++ aide ++ amanda-client ++ convmv ++ createrepo_c ++ freerdp ++ gpm ++ gssdp ++ gupnp ++ mc ++ mtx ++ net-snmp-utils ++ oddjob ++ oddjob-mkhomedir ++ sysstat ++ x3270-x11 ++ ++ ++ ++ virtualization-hypervisor ++ Virtualization Hypervisor ++ 虚拟化 Hypervisor ++ Smallest possible virtualization host installation. ++ 最小的虚拟化主机安装。 ++ false ++ false ++ ++ libvirt ++ libvirt-admin ++ libvirt-bash-completion ++ libvirt-client ++ libvirt-daemon ++ libvirt-daemon-config-network ++ libvirt-daemon-config-nwfilter ++ libvirt-daemon-driver-interface ++ libvirt-daemon-driver-network ++ libvirt-daemon-driver-nodedev ++ libvirt-daemon-driver-nwfilter ++ libvirt-daemon-driver-qemu ++ libvirt-daemon-driver-secret ++ libvirt-daemon-driver-storage ++ libvirt-daemon-driver-storage-core ++ libvirt-daemon-driver-storage-disk ++ libvirt-daemon-driver-storage-gluster ++ libvirt-daemon-driver-storage-iscsi ++ libvirt-daemon-driver-storage-iscsi-direct ++ libvirt-daemon-driver-storage-logical ++ libvirt-daemon-driver-storage-mpath ++ libvirt-daemon-driver-storage-rbd ++ libvirt-daemon-driver-storage-scsi ++ libvirt-daemon-kvm ++ libvirt-daemon-qemu ++ libvirt-devel ++ libvirt-docs ++ libvirt-libs ++ libvirt-lock-sanlock ++ libvirt-nss ++ python3-libvirt ++ edk2-sw_64 ++ edk2-help ++ qemu-help ++ qemu ++ qemu-block-iscsi ++ qemu-img ++ stratovirt ++ ++ ++ ++ openvswitch ++ Virtualization Openvswitch ++ 虚拟switch ++ vswitch installation. ++ 安装vswitch。 ++ false ++ false ++ ++ openvswitch ++ ++ ++ ++ remote-desktop-clients ++ Remote Desktop Clients ++ 远程桌面客户端 ++ ++ true ++ false ++ ++ freerdp ++ tigervnc ++ vinagre ++ ++ ++ ++ smart-card ++ Smart Card Support ++ 智能卡支持 ++ Support for using smart card authentication. ++ 支持使用智能卡验证。 ++ true ++ true ++ ++ esc ++ ++ ++ ++ web-server ++ Basic Web Server ++ 基本网页服务器 ++ These tools allow you to run a Web server on the system. ++ 这些工具允许您在系统上运行万维网服务器。 ++ true ++ false ++ ++ httpd ++ mod_fcgid ++ mod_ssl ++ libmemcached ++ memcached ++ mod_security ++ ++ ++ ++ x11 ++ X Window System ++ X 窗口系统 ++ X Window System Support. ++ X 窗口系统支持。 ++ false ++ false ++ ++ glx-utils ++ initial-setup-gui ++ mesa-dri-drivers ++ plymouth-system-theme ++ spice-vdagent ++ xorg-x11-drivers ++ xorg-x11-server-Xorg ++ xorg-x11-utils ++ xorg-x11-xauth ++ xorg-x11-xinit ++ xvattr ++ mesa-libGLES ++ tigervnc-server ++ wayland-protocols-devel ++ xorg-x11-drv-libinput ++ ++ ++ ++ development ++ Development ++ 开发 ++ Packages which provide functionality for developing and building applications. ++ 用于开发和构建应用程序的软件包。 ++ 90 ++ ++ additional-devel ++ development ++ platform-devel ++ ++ ++ ++ servers ++ Servers ++ 服务器 ++ Software used for running network servers ++ 用于运行网络服务器的软件 ++ 20 ++ ++ file-server ++ ftp-server ++ mail-server ++ network-server ++ web-server ++ ++ ++ ++ base-system ++ System ++ 系统 ++ Core system components. ++ 核系统组件。 ++ 10 ++ ++ backup-client ++ debugging ++ java-platform ++ print-client ++ smart-card ++ dial-up ++ hardware-monitoring ++ infiniband ++ large-systems ++ legacy-unix ++ mainframe-access ++ network-tools ++ performance ++ scientific ++ security-tools ++ standard ++ ++ ++ ++ desktops ++ Desktops ++ 桌面环境 ++ Desktops and thin clients. ++ 桌面和瘦客户端。 ++ 70 ++ ++ base-x ++ desktop-debugging ++ fonts ++ input-methods ++ legacy-x ++ remote-desktop-clients ++ ++ ++ ++ apps ++ Applications ++ 应用程序 ++ Applications to perform a variety of tasks ++ 执行不同任务的应用程序 ++ 80 ++ ++ graphics ++ ++ ++ ++ minimal-environment ++ Minimal Install ++ 最小安装 ++ Basic functionality. ++ 基本功能。 ++ 1 ++ ++ core ++ ++ ++ standard ++ ++ ++ ++ server-product-environment ++ Server ++ 服务器 ++ An integrated, easy-to-manage server. ++ 集成的易于管理的服务器 ++ 2 ++ ++ container-management ++ core ++ hardware-support ++ headless-management ++ server-product ++ standard ++ ++ ++ debugging ++ dns-server ++ file-server ++ ftp-server ++ hardware-monitoring ++ infiniband ++ mail-server ++ network-file-system-client ++ network-server ++ performance ++ remote-system-management ++ smb-server ++ virtualization-hypervisor ++ web-server ++ ++ ++ ++ virtualization-host-environment ++ Virtualization Host ++ 虚拟化主机 ++ Minimal virtualization host. ++ 最小虚拟化主机。 ++ 40 ++ ++ base ++ core ++ virtualization-hypervisor ++ ++ ++ debugging ++ network-file-system-client ++ remote-system-management ++ openvswitch ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -uNar oemaker.org/isomaker/config/sw_64/standard.conf oemaker.sw/isomaker/config/sw_64/standard.conf +--- oemaker.org/isomaker/config/sw_64/standard.conf 1970-01-01 08:00:00.000000000 +0800 ++++ oemaker.sw/isomaker/config/sw_64/standard.conf 2024-09-28 01:02:10.646466465 +0800 +@@ -0,0 +1,6 @@ ++CONFIG_YUM_REPOS="file:///ISO/Packages" ++CONFIG_PACKAGES_LIST_FILE="config/sw_64/normal.xml" ++CONFIG_RPM_LIST="config/rpmlist.xml" ++CONFIG_PRODUCT="openEuler" ++CONFIG_VERSION="22.03" ++CONFIG_RELEASE="LTS" +diff -uNar oemaker.org/isomaker/init.sh oemaker.sw/isomaker/init.sh +--- oemaker.org/isomaker/init.sh 2024-09-28 01:02:00.022465824 +0800 ++++ oemaker.sw/isomaker/init.sh 2024-09-28 01:02:10.649466465 +0800 +@@ -35,7 +35,7 @@ + { + #param init + ARCH="$(uname -m)" +- if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ];then ++ if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "sw_64" ];then + CONFIG_FILE="${CPATH}/config/${ARCH}/standard.conf" + source "${CONFIG_FILE}" + else +diff -uNar oemaker.org/isomaker/iso.sh oemaker.sw/isomaker/iso.sh +--- oemaker.org/isomaker/iso.sh 2024-09-28 01:02:00.022465824 +0800 ++++ oemaker.sw/isomaker/iso.sh 2024-09-28 01:02:10.649466465 +0800 +@@ -29,6 +29,9 @@ + 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}/${DBG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ elif [ "$ARCH" == "sw_64" ]; then ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 "${OUTPUT_DIR}/${DBG_ISO_NAME}" + return 0 +@@ -43,6 +46,9 @@ + 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 ++ elif [ "$ARCH" == "sw_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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" + return 0 +@@ -60,6 +66,9 @@ + 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 ++ elif [ "$ARCH" == "sw_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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 "${OUTPUT_DIR}/${EDGE_ISO_NAME}" + return 0 +@@ -77,6 +86,9 @@ + 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}/${SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ elif [ "$ARCH" == "sw_64" ]; then ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + return 0 + } +@@ -96,6 +108,9 @@ + 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 ++ elif [ "$ARCH" == "sw_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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 /result/"${EVE_ISO_NAME}" + return 0 +@@ -115,6 +130,9 @@ + 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_DEBUG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ elif [ "$ARCH" == "sw_64" ]; then ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 /result/"${EVE_DEBUG_ISO_NAME}" + return 0 +@@ -134,6 +152,9 @@ + 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_SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 ++ elif [ "$ARCH" == "sw_64" ]; then ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi + implantisomd5 /result/"${EVE_SRC_ISO_NAME}" + return 0 diff --git a/oemaker.spec b/oemaker.spec index eb52e3a..adf45e2 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -6,12 +6,16 @@ %global efi_x64 1 %endif +%ifarch sw_64 +%global efi_sw_64 1 +%endif + Name: oemaker Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.4 -Release: 8 +Release: 9 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -34,7 +38,7 @@ 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-bugfix-IABY7K.patch - +Patch0014: 0014-oemaker-Add-sw64-architecture.patch %description a building tool for DVD ISO making and ISO cutting @@ -101,6 +105,11 @@ 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 +%if 0%{?efi_sw_64} + install -m 600 %{name}/isocut/config/sw_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/ + install -m 600 %{name}/isocut/config/sw_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/ +%endif + %pre %post @@ -137,6 +146,9 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Fri Sep 27 2024 wuzx - 2.0.4-9 +- add sw64 patch + * Wed Jul 10 2024 wangchong - 2.0.4-8 - ID:NA - SUG:NA -- Gitee