diff --git a/config.yaml b/config.yaml index 784a4e9..c403837 100644 --- a/config.yaml +++ b/config.yaml @@ -1,14 +1,14 @@ actions: - modify_release: - - suffix: ".alma.1" + - suffix: ".alma.2" enabled: true - changelog_entry: - name: "Eduard Abdullin" email: "eabdullin@almalinux.org" line: - - "Use static syslinux64.exe to avoid a difference in the checksum in x86_64_v2 arch" + - "Use static syslinux64.exe and syslinux.exe to avoid a difference in the checksum in x86_64_v2 arch" - replace: - target: "spec" @@ -18,7 +18,9 @@ actions: replace: | rm -f %{buildroot}%{_prefix}/lib/libsyslinux* rm -f %{buildroot}%{_includedir}/syslinux.h + rm -f %{buildroot}%{_datadir}/syslinux/syslinux.exe rm -f %{buildroot}%{_datadir}/syslinux/syslinux64.exe + mv %{SOURCE1001} %{buildroot}%{_datadir}/syslinux/syslinux.exe mv %{SOURCE1000} %{buildroot}%{_datadir}/syslinux/syslinux64.exe count: 1 @@ -30,3 +32,6 @@ actions: - type: "source" name: "syslinux64.exe" number: 1000 + - type: "source" + name: "syslinux.exe" + number: 1001 diff --git a/scripts/build-syslinux-exe.sh b/scripts/build-syslinux-exe.sh index 0d3be9f..a06cdac 100644 --- a/scripts/build-syslinux-exe.sh +++ b/scripts/build-syslinux-exe.sh @@ -27,4 +27,7 @@ docker exec -w /root/rpmbuild/RPMS/x86_64 $CONTAINER_ID sh -c "rpm2cpio \$(ls | [ -d files ] || mkdir files docker cp $CONTAINER_ID:/root/rpmbuild/RPMS/x86_64/usr/share/syslinux/syslinux64.exe files/syslinux64.exe +docker exec -w /root/rpmbuild/RPMS/noarch $CONTAINER_ID sh -c "rpm2cpio \$(ls | grep -E '^syslinux-nonlinux-.*\.rpm$') | cpio -id" +docker cp $CONTAINER_ID:/root/rpmbuild/RPMS/noarch/usr/share/syslinux/syslinux.exe files/syslinux.exe + docker rm -f $CONTAINER_ID