Create preview release version, change default repos
This commit is contained in:
Jon Slobodzian
Родитель
a3e8771c8f
Коммит
8fc267d33c
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Metapackage with core sets of packages
|
||||
Name: core-packages
|
||||
Version: 0.1
|
||||
Release: 23%{?dist}
|
||||
Version: 2.0
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -55,10 +55,12 @@ Requires: gzip
|
|||
Requires: libtool
|
||||
Requires: lz4
|
||||
Requires: mariner-release
|
||||
Requires: mariner-repos
|
||||
Requires: mariner-repos-preview
|
||||
Requires: mariner-repos-extended-preview
|
||||
Requires: mariner-repos-extras-preview
|
||||
%ifarch x86_64
|
||||
# Temporarily exclude aarch64 from including the microsoft repo until content is available in the repo
|
||||
Requires: mariner-repos-microsoft
|
||||
Requires: mariner-repos-microsoft-preview
|
||||
%endif
|
||||
Requires: mariner-rpm-macros
|
||||
Requires: ncurses-libs
|
||||
|
|
@ -94,6 +96,9 @@ Requires: zlib
|
|||
%files container
|
||||
|
||||
%changelog
|
||||
* Mon Dec 13 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-1
|
||||
- Update core-package to include new repositories for default Mariner 2.0 Preview Images
|
||||
|
||||
* Sat Jul 24 2021 Jon Slobodzian <joslobo@microsoft.com> - 0.1-23
|
||||
- Include new Microsoft repo for x86_64 architectures (temporarily exclude from aarch64)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: CBL-Mariner release files
|
||||
Name: mariner-release
|
||||
Version: 2.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: MIT
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -26,7 +26,7 @@ cat > %{buildroot}%{_sysconfdir}/lsb-release <<- "EOF"
|
|||
DISTRIB_ID="Mariner"
|
||||
DISTRIB_RELEASE="%{mariner_release_version}"
|
||||
DISTRIB_CODENAME=Mariner
|
||||
DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version}"
|
||||
DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version} Preview-A"
|
||||
EOF
|
||||
|
||||
version_id=`echo %{mariner_release_version} | grep -o -E '[0-9]+.[0-9]+' | head -1`
|
||||
|
|
@ -62,6 +62,9 @@ EOF
|
|||
%config(noreplace) %{_sysconfdir}/issue.net
|
||||
|
||||
%changelog
|
||||
* Mon Dec 13 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-2
|
||||
- CBL-Mariner 2.0 Public Preview Release version.
|
||||
|
||||
* Thu Jul 29 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-1
|
||||
- Updating version and distrotag for future looking 2.0 branch. Formatting fixes.
|
||||
- Remove %%clean section, buildroot cleaning step (both automatically done by RPM)
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ endif
|
|||
RELEASE_VERSION ?= $(RELEASE_MAJOR_ID)$(RELEASE_MINOR_ID)
|
||||
|
||||
# Image tag - empty by default. Does not apply to the initrd.
|
||||
IMAGE_TAG ?=
|
||||
IMAGE_TAG ?= Preview-A
|
||||
|
||||
# panic,fatal,error,warn,info,debug,trace
|
||||
LOG_LEVEL ?= info
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ findutils-lang-4.8.0-1.cm2.aarch64.rpm
|
|||
gettext-0.21-2.cm2.aarch64.rpm
|
||||
gzip-1.11-1.cm2.aarch64.rpm
|
||||
make-4.3-1.cm2.aarch64.rpm
|
||||
mariner-release-2.0-1.cm2.noarch.rpm
|
||||
mariner-release-2.0-2.cm2.noarch.rpm
|
||||
patch-2.7.6-7.cm2.aarch64.rpm
|
||||
util-linux-2.37.2-1.cm2.aarch64.rpm
|
||||
util-linux-devel-2.37.2-1.cm2.aarch64.rpm
|
||||
|
|
@ -217,7 +217,6 @@ npth-1.6-4.cm2.aarch64.rpm
|
|||
pinentry-1.2.0-1.cm2.aarch64.rpm
|
||||
gnupg2-2.3.3-1.cm2.aarch64.rpm
|
||||
gpgme-1.16.0-1.cm2.aarch64.rpm
|
||||
mariner-repos-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-preview-2.0-2.cm2.noarch.rpm
|
||||
libffi-3.2.1-12.cm2.aarch64.rpm
|
||||
libffi-devel-3.2.1-12.cm2.aarch64.rpm
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ findutils-lang-4.8.0-1.cm2.x86_64.rpm
|
|||
gettext-0.21-2.cm2.x86_64.rpm
|
||||
gzip-1.11-1.cm2.x86_64.rpm
|
||||
make-4.3-1.cm2.x86_64.rpm
|
||||
mariner-release-2.0-1.cm2.noarch.rpm
|
||||
mariner-release-2.0-2.cm2.noarch.rpm
|
||||
patch-2.7.6-7.cm2.x86_64.rpm
|
||||
util-linux-2.37.2-1.cm2.x86_64.rpm
|
||||
util-linux-devel-2.37.2-1.cm2.x86_64.rpm
|
||||
|
|
@ -217,7 +217,6 @@ npth-1.6-4.cm2.x86_64.rpm
|
|||
pinentry-1.2.0-1.cm2.x86_64.rpm
|
||||
gnupg2-2.3.3-1.cm2.x86_64.rpm
|
||||
gpgme-1.16.0-1.cm2.x86_64.rpm
|
||||
mariner-repos-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-preview-2.0-2.cm2.noarch.rpm
|
||||
libffi-3.2.1-12.cm2.x86_64.rpm
|
||||
libffi-devel-3.2.1-12.cm2.x86_64.rpm
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ m4-debuginfo-1.4.18-5.cm2.aarch64.rpm
|
|||
make-4.3-1.cm2.aarch64.rpm
|
||||
make-debuginfo-4.3-1.cm2.aarch64.rpm
|
||||
mariner-check-macros-2.0-8.cm2.noarch.rpm
|
||||
mariner-release-2.0-1.cm2.noarch.rpm
|
||||
mariner-release-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-debuginfo-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-debuginfo-preview-2.0-2.cm2.noarch.rpm
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ m4-debuginfo-1.4.18-5.cm2.x86_64.rpm
|
|||
make-4.3-1.cm2.x86_64.rpm
|
||||
make-debuginfo-4.3-1.cm2.x86_64.rpm
|
||||
mariner-check-macros-2.0-8.cm2.noarch.rpm
|
||||
mariner-release-2.0-1.cm2.noarch.rpm
|
||||
mariner-release-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-debuginfo-2.0-2.cm2.noarch.rpm
|
||||
mariner-repos-debuginfo-preview-2.0-2.cm2.noarch.rpm
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче