use systemd-bootstrap-rpm-macros

This commit is contained in:
Dan Streetman 2024-01-30 11:30:35 -05:00
Родитель 5c2c14b916
Коммит e7314b913e
11 изменённых файлов: 38 добавлений и 18 удалений

Просмотреть файл

@ -12,7 +12,7 @@
Summary: Signed GRand Unified Bootloader for %{buildarch} systems
Name: grub2-efi-binary-signed-%{buildarch}
Version: 2.06
Release: 13%{?dist}
Release: 14%{?dist}
License: GPLv3+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -77,6 +77,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
/boot/efi/EFI/BOOT/%{grubpxeefiname}
%changelog
* Thu Jan 25 10:55:03 EST 2024 Dan Streetman <ddstreet@ieee.org> - 2.06-14
- match grub2 version
* Mon Nov 27 2023 Cameron Baird <cameronbaird@microsoft.com> - 2.06-13
- Bump release number to match grub release number

Просмотреть файл

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.12.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /module_info.ld
%changelog
* Sat Jan 27 11:11:08 EST 2024 Dan Streetman <ddstreet@ieee.org> - 6.6.12.1-2
- update to match kernel version
* Fri Jan 26 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.12.1-1
- Upgrade to 6.6.12.1

Просмотреть файл

@ -6,7 +6,7 @@
Summary: GRand Unified Bootloader
Name: grub2
Version: 2.06
Release: 13%{?dist}
Release: 14%{?dist}
License: GPLv3+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -88,7 +88,6 @@ Patch0202: 0202-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch
BuildRequires: autoconf
BuildRequires: device-mapper-devel
BuildRequires: python3
BuildRequires: systemd-devel
BuildRequires: xz-devel
Requires: device-mapper
Requires: xz
@ -388,6 +387,9 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME
%config(noreplace) %{_sysconfdir}/grub.d/41_custom
%changelog
* Thu Jan 25 10:49:55 EST 2024 Dan Streetman <ddstreet@ieee.org> - 2.06-14
- remove systemd-devel build dep
* Mon Nov 27 2023 Cameron Baird <cameronbaird@microsoft.com> - 2.06-13
- Move /etc/grub.d to the configuration subpackage

Просмотреть файл

@ -11,7 +11,7 @@
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 6.6.12.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -44,7 +44,7 @@ is running on Windows Host with Hyper-V.
%package -n hypervkvpd
Summary: Hyper-V key value pair (KVP) daemon
BuildRequires: kernel-headers
BuildRequires: systemd
BuildRequires: systemd-bootstrap-rpm-macros
Requires: %{name}-license = %{version}-%{release}
Requires(post): systemd
Requires(postun): systemd
@ -60,7 +60,7 @@ IP injection functionality on the Guest.
%package -n hypervvssd
Summary: Hyper-V VSS daemon
BuildRequires: kernel-headers
BuildRequires: systemd
BuildRequires: systemd-bootstrap-rpm-macros
Requires: %{name}-license = %{version}-%{release}
Requires(post): systemd
Requires(postun): systemd
@ -77,7 +77,7 @@ on the Linux Guest.
%package -n hypervfcopyd
Summary: Hyper-V FCOPY daemon
BuildRequires: kernel-headers
BuildRequires: systemd
BuildRequires: systemd-bootstrap-rpm-macros
Requires: %{name}-license = %{version}-%{release}
Requires(post): systemd
Requires(postun): systemd
@ -221,6 +221,9 @@ fi
%{_sbindir}/lsvmbus
%changelog
* Mon Jan 29 14:54:48 EST 2024 Dan Streetman <ddstreet@ieee.org> - 6.6.12.1-2
- use "bootstrap" systemd rpm macros
* Fri Jan 26 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.12.1-1
- Upgrade to 6.6.12.1

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Linux kernel packet control tool
Name: iptables
Version: 1.8.7
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -16,7 +16,7 @@ Source5: ip6save
BuildRequires: jansson-devel
BuildRequires: libmnl-devel
BuildRequires: libnftnl-devel
BuildRequires: systemd
BuildRequires: systemd-bootstrap-rpm-macros
Requires: iana-etc
Requires: systemd
Provides: %{name}-services = %{version}-%{release}
@ -98,6 +98,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_mandir}/man3/*
%changelog
* Thu Jan 25 18:31:11 EST 2024 Dan Streetman <ddstreet@ieee.org> - 1.8.7-5
- use bootstrap to avoid "circular deps"
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.8.7-4
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)

Просмотреть файл

@ -14,7 +14,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 6.6.12.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -75,6 +75,9 @@ done
%endif
%changelog
* Sat Jan 27 11:16:08 EST 2024 Dan Streetman <ddstreet@ieee.org> - 6.6.12.1-2
- update to match kernel version
* Fri Jan 26 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.12.1-1
- Upgrade to 6.6.12.1

Просмотреть файл

@ -29,7 +29,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.6.12.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -66,7 +66,7 @@ BuildRequires: pam-devel
BuildRequires: procps-ng-devel
BuildRequires: python3-devel
BuildRequires: sed
BuildRequires: systemd-rpm-macros
BuildRequires: systemd-bootstrap-rpm-macros
%ifarch x86_64
BuildRequires: pciutils-devel
%endif
@ -429,6 +429,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Sat Jan 27 11:07:05 EST 2024 Dan Streetman <ddstreet@ieee.org> - 6.6.12.1-2
- use "bootstrap" systemd macros
* Fri Jan 26 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.12.1-1
- Upgrade to 6.6.12.1

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-18.azl3.aarch64.rpm
kernel-headers-6.6.12.1-1.azl3.noarch.rpm
kernel-headers-6.6.12.1-2.azl3.noarch.rpm
glibc-2.38-1.azl3.aarch64.rpm
glibc-devel-2.38-1.azl3.aarch64.rpm
glibc-i18n-2.38-1.azl3.aarch64.rpm

Просмотреть файл

@ -1,5 +1,5 @@
filesystem-1.1-18.azl3.x86_64.rpm
kernel-headers-6.6.12.1-1.azl3.noarch.rpm
kernel-headers-6.6.12.1-2.azl3.noarch.rpm
glibc-2.38-1.azl3.x86_64.rpm
glibc-devel-2.38-1.azl3.x86_64.rpm
glibc-i18n-2.38-1.azl3.x86_64.rpm

Просмотреть файл

@ -136,7 +136,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-1.azl3.aarch64.rpm
kbd-debuginfo-2.2.0-1.azl3.aarch64.rpm
kernel-headers-6.6.12.1-1.azl3.noarch.rpm
kernel-headers-6.6.12.1-2.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm

Просмотреть файл

@ -141,8 +141,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-1.azl3.x86_64.rpm
kbd-debuginfo-2.2.0-1.azl3.x86_64.rpm
kernel-cross-headers-6.6.12.1-1.azl3.noarch.rpm
kernel-headers-6.6.12.1-1.azl3.noarch.rpm
kernel-cross-headers-6.6.12.1-2.azl3.noarch.rpm
kernel-headers-6.6.12.1-2.azl3.noarch.rpm
kmod-30-1.azl3.x86_64.rpm
kmod-debuginfo-30-1.azl3.x86_64.rpm
kmod-devel-30-1.azl3.x86_64.rpm