Skip to content

Commit

Permalink
move src tarball blob to AME - 3.0-dev branch (microsoft#8916)
Browse files Browse the repository at this point in the history
Co-authored-by: CBL-Mariner Servicing Account <[email protected]>
  • Loading branch information
nicogbg and CBL-Mariner-Bot authored May 17, 2024
1 parent 34daae6 commit cae1876
Show file tree
Hide file tree
Showing 15 changed files with 91 additions and 88 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ When creating your PR, please ensure the following:

* Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files. When running the check section, results will not fail a build. Check the logs for the results of this section.

* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by an Azure Linux developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://cblmarinerstorage.blob.core.windows.net/sources/core/< source tar >].
* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by an Azure Linux developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/< source tar >].

* cgmanifest files are up-to-date and alphabetically sorted. The cgmanifest files are used to record all package sources. They include the following files:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"generate-package-note.py": "bd76a8e88a1356fed74863c38e5cf6a20c1c26426ac94ba21dd172578e8ca2a2",
"gpgverify": "db0e050f56b694497d70603a6f5c17dd60ddbcf7cee670616851cd389f6767c4",
"import_all_modules.py": "543d8c90e7db902e3b4587b7c488419e2f20a6d8b34174b7303dcd70794d8fc7",
"macros": "a5cde7ca92f0552e15620a94dcc800db0316876239d882caa87fa2c894441e19",
"macros": "d94e2ee84806c5cb996b810137e0498c2accd5ccc73cd5aff4cfc0235d760ecc",
"macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
"macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",
"macros.forge": "52cdffd48217cafe33afe47c625cd6aac6460848cd76de66fe61031c26beeaf4",
Expand Down
5 changes: 4 additions & 1 deletion SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Azure Linux specific rpm macro files
Name: azurelinux-rpm-macros
Version: %{azl}.0
Release: 3%{?dist}
Release: 4%{?dist}
License: GPL+ AND MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -141,6 +141,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm python.lua
%{_rpmconfigdir}/macros.d/macros.check

%changelog
* Fri May 17 2024 Nicolas Guibourge <[email protected]> - 3.0-4
- Move src tarball location to AME

* Fri May 11 2024 Chris Co <[email protected]> - 3.0-3
- Add macros to allow enabling frame pointers on x86_64 and aarch64

Expand Down
2 changes: 1 addition & 1 deletion SPECS/azurelinux-rpm-macros/macros
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,4 @@ end

# Azure Linux's sources storage URL.
# NOTE: only allowed to be used for source URLs when original, upstream source cannot be found.
%_distro_sources_url https://cblmarinerstorage.blob.core.windows.net/sources/core
%_distro_sources_url https://azurelinuxsrcstorage.blob.core.windows.net/sources/core
2 changes: 1 addition & 1 deletion SPECS/maven/maven_build_caches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ BUILDARCH=$(rpm --eval '%{_arch}')
SOURCEURL="https://archive.apache.org/dist/maven/maven-3/${VERSION}/source/apache-maven-${VERSION}-src.tar.gz"
# Maven binary dependency to download from pmc.
# NOTE: Version IN THIS IS HARDCODED.
MAVENBINARY="https://cblmarinerstorage.blob.core.windows.net/sources/core/maven-3.8.7-3.cm2.${BUILDARCH}.rpm"
MAVENBINARY="https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/maven-3.8.7-3.cm2.${BUILDARCH}.rpm"

maven_m2_cache_tarball_name="apache-maven-${VERSION}-m2.tar.gz"
maven_licenses_tarball_name="apache-maven-${VERSION}-licenses.tar.gz"
Expand Down
Loading

0 comments on commit cae1876

Please sign in to comment.