3.0 package build fixes: crash, grep, libpsm2, openmpi, sysstat (#6949)
This commit is contained in:
Andrew Phelps
GitHub
Родитель
d8742a711b
Коммит
4e742b6a90
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"gdb-10.2.tar.gz": "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350",
|
||||
"crash-8.0.3.tar.gz": "22750c927286296e574991edfa9e7bf43bfe4bf9f1163615f08b210854bcb2bd"
|
||||
"crash-8.0.4.tar.gz": "94df600c183301013787cd47112044e358fb37bb8e2b5544f40377dda98ee78f"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Name: crash
|
||||
Version: 8.0.3
|
||||
Version: 8.0.4
|
||||
Release: 1%{?dist}
|
||||
Summary: kernel crash analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
|
||||
Group: Development/Tools
|
||||
|
|
@ -63,6 +63,9 @@ cp -p defs.h %{buildroot}%{_includedir}/crash
|
|||
%{_includedir}/crash/*.h
|
||||
|
||||
%changelog
|
||||
* Thu Dec 07 2023 Andrew Phelps <anphel@microsoft.com> - 8.0.4-1
|
||||
- Upgrade to 8.0.4
|
||||
|
||||
* Fri Oct 27 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 8.0.3-1
|
||||
- Auto-upgrade to 8.0.3 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
Summary: Programs for searching through files
|
||||
Name: grep
|
||||
Version: 3.11
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv3+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: Applications/File
|
||||
URL: https://www.gnu.org/software/grep
|
||||
Source0: https://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: pcre2-devel
|
||||
%if %{with_check}
|
||||
BuildRequires: perl(File::Find)
|
||||
%endif
|
||||
Requires: pcre
|
||||
Requires: pcre2
|
||||
Conflicts: toybox
|
||||
|
||||
%description
|
||||
|
|
@ -57,6 +57,9 @@ make %{?_smp_mflags} check
|
|||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Thu Dec 09 2023 Andrew Phelps <anphel@microsoft.com> - 3.11-2
|
||||
- Rebuild with PCRE2
|
||||
|
||||
* Mon Oct 16 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.11-1
|
||||
- Auto-upgrade to 3.11 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
Summary: Intel PSM Libraries
|
||||
Name: libpsm2
|
||||
Version: 11.2.206
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: BSD-3-Clause OR GPLv2
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -112,7 +112,7 @@ rm -f %{buildroot}%{_lib64dir}/*.a
|
|||
%license COPYING
|
||||
%{_lib64dir}/libpsm2.so.2.*
|
||||
%{_lib64dir}/libpsm2.so.2
|
||||
/lib/udev/rules.d/40-psm.rules
|
||||
%{_libdir}/udev/rules.d/40-psm.rules
|
||||
|
||||
%files devel
|
||||
%{_lib64dir}/libpsm2.so
|
||||
|
|
@ -123,11 +123,14 @@ rm -f %{buildroot}%{_lib64dir}/*.a
|
|||
|
||||
%files compat
|
||||
%{_lib64dir}/psm2-compat
|
||||
/lib/udev/rules.d/40-psm-compat.rules
|
||||
%{_libdir}/udev/rules.d/40-psm-compat.rules
|
||||
%{_libdir}/libpsm2
|
||||
%{_sysconfdir}/modprobe.d/libpsm2-compat.conf
|
||||
|
||||
%changelog
|
||||
* Thu Dec 07 2023 Andrew Phelps <anphel@microsoft.com> - 11.2.206-3
|
||||
- Fix build issue by using _libdir macro
|
||||
|
||||
* Mon Feb 06 2023 Riken Maharjan <rmaharjan@microsoft.com> - 11.2.206-2
|
||||
- Move from Extended to Core.
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=1780584
|
||||
|
||||
# enable rdma as we will only build for ARM64 and AMD64
|
||||
%bcond_without rdma
|
||||
%bcond_without rdma
|
||||
|
||||
# enable java openmpi subpackage by default
|
||||
%bcond_without java
|
||||
%bcond_without java
|
||||
|
||||
# Private openmpi libraries
|
||||
%global __provides_exclude_from %{_libdir}/openmpi/lib/(lib(mca|ompi|open-(pal|rte|trace))|openmpi/).*.so
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
Summary: Open Message Passing Interface
|
||||
Name: openmpi%{?_cc_name_suffix}
|
||||
Version: 4.1.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: BSD AND MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -229,6 +229,7 @@ make check
|
|||
%{_libdir}/%{name}/bin/oshrun
|
||||
%{_libdir}/%{name}/bin/shmemrun
|
||||
%endif
|
||||
%{_libdir}/libOpenIPMIglib.so*
|
||||
%{_libdir}/%{name}/lib/*.so.40*
|
||||
%{_libdir}/%{name}/lib/libmca_common_ofi.so.10*
|
||||
%{_libdir}/%{name}/lib/libmca*.so.41*
|
||||
|
|
@ -303,6 +304,9 @@ make check
|
|||
%{python3_sitearch}/openmpi.pth
|
||||
|
||||
%changelog
|
||||
* Thu Dec 07 2023 Andrew Phelps <anphel@microsoft.com> - 4.1.5-2
|
||||
- Update file list
|
||||
|
||||
* Mon Nov 06 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 4.1.5-1
|
||||
- Auto-upgrade to 4.1.5 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
Summary: The Sysstat package contains utilities to monitor system performance and usage activity
|
||||
Name: sysstat
|
||||
Version: 12.7.4
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPL-2.0-only
|
||||
URL: http://sebastien.godard.pagesperso-orange.fr/
|
||||
Group: Development/Debuggers
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: cronie-anacron
|
||||
|
||||
Requires: cronie-anacron
|
||||
|
||||
%description
|
||||
|
|
@ -43,16 +41,17 @@ install -D -m 0644 %{_builddir}/%{name}-%{version}/cron/sysstat-collect.service
|
|||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/*
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/*
|
||||
%exclude %{_sysconfdir}/rc.d/init.d/sysstat
|
||||
%{_bindir}/*
|
||||
%{_libdir}/sa/*
|
||||
%{_datadir}/doc/%{name}-%{version}/*
|
||||
%{_mandir}/man*/*
|
||||
%{_libdir}/systemd/system/*
|
||||
|
||||
%{_libdir}/systemd/system-sleep/sysstat.sleep
|
||||
|
||||
%changelog
|
||||
* Thu Dec 07 2023 Andrew Phelps <anphel@microsoft.com> - 12.7.4-2
|
||||
- Update file list
|
||||
|
||||
* Fri Oct 27 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 12.7.4-1
|
||||
- Auto-upgrade to 12.7.4 - Azure Linux 3.0 - package upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -2197,8 +2197,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "crash",
|
||||
"version": "8.0.3",
|
||||
"downloadUrl": "https://github.com/crash-utility/crash/archive/8.0.3.tar.gz"
|
||||
"version": "8.0.4",
|
||||
"downloadUrl": "https://github.com/crash-utility/crash/archive/8.0.4.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ procps-ng-4.0.4-1.azl3.aarch64.rpm
|
|||
procps-ng-devel-4.0.4-1.azl3.aarch64.rpm
|
||||
procps-ng-lang-4.0.4-1.azl3.aarch64.rpm
|
||||
m4-1.4.19-2.azl3.aarch64.rpm
|
||||
grep-3.11-1.azl3.aarch64.rpm
|
||||
grep-lang-3.11-1.azl3.aarch64.rpm
|
||||
grep-3.11-2.azl3.aarch64.rpm
|
||||
grep-lang-3.11-2.azl3.aarch64.rpm
|
||||
diffutils-3.10-1.azl3.aarch64.rpm
|
||||
gawk-5.2.2-1.azl3.aarch64.rpm
|
||||
findutils-4.9.0-1.azl3.aarch64.rpm
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ procps-ng-4.0.4-1.azl3.x86_64.rpm
|
|||
procps-ng-devel-4.0.4-1.azl3.x86_64.rpm
|
||||
procps-ng-lang-4.0.4-1.azl3.x86_64.rpm
|
||||
m4-1.4.19-2.azl3.x86_64.rpm
|
||||
grep-3.11-1.azl3.x86_64.rpm
|
||||
grep-lang-3.11-1.azl3.x86_64.rpm
|
||||
grep-3.11-2.azl3.x86_64.rpm
|
||||
grep-lang-3.11-2.azl3.x86_64.rpm
|
||||
diffutils-3.10-1.azl3.x86_64.rpm
|
||||
gawk-5.2.2-1.azl3.x86_64.rpm
|
||||
findutils-4.9.0-1.azl3.x86_64.rpm
|
||||
|
|
|
|||
|
|
@ -126,9 +126,9 @@ gperf-debuginfo-3.1-5.azl3.aarch64.rpm
|
|||
gpgme-1.23.2-1.azl3.aarch64.rpm
|
||||
gpgme-debuginfo-1.23.2-1.azl3.aarch64.rpm
|
||||
gpgme-devel-1.23.2-1.azl3.aarch64.rpm
|
||||
grep-3.11-1.azl3.aarch64.rpm
|
||||
grep-debuginfo-3.11-1.azl3.aarch64.rpm
|
||||
grep-lang-3.11-1.azl3.aarch64.rpm
|
||||
grep-3.11-2.azl3.aarch64.rpm
|
||||
grep-debuginfo-3.11-2.azl3.aarch64.rpm
|
||||
grep-lang-3.11-2.azl3.aarch64.rpm
|
||||
gtk-doc-1.33.2-1.azl3.noarch.rpm
|
||||
gzip-1.13-1.azl3.aarch64.rpm
|
||||
gzip-debuginfo-1.13-1.azl3.aarch64.rpm
|
||||
|
|
|
|||
|
|
@ -126,9 +126,9 @@ gperf-debuginfo-3.1-5.azl3.x86_64.rpm
|
|||
gpgme-1.23.2-1.azl3.x86_64.rpm
|
||||
gpgme-debuginfo-1.23.2-1.azl3.x86_64.rpm
|
||||
gpgme-devel-1.23.2-1.azl3.x86_64.rpm
|
||||
grep-3.11-1.azl3.x86_64.rpm
|
||||
grep-debuginfo-3.11-1.azl3.x86_64.rpm
|
||||
grep-lang-3.11-1.azl3.x86_64.rpm
|
||||
grep-3.11-2.azl3.x86_64.rpm
|
||||
grep-debuginfo-3.11-2.azl3.x86_64.rpm
|
||||
grep-lang-3.11-2.azl3.x86_64.rpm
|
||||
gtk-doc-1.33.2-1.azl3.noarch.rpm
|
||||
gzip-1.13-1.azl3.x86_64.rpm
|
||||
gzip-debuginfo-1.13-1.azl3.x86_64.rpm
|
||||
|
|
|
|||
|
|
@ -440,9 +440,6 @@ case $(uname -m) in
|
|||
;;
|
||||
esac
|
||||
|
||||
# PCRE needs to be installed (above) for grep to build with perl regexp support
|
||||
build_rpm_in_chroot_no_install grep
|
||||
|
||||
# Lua needs to be installed for RPM to build
|
||||
build_rpm_in_chroot_no_install lua
|
||||
chroot_and_install_rpms lua lua
|
||||
|
|
@ -554,6 +551,9 @@ build_rpm_in_chroot_no_install libselinux
|
|||
|
||||
chroot_and_install_rpms libselinux
|
||||
|
||||
# PCRE2 needs to be installed (above) for grep to build with perl regexp support
|
||||
build_rpm_in_chroot_no_install grep
|
||||
|
||||
# coreutils and findutils require libselinux
|
||||
# for SELinux support.
|
||||
build_rpm_in_chroot_no_install coreutils
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче