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

Merge pull request #3 from microsoft/sarsoma/enable_prod_keys 

Fixing Repo Path & GPG Keys for Prod
This commit is contained in:
Saravanan Somasundaram 2020-08-10 15:27:20 -07:00 committed by GitHub
parent ee038eb293 8167a8a8c4
commit d88cbb0829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SPECS/mariner-repos/MICROSOFT-METADATA-GPG-KEY Normal file
View File

@ -0,0 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)
mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV
7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag
OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j
H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr
M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs
ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC
AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH
/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe
MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy
7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV
KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ
XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
NdCFTW7wY0Fb1fWJ+/KTsC4=
=J6gs
-----END PGP PUBLIC KEY BLOCK-----

34
SPECS/mariner-repos/MICROSOFT-RPM-GPG-KEY
View File

@ -1,19 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux) Version: BSN Pgp v1.1.0.0
mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT mQENBF5v2nQBCADD+o8FgJQUcV9QTgdOTrYo8VtwHNOtTI1WWki8cUx+pI+aarHo
LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV zYN3/QQj+a5lALWeWM/w+aT1q/xGBBkmr9Qo5xWaXeiKZaMVv3H+1HIOjVvrWOHX
7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag zm+FvONB2fwAOclq9p7YaMqWtn4GckxD2YXhkTW0Y4kM+TcMTgSCiGKskjnmTfHw
OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j G+SI9av/CZvqqfNZkdIuNTS9eSqTTenCKkgLvYRKSpkhZj1OuB/iTu+xK0BuoVns
H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr jmju/Fw+tBrcdu3Q1sRXDrh8lnZgHxQUxHjwnyMlTM8a9N2qCgnu+SQjNyk3NXgi
M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs dGSFkdtaF/Z+KNwG10XVs1jzjO/rtsrvrwJvABEBAAG0Ok1hcmluZXIgUlBNIFJl
ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC bGVhc2UgU2lnbmluZyA8bWFyaW5lcnJwbXByb2RAbWljcm9zb2Z0LmNvbT6JATgE
AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH EwEIACIFAl5v2nQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAzZ/tMx
/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe Nc6QfaMH/iqp4Uyd66rAC2tSILWrH6RLkf05TIE0GZheqQkEO7a/Khy3u/Ej/HgC
MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy QUlIC7yrJJGfNCyAx44Z/QsnrWz5EqVZOvjgY9MDpmzfve7KqmbnDBjmbSc6g8IH
7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV HcgUYyfTHEUj69IfgNyJK4Io1vi1WgY/sesAn2ZPpoeT3ihH5FqH7dQkGWeGg1bA
KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ FIaVXm+gMAssaj+k52g/+CnY4KZUHrSkg48OoRB+2a6FqGS8BLeCa+v+zaJCk2fz
XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+ EI/NeJwL4Asz1F4AwkEu5X9y8eEGArCXoP0OpYpCxIBZ+7MiKKDOoNf0a/0nOhvs
NdCFTW7wY0Fb1fWJ+/KTsC4= 29LIIOnG+x0/RDfRgFObrF9geKpVTpI=
=J6gs =ZhFE
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----

2
SPECS/mariner-repos/mariner-official-base.repo
View File

@ -1,6 +1,6 @@
[mariner-official-base] [mariner-official-base]
name=CBL-Mariner Official Base $releasever $basearch name=CBL-Mariner Official Base $releasever $basearch
baseurl=https://packages.microsoft.com/yumrepos/cbl-mariner-$releasever-prod−base-$basearch-rpms baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/base/$basearch/rpms/
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0

2
SPECS/mariner-repos/mariner-official-update.repo
View File

@ -1,6 +1,6 @@
[mariner-official-update] [mariner-official-update]
name=CBL-Mariner Official Update $releasever $basearch name=CBL-Mariner Official Update $releasever $basearch
baseurl=https://packages.microsoft.com/yumrepos/cbl-mariner-$releasever-prod-update-$basearch-rpms baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/update/$basearch/rpms/
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1

7
SPECS/mariner-repos/mariner-repos.signatures.json
View File

@ -1,7 +1,8 @@
{ {
"Signatures": { "Signatures": {
"MICROSOFT-RPM-GPG-KEY": "2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa", "MICROSOFT-RPM-GPG-KEY": "eb12973679a692551df1cd803cc99ce56a74d7357e24530ce003bd4846134a6c",
"mariner-official-base.repo": "e551fdc398d9b4c098b403fe0e176b758a6a5450d22d178b0bbc0beb29398771", "MICROSOFT-METADATA-GPG-KEY": "c29e5709ec534383acf34a0da5ffce45313bc175a94f14b9f0414d376933e78f",
"mariner-official-update.repo": "b2002481315f5f10e6222dd219e76251501611423bc1559288a9a25ed2b8cc4e" "mariner-official-base.repo": "56a5a8ef0b9008c0ada68ac61362501238bae433512f62c3e967849f9cf3c9ae",
"mariner-official-update.repo": "54e30c0cd07caf3513a6bbb4b0df70ea63e60475512199179135c36dd53562dd"
} }
} }

13
SPECS/mariner-repos/mariner-repos.spec
View File

