folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rpm macros to use other macros (#3149)

This commit is contained in:
rlmenge 2022-06-20 09:36:34 -07:00 committed by GitHub
parent 1385ba250c
commit 82380bbc2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SPECS/mariner-rpm-macros/macros
View File

@ -9,17 +9,17 @@
%_lib lib
%_lib64 lib64
%_prefix /usr
%_exec_prefix /usr
%_bindir /usr/bin
%_sbindir /usr/sbin
%_exec_prefix %{_prefix}
%_bindir %{_exec_prefix}/bin
%_sbindir %{_exec_prefix}/sbin
%_libdir /usr/%{_lib}
%_lib64dir /usr/%{_lib64}
%_libexecdir /usr/libexec
%_datadir /usr/share
%_docdir /usr/share/doc
%_includedir /usr/include
%_infodir /usr/share/info
%_mandir /usr/share/man
%_libexecdir %{_exec_prefix}/libexec
%_datadir %{_prefix}/share
%_docdir %{_datadir}/doc
%_includedir %{_prefix}/include
%_infodir %{_datadir}/info
%_mandir %{_datadir}/man
%_oldincludedir /usr/include
%_sharedstatedir /var/lib
%_var /var

2
SPECS/mariner-rpm-macros/mariner-rpm-macros.signatures.json
View File

@ -10,7 +10,7 @@
"gen-ld-script.sh": "894b394f376dae7be23c314b79f31772aa40a24895122242abd7a178aea9cade",
"generate-package-note.py": "bd76a8e88a1356fed74863c38e5cf6a20c1c26426ac94ba21dd172578e8ca2a2",
"gpgverify": "db0e050f56b694497d70603a6f5c17dd60ddbcf7cee670616851cd389f6767c4",
"macros": "faab13dae469ebf3812eac43dbd03ae145181bf47efdebb5cd3633dc7e00d749",
"macros": "d24f63ec2ee9f58db2298375cda29c2df884a4968d7cb1c58b64930646fd270f",
"macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
"macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",
"macros.forge": "8785fe3de4570d6b78dc40aa2f0a4124ce1ddb6282fe3060fb0ae2001178abe6",

5
SPECS/mariner-rpm-macros/mariner-rpm-macros.spec
View File

@ -6,7 +6,7 @@
Summary: Mariner specific rpm macro files
Name: mariner-rpm-macros
Version: 2.0
Release: 15%{?dist}
Release: 16%{?dist}
License: GPL+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -121,6 +121,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
%{_rpmconfigdir}/macros.d/macros.check
%changelog
* Fri Jun 10 2022 Rachel Menge <rachelmenge@microsoft.com> - 2.0-16
- Modify macros to depend on other macros
* Fri May 20 2022 Andrew Phelps <anphel@microsoft.com> - 2.0-15
- Remove module_info.ld from default LDFLAGS; require setting through "mariner_module_ldflags"
- Modify gen-ld-script.sh to pass OS Version and predefine OS ID instead of parsing from /etc/os-release (no longer in toolchain env)

4
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -206,8 +206,8 @@ pcre-8.45-2.cm2.aarch64.rpm
pcre-libs-8.45-2.cm2.aarch64.rpm
lua-5.4.3-3.cm2.aarch64.rpm
lua-libs-5.4.3-3.cm2.aarch64.rpm
mariner-rpm-macros-2.0-15.cm2.noarch.rpm
mariner-check-macros-2.0-15.cm2.noarch.rpm
mariner-rpm-macros-2.0-16.cm2.noarch.rpm
mariner-check-macros-2.0-16.cm2.noarch.rpm
libassuan-2.5.5-2.cm2.aarch64.rpm
libassuan-devel-2.5.5-2.cm2.aarch64.rpm
libgpg-error-1.43-2.cm2.aarch64.rpm

4
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -206,8 +206,8 @@ pcre-8.45-2.cm2.x86_64.rpm
pcre-libs-8.45-2.cm2.x86_64.rpm
lua-5.4.3-3.cm2.x86_64.rpm
lua-libs-5.4.3-3.cm2.x86_64.rpm
mariner-rpm-macros-2.0-15.cm2.noarch.rpm
mariner-check-macros-2.0-15.cm2.noarch.rpm
mariner-rpm-macros-2.0-16.cm2.noarch.rpm
mariner-check-macros-2.0-16.cm2.noarch.rpm
libassuan-2.5.5-2.cm2.x86_64.rpm
libassuan-devel-2.5.5-2.cm2.x86_64.rpm
libgpg-error-1.43-2.cm2.x86_64.rpm

4
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -220,7 +220,7 @@ m4-1.4.19-1.cm2.aarch64.rpm
m4-debuginfo-1.4.19-1.cm2.aarch64.rpm
make-4.3-2.cm2.aarch64.rpm
make-debuginfo-4.3-2.cm2.aarch64.rpm
mariner-check-macros-2.0-15.cm2.noarch.rpm
mariner-check-macros-2.0-16.cm2.noarch.rpm
mariner-repos-2.0-7.cm2.noarch.rpm
mariner-repos-debug-2.0-7.cm2.noarch.rpm
mariner-repos-debug-preview-2.0-7.cm2.noarch.rpm
@ -234,7 +234,7 @@ mariner-repos-microsoft-2.0-7.cm2.noarch.rpm
mariner-repos-microsoft-preview-2.0-7.cm2.noarch.rpm
mariner-repos-preview-2.0-7.cm2.noarch.rpm
mariner-repos-shared-2.0-7.cm2.noarch.rpm
mariner-rpm-macros-2.0-15.cm2.noarch.rpm
mariner-rpm-macros-2.0-16.cm2.noarch.rpm
meson-0.60.2-2.cm2.noarch.rpm
mpfr-4.1.0-1.cm2.aarch64.rpm
mpfr-debuginfo-4.1.0-1.cm2.aarch64.rpm

4
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -220,7 +220,7 @@ m4-1.4.19-1.cm2.x86_64.rpm
m4-debuginfo-1.4.19-1.cm2.x86_64.rpm
make-4.3-2.cm2.x86_64.rpm
make-debuginfo-4.3-2.cm2.x86_64.rpm
mariner-check-macros-2.0-15.cm2.noarch.rpm
mariner-check-macros-2.0-16.cm2.noarch.rpm
mariner-repos-2.0-7.cm2.noarch.rpm
mariner-repos-debug-2.0-7.cm2.noarch.rpm
mariner-repos-debug-preview-2.0-7.cm2.noarch.rpm
@ -234,7 +234,7 @@ mariner-repos-microsoft-2.0-7.cm2.noarch.rpm
mariner-repos-microsoft-preview-2.0-7.cm2.noarch.rpm
mariner-repos-preview-2.0-7.cm2.noarch.rpm
mariner-repos-shared-2.0-7.cm2.noarch.rpm
mariner-rpm-macros-2.0-15.cm2.noarch.rpm
mariner-rpm-macros-2.0-16.cm2.noarch.rpm
meson-0.60.2-2.cm2.noarch.rpm
mpfr-4.1.0-1.cm2.x86_64.rpm
mpfr-debuginfo-4.1.0-1.cm2.x86_64.rpm