diff --git a/oemaker-2.0.3-sw.patch b/oemaker-2.0.3-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..eede1d290b8ef71ebac0eae5f1157d10fb8d0a39 --- /dev/null +++ b/oemaker-2.0.3-sw.patch @@ -0,0 +1,1271 @@ +diff -Naru oemaker/isomaker/80-openeuler/runtime-cleanup.tmpl oemaker.sw/isomaker/80-openeuler/runtime-cleanup.tmpl +--- oemaker/isomaker/80-openeuler/runtime-cleanup.tmpl 2022-11-11 02:43:37.710710293 +0000 ++++ oemaker.sw/isomaker/80-openeuler/runtime-cleanup.tmpl 2022-11-11 06:05:57.825227000 +0000 +@@ -44,7 +44,7 @@ + removepkg dmraid-events sgpio + ## keep library files + removefrom device-mapper-event --allbut \ +- /usr/lib64/libdevmapper-event.so.* ++ /usr/lib/libdevmapper-event.so.* + ## no notifications in anaconda + removepkg notification-daemon + ## logrotate isn't useful in anaconda +diff -Naru oemaker/isomaker/80-openeuler/runtime-install.tmpl oemaker.sw/isomaker/80-openeuler/runtime-install.tmpl +--- oemaker/isomaker/80-openeuler/runtime-install.tmpl 2021-12-27 07:44:03.000000000 +0000 ++++ oemaker.sw/isomaker/80-openeuler/runtime-install.tmpl 2022-11-11 05:42:41.295227000 +0000 +@@ -5,7 +5,7 @@ + installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-env-deps + ## Other available payloads + installpkg dnf +-installpkg ostree ++installpkg rpm + ## speed up compression on multicore systems + installpkg pigz + +@@ -123,7 +123,7 @@ + installpkg google-noto-sans-cjk-ttc-fonts + + ## debugging/bug reporting tools +-installpkg gdb-gdbserver ++#installpkg gdb-gdbserver + installpkg libreport + installpkg fpaste + installpkg python3-pyatspi +diff -Naru oemaker/isomaker/80-openeuler/sw64.tmpl oemaker.sw/isomaker/80-openeuler/sw64.tmpl +--- oemaker/isomaker/80-openeuler/sw64.tmpl 1970-01-01 00:00:00.000000000 +0000 ++++ oemaker.sw/isomaker/80-openeuler/sw64.tmpl 2022-11-11 03:44:06.345227000 +0000 +@@ -0,0 +1,96 @@ ++<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/> ++<% ++configdir="tmp/config_files/sw64" ++STAGE2IMG="isoft/sw64/root-image.fs.sfs" ++#BOOTDIR="isolinux" ++BOOTDIR="boot" ++ISOLINUXDIR="isolinux" ++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) ++ ++import os ++from os.path import basename ++from pylorax.sysutils import joinpaths ++ ++# Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3 ++if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: ++ isoargs = "-iso-level 3" ++else: ++ isoargs = "" ++%> ++ ++mkdir isoft/sw64 ++install ${runtime_img} ${STAGE2IMG} ++treeinfo stage2 mainimage isoft/sw64/${runtime_base} ++ ++## install bootloader and config files ++mkdir ${ISOLINUXDIR} ++install ${configdir}/isolinux.bin ${ISOLINUXDIR} ++install ${configdir}/isolinux.cfg ${ISOLINUXDIR} ++install ${configdir}/boot.msg ${ISOLINUXDIR} ++install ${configdir}/grub.conf ${ISOLINUXDIR} ++install usr/share/anaconda/boot/syslinux-splash.png ${ISOLINUXDIR}/splash.png ++install ${configdir}/isolinux/anaconda_configure_user.sh ${ISOLINUXDIR} ++install ${configdir}/isolinux/.bashrc ${ISOLINUXDIR} ++ ++## configure bootloader ++replace @VERSION@ ${product.version} ${ISOLINUXDIR}/grub.conf ${ISOLINUXDIR}/isolinux.cfg ${ISOLINUXDIR}/*.msg ++replace @PRODUCT@ '${product.name}' ${ISOLINUXDIR}/grub.conf ${ISOLINUXDIR}/isolinux.cfg ${ISOLINUXDIR}/*.msg ++replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${ISOLINUXDIR}/isolinux.cfg ++ ++## install kernels ++mkdir ${BOOTDIR} ++mkdir ${BOOTDIR}/grub ++mkdir ${BOOTDIR}/grub/fonts ++mkdir ${BOOTDIR}/grub/locale ++install ${configdir}/boot/bootloader.bin ${BOOTDIR} ++install ${configdir}/boot/grub/grub.cfg ${BOOTDIR}/grub/ ++install ${configdir}/boot/grub/grub.efi ${BOOTDIR}/grub/ ++install ${configdir}/boot/grub/kernel.* ${BOOTDIR}/grub/ ++install ${configdir}/boot/grub/splash.xpm.gz ${BOOTDIR}/grub/ ++install ${configdir}/boot/grub/fonts/unicode.pf2 ${BOOTDIR}/grub/fonts/ ++install ${configdir}/boot/grub/locale/zh_CN.mo ${BOOTDIR}/grub/locale/ ++ ++%for kernel in kernels: ++ %if kernel.flavor: ++ ## i386 PAE ++ installkernel images-xen ${kernel.path} ${BOOTDIR}/vmlinuz-${kernel.flavor} ++ installinitrd images-xen ${kernel.initrd.path} ${BOOTDIR}/initrd-${kernel.flavor}.img ++ %else: ++ ## normal i386, x86_64 ++ installkernel images-${basearch} ${kernel.path} ${BOOTDIR}/vmlinuz ++ installinitrd images-${basearch} ${kernel.initrd.path} ${BOOTDIR}/initrd.img ++ %endif ++%endfor ++ ++replace @VERSION@ '${product.version}' ${BOOTDIR}/grub/grub.cfg ++replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub/grub.cfg ++replace @LABEL@ '${isolabel|udev}' ${BOOTDIR}/grub/grub.cfg ++ ++install ${configdir}/efibootimg ${BOOTDIR}/../ ++ ++mkdir EFI ++mkdir EFI/BOOT ++mkdir EFI/BOOT/fonts ++mkdir EFI/BOOT/locale ++install ${configdir}/EFI/BOOT/BOOT.cfg EFI/BOOT/ ++install ${configdir}/EFI/BOOT/grub.cfg EFI/BOOT/ ++install ${configdir}/EFI/BOOT/grub.efi EFI/BOOT/ ++install ${configdir}/EFI/BOOT/kernel.* EFI/BOOT/ ++install ${configdir}/EFI/BOOT/splash.xpm.gz EFI/BOOT/ ++install ${configdir}/EFI/BOOT/fonts/unicode.pf2 EFI/BOOT/fonts/ ++install ${configdir}/EFI/BOOT/locale/zh_CN.mo EFI/BOOT/locale/ ++ ++## make boot.iso ++mkdir images ++runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ ++ -b ${ISOLINUXDIR}/isolinux.bin -c ${ISOLINUXDIR}/boot.cat \ ++ -boot-load-size 4 -boot-info-table -no-emul-boot \ ++ -R -J -V '${isolabel}' \ ++ ${outroot} ++treeinfo images-${basearch} boot.iso images/boot.iso +diff -Naru oemaker/isomaker/config/rpmlist.xml oemaker.sw/isomaker/config/rpmlist.xml +--- oemaker/isomaker/config/rpmlist.xml 2022-11-11 02:43:37.650710178 +0000 ++++ oemaker.sw/isomaker/config/rpmlist.xml 2022-11-11 07:33:35.415227000 +0000 +@@ -71,6 +71,8 @@ + grub2-efi-x64-modules + shim + ++ ++ + + abattis-cantarell-fonts + abattis-cantarell-fonts-help +@@ -79,8 +81,6 @@ + accountsservice-libs + acl + acl-help +- acpid +- acpid-help + adcli + adcli-help + adobe-mappings-cmap +@@ -96,18 +96,12 @@ + apr-help + arptables + arptables-help +- arpwatch +- arpwatch-help + asciidoc + asciidoc-help + at + at-help + attr + attr-help +- atune +- atune-client +- atune-db +- atune-engine + audiofile + audit + audit-help +@@ -119,7 +113,6 @@ + authselect-compat + authselect-help + authselect-libs +- authz + avahi + avahi-autoipd + avahi-compat-howl +@@ -208,7 +201,6 @@ + cogl + cogl-help + color-filesystem +- containers-common + container-selinux + coreutils + coreutils-help +@@ -238,8 +230,6 @@ + cups-pk-helper + curl + curl-help +- cvs +- cvs-help + cyrus-sasl + cyrus-sasl-gs2 + cyrus-sasl-help +@@ -274,8 +264,6 @@ + dnsmasq-utils + docbook-dtds + docbook-style-xsl +- docker-engine +- docker-runc + dos2unix + dosfstools + dosfstools-help +@@ -293,10 +281,6 @@ + e2fsprogs-devel + e2fsprogs-help + ed +- edk2-devel +- edk2-help +- efibootmgr +- efibootmgr-help + efivar + efivar-help + elfutils +@@ -353,7 +337,6 @@ + gettext-libs + git + git-help +- gjs + glib2 + glib2-help + glibc +@@ -373,7 +356,6 @@ + gobject-introspection-help + golang + golang-devel +- golang-help + gperftools + gperftools-devel + gperftools-libs +@@ -384,12 +366,6 @@ + grilo-help + groff + groff-help +- grpc +- grpc-devel +- grpc-plugins +- grub2-common +- grub2-help +- grub2-tools + grubby + grubby-help + gssproxy +@@ -447,8 +423,6 @@ + ipvsadm-help + irqbalance + irqbalance-help +- iSulad +- iSulad-img + ivtv-firmware + iw + iw-help +@@ -461,7 +435,6 @@ + json-c-help + json-glib + json-glib-help +- kata-containers + kbd + kbd-help + kbd-legacy +@@ -509,10 +482,6 @@ + libassuan-help + libbasicobjects + libblkid +- libbonobo +- libbonobo-help +- libbonoboui +- libbonoboui-help + libcanberra-gtk2 + libcanberra-help + libcap +@@ -558,7 +527,6 @@ + libevdev-help + libevent + libevent-devel +- libevhtp-devel + libexif + libexif-help + libfastjson +@@ -572,10 +540,8 @@ + libgdata-help + libgee + libgee-help +- libgnome + libgnomecanvas + libgnomecanvas-help +- libgnome-help + libgnomekbd + libgomp + libgpg-error +@@ -655,7 +621,6 @@ + libpsl-help + libpwquality + libpwquality-help +- librados2 + libref_array + librepo + libreport-filesystem +@@ -683,11 +648,6 @@ + libssh2 + libssh2-help + libssh-help +- libsss_autofs +- libsss_certmap +- libsss_idmap +- libsss_nss_idmap +- libsss_sudo + libstdc++ + libtalloc + libtalloc-help +@@ -744,9 +704,7 @@ + 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 +@@ -817,7 +775,6 @@ + lxc + lxc-devel + lxcfs +- lxcfs-tools + lxc-help + lz4 + lz4-help +@@ -838,13 +795,10 @@ + make-help + man-db + man-pages +- mcstrans +- mcstrans-help + mdadm + mdadm-help + mesa-filesystem + mesa-libGLES +- mesa-libxatracker + metacity + metacity-help + mlocate +@@ -922,8 +876,6 @@ + numad-help + oddjob + oddjob-help +- openblas-serial +- openblas-threads + openEuler-indexhtml + openEuler-logos + openEuler-release +@@ -953,9 +905,6 @@ + openssl-devel + openssl-help + openssl-pkcs11 +- openvpn +- openvpn-devel +- openvpn-help + openvswitch + openvswitch-devel + opus +@@ -966,7 +915,6 @@ + osinfo-db + osinfo-db-tools + osinfo-db-tools-help +- os-prober + p11-kit + p11-kit-help + p11-kit-trust +@@ -990,7 +938,6 @@ + pcre-tools + pcsc-lite + pcsc-lite-help +- perf + perl + perl-Compress-Raw-Bzip2 + perl-Compress-Raw-Bzip2-help +@@ -1036,9 +983,6 @@ + pigz-help + pinentry + pinentry-help +- pkcs11-helper +- pkcs11-helper-devel +- pkcs11-helper-help + pkgconf + pkgconf-help + plymouth +@@ -1087,7 +1031,6 @@ + python3-dmidecode + python3-dnf + python3-dnf-plugins-core +- python3-edk2-devel + python3-ethtool + python3-firewall + python3-flask +@@ -1116,7 +1059,6 @@ + python3-numpy + python3-openipmi + python3-pandas +- python3-perf + python3-pip + python3-pyatspi + python3-pycurl +@@ -1133,7 +1075,6 @@ + python3-setuptools + python3-six + python3-slip +- python3-sssdconfig + python3-talloc + python3-unbound + python3-urlgrabber +@@ -1173,8 +1114,6 @@ + rpm-libs + rpm-plugin-selinux + rpm-plugin-systemd-inhibit +- rpmrebuild +- rpmrebuild-help + rsync + rsync-help + rsyslog +@@ -1195,8 +1134,6 @@ + sbc-help + screen + screen-help +- sdparm +- sdparm-help + sed + sed-help + selinux-policy +@@ -1237,17 +1174,11 @@ + sqlite + sqlite-help + squashfs-tools +- squid +- sssd +- sssd-client +- sssd-help +- sssd-nfs-idmap + strace + strongswan + sudo + sudo-help + symlinks +- syscontainer-tools + sysfsutils + sysfsutils-help + sysstat +@@ -1299,7 +1230,6 @@ + tmux + tmux-help + totem-pl-parser +- totem-pl-parser-help + tpm2-abrmd + tpm2-abrmd-help + tpm2-tools +@@ -1310,15 +1240,11 @@ + traceroute-help + tracker + tracker-help +- tracker-miners +- tracker-miners-help + tree + tree-help + trousers + trousers-help + trousers-lib +- tuned +- tuned-help + tzdata + unbound-libs + unzip +@@ -1346,23 +1272,18 @@ + wget-help + which + which-help +- wpa_supplicant +- wpa_supplicant-help + wqy-microhei-fonts + wqy-microhei-fonts-help + wqy-zenhei-fonts + xfsprogs + xfsprogs-help + xinetd +- xinetd-help + xkeyboard-config + xkeyboard-config-help + xmlsec1-help + xmlsec1-openssl + xmlto + xmlto-help +- xterm +- xterm-help + xvattr + xvattr-help + xz +@@ -1389,8 +1310,6 @@ + zziplib-utils + unixODBC-devel + jemalloc-devel +- DCF +- opengauss + + + grub2-efi-aa64 +diff -Naru oemaker/isomaker/config/sw_64/ks.cfg oemaker.sw/isomaker/config/sw_64/ks.cfg +--- oemaker/isomaker/config/sw_64/ks.cfg 1970-01-01 00:00:00.000000000 +0000 ++++ oemaker.sw/isomaker/config/sw_64/ks.cfg 2022-11-11 03:32:17.015227000 +0000 +@@ -0,0 +1,21 @@ ++# version=openEuler 20.03 ++# System authorization information ++ ++# Use CDROM installation media ++# Use graphical install ++# Run the Setup Agent on first boot ++# Keyboard layouts ++keyboard --vckeymap=us --xlayouts='us' ++# System language ++ ++# Network information ++# Root password ++# System timezone ++timezone Asia/Shanghai --isUtc --nontp ++# System bootloader configuration ++# Partition clearing information ++ ++%packages ++@minimal-environment ++%end ++ +diff -Naru oemaker/isomaker/config/sw_64/normal.xml oemaker.sw/isomaker/config/sw_64/normal.xml +--- oemaker/isomaker/config/sw_64/normal.xml 1970-01-01 00:00:00.000000000 +0000 ++++ oemaker.sw/isomaker/config/sw_64/normal.xml 2022-11-11 03:30:06.575227000 +0000 +@@ -0,0 +1,681 @@ ++ ++ ++ ++ ++ core ++ Core ++ Kern ++ ማዕከላዊ ቦታ ++ اللبّ ++ ভিত্তি ++ هستگ ++ Падмурак ++ Основа ++ কোর ++ Jezgra ++ Nucli ++ Úplný základ ++ Craidd ++ Grundlæggende ++ Kern ++ Kern ++ Πυρήνας ++ Core ++ Núcleo ++ Tuum ++ اصل ++ اصل ++ Keskeiset ++ Core ++ Núcleo ++ મૂળ ++ ליבה ++ कोर ++ Jezgra ++ Mag ++ Հիմք ++ Nucleo ++ Inti ++ Bugas ++ Lágmarkskerfi ++ Principale ++ コア ++ ბირთვი ++ ಅಂತಸ್ಸಾರ ++ 핵심 ++ Pamatsistēma ++ कोर ++ Основни ++ കോറ്‍ ++ कोर ++ Teras ++ Kjerne ++ कोर ++ Kern ++ Kjerne ++ Bogare ++ ପ୍ରମୂଖ ++ ਮੂਲ ++ Rdzeń ++ Núcleo ++ Núcleo ++ Nucleu ++ Основа ++ න්‍යෂ්ඨිය ++ Jadro ++ Jedro ++ Bërthama ++ Срж ++ Srž ++ Srž ++ Grund ++ கோர் ++ అంతర్భాగం ++ Система ++ แกนหลัก ++ Çekirdek ++ Основа ++ مرکز ++ Lõi ++ 核心 ++ 核心 ++ 核心 ++ Okuyikhona ++ Smallest possible installation ++ Kleinste moontlike installasie ++ ትንሹ የሚቻለው የማስገባት ሥራ ++ أصغر تثبيت متاح ++ ক্ষুদ্ৰতম সম্ভৱ ইনস্টল ++ هوردترین نصب ممکن ++ Найменшая з магчымых усталёўка ++ Най-малката възможна инсталация ++ ন্যূনতম ইনস্টলেশন ++ Najmanja moguća instalacija ++ La instal·lació més petita possible ++ Nejmenší možná instalace ++ Arsefydliad lleiaf posib ++ Mindst mulige installation ++ Kleinstmögliche Installation ++ Kleinstmögliche Installation ++ Μικρότερη δυνατή εγκατάσταση ++ Smallest possible installation ++ Instalación lo más pequeña posible ++ Väikseim võimalik installatsioon ++ کوچکترین نصب ممکن ++ کوچکترین نصب ممکن ++ Pienin mahdollinen asennus ++ Installation minimale ++ નાનામાં નાના શક્ય સ્થાપનો ++ התקנה מזערית ++ सबसे छोटा संभावित अधिष्ठापन ++ Najmanja moguća instalacija ++ Minimális telepítés ++ Փոքրագույն հնարավոր տեղադրում ++ Le plus parve installation possibile ++ Instalasi sekecil mungkin ++ Lágmarks uppsetning ++ Installazione minima ++ 最小限のインストール ++ უმცირესი შესაძლო ჩადგმა ++ ಕನಿಷ್ಟ ಸಾಧ್ಯವಿರುವ ಅನುಸ್ಥಾಪನೆ ++ 가능한 최소 설치 ++ Vismazākā iespējamā instalācija ++ सबसँ छोट संभावित संस्थापन ++ Најмалата можна инсталација ++ സാധ്യമായ ഏറ്റവും ചെറിയ ഇന്‍സ്റ്റലേഷന്‍ ++ सर्वात लहान शक्य प्रतिष्ठापन ++ Pemasangan sekecil mungkin ++ Minste mulige installering ++ सम्भावित सबैभन्दा सानो स्थापना ++ Kleinst mogelijke installatie ++ Minste mulige installering ++ Go tsenya mo go kgonegago go gonyenyane kudu ++ କ୍ଷୁଦ୍ରତମ ସମ୍ଭାବ୍ଯ ସ୍ଥାପନ ++ ਘੱਟੋ-ਘੱਟ ਸੰਭਵ ਇੰਸਟਾਲੇਸ਼ਨ ++ Najmniejsza możliwa instalacja ++ A mais pequena instalação possível ++ A mais pequena instalação possível ++ Cea mai mică instalare posibilă ++ Минимальная установка ++ සිදුකල හැකි ඉතාම කුඩා ස්ථාපනය ++ Najmenšia možná inštalácia ++ Najmanjša možna namestitev ++ Instalimi më i vogël i mundshëm ++ Најмања могућа инсталација ++ Najmanja moguća instalacija ++ Najmanja moguća instalacija ++ Minsta möjliga installation ++ மிக சிறிய நிறுவல் ++ సాధ్యమగు చిన్న సంస్థాపన ++ Сабткунии оддӣ ++ ติดตั้งให้มีขนาดเล็กที่สุดที่เป็นไปได้ ++ Olası en küçük kurulum ++ Мінімально можливе встановлення ++ چھو ٹی ممکن انسٹللشن ++ Cài đặt nhỏ tối thiểu ++ 最小安裝 ++ 最小安装 ++ 最小安裝 ++ Ukufakwa okuncane ++ true ++ false ++ ++ rpm ++ man-pages ++ zlib ++ file ++ readline ++ m4 ++ bc ++ binutils ++ gmp ++ mpfr ++ setup ++ bzip2 ++ glibc ++ pkgconf ++ ncurses ++ attr ++ acl ++ libcap ++ sed ++ psmisc ++ bison ++ flex ++ grep ++ pcre ++ bash ++ libtool ++ gdbm ++ gperf ++ expat ++ iputils ++ perl ++ intltool ++ xz ++ kmod ++ gettext ++ elfutils ++ libffi ++ systemd ++ procps-ng ++ e2fsprogs ++ coreutils ++ check ++ checkpolicy ++ diffutils ++ gawk ++ findutils ++ groff ++ less ++ gzip ++ iproute ++ kbd ++ libpipeline ++ patch ++ dbus ++ util-linux ++ man-db ++ tar ++ texinfo ++ vim-minimal ++ dracut-config-rescue ++ dracut-config-generic ++ dracut-network ++ gmp-devel ++ dnf ++ yum ++ NetworkManager ++ ++ ++ ++ fonts ++ Fonts ++ خطوط ++ ফন্টসমূহ ++ فونت آن ++ Шрифтове ++ ফন্ট ++ Tipus de lletra ++ Sada fontů ++ Skrifttyper ++ Schriftarten ++ Schriftarten ++ Γραμματοσειρές ++ Fuentes ++ Kirjatüübid (fondid) ++ Letra-tipoak ++ Kirjasimet ++ Polices ++ ફોન્ટ ++ גופנים ++ फ़ॉन्ट ++ Betűkészletek ++ Characteres ++ Huruf ++ Letur ++ Caratteri ++ フォント ++ ಅಕ್ಷರಶೈಲಿಗಳು ++ 글꼴 ++ Fonti ++ फान्ट्स ++ ലിപികള്‍ ++ फॉन्ट ++ Font ++ Skrifter ++ फन्ट ++ Lettertypes ++ ଅକ୍ଷରରୂପଗୁଡ଼ିକ ++ ਫੌਂਟ ++ Czcionki ++ Tipos de Letra ++ Tipos de Letra ++ Шрифты ++ Písma ++ Фонтови ++ Fontovi ++ Fontovi ++ Typsnitt ++ எழுத்துருக்கள் ++ ఫాంట్లు ++ Ҳарфҳо ++ แบบอักษร ++ Шрифти ++ 字型 ++ 字体 ++ 字型 ++ Fonts packages for rendering text on the desktop. ++ Schriftet Pakete für das Rendern von Text auf dem Desktop. ++ Paquetes de fuentes para renderizar texto en el escritorio. ++ Packages de police pour le rendu du texte sur le bureau ++ Font per il rendering del testo sul desktop. ++ デスクトップでテキストをレンダリングするフォントパッケージです。 ++ 바탕 화면에서 텍스트를 표시하기 위한 글꼴 패키지입니다. ++ Pacotes de fontes para renderizar texto no desktop. ++ Пакеты шрифтов для визуализации текста на рабочем столе. ++ 用于在桌面显示文字的字体软件包。 ++ 用於在桌面上呈現文本的字體包。 ++ true ++ false ++ ++ urw-base35-nimbus-mono-ps-fonts ++ urw-base35-fonts-common ++ urw-base35-bookman-fonts ++ urw-base35-c059-fonts ++ urw-base35-d050000l-fonts ++ urw-base35-gothic-fonts ++ urw-base35-nimbus-roman-fonts ++ urw-base35-nimbus-sans-fonts ++ urw-base35-p052-fonts ++ urw-base35-standard-symbols-ps-fonts ++ urw-base35-z003-fonts ++ urw-base35-fonts ++ urw-base35-fonts-legacy ++ dejavu-fonts ++ google-noto-serif-sc-fonts ++ ++ ++ ++ mate-desktop ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ Гном ++ ഗ്നോം ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE ++ MATE is a highly intuitive and user-friendly desktop environment. ++ MATE ist eine sehr intuitive und benutzerfreundliche Desktop-Umgebung. ++ MATE es un entorno de escritorio muy intuitivo y fácil de usar. ++ MATE est un environnement de bureau convivial et hautement intuitif. ++ MATE è un ambiente desktop molto intuitivo e facile da usare. ++ MATE は非常に直観的でユーザーフレンドリーなデスクトップ環境です。 ++ MATE은 사용하기 쉽고 사용자 친화적인 데스크탑 환경입니다. ++ O MATE é um ambiente de trabalho altamente intuitivo e fácil de usar. ++ MATE - это интуитивно понятное и удобное окружение рабочего стола. ++ MATE 是一个非常直观且用户友好的桌面环境。 ++ MATE是一個高度直觀且用戶友好的桌面環境。 ++ true ++ false ++ ++ ModemManager ++ avahi ++ glib-networking ++ polkit ++ mate-desktop ++ mate-control-center ++ mate-common ++ mate-menus ++ mate-user-admin ++ mate-panel ++ libmatekbd ++ mate-menus-preferences-category-menu ++ mate-backgrounds ++ libmatemixer ++ mate-notification-daemon ++ mate-polkit ++ mate-screensaver ++ mate-power-manager ++ libmateweather ++ mate-sensors-applet ++ mate-calc ++ mate-applets ++ mate-session-manager ++ mate-terminal ++ mate-system-monitor ++ mate-icon-theme ++ mate-netbook-lang ++ mate-netbook ++ mate-utils-common ++ mate-dictionary ++ mate-disk-usage-analyzer ++ mate-screenshot ++ mate-search-tool ++ mate-system-log ++ mate-utils ++ mate-disk-image-mounter ++ mate-user-share-lang ++ mate-applet-indicator-lang ++ mate-applet-indicator ++ mate-user-share ++ mate-user-guide ++ metacity ++ marco ++ network-manager-applet ++ nm-connection-editor ++ vim-enhanced ++ asciidoc ++ usermode ++ plymouth ++ plymouth-theme-fade-in ++ plymouth-theme-solar ++ plymouth-theme-spinfinity ++ plymouth-theme-spinner ++ caja-open-terminal ++ ++ ++ ++ ++ standard ++ Standard ++ Standard ++ Estándar ++ Standard ++ Standard ++ 標準 ++ 표준 ++ Padrão ++ Padrão ++ Стандарт ++ 标准安装 ++ 標準 ++ The standard installation of iSoft Linux. ++ true ++ false ++ ++ acl ++ attr ++ bc ++ cpio ++ crontabs ++ dbus ++ ed ++ file ++ logrotate ++ lsof ++ net-tools ++ pciutils ++ symlinks ++ tar ++ tree ++ util-linux-user ++ bash-completion ++ bzip2 ++ chrony ++ dosfstools ++ ethtool ++ lvm2 ++ mailcap ++ man-pages ++ mdadm ++ rsync ++ libteam ++ words ++ ima-evm-utils ++ nfs-utils ++ dos2unix ++ gnupg2 ++ time ++ unzip ++ which ++ zip ++ openssh ++ openssh-clients ++ cronie ++ ++ ++ ++ ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ base-x ++ базовый ++ base-x ++ base-x ++ Local X.org display server ++ Lokaler X.org-Anzeigeserver ++ Servidor de pantalla X.org local ++ Serveur d'affichage d' X.org locale ++ Server di visualizzazione X.org locale ++ ローカル X.org ディスプレイサーバー ++ 로컬 X.org 디스플레이 서버 ++ Servidor de exibição X.org local ++ Servidor de exibição X.org local ++ Локальный сервер отображения X.org ++ Local X.org 显示服务器 ++ 本地X.org顯示服務器 ++ true ++ false ++ ++ mesa-demos ++ mesa-libglapi ++ mesa-dri-drivers ++ mesa-libgbm ++ mesa-filesystem ++ mesa-libEGL ++ mesa-libGL ++ mesa-libOSMesa ++ mesa-libGLU ++ mesa-vdpau-drivers ++ xorg-x11-drv-fbdev ++ xorg-x11-drv-libinput ++ xorg-x11-xauth ++ xorg-x11-xinit ++ xorg-x11-font-utils ++ xorg-x11-fonts ++ xorg-x11-fonts-others ++ gmp-devel ++ libpng ++ libpng-devel ++ lightdm-gobject ++ lightdm ++ lightdm-gobject ++ lightdm-gtk ++ gdk-pixbuf2 ++ gdk-pixbuf2-devel ++ gdk-pixbuf2-modules ++ openEuler-logos ++ ++ ++ ++ minimal-environment ++ Minimal Install ++ নূন্যতম ইনস্টল ++ Minimální instalace ++ Minimale Installation ++ Minimale Installation ++ Instalación mínima ++ Installation minimale ++ ન્યૂનતમ સ્થાપન ++ न्यूनतम संस्थापन ++ Installazione minima ++ 最小限のインストール ++ ಕನಿಷ್ಟ ಅನುಸ್ಥಾಪನೆ ++ 최소 설치 ++ ഏറ്റവും കുറഞ്ഞ ഇന്‍സ്റ്റോള്‍ ++ किमान इंस्टॉल ++ ସର୍ବନିମ୍ନ ସ୍ଥାପନ ++ ਘੱਟ ਤੋਂ ਘੱਟ ਇੰਸਟਾਲ ++ Minimalna instalacja ++ Instalações Mínimas ++ Instalações Mínimas ++ Минимальная установка ++ குறைந்தபட்ச நிறுவல் ++ కనీసపు సంస్థాపన ++ Мінімальна система ++ 最小型安裝 ++ 最小安装 ++ 最小型安裝 ++ Basic functionality. ++ মৌলি কাৰ্য্যকৰীতা। ++ Základní funkcionalita. ++ Grundlegende Funktionalität. ++ Grundlegende Funktionalität. ++ Funcionalidad básica. ++ Fonctionnalité de base. ++ મૂળભૂત વિધેય. ++ मौलिक प्रकार्यात्मकता. ++ Funzione di base. ++ 基本的な機能です。 ++ ಮೂಲಭೂತ ಕ್ರಿಯಾಶೀಲತೆ. ++ 기본적인 기능입니다. ++ അടിസ്ഥാന പ്രവൃത്തിവിശേഷണം. ++ मूळ कार्यक्षमता. ++ ସାଧାରଣ କାର୍ଯ୍ୟକାରିତା। ++ ਮੁੱਢਲੀ ਕਾਰਜਸ਼ੀਲਤਾ। ++ Podstawowa funkcjonalność. ++ Função básica ++ Função básica ++ Базовая функциональность. ++ அடிப்படை செயலம்சம். ++ ప్రాథమిక ఫంక్షనాలిటి. ++ Основні можливості. ++ 基本功能。 ++ 基本功能。 ++ 基本功能。 ++ 2 ++ ++ core ++ standard ++ ++ ++ ++ ++ graphical-server-environment ++ Server with GUI ++ GUI ৰ সৈতে চাৰ্ভাৰ ++ Server s grafickým uživatelským rozhraním ++ Server mit GUI ++ Server mit GUI ++ Servidor con GUI ++ Serveur avec GUI ++ GUI વાળું સર્વર ++ GUI सहित सर्वर ++ Server con GUI ++ サーバー (GUI 使用) ++ GUI ಅನ್ನು ಹೊಂದಿರುವ ಪೂರೈಕೆಗಣಕ ++ 서버 - GUI 사용 ++ ജിയുഐയുള്ള സര്‍വര്‍ ++ GUI सह सर्व्हर ++ GUI ସହିତ ସର୍ଭର ++ GUI ਨਾਲ ਸਰਵਰ ++ Serwer z graficznym interfejsem użytkownika ++ Servidor com GUI ++ Servidor com GUI ++ Сервер с GUI ++ GUI கொண்டுள்ள சேவையகம் ++ GUI తో సేవిక ++ Сервер з графічним інтерфейсом ++ 含有 GUI 的伺服器 ++ 带 GUI 的服务器 ++ 含有 GUI 的伺服器 ++ An integrated, easy-to-manage server with a graphical interface. ++ Ein integrierter, einfach zu verwaltender Server mit grafischer Benutzeroberfläche. ++ Un servidor integrado y fácil de administrar con una interfaz gráfica. ++ Un serveur intégré, facile à gérer, avec une interface graphique. ++ Un server integrato e facile da gestire con un'interfaccia grafica. ++ 統合された、管理が容易なサーバー (グラフィカルインターフェイスあり) です。 ++ 그래픽 인터페이스로 통합되고 관리가 쉬운 서버 ++ Um servidor integrado e fácil de gerenciar com uma interface gráfica. ++ Um servidor integrado e fácil de gerenciar com uma interface gráfica. ++ Интегрированный, простой в управлении сервер с графическим интерфейсом. ++ 集成的易于管理的带有图形界面的服务器 ++ 集成，易於管理的服務器，帶有圖形界面。 ++ 1 ++ ++ base-x ++ core ++ fonts ++ mate-desktop ++ standard ++ ++ ++ +diff -Naru oemaker/isomaker/config/sw_64/standard.conf oemaker.sw/isomaker/config/sw_64/standard.conf +--- oemaker/isomaker/config/sw_64/standard.conf 1970-01-01 00:00:00.000000000 +0000 ++++ oemaker.sw/isomaker/config/sw_64/standard.conf 2022-11-11 03:34:26.065227000 +0000 +@@ -0,0 +1,7 @@ ++CONFIG_YUM_REPOS="http://192.168.17.41/repo/mate-rpm/" ++CONFIG_PACKAGES_LIST_FILE="config/sw_64/normal.xml" ++CONFIG_RPM_LIST="config/rpmlist.xml" ++CONFIG_KS_FILE="config/sw_64/ks.cfg" ++CONFIG_PRODUCT="openEuler" ++CONFIG_VERSION="22.03" ++CONFIG_RELEASE="LTS" +diff -Naru oemaker/isomaker/init.sh oemaker.sw/isomaker/init.sh +--- oemaker/isomaker/init.sh 2022-11-11 02:43:37.710710293 +0000 ++++ oemaker.sw/isomaker/init.sh 2022-11-11 03:46:38.665227000 +0000 +@@ -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 -Naru oemaker/isomaker/iso.sh oemaker.sw/isomaker/iso.sh +--- oemaker/isomaker/iso.sh 2022-11-11 02:43:37.710710293 +0000 ++++ oemaker.sw/isomaker/iso.sh 2022-11-11 06:43:08.235227000 +0000 +@@ -43,7 +43,14 @@ + 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 ++ pushd "${BUILD}"/iso/boot ++ ln -s . boot ++ popd ++ 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 efibootimg -no-emul-boot "${BUILD}"/iso ++ [ $? != 0 ] && return 1 + fi ++ + implantisomd5 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" + return 0 + } +diff -Naru oemaker/isomaker/rpm.sh oemaker.sw/isomaker/rpm.sh +--- oemaker/isomaker/rpm.sh 2022-11-11 02:43:37.720710312 +0000 ++++ oemaker.sw/isomaker/rpm.sh 2022-11-11 05:37:48.295227000 +0000 +@@ -76,7 +76,7 @@ + fi + rname=${rname_tmp} + fi +- if [ "X$rarch" == "Xi686" ] || [ "X$rarch" == "Xx86_64" ] || [ "X$rarch" == "Xnoarch" ] || [ "X$rarch" == "Xaarch64" ]; then ++ if [ "X$rarch" == "Xi686" ] || [ "X$rarch" == "Xx86_64" ] || [ "X$rarch" == "Xnoarch" ] || [ "X$rarch" == "Xaarch64" ] || [ "X$rarch" == "Xsw_64" ]; then + rname="${rname}" + else + cat __list.arch | grep -w "^$rname.$ARCH" > /dev/null 2>&1 diff --git a/oemaker.spec b/oemaker.spec index 88eb1df04610bf913c8d153671076c8125c27140..ff2b4b133cc01d0a6a976e26ecde411bebf442a0 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -14,7 +14,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.3 -Release: 16 +Release: 17 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -23,6 +23,9 @@ Source2: normal_x86_64.xml Source3: rpmlist.xml Source4: edge_normal_aarch64.xml Source5: edge_normal_x86_64.xml +%ifarch sw_64 +Source8: sw64.tar.gz +%endif Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 Requires: lorax >= 19.6.78-1 @@ -42,6 +45,10 @@ Patch0101: 0002-add-config-for-loongarch.patch Patch0102: 0003-delete-pkg-when-build-runtime-and-iso-for-loongarch.patch %endif +%ifarch sw_64 +Patch0012: oemaker-2.0.3-sw.patch +%endif + %description a building tool for DVD ISO making and ISO cutting @@ -77,6 +84,11 @@ mkdir -p %{buildroot}/opt/oemaker/config/aarch64 %ifarch loongarch64 mkdir -p %{buildroot}/opt/oemaker/config/loongarch64 %endif + +%ifarch sw_64 +mkdir -p %{buildroot}/opt/oemaker/config/sw_64 +%endif + mkdir -p %{buildroot}/opt/oemaker/docs mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_sysconfdir}/isocut @@ -97,9 +109,17 @@ install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config %ifarch loongarch64 install -m 400 %{name}/isomaker/config/loongarch64/* %{buildroot}/opt/oemaker/config/loongarch64/ %endif + +%ifarch sw_64 +install -m 400 %{name}/isomaker/config/sw_64/* %{buildroot}/opt/oemaker/config/sw_64/ +%endif + install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/ cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/ +%ifarch sw_64 +tar -zxvf %{SOURCE8} -C %{buildroot}/opt/oemaker/80-openeuler/config_files/ +%endif install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/ @@ -141,8 +161,12 @@ fi %files -n isocut %defattr(-,root,root) %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template + +%ifnarch sw_64 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg +%endif + %{_bindir}/isocut %dir %{_sysconfdir}/isocut %{_sysconfdir}/isocut/* @@ -154,6 +178,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Dec 20 2022 Wenjuan Qiu - 2.0.3-17 +- ID:NA +- SUG:NA +- DESC: add sw64 support for oemaker + * Thu Dec 15 2022 wangkai - 2.0.3-16 - ID:NA - SUG:NA diff --git a/sw64.tar.gz b/sw64.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..42cc903a0474bfad8542288ac116d79f181fc8e4 Binary files /dev/null and b/sw64.tar.gz differ