@ -1,13 +1,14 @@
Summary: CBL-Mariner repo files, gpg keys Summary: CBL-Mariner repo files, gpg keys
Name: mariner-repos Name: mariner-repos
Version: 1.0 Version: 1.0
Release: 7%{?dist} Release: 8%{?dist}
License: Apache License License: Apache License
Group: System Environment/Base Group: System Environment/Base
URL: https://aka.ms/mariner URL: https://aka.ms/mariner
Source0: MICROSOFT-RPM-GPG-KEY Source0: MICROSOFT-RPM-GPG-KEY
Source1: mariner-official-base.repo Source1: MICROSOFT-METADATA-GPG-KEY
Source2: mariner-official-update.repo Source2: mariner-official-base.repo
Source3: mariner-official-update.repo
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: mariner Distribution: mariner
Provides: mariner-repos Provides: mariner-repos
@ -19,11 +20,12 @@ CBL-Mariner repo files and gpg keys
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum.repos.d
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum.repos.d install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum.repos.d
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/yum.repos.d
install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -32,10 +34,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir /etc/yum.repos.d %dir /etc/yum.repos.d
/etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
/etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
%config(noreplace) /etc/yum.repos.d/mariner-official-base.repo %config(noreplace) /etc/yum.repos.d/mariner-official-base.repo
%config(noreplace) /etc/yum.repos.d/mariner-official-update.repo %config(noreplace) /etc/yum.repos.d/mariner-official-update.repo
%changelog %changelog
* Mon Aug 10 2020 Saravanan Somasundaram <sarsoma@microsoft.com> - 1.0-8
- Adding Metadata Key and Updating to Prod GPG Key.
* Fri Jul 31 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0-7 * Fri Jul 31 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0-7
- Fixing distro name. - Fixing distro name.
* Fri Jul 17 2020 Andrew Phelps <anphel@microsoft.com> 1.0-6 * Fri Jul 17 2020 Andrew Phelps <anphel@microsoft.com> 1.0-6

6
toolkit/Makefile
View File

@ -84,9 +84,9 @@ endif
# External source server # External source server
SOURCE_URL ?= SOURCE_URL ?=
PACKAGE_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-base-$(build_arch)-rpms PACKAGE_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/base/$(build_arch)/rpms
PACKAGE_UPDATE_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-update-$(build_arch)-rpms PACKAGE_UPDATE_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/update/$(build_arch)/rpms
SRPM_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-base-srpms SRPM_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/base/srpms
REPO_LIST ?= REPO_LIST ?=
CA_CERT ?= CA_CERT ?=
TLS_CERT ?= TLS_CERT ?=

6
toolkit/docs/building/building.md
View File

@ -158,9 +158,9 @@ The build system pulls files two ways:
Direct file downloads are by default pulled from: Direct file downloads are by default pulled from:
```makefile ```makefile
SOURCE_URL ?= SOURCE_URL ?=
PACKAGE_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-base-$(build_arch)-rpms PACKAGE_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/base/$(build_arch)/rpms
PACKAGE_UPDATE_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-update-$(build_arch)-rpms PACKAGE_UPDATE_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/update/$(build_arch)/rpms
SRPM_URL ?= https://packages.microsoft.com/yumrepos/cbl-mariner-$(RELEASE_MAJOR_ID)-prod-base-srpms SRPM_URL ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/base/srpms
``` ```
While `tdnf` uses a list of repo files: While `tdnf` uses a list of repo files:
```makefile ```makefile

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

@ -146,7 +146,7 @@ krb5-1.17-2.cm1.aarch64.rpm
lua-5.3.5-4.cm1.aarch64.rpm lua-5.3.5-4.cm1.aarch64.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-repos-1.0-7.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm
libffi-3.2.1-10.cm1.aarch64.rpm libffi-3.2.1-10.cm1.aarch64.rpm
libtasn1-4.14-2.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm
p11-kit-0.23.16.1-2.cm1.aarch64.rpm p11-kit-0.23.16.1-2.cm1.aarch64.rpm

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

@ -146,7 +146,7 @@ krb5-1.17-2.cm1.x86_64.rpm
lua-5.3.5-4.cm1.x86_64.rpm lua-5.3.5-4.cm1.x86_64.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-repos-1.0-7.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm
libffi-3.2.1-10.cm1.x86_64.rpm libffi-3.2.1-10.cm1.x86_64.rpm
libtasn1-4.14-2.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm
p11-kit-0.23.16.1-2.cm1.x86_64.rpm p11-kit-0.23.16.1-2.cm1.x86_64.rpm

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

@ -236,7 +236,7 @@ make-4.2.1-4.cm1.aarch64.rpm
make-debuginfo-4.2.1-4.cm1.aarch64.rpm make-debuginfo-4.2.1-4.cm1.aarch64.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-release-1.0-6.cm1.noarch.rpm mariner-release-1.0-6.cm1.noarch.rpm
mariner-repos-1.0-7.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
meson-0.49.2-1.cm1.noarch.rpm meson-0.49.2-1.cm1.noarch.rpm
mpfr-4.0.1-3.cm1.aarch64.rpm mpfr-4.0.1-3.cm1.aarch64.rpm

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

@ -236,7 +236,7 @@ make-4.2.1-4.cm1.x86_64.rpm
make-debuginfo-4.2.1-4.cm1.x86_64.rpm make-debuginfo-4.2.1-4.cm1.x86_64.rpm
mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm
mariner-release-1.0-6.cm1.noarch.rpm mariner-release-1.0-6.cm1.noarch.rpm
mariner-repos-1.0-7.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm
mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm
meson-0.49.2-1.cm1.noarch.rpm meson-0.49.2-1.cm1.noarch.rpm
mpfr-4.0.1-3.cm1.x86_64.rpm mpfr-4.0.1-3.cm1.x86_64.rpm