diff --git a/normal_loongarch64.xml b/normal_loongarch64.xml index db16e4b89eb4ad1674d8fe9b68b691840bd5857c..6ab238405156a206ee6b0c39a6acfa7040c9b0dc 100644 --- a/normal_loongarch64.xml +++ b/normal_loongarch64.xml @@ -914,7 +914,6 @@ tuned sysstat powertop - fio iperf3 libpfm tuned-utils diff --git a/oemaker.spec b/oemaker.spec index 5595e961380a82900b684c4ceb639d9e198f940c..874c2fa31643dbbea04eddd39d6d0af4febee8f8 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -15,7 +15,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 3.3.0 -Release: 13 +Release: 14 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -132,11 +132,13 @@ 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}/ +%ifnarch loongarch64 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 +%endif +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 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/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 @@ -234,6 +236,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Thu Jun 5 2025 Wenlong Zhang - 3.3.0-14 +- ID:NA +- SUG:NA +- DESC: support sp2 for loongarch64 + * Wed Jun 04 2025 Shi Hongyu - 3.3.0-13 - ID:NA - SUG:NA diff --git a/rpmlist_loongarch64.xml b/rpmlist_loongarch64.xml index 0ea49927c7095a1423dea8bd15244da177aaa577..b1c027a0816e51efabb5a7196ee3dce64a4de597 100644 --- a/rpmlist_loongarch64.xml +++ b/rpmlist_loongarch64.xml @@ -16,116 +16,35 @@ python3-abrt-container-addon - abrt-atomic - abrt-cli - abrt-console-notification - abrt-desktop - apptainer - apptainer-suid - castor - castor-maven-plugin - compat-openssl11-devel - gnome-boxes - ibus-table-chinese-array - ldapjdk - libcmpiCppImpl0 - libev-libevent-devel - moby-client - moby-engine - moby - nfs-utils-min - nodejs-grunt-contrib-watch - oncn-bwm-devel - pcp-pmda-bpftrace - pcp-testsuite - postgresql-private-devel - protobuf2-compiler - protobuf2-devel - protobuf2-lite-devel - protobuf2-lite-static - protobuf2-static - protobuf2-vim - python3-abrt-addon - python3-keras-rl2 - python3-pytype - texlive-biblatex-apa - texlive-collection-bibtexextra - texlive-collection-binextra - texlive-collection-fontsextra - texlive-collection-fontutils - texlive-collection-latexextra - texlive-collection-mathscience - texlive-ctanupload - texlive-exceltex - texlive-includernw - texlive-latexindent - texlive-oldstandard - texlive-scheme-full - texlive-scheme-gust - texlive-scheme-medium - texlive-scheme-tetex - tomcatjss - cassandra-java-driver - cassandra-java-driver-extras - cassandra-java-driver-mapping - cassandra-java-driver-tests - closure-compiler - gala-anteater - gala-ops - google-http-java-client-protobuf - hdf5-openmpi - hdf5-openmpi-devel - hdf5-openmpi-static - language-detector - linkchecker - mailman - netcdf-openmpi - netcdf-openmpi-devel - netcdf-openmpi-static - nodejs-closure-compiler - nodejs-lodash-cli - obs-service-rust2rpm - pcp-pmda-mongodb - protostream - python3-authheaders - python3-dkimpy - python3-email-validator - python3-eventlet - python3-gala-anteater - python3-kdcproxy - python3-pydantic - python3-pymongo - python3-pymongo-gridfs - python3-rust2rpm - python3-samba - python3-samba-dc - python3-samba-test - rust-packaging - samba-test - samba-tools - texlive-fontspec-doc - texlive-polyglossia-doc - texlive-unicode-math-doc - docker-client-java - glassfish-hk2-configuration - hibernate - infinispan - ironjacamar - jetty - jetty-infinispan - mysql-connector-java - picketbox - resteasy - resteasy-optional - resteasy-test - wildfly-core - wildfly-core-feature-pack - xstream-hibernate - resteasy-optional - artemis-rest - infinispan - protostream - hibernate4-infinispan + artemis-rest + artemis-spring-integration + docker-client-java + gdal + glassfish-hk2-spring-bridge + hessian + hibernate4-infinispan + hibernate + infinispan + ironjacamar + jetty + jetty-infinispan + picketbox + python3-keras-rl2 + python3-pytype + resteasy + resteasy-optional + resteasy-test + wildfly-core + wildfly-core-feature-pack + xstream-hibernate + jdbi + jersey + jetty-spring + ldaptive-templates + metrics-jdbi + metrics-jersey2 + syscontainer-tools + jersey-test-framework drbd @@ -1133,7 +1052,6 @@ postfix-help ppp ppp-help - pprof procmail procmail-help procps-ng @@ -1319,7 +1237,6 @@ sudo sudo-help symlinks - syscontainer-tools sysfsutils sysfsutils-help sysstat