diff --git a/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch b/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch new file mode 100644 index 0000000000000000000000000000000000000000..878c8f7e51bc69e6e2ce8b4b873590fc1deccdfb --- /dev/null +++ b/0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch @@ -0,0 +1,33 @@ +From 8843eab5ae826bd0229bb73a00f3041e892e81de Mon Sep 17 00:00:00 2001 +From: Li Ping <1477412247@qq.com> +Date: Sat, 22 Feb 2025 02:17:52 +0000 +Subject: [PATCH] Fixes boot failure caused by invalid volume IDs + +--- + isomaker/iso.sh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/isomaker/iso.sh b/isomaker/iso.sh +index 2bb52ac..3fbed91 100755 +--- a/isomaker/iso.sh ++++ b/isomaker/iso.sh +@@ -351,12 +351,13 @@ function gen_devstation_iso() + [ $? != 0 ] && return 1 + cd ${work_dir}/*/images + DEVSTATION_LIVECD_TAR=$(ls *.iso) +- mkdir -p iso && mount "$DEVSTATION_LIVECD_TAR" iso && cp -rf iso/* "${BUILD}"/iso && umount iso ++ volume_id=$(isoinfo -d -i "$DEVSTATION_LIVECD_TAR" | grep "Volume id" | awk '{print $NF}') ++ mkdir -p iso && mount "$DEVSTATION_LIVECD_TAR" iso && cp -rf iso/* "${BUILD}"/iso && sed -i '/menuentry/{s/-netinst//g}' "${BUILD}"/iso/EFI/BOOT/grub.cfg && umount 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}/${DEVSTATION_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 ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${volume_id}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 + elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then +- mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso ++ mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${volume_id}" -o "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso + [ $? != 0 ] && return 1 + fi + implantisomd5 "${OUTPUT_DIR}/${DEVSTATION_ISO_NAME}" +-- +2.46.0 + diff --git a/0001-bugfix-IABY7K.patch b/0001-bugfix-IABY7K.patch index e559a9def5e666079163ffe1c29cd016247c779a..129e06731cbd2e8ad5ddd1a006c6a7841e0fe9ef 100644 --- a/0001-bugfix-IABY7K.patch +++ b/0001-bugfix-IABY7K.patch @@ -8,7 +8,7 @@ diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh index a9efe4b..b2ba4de 100644 --- a/isomaker/rpm.sh +++ b/isomaker/rpm.sh -@@ -185,7 +185,7 @@ function get_desktop_rpms() +@@ -203,7 +203,7 @@ function get_desktop_rpms() function get_everything_rpms() { @@ -17,7 +17,7 @@ index a9efe4b..b2ba4de 100644 parse_rpmlist_xml "exclude" cat parsed_rpmlist_exclude if [ -s parsed_rpmlist_exclude ];then -@@ -259,7 +259,7 @@ function everything_source_rpms_download() +@@ -277,7 +277,7 @@ function everything_source_rpms_download() function everything_debug_rpms_download() { mkdir ${EVERY_DEBUG_DIR} diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist new file mode 100644 index 0000000000000000000000000000000000000000..61f14fa974c4d4e106e08d2a24372dcd7c1fd377 --- /dev/null +++ b/devstation_aarch64_rpmlist @@ -0,0 +1,192 @@ +abattis-cantarell-fonts +audit +authselect +basesystem +bash +bind +bind-dnssec-utils +boost-iostreams +checkpolicy +code +coreutils +cronie +cryptsetup +CUnit +CUnit-devel +curl +dejavu-fonts +devstation-config +dhcp +dnf +dnf-plugins-core +dosfstools +dracut-config-generic +dracut-config-rescue +dracut-live +dracut-network +e2fsprogs +efibootmgr +filesystem +fipscheck +firefox +firewalld +gdb +gdm +git +glibc +gnome-menus +gnome-session +gnome-shell +gnome-software +gnome-terminal +google-droid-sans-fonts +google-noto-fonts-common +google-noto-sans-arabic-vf-fonts +google-noto-sans-armenian-vf-fonts +google-noto-sans-bengali-vf-fonts +google-noto-sans-canadian-aboriginal-vf-fonts +google-noto-sans-cherokee-vf-fonts +google-noto-sans-devanagari-vf-fonts +google-noto-sans-ethiopic-vf-fonts +google-noto-sans-georgian-vf-fonts +google-noto-sans-hebrew-vf-fonts +google-noto-sans-kannada-vf-fonts +google-noto-sans-khmer-vf-fonts +google-noto-sans-lao-vf-fonts +google-noto-sans-math-fonts +google-noto-sans-mono-vf-fonts +google-noto-sans-sinhala-vf-fonts +google-noto-sans-symbols2-fonts +google-noto-sans-symbols-vf-fonts +google-noto-sans-tamil-vf-fonts +google-noto-sans-thaana-vf-fonts +google-noto-sans-thai-vf-fonts +google-noto-sans-vf-fonts +google-noto-serif-armenian-vf-fonts +google-noto-serif-ethiopic-vf-fonts +google-noto-serif-georgian-vf-fonts +google-noto-serif-gujarati-vf-fonts +google-noto-serif-gurmukhi-vf-fonts +google-noto-serif-hebrew-vf-fonts +google-noto-serif-kannada-vf-fonts +google-noto-serif-khmer-vf-fonts +google-noto-serif-lao-vf-fonts +google-noto-serif-sinhala-vf-fonts +google-noto-serif-tamil-vf-fonts +google-noto-serif-thai-vf-fonts +google-noto-serif-vf-fonts +grub2 +grub2-efi +grub2-efi-aa64-cdboot +grubby +gtest +gtest-devel +hostname +ibus-libpinyin +initscripts +ipmitool +iproute +iprutils +iputils +irqbalance +java-21-openjdk-devel +kbd +kernel +kernel-tools +kexec-tools +less +libdaemon +liberation-fonts +libnet +libteam +libX11 +linux-firmware +lshw +lsscsi +lvm2 +man-db +nautilus +ncurses +net-snmp +NetworkManager +NetworkManager-config-server +openEuler-latest-release +openEuler-logos +openEuler-release +openssh +openssh-clients +openssh-server +open-vm-tools +open-vm-tools-desktop +parted +passwd +perf +policycoreutils +procps-ng +python3-decorator +python3-ply +python3-pytest +python3-slip +rdma-core +rng-tools +rootfiles +rpm +rsync +rsyslog +samba-client +samba-libs +security-tool +selinux-policy-mls +selinux-policy-targeted +setup +sg3_utils +shadow +shim +sssd +sudo +sysfsutils +systemd +tuned +unzip +util-linux +vim-minimal +wget +wqy-zenhei-fonts +xdg-utils +xfsprogs +xorg-x11-drv-* +yum +linux-firmware-iwlwifi +linux-firmware-mediatek +oeDevPlugin +rust-cbindgen +polkit-qt5-1 +polkit-qt5-1-devel +oedp +kernel-extra-modules +epkg +euler-copilot-shell +vscodium +oegitext +kf5-kcalendarcore-devel +kf5-kcalendarcore +rust-ripgrep +gnome-keyring +gnome-keyring-pam +linux-firmware-ath +linux-firmware-cypress +linux-firmware-libertas +linux-firmware-mrvl +linux-firmware-netronome +gnome-shell-extension-dash-to-dock +thunderbird +autogen +ntp +timedatex +chrony +gnome-user-docs +gnome-doc-utils +yelp-tools +roo-code +uv +python3-mcp diff --git a/devstation_x86_64_rpmlist b/devstation_x86_64_rpmlist new file mode 100644 index 0000000000000000000000000000000000000000..fcf32892baac756998188bf498cb8d9a16337786 --- /dev/null +++ b/devstation_x86_64_rpmlist @@ -0,0 +1,214 @@ +abattis-cantarell-fonts +audit +authselect +basesystem +bash +bind +bind-dnssec-utils +boost-iostreams +btrfs-progs +checkpolicy +code +coreutils +cronie +cryptsetup +CUnit +CUnit-devel +curl +dejavu-fonts +devstation-config +dhcp +dnf +dnf-plugins-core +dosfstools +dracut-config-generic +dracut-config-rescue +dracut-live +dracut-network +e2fsprogs +efibootmgr +filesystem +findutils +fipscheck +firefox +firewalld +gdb +gdm +genisoimage +git +glibc +gnome-bluetooth +gnome-bluetooth-libs +gnome-menus +gnome-session +gnome-shell +gnome-software +gnome-terminal +google-droid-sans-fonts +google-noto-fonts-common +google-noto-sans-arabic-vf-fonts +google-noto-sans-armenian-vf-fonts +google-noto-sans-bengali-vf-fonts +google-noto-sans-canadian-aboriginal-vf-fonts +google-noto-sans-cherokee-vf-fonts +google-noto-sans-devanagari-vf-fonts +google-noto-sans-ethiopic-vf-fonts +google-noto-sans-georgian-vf-fonts +google-noto-sans-hebrew-vf-fonts +google-noto-sans-kannada-vf-fonts +google-noto-sans-khmer-vf-fonts +google-noto-sans-lao-vf-fonts +google-noto-sans-math-fonts +google-noto-sans-mono-vf-fonts +google-noto-sans-sinhala-vf-fonts +google-noto-sans-symbols2-fonts +google-noto-sans-symbols-vf-fonts +google-noto-sans-tamil-vf-fonts +google-noto-sans-thaana-vf-fonts +google-noto-sans-thai-vf-fonts +google-noto-sans-vf-fonts +google-noto-serif-armenian-vf-fonts +google-noto-serif-ethiopic-vf-fonts +google-noto-serif-georgian-vf-fonts +google-noto-serif-gujarati-vf-fonts +google-noto-serif-gurmukhi-vf-fonts +google-noto-serif-hebrew-vf-fonts +google-noto-serif-kannada-vf-fonts +google-noto-serif-khmer-vf-fonts +google-noto-serif-lao-vf-fonts +google-noto-serif-sinhala-vf-fonts +google-noto-serif-tamil-vf-fonts +google-noto-serif-thai-vf-fonts +google-noto-serif-vf-fonts +grub2 +grub2-efi-ia32-cdboot +grub2-efi-x64 +grub2-efi-x64-cdboot +grub2-pc +grubby +gtest +gtest-devel +gtk2 +hostname +ibus-libpinyin +initscripts +ipmitool +iproute +iprutils +iputils +irqbalance +java-21-openjdk-devel +kbd +kernel +kernel-tools +kexec-tools +lcms2 +less +lftp +libdaemon +liberation-fonts +libgusb +libiscsi +libnet +libnl3 +libpciaccess +libteam +libusbx +libX11 +linux-firmware +lshw +lsscsi +lvm2 +lzo +man-db +nautilus +ncurses +net-snmp +net-tools +NetworkManager +NetworkManager-config-server +nfs-utils +openEuler-latest-release +openEuler-logos +openEuler-release +openssh +openssh-clients +openssh-server +parted +passwd +pciutils +perf +policycoreutils +procps-ng +python3-decorator +python3-ply +python3-pytest +python3-slip +rdma-core +rest +rng-tools +rootfiles +rpm +rsync +rsyslog +samba-client +samba-libs +security-tool +selinux-policy-mls +selinux-policy-targeted +setup +sg3_utils +shadow +shim +smartmontools +sssd +sudo +sysfsutils +syslinux +systemd +tuned +unzip +util-linux +vim-enhanced +vim-minimal +wget +wqy-zenhei-fonts +xdg-utils +xfsprogs +xorg-x11-drv-* +yum +zip +linux-firmware-iwlwifi +linux-firmware-mediatek +oeDevPlugin +rust-cbindgen +polkit-qt5-1 +polkit-qt5-1-devel +oedp +kernel-extra-modules +epkg +euler-copilot-shell +vscodium +oegitext +kf5-kcalendarcore-devel +kf5-kcalendarcore +rust-ripgrep +gnome-keyring +gnome-keyring-pam +linux-firmware-ath +linux-firmware-cypress +linux-firmware-libertas +linux-firmware-mrvl +linux-firmware-netronome +gnome-shell-extension-dash-to-dock +thunderbird +autogen +ntp +timedatex +chrony +gnome-user-docs +gnome-doc-utils +yelp-tools +roo-code +uv +python3-mcp diff --git a/enable-efi-boot-for-loongarch64.patch b/enable-efi-boot-for-loongarch64.patch deleted file mode 100644 index a877bcee905af5ab49a1bec96b6a6ffc7b50fc69..0000000000000000000000000000000000000000 --- a/enable-efi-boot-for-loongarch64.patch +++ /dev/null @@ -1,163 +0,0 @@ -From b325c0dcbb7ad90448aad6d99752ce08f9c90f5d Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Tue, 26 Nov 2024 10:36:46 +0800 -Subject: [PATCH] enable efi boot for loongarch64 - ---- - .../loongarch64/livecd/live/loongarch64.tmpl | 4 +- - isomaker/iso.sh | 46 +++++++++++++++---- - 2 files changed, 39 insertions(+), 11 deletions(-) - -diff --git a/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl -index daf68c1..b18ffc9 100644 ---- a/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl -+++ b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl -@@ -65,9 +65,11 @@ mkdir ${KERNELDIR} - - %if exists("boot/efi/EFI/*/grubloongarch64.efi"): - ## make boot.iso --runcmd mkisofs -o ${outroot}/images/boot.iso \ -+runcmd xorriso as mkisofs -o ${outroot}/images/boot.iso \ - ${efiargs} -R -J -V '${isolabel}' -T ${udfargs} \ - -graft-points \ -+ -efi-boot-part \ -+ --efi-boot-image \ - ${KERNELDIR}=${outroot}/${KERNELDIR} \ - ${LIVEDIR}=${outroot}/${LIVEDIR} \ - ${efigraft} ${filegraft} -diff --git a/isomaker/iso.sh b/isomaker/iso.sh -index 9c0cb0f..a70eb15 100755 ---- a/isomaker/iso.sh -+++ b/isomaker/iso.sh -@@ -26,9 +26,13 @@ function gen_debug_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}/${DBG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ # Enable EFI boot loongarch64 -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -43,9 +47,12 @@ function gen_standard_iso() - 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" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -63,9 +70,12 @@ function gen_edge_iso() - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -83,9 +93,12 @@ function gen_desktop_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}/${DESKTOP_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -+ elif [ "$ARCH" == "loongarch64" ]; then -+ xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -103,9 +116,12 @@ function gen_src_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}/${SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -125,9 +141,12 @@ function gen_everything_iso() - 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" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -147,9 +166,12 @@ function gen_everything_debug_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_DEBUG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -169,13 +191,15 @@ function gen_everything_src_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_SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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" == "loongarch64" ]; then -+ xorriso as 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}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso -+ [ $? != 0 ] && return 1 - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 -- - fi - implantisomd5 /result/"${EVE_SRC_ISO_NAME}" - return 0 -@@ -187,8 +211,10 @@ function gen_netinst_iso() - 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" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; 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 -+ elif [ "$ARCH" == "loongarch64" ]; then -+ xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - elif [ "$ARCH" == "ppc64le" ]; then - mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso - [ $? != 0 ] && return 1 --- -2.43.0 - diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 4b1cdcfcc45e4d56d95f432efadce57633c0c1d2..d7dc90248bc86afd681733b471360768d1d15a07 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -1375,6 +1375,7 @@ freerdp tigervnc + vinagre diff --git a/normal_loongarch64.xml b/normal_loongarch64.xml index d02990760bc97b8cb52c4102adf47926227895f8..2f20ce6471d5c62b463c50156e48c68099a61867 100644 --- a/normal_loongarch64.xml +++ b/normal_loongarch64.xml @@ -1281,6 +1281,7 @@ freerdp tigervnc + vinagre diff --git a/normal_riscv64.xml b/normal_riscv64.xml index d85b6f70e6b741a4dd4d2a8ba4821bf72ab74a0b..dd3645c378e4849fc32a924fe0bc84c309c24647 100644 --- a/normal_riscv64.xml +++ b/normal_riscv64.xml @@ -303,7 +303,7 @@ rsyslog security-tool sg3_utils - systemd-cryptsetup + systemd-cryptsetup dracut-config-generic dracut-network rdma-core @@ -1371,6 +1371,7 @@ freerdp tigervnc + vinagre diff --git a/normal_x86_64.xml b/normal_x86_64.xml index 285608159461b7c32f113e3f07696387f80fabff..621d5b1fc61b3c47d4d79da742fc0d58bb84769a 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -1376,6 +1376,7 @@ freerdp tigervnc + vinagre diff --git a/oemaker-3.2.0.tar.gz b/oemaker-3.2.0.tar.gz deleted file mode 100644 index d7eb20e5133ea9021b47872eede8de4307c66a96..0000000000000000000000000000000000000000 Binary files a/oemaker-3.2.0.tar.gz and /dev/null differ diff --git a/oemaker-3.3.0.tar.gz b/oemaker-3.3.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d0045f1a547f39e0a6dc11a0711cc1c3a33ab41a Binary files /dev/null and b/oemaker-3.3.0.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index e22a2c1fb517c2fa2e33bb9e92533479906955b1..bbaf38927b3750040747c2765a813cc139cb0698 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -14,8 +14,8 @@ Name: oemaker Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 3.2.0 -Release: 14 +Version: 3.3.0 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -31,8 +31,9 @@ Source9: normal_riscv64.xml Source10: normal_loongarch64.xml Source11: rpmlist_loongarch64.xml Source12: desktop_normal_loongarch64.xml -Source13: edge_normal_riscv64.xml - +Source13: devstation_aarch64_rpmlist +Source14: devstation_x86_64_rpmlist +Source15: edge_normal_riscv64.xml Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils Requires: lorax >= 19.6.78-1 @@ -43,7 +44,7 @@ Requires: xorriso # Patch here Patch0001: 0001-bugfix-IABY7K.patch Patch0002: 0001-fix-livecd-grub2-efi.cfg-not-found.patch -Patch0003: enable-efi-boot-for-loongarch64.patch +Patch0003: 0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch %description a building tool for DVD ISO making and ISO cutting @@ -89,6 +90,10 @@ rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_n cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml cp %{SOURCE12} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml +rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/livecd/devstation_rpmlist +cp %{SOURCE13} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/livecd/devstation_rpmlist +rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/livecd/devstation_rpmlist +cp %{SOURCE14} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/livecd/devstation_rpmlist cd %{_builddir}/%{name}-%{version}/%{name} %autopatch -p1 %ifarch riscv64 @@ -97,7 +102,7 @@ cp %{SOURCE8} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xm rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml cp %{SOURCE9} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml -cp %{SOURCE13} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml +cp %{SOURCE15} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml %endif @@ -108,6 +113,7 @@ mkdir -p %{buildroot}/opt/oemaker mkdir -p %{buildroot}/opt/oemaker/config mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch} mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch} +mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch} mkdir -p %{buildroot}/opt/oemaker/config/common mkdir -p %{buildroot}/opt/oemaker/config/common/livecd/live mkdir -p %{buildroot}/opt/oemaker/docs @@ -126,18 +132,30 @@ install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_recor 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 640 %{name}/isomaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/ +install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch}/ install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks +install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/devstation_livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_livecd_${sys_arch}.ks install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/rpmlist +install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/devstation_rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_rpmlist install -m 400 %{name}/isomaker/config/${sys_arch}/desktop_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/desktop_normal.xml install -m 400 %{name}/isomaker/config/${sys_arch}/edge_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/edge_normal.xml install -m 400 %{name}/isomaker/config/${sys_arch}/normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/normal.xml install -m 400 %{name}/isomaker/config/${sys_arch}/standard.conf %{buildroot}/opt/oemaker/config/${sys_arch}/standard.conf %ifarch x86_64 install -m 700 %{name}/isomaker/config/x86_64/livecd/live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/live/x86.tmpl +install -m 700 %{name}/isomaker/config/x86_64/livecd/devstation_live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/devstation_live/x86.tmpl install -m 400 %{name}/isomaker/config/x86_64/ks.cfg %{buildroot}/opt/oemaker/config/x86_64/ks.cfg %endif %ifarch aarch64 install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl +install -m 700 %{name}/isomaker/config/aarch64/livecd/devstation_live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/devstation_live/aarch64.tmpl +%endif +%ifarch riscv64 +install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl +%endif +%ifarch loongarch64 +install -m 700 %{name}/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl %{buildroot}/opt/oemaker/config/loongarch64/livecd/live/loongarch64.tmpl +install -m 400 %{name}/isomaker/config/loongarch64/ks.cfg %{buildroot}/opt/oemaker/config/loongarch64/ks.cfg %endif %ifarch riscv64 install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl @@ -147,6 +165,7 @@ install -m 700 %{name}/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl install -m 400 %{name}/isomaker/config/loongarch64/ks.cfg %{buildroot}/opt/oemaker/config/loongarch64/ks.cfg %endif install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/ +install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/ install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/ cp -ar %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/ @@ -215,41 +234,110 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog -* Wed Apr 09 2025 Funda Wang - 3.2.0-14 +* Fri Apr 18 2025 Liu Wang <1823363429@qq.com> - 3.3.0-7 +- ID:NA +- SUG:NA +- DESC: sync openEuler-24.03-LTS-SP2 branch to master + +* Tue Apr 15 2025 Liu Wang <1823363429@qq.com> - 3.3.0-6 +- ID:NA +- SUG:NA +- DESC: sync 25.03 modify to master branch and add roo-code, uv, python3-mcp packages + +* Sat Mar 22 2025 Funda Wang - 3.3.0-5 +- ID:NA +- SUG:NA +- DESC: logrotate-help was merged into logrotate + +* Fri Mar 14 2025 wangchong - 3.3.0-4 +- ID:NA +- SUG:NA +- DESC: add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt, haoc-kernel, vk-kernel and kernel-extra-modules to the exclude tag + +* Mon Mar 3 2025 hugel - 3.3.0-3 +- ID:NA +- SUG:NA +- DESC: Fix boot failure caused by invalid volume IDs + +* Thu Jan 23 2025 Funda Wang - 3.3.0-2 - ID:NA - SUG:NA -- DESC: vinagre has been archived into recycle sig +- DESC: tpm2-tools-help was merged into tpm2-tools as of Oct 2024 +- DESC: attr-help was merged into attr as of Dec 2024 +- DESC: xorg-x11-utils was retired as of Dec 2024 -* Tue Apr 8 2025 xiangyuning - 3.2.0-13 +* Thu Jan 23 2025 Li Ping <1477412247@qq.com> - 3.3.0-1 - ID:NA - SUG:NA -- DESC: upgrade to 3.2.0 and sync change from 2403-sp1 +- DESC: add new iso_type devstation devstation_netinst support for oemaker and update to 3.3.0 -* Mon Mar 24 2025 wangchong - 3.1.0-10 +* Mon Dec 30 2024 Wenlong Zhang - 3.2.0-11 - ID:NA - SUG:NA -- DESC: delete libvirt and initial-setup-gui +- DESC: add rpmlist.xml normal.xml for loongarch64 + enable efi boot for loongarch64 -* Fri Mar 14 2025 wangchong - 3.1.0-9 +* Tue Dec 24 2024 Ouuleilei - 3.2.0-10 +- fix riscv64 livecd grub2-efi.cfg not found + +* Fri Dec 20 2024 wangchong - 3.2.0-9 +- ID:NA +- SUG:NA +- DESC: add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt and haoc-kernel to the exclude tag + +* Fri Dec 6 2024 yangchaohao - 3.2.0-8 - ID:NA - SUG:NA -- DESC: add kernel-rt, raspberrypi-kernel, raspberrypi-kernel-rt, haoc-kernel, vk-kernel and kernel-extra-modules tothe exclude tag +- DESC: edge_ISO change kubeedge to k3s -* Thu Dec 5 2024 zhaolichang - 3.1.0-8 +* Thu Dec 5 2024 zhaolichang - 3.2.0-7 - ID:NA - SUG:NA - DESC: delete libkperf in rpmlist.xml -* Tue Dec 3 2024 zhaolichang - 3.1.0-7 +* Wed Dec 4 2024 zhaolichang - 3.2.0-6 +- ID:NA +- SUG:NA +- DESC: delete libkperf and oeAware-manager in minimal install + +* Tue Dec 3 2024 sunsuwan - 3.2.0-5 +- ID:NA +- SUG:NA +- DESC: use xtables-nft instead of xtables-legacy for high performance + +* Tue Dec 3 2024 zhaolichang - 3.2.0-4 - ID:NA - SUG:NA - DESC: add libkperf and oeAware-manager -* Wed Jul 10 2024 wangchong - 3.1.0-6 +* Wed Sep 18 2024 xiangyuning - 3.2.0-3 +- ID:NA +- SUG:NA +- DESC: enable encrypt need install systemd-cryptsetup package + +* Mon Sep 23 2024 Ouuleilei - 3.2.0-2 +- fix riscv64.tmpl file miss problem and add riscv64 rpmlist.xml normal.xml + +* Wed Sep 18 2024 xiangyuning - 3.2.0-1 +- ID:NA +- SUG:NA +- upgrade to 3.2.0 + +* Wed Jul 10 2024 wangchong - 3.1.0-8 - ID:NA - SUG:NA - DESC: fix issue IABY7K +* Thu Mar 28 2024 mayunlong - 3.1.0-7 +- ID:NA +- SUG:NA +- DESC: delete libvirt package + +* Wed Mar 20 2024 sunhai - 3.1.0-6 +- ID:NA +- SUG:NA +- DESC: delete initial-setup-gui + * Tue Mar 19 2024 sunhai - 3.1.0-5 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index 10c25adfd27205447b8abfb35f6488f4b7eb0e2d..66950b5cf25f82e4e20184e8a7f45187f8698af0 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -770,7 +770,7 @@ libvirt-daemon-driver-storage-mpath libvirt-daemon-driver-storage-rbd libvirt-daemon-driver-storage-scsi - libvirt-daemon-kvm + libvirt-daemon-kvm libvirt-daemon-qemu libvirt-devel libvirt-docs @@ -1433,6 +1433,10 @@ kubernetes-kubelet kubernetes-master kubernetes-node + kubernetes-cloudcore + kubernetes-edgecore + kubernetes-edgesite + kubernetes-keadm k3s k3s-selinux k3s-plugins diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml index e8c57d81737a84a7b30daf709d046ea59733b8e6..6ba48973cd28731641b10e13450ab06995801959 100644 --- a/rpmlist_riscv64.xml +++ b/rpmlist_riscv64.xml @@ -57,6 +57,24 @@ haoc-kernel-devel haoc-kernel-headers nvwa + python3-keras-rl2 + kernel-rt + kernel-rt-tools + kernel-rt-source + kernel-rt-devel + kernel-rt-headers + kernel-rt-tools-devel + raspberrypi-kernel + raspberrypi-kernel-devel + raspberrypi-kernel-rt + raspberrypi-kernel-rt-devel + haoc-kernel + haoc-kernel-source + haoc-kernel-tools + haoc-kernel-tools-devel + haoc-kernel-devel + haoc-kernel-headers + nvwa drbd @@ -66,6 +84,15 @@ kernel-rt raspberrypi-kernel raspberrypi-kernel-rt + apache-commons-vfs + apache-poi + mchange-commons + metrics + typesafe-config + haoc-kernel + kernel-rt + raspberrypi-kernel + raspberrypi-kernel-rt drbd-debuginfo @@ -88,6 +115,11 @@ libwd shim-aa64 oeAware-manager + librados2 + kata-containers + DCF + opengauss + oeAware-manager edk2-ovmf @@ -100,6 +132,11 @@ edk2-ovmf-riscv64 grub2-efi-riscv64 grub2-efi-riscv64-modules + librados2 + kata-containers + DCF + opengauss + oeAware-manager abattis-cantarell-fonts @@ -680,7 +717,7 @@ libpsl-help libpwquality libpwquality-help - librados2 + librados2 libref_array librepo libreport-filesystem @@ -769,7 +806,7 @@ libvirt-daemon-driver-storage-mpath libvirt-daemon-driver-storage-rbd libvirt-daemon-driver-storage-scsi - libvirt-daemon-kvm + libvirt-daemon-kvm libvirt-daemon-qemu libvirt-devel libvirt-docs @@ -1134,7 +1171,7 @@ python3-librepo python3-libs python3-libselinux - python3-libvirt + python3-libvirt python3-libxml2 python3-linux-procfs python3-net-snmp @@ -1442,6 +1479,38 @@ k3s-selinux k3s-plugins k3s-containerd + kubeedge-cloudcore + kubeedge-edgecore + kubeedge-edgesite + kubeedge-keadm + + + grub2-pc + grub2-pc-modules + grub2-efi-x64 + shim + + + grub2-efi-riscv64 + grub2-efi-riscv64-cdboot + grub2-efi-riscv64-modules + + + kubernetes + kubernetes-client + kubernetes-help + kubernetes-kubeadm + kubernetes-kubelet + kubernetes-master + kubernetes-node + kubeedge-cloudcore + kubeedge-edgecore + kubeedge-edgesite + kubeedge-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd grub2-common grub2-tools-minimal grub2-tools-extra