已开启
fix sw64 error in kernel.spec #2677
wuzx065891创建于 6月29日
fix sw64 error in kernel.spec #2677
已开启
共 1 个文件变更+10-6
| @@ -47,7 +47,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig | |||
| 47 | %global upstream_sublevel 0 | 47 | %global upstream_sublevel 0 |
| 48 | %global devel_release 159 | 48 | %global devel_release 159 |
| 49 | %global maintenance_release .4.3 | 49 | %global maintenance_release .4.3 |
| 50 | -%global pkg_release .154 | 50 | +%global pkg_release .155 |
| 51 | 51 | ||
| 52 | %global openeuler_lts 1 | 52 | %global openeuler_lts 1 |
| 53 | %global openeuler_major 2403 | 53 | %global openeuler_major 2403 |
| @@ -487,8 +487,8 @@ cp vmlinux ./arch/sw_64/boot/vmlinux.bin | |||
| 487 | %ifarch loongarch64 | 487 | %ifarch loongarch64 |
| 488 | %{make} ARCH=%{Arch} vmlinuz.efi %{?_smp_mflags} | 488 | %{make} ARCH=%{Arch} vmlinuz.efi %{?_smp_mflags} |
| 489 | %endif | 489 | %endif |
| 490 | -%{make} ARCH=%{Arch} modules %{?_smp_mflags} | ||
| 491 | %endif | 490 | %endif |
| 491 | +%{make} ARCH=%{Arch} modules %{?_smp_mflags} | ||
| 492 | 492 | ||
| 493 | %if 0%{?with_kabichk} | 493 | %if 0%{?with_kabichk} |
| 494 | chmod 0755 %{SOURCE18} | 494 | chmod 0755 %{SOURCE18} |
| @@ -978,7 +978,7 @@ if [ `uname -i` == "aarch64" ] && | |||
| 978 | fi | 978 | fi |
| 979 | if [ `uname -i` == "sw_64" ] && | 979 | if [ `uname -i` == "sw_64" ] && |
| 980 | [ -f /boot/EFI/grub2/grub.cfg ]; then | 980 | [ -f /boot/EFI/grub2/grub.cfg ]; then |
| 981 | - /usr/bin/sh %{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh %{version}-%{release}.aarch64 /boot/EFI/grub2/grub.cfg remove | 981 | + /usr/bin/sh %{_sbindir}/mkgrub-menu-%{version}-%{devel_release}%{?maintenance_release}%{?pkg_release}.sh %{version}-%{release}.sw_64 /boot/EFI/grub2/grub.cfg remove |
| 982 | fi | 982 | fi |
| 983 | 983 | ||
| 984 | %postun | 984 | %postun |
| @@ -998,9 +998,6 @@ if [ `uname -i` == "loongarch64" ];then | |||
| 998 | [ "x${GRUB_CFG}" == "x" ] && [ -f /boot/efi/EFI/openEuler/grub.cfg ] && GRUB_CFG=/boot/efi/EFI/openEuler/grub.cfg | 998 | [ "x${GRUB_CFG}" == "x" ] && [ -f /boot/efi/EFI/openEuler/grub.cfg ] && GRUB_CFG=/boot/efi/EFI/openEuler/grub.cfg |
| 999 | [ "x${GRUB_CFG}" != "x" ] && grub2-mkconfig -o ${GRUB_CFG} | 999 | [ "x${GRUB_CFG}" != "x" ] && grub2-mkconfig -o ${GRUB_CFG} |
| 1000 | fi | 1000 | fi |
| 1001 | -if [ `uname -i` == "sw_64" ];then | ||
| 1002 | - grub2-mkconfig -o /boot/efi/EFI/openEuler/grub.cfg | ||
| 1003 | -fi | ||
| 1004 | 1001 | ||
| 1005 | %posttrans | 1002 | %posttrans |
| 1006 | %{_sbindir}/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --update %{KernelVer} || exit $? | 1003 | %{_sbindir}/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --update %{KernelVer} || exit $? |
| @@ -1016,6 +1013,10 @@ if [ `uname -i` == "loongarch64" ];then | |||
| 1016 | [ "x${GRUB_CFG}" != "x" ] && grub2-mkconfig -o ${GRUB_CFG} | 1013 | [ "x${GRUB_CFG}" != "x" ] && grub2-mkconfig -o ${GRUB_CFG} |
| 1017 | grubby --set-default=/boot/vmlinuz-%{KernelVer} | 1014 | grubby --set-default=/boot/vmlinuz-%{KernelVer} |
| 1018 | fi | 1015 | fi |
| 1016 | +if [ `uname -i` == "sw_64" ];then | ||
| 1017 | + grub2-mkconfig -o /boot/efi/EFI/openEuler/grub.cfg | ||
| 1018 | + grubby --set-default=/boot/vmlinuz-%{KernelVer} | ||
| 1019 | +fi | ||
| 1019 | if [ -x %{_sbindir}/weak-modules ] | 1020 | if [ -x %{_sbindir}/weak-modules ] |
| 1020 | then | 1021 | then |
| 1021 | %{_sbindir}/weak-modules --add-kernel %{KernelVer} || exit $? | 1022 | %{_sbindir}/weak-modules --add-kernel %{KernelVer} || exit $? |
| @@ -1184,6 +1185,9 @@ fi | |||
| 1184 | %endif | 1185 | %endif |
| 1185 | 1186 | ||
| 1186 | %changelog | 1187 | %changelog |
| 1188 | +* Mon Jun 29 2026 wuzx <wuzx1226@qq.com> - 6.6.0-159.4.3.155 | ||
| 1189 | +- kernel.spec: fix sw_64 bugs when building | ||
| 1190 | + | ||
| 1187 | * Sun Jun 28 2026 Tengda Wu <wutengda2@huawei.com> - 6.6.0-159.4.3.154 | 1191 | * Sun Jun 28 2026 Tengda Wu <wutengda2@huawei.com> - 6.6.0-159.4.3.154 |
| 1188 | - kernel.spec: write kernel lastest tag into SOURCE file | 1192 | - kernel.spec: write kernel lastest tag into SOURCE file |
| 1189 | 1193 | ||