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

Merge branch 'dev' into nisamson/python2-removal

This commit is contained in:
Nick Samson 2021-05-19 15:18:32 -07:00 committed by GitHub
parent 46c4206fe4 b6a0d17fe4
commit dfad704a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 96 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SPECS/glib/glib.spec
View File

@ -1,7 +1,7 @@
Summary: Low-level libraries useful for providing data structure handling for C.
Name: glib
Version: 2.60.1
Release: 4%{?dist}
Release: 5%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -39,6 +39,7 @@ The GLib package contains a low-level libraries useful for providing data struct
Summary: Header files for the glib library
Group: Development/Libraries
Requires: glib = %{version}-%{release}
Requires: glib-schemas = %{version}-%{release}
Requires: libffi-devel
Requires: pcre-devel
Requires: python3-xml
@ -135,9 +136,10 @@ touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
%doc %{_datadir}/gtk-doc/html/*
%changelog
* Wed May 19 2021 Nick Samson <nisamson@microsoft.com> - 2.60.1-4
* Wed May 19 2021 Nick Samson <nisamson@microsoft.com> - 2.60.1-5
- Removed python2 support
* Wed May 19 2021 Thomas Crain <thcrain@microsoft.com> - 2.60.1-4
- Require schemas subpackage from devel subpackage
* Fri Apr 27 2021 Thomas Crain <thcrain@microsoft.com> - 2.60.1-3
- Remove CVE-2019-13012 patch (already in the this version)
- Exclude doubly-packaged files from devel subpackage

55
SPECS/mariner-rpm-macros/macros.rust-srpm Normal file
View File

@ -0,0 +1,55 @@
%rust_arches x86_64 aarch64
%version_no_tilde() %{lua:
local sep = rpm.expand('%1')
local ver = rpm.expand('%2')
\
if sep == '%1' then
sep = '-'
end
\
if ver == '%2' then
ver = rpm.expand('%version')
end
ver = ver:gsub('~', sep)
\
print(ver)
}
%__crates_url https://crates.io/api/v1/crates/
%crates_source() %{lua:
local crate = rpm.expand('%1')
local version = rpm.expand('%2')
local url = rpm.expand('%__crates_url')
\
if crate == '%1' then
crate = rpm.expand('%real_crate')
end
if crate == '%real_crate' then
crate = rpm.expand('%crate')
end
if crate == '%crate' then
crate = rpm.expand('%name')
end
\
if version == '%2' then
version = rpm.expand('%version')
end
version = version:gsub('~', '-')
\
print(url .. crate .. '/' .. version .. '/download#/' .. crate .. '-' .. version .. '.crate')
}
# If crate not in _build_crates and _module_build is set, we should skip the build
%__cargo_skip_build %{lua:
local crate = rpm.expand('%{crate}')
local build_crate = false
for w in rpm.expand('%{?_build_crates}'):gmatch('%S+') do
if w == crate then
build_crate = true
break
end
end
if (rpm.expand('%{defined _module_build}') ~= '0' and not build_crate) then
print(1)
else
print(0)
end}

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

@ -21,6 +21,7 @@
"macros.python-srpm": "63d73bc64d58739e7d4ca020a698cc83106d6e555508d0c7bd186e24a5067366",
"macros.python2": "954d866a657d44f1a0418935475633961223ddb7ef84de50d58bc907d7651b37",
"macros.python3": "2d9559f1ffdd20908bbe3d483bb2b7b8127137750cf65ef5552e008fed339c1f",
"macros.rust-srpm": "ea69ab49a243c44ab75cfe506ba5d73046bf31e561698cc389ad5b4edb82f2b2",
"pythondist.attr": "9162c91b09e01bc0c9c2e8b730424eda11ca4de35304434353dc3c8d9469419d",
"rpmrc": "c197369d806430f581de9d5f0e89384d231745712f394ce39497ada47d1f4efe"
}

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

@ -6,8 +6,8 @@
Summary: Mariner specific rpm macro files
Name: mariner-rpm-macros
Version: 1.0
Release: 15%{?dist}
License: GPL+
Release: 16%{?dist}
License: GPL+ AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Development/System
@ -35,6 +35,8 @@ Source19: https://github.com/fedora-python/compileall2/raw/v0.7.1/compilea
Source20: macros.forge
Source21: common.lua
Source22: forge.lua
# macros.rust-srpm is taken from https://pagure.io/fedora-rust/rust2rpm
Source23: macros.rust-srpm
Provides: redhat-rpm-config
Provides: openblas-srpm-macros
Provides: ocaml-srpm-macros
@ -43,6 +45,7 @@ Provides: python-srpm-macros
Provides: python-rpm-macros
Provides: python2-rpm-macros
Provides: python3-rpm-macros
Provides: rust-srpm-macros
BuildArch: noarch
%description
@ -91,6 +94,7 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
%{_rpmconfigdir}/macros.d/macros.mono-srpm
%{_rpmconfigdir}/macros.d/macros.ocaml-srpm
%{_rpmconfigdir}/macros.d/macros.perl-srpm
%{_rpmconfigdir}/macros.d/macros.rust-srpm
%{_rpmconfigdir}/macros.d/macros.forge
%dir %{rcluadir}
%dir %{rcluadir}/srpm
@ -105,6 +109,10 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm forge.lua
%{_rpmconfigdir}/macros.d/macros.check
%changelog
* Mon May 17 2021 Thomas Crain <thcrain@microsoft.com> - 1.0-16
- Add Rust SRPM macros from rust2rpm (license: MIT)
- Add rust-srpm-macros Provides
* Thu Feb 25 2021 Henry Li <lihl@microsoft.com> - 1.0-15
- Add _smp_build_cpus and relevant macros.

8
SPECS/rust/rust.spec
View File

@ -3,7 +3,7 @@
Summary: Rust Programming Language
Name: rust
Version: 1.47.0
Release: 4%{?dist}
Release: 5%{?dist}
License: ASL 2.0 AND MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -34,6 +34,7 @@ BuildRequires: python2
%if %{with_check}
BuildRequires: python-xml
%endif
Provides: cargo = %{version}-%{release}
%description
Rust Programming Language
@ -70,8 +71,6 @@ mv %{SOURCE7} %{BUILD_CACHE_DIR}
export CFLAGS="`echo " %{build_cflags} " | sed 's/ -g//'`"
export CXXFLAGS="`echo " %{build_cxxflags} " | sed 's/ -g//'`"
sh ./configure --prefix=%{_prefix} --enable-extended --tools="cargo"
# Exporting SUDO_USER=root bypasses a check in the python bootstrap that
# makes rust refuse to pull sources from the internet
@ -117,6 +116,9 @@ rm %{buildroot}%{_docdir}/%{name}/*.old
%{_sysconfdir}/bash_completion.d/cargo
%changelog
* Mon May 17 2021 Thomas Crain <thcrain@microsoft.com> - 1.47.0-5
- Add provides for 'cargo' from the base package
* Tue May 04 2021 Thomas Crain <thcrain@microsoft.com> - 1.47.0-4
- Remove XZ support detection in bootstrap

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

@ -200,15 +200,15 @@ libxml2-2.9.10-7.cm1.aarch64.rpm
libxml2-devel-2.9.10-7.cm1.aarch64.rpm
libsepol-3.1-1.cm1.aarch64.rpm
libselinux-2.9-5.cm1.aarch64.rpm
glib-2.60.1-3.cm1.aarch64.rpm
glib-2.60.1-4.cm1.aarch64.rpm
libltdl-2.4.6-7.cm1.aarch64.rpm
libltdl-devel-2.4.6-7.cm1.aarch64.rpm
pcre-libs-8.44-2.cm1.aarch64.rpm
krb5-1.17-7.cm1.aarch64.rpm
lua-5.3.5-11.cm1.aarch64.rpm
lua-libs-5.3.5-11.cm1.aarch64.rpm
mariner-rpm-macros-1.0-15.cm1.noarch.rpm
mariner-check-macros-1.0-15.cm1.noarch.rpm
mariner-rpm-macros-1.0-16.cm1.noarch.rpm
mariner-check-macros-1.0-16.cm1.noarch.rpm
libassuan-2.5.1-5.cm1.aarch64.rpm
libgpg-error-1.32-5.cm1.aarch64.rpm
libgcrypt-1.8.7-1.cm1.aarch64.rpm

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

@ -200,15 +200,15 @@ libxml2-2.9.10-7.cm1.x86_64.rpm
libxml2-devel-2.9.10-7.cm1.x86_64.rpm
libsepol-3.1-1.cm1.x86_64.rpm
libselinux-2.9-5.cm1.x86_64.rpm
glib-2.60.1-3.cm1.x86_64.rpm
glib-2.60.1-4.cm1.x86_64.rpm
libltdl-2.4.6-7.cm1.x86_64.rpm
libltdl-devel-2.4.6-7.cm1.x86_64.rpm
pcre-libs-8.44-2.cm1.x86_64.rpm
krb5-1.17-7.cm1.x86_64.rpm
lua-5.3.5-11.cm1.x86_64.rpm
lua-libs-5.3.5-11.cm1.x86_64.rpm
mariner-rpm-macros-1.0-15.cm1.noarch.rpm
mariner-check-macros-1.0-15.cm1.noarch.rpm
mariner-rpm-macros-1.0-16.cm1.noarch.rpm
mariner-check-macros-1.0-16.cm1.noarch.rpm
libassuan-2.5.1-5.cm1.x86_64.rpm
libgpg-error-1.32-5.cm1.x86_64.rpm
libgcrypt-1.8.7-1.cm1.x86_64.rpm

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

@ -109,11 +109,11 @@ gdbm-lang-1.18-4.cm1.aarch64.rpm
gettext-0.21-1.cm1.aarch64.rpm
gettext-debuginfo-0.21-1.cm1.aarch64.rpm
gfortran-9.1.0-11.cm1.aarch64.rpm
glib-2.60.1-3.cm1.aarch64.rpm
glib-debuginfo-2.60.1-3.cm1.aarch64.rpm
glib-devel-2.60.1-3.cm1.aarch64.rpm
glib-doc-2.60.1-3.cm1.noarch.rpm
glib-schemas-2.60.1-3.cm1.aarch64.rpm
glib-2.60.1-4.cm1.aarch64.rpm
glib-debuginfo-2.60.1-4.cm1.aarch64.rpm
glib-devel-2.60.1-4.cm1.aarch64.rpm
glib-doc-2.60.1-4.cm1.noarch.rpm
glib-schemas-2.60.1-4.cm1.aarch64.rpm
glibc-2.28-17.cm1.aarch64.rpm
glibc-devel-2.28-17.cm1.aarch64.rpm
glibc-i18n-2.28-17.cm1.aarch64.rpm
@ -251,7 +251,7 @@ m4-1.4.18-4.cm1.aarch64.rpm
m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
make-4.2.1-5.cm1.aarch64.rpm
make-debuginfo-4.2.1-5.cm1.aarch64.rpm
mariner-check-macros-1.0-15.cm1.noarch.rpm
mariner-check-macros-1.0-16.cm1.noarch.rpm
mariner-release-1.0-16.cm1.noarch.rpm
mariner-repos-1.0-13.cm1.noarch.rpm
mariner-repos-extras-1.0-13.cm1.noarch.rpm
@ -259,7 +259,7 @@ mariner-repos-extras-preview-1.0-13.cm1.noarch.rpm
mariner-repos-preview-1.0-13.cm1.noarch.rpm
mariner-repos-ui-1.0-13.cm1.noarch.rpm
mariner-repos-ui-preview-1.0-13.cm1.noarch.rpm
mariner-rpm-macros-1.0-15.cm1.noarch.rpm
mariner-rpm-macros-1.0-16.cm1.noarch.rpm
meson-0.57.1-2.cm1.noarch.rpm
mpfr-4.0.1-3.cm1.aarch64.rpm
mpfr-debuginfo-4.0.1-3.cm1.aarch64.rpm

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

@ -108,11 +108,11 @@ gdbm-lang-1.18-4.cm1.x86_64.rpm
gettext-0.21-1.cm1.x86_64.rpm
gettext-debuginfo-0.21-1.cm1.x86_64.rpm
gfortran-9.1.0-11.cm1.x86_64.rpm
glib-2.60.1-3.cm1.x86_64.rpm
glib-debuginfo-2.60.1-3.cm1.x86_64.rpm
glib-devel-2.60.1-3.cm1.x86_64.rpm
glib-doc-2.60.1-3.cm1.noarch.rpm
glib-schemas-2.60.1-3.cm1.x86_64.rpm
glib-2.60.1-4.cm1.x86_64.rpm
glib-debuginfo-2.60.1-4.cm1.x86_64.rpm
glib-devel-2.60.1-4.cm1.x86_64.rpm
glib-doc-2.60.1-4.cm1.noarch.rpm
glib-schemas-2.60.1-4.cm1.x86_64.rpm
glibc-2.28-17.cm1.x86_64.rpm
glibc-devel-2.28-17.cm1.x86_64.rpm
glibc-i18n-2.28-17.cm1.x86_64.rpm
@ -249,7 +249,7 @@ m4-1.4.18-4.cm1.x86_64.rpm
m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
make-4.2.1-5.cm1.x86_64.rpm
make-debuginfo-4.2.1-5.cm1.x86_64.rpm
mariner-check-macros-1.0-15.cm1.noarch.rpm
mariner-check-macros-1.0-16.cm1.noarch.rpm
mariner-release-1.0-16.cm1.noarch.rpm
mariner-repos-1.0-13.cm1.noarch.rpm
mariner-repos-extras-1.0-13.cm1.noarch.rpm
@ -257,7 +257,7 @@ mariner-repos-extras-preview-1.0-13.cm1.noarch.rpm
mariner-repos-preview-1.0-13.cm1.noarch.rpm
mariner-repos-ui-1.0-13.cm1.noarch.rpm
mariner-repos-ui-preview-1.0-13.cm1.noarch.rpm
mariner-rpm-macros-1.0-15.cm1.noarch.rpm
mariner-rpm-macros-1.0-16.cm1.noarch.rpm
meson-0.57.1-2.cm1.noarch.rpm
mpfr-4.0.1-3.cm1.x86_64.rpm
mpfr-debuginfo-4.0.1-3.cm1.x86_64.rpm