From cae187699f660a9407bc96e8800d7fe84e4882d6 Mon Sep 17 00:00:00 2001 From: nicolas guibourge Date: Fri, 17 May 2024 17:23:43 -0400 Subject: [PATCH] move src tarball blob to AME - 3.0-dev branch (#8916) Co-authored-by: CBL-Mariner Servicing Account --- CONTRIBUTING.md | 2 +- .../azurelinux-rpm-macros.signatures.json | 2 +- .../azurelinux-rpm-macros.spec | 5 +- SPECS/azurelinux-rpm-macros/macros | 2 +- SPECS/maven/maven_build_caches.sh | 2 +- cgmanifest.json | 138 +++++++++--------- toolkit/Makefile | 2 +- toolkit/docs/building/add-package.md | 2 +- toolkit/docs/building/building.md | 4 +- .../manifests/package/pkggen_core_aarch64.txt | 4 +- .../manifests/package/pkggen_core_x86_64.txt | 4 +- .../manifests/package/toolchain_aarch64.txt | 4 +- .../manifests/package/toolchain_x86_64.txt | 4 +- toolkit/scripts/build_cargo_cache.sh | 2 +- toolkit/scripts/build_go_vendor_cache.sh | 2 +- 15 files changed, 91 insertions(+), 88 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82919472972..44edc638d13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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//SOURCES` or `SPECS/`). 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//SOURCES` or `SPECS/`). 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: diff --git a/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.signatures.json b/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.signatures.json index c26c0d7ab75..39f7255b8ca 100644 --- a/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.signatures.json +++ b/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.signatures.json @@ -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", diff --git a/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec b/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec index 398f1c6cf48..75256108e65 100644 --- a/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec +++ b/SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec @@ -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 @@ -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 - 3.0-4 +- Move src tarball location to AME + * Fri May 11 2024 Chris Co - 3.0-3 - Add macros to allow enabling frame pointers on x86_64 and aarch64 diff --git a/SPECS/azurelinux-rpm-macros/macros b/SPECS/azurelinux-rpm-macros/macros index 8270e594e89..85b3941af31 100644 --- a/SPECS/azurelinux-rpm-macros/macros +++ b/SPECS/azurelinux-rpm-macros/macros @@ -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 diff --git a/SPECS/maven/maven_build_caches.sh b/SPECS/maven/maven_build_caches.sh index 8820c766016..487dbbb2119 100644 --- a/SPECS/maven/maven_build_caches.sh +++ b/SPECS/maven/maven_build_caches.sh @@ -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" diff --git a/cgmanifest.json b/cgmanifest.json index ef4f0b12a20..d72e4117387 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -256,7 +256,7 @@ "other": { "name": "antlr", "version": "2.7.7", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/antlr-2.7.7.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/antlr-2.7.7.tar.bz2" } } }, @@ -266,7 +266,7 @@ "other": { "name": "aopalliance", "version": "1.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/aopalliance-src.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/aopalliance-src.tar.gz" } } }, @@ -676,7 +676,7 @@ "other": { "name": "atinject", "version": "1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/atinject-1.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/atinject-1.tar.xz" } } }, @@ -1016,7 +1016,7 @@ "other": { "name": "bcache-tools", "version": "1.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/bcache-tools-1.1.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/bcache-tools-1.1.tar.gz" } } }, @@ -1068,7 +1068,7 @@ "other": { "name": "bea-stax", "version": "1.2.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/stax-src-1.2.0.zip" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/stax-src-1.2.0.zip" } } }, @@ -1808,7 +1808,7 @@ "other": { "name": "clucene", "version": "2.3.3.4", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/clucene-core-2.3.3.4-e8e3d20.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/clucene-core-2.3.3.4-e8e3d20.tar.xz" } } }, @@ -2008,7 +2008,7 @@ "other": { "name": "container-exception-logger", "version": "1.0.3", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/container-exception-logger-1.0.3.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/container-exception-logger-1.0.3.tar.gz" } } }, @@ -2559,7 +2559,7 @@ "other": { "name": "device-mapper-persistent-data", "version": "0.8.5", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/device-mapper-persistent-data-0.8.5.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/device-mapper-persistent-data-0.8.5.tar.gz" } } }, @@ -2899,7 +2899,7 @@ "other": { "name": "dotconf", "version": "1.3", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/dotconf-1.3.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/dotconf-1.3.tar.gz" } } }, @@ -3289,7 +3289,7 @@ "other": { "name": "enscript", "version": "1.6.6", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/enscript-1.6.6.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/enscript-1.6.6.tar.gz" } } }, @@ -3519,7 +3519,7 @@ "other": { "name": "fence-virt", "version": "1.0.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/fence-virt-1.0.0.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/fence-virt-1.0.0.tar.bz2" } } }, @@ -3801,7 +3801,7 @@ "other": { "name": "foomatic-db", "version": "4.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/foomatic-db-4.0-20201104.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/foomatic-db-4.0-20201104.tar.gz" } } }, @@ -4001,7 +4001,7 @@ "other": { "name": "fxload", "version": "2008_10_13", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/fxload-2008_10_13-noa3load.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/fxload-2008_10_13-noa3load.tar.gz" } } }, @@ -4201,7 +4201,7 @@ "other": { "name": "GeoIP-GeoLite-data", "version": "2018.06", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/GeoIP.dat.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/GeoIP.dat.gz" } } }, @@ -4231,7 +4231,7 @@ "other": { "name": "geronimo-specs", "version": "1.2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/geronimo-specs-1.2.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/geronimo-specs-1.2.tar.gz" } } }, @@ -4701,7 +4701,7 @@ "other": { "name": "google-guice", "version": "5.1.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/google-guice-5.1.0.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/google-guice-5.1.0.tar.gz" } } }, @@ -4781,7 +4781,7 @@ "other": { "name": "gpm", "version": "1.20.7", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/gpm-1.20.7.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/gpm-1.20.7.tar.xz" } } }, @@ -6711,7 +6711,7 @@ "other": { "name": "hyphen-hu", "version": "0.20090612", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/nagybence-huhyphn-aa3fc85.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/nagybence-huhyphn-aa3fc85.tar.gz" } } }, @@ -6791,7 +6791,7 @@ "other": { "name": "hyphen-mi", "version": "0.20080630", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/hunspell-hyphen-mi-0.1.20080630-beta.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/hunspell-hyphen-mi-0.1.20080630-beta.tar.gz" } } }, @@ -7632,7 +7632,7 @@ "other": { "name": "jakarta-taglibs-standard", "version": "1.1.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jakarta-taglibs-standard-1.1.1-src.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jakarta-taglibs-standard-1.1.1-src.tar.bz2" } } }, @@ -7692,7 +7692,7 @@ "other": { "name": "java-cup", "version": "0.11", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/develop.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/develop.tar.bz2" } } }, @@ -7702,7 +7702,7 @@ "other": { "name": "java-cup-bootstrap", "version": "0.11", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/develop.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/develop.tar.bz2" } } }, @@ -7982,7 +7982,7 @@ "other": { "name": "jsoup", "version": "1.11.3", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jsoup-1.11.3.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jsoup-1.11.3.tar.gz" } } }, @@ -7992,7 +7992,7 @@ "other": { "name": "jsr-305", "version": "0.1+20130910", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jsr-305-20130910svn.tgz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jsr-305-20130910svn.tgz" } } }, @@ -8002,7 +8002,7 @@ "other": { "name": "jtidy", "version": "8.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jtidy-r813.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jtidy-r813.tar.bz2" } } }, @@ -8172,7 +8172,7 @@ "other": { "name": "kernel-mshv", "version": "5.15.126.mshv9", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/kernel-mshv-5.15.126.mshv9.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/kernel-mshv-5.15.126.mshv9.tar.gz" } } }, @@ -8192,7 +8192,7 @@ "other": { "name": "kernel-uvm", "version": "6.1.0.mshv16", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/kernel-uvm-6.1.0.mshv16.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/kernel-uvm-6.1.0.mshv16.tar.gz" } } }, @@ -10802,7 +10802,7 @@ "other": { "name": "librx", "version": "1.5", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rx-1.5.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/rx-1.5.tar.bz2" } } }, @@ -10962,7 +10962,7 @@ "other": { "name": "libsmi", "version": "0.4.8", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/libsmi-0.4.8.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/libsmi-0.4.8.tar.gz" } } }, @@ -11272,7 +11272,7 @@ "other": { "name": "libucil", "version": "0.9.10", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/libucil-0.9.10.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/libucil-0.9.10.tar.gz" } } }, @@ -11282,7 +11282,7 @@ "other": { "name": "libunicap", "version": "0.9.12", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/libunicap-0.9.12.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/libunicap-0.9.12.tar.gz" } } }, @@ -12142,7 +12142,7 @@ "other": { "name": "lockdev", "version": "1.0.4", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/lockdev-1.0.4.20111007git.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/lockdev-1.0.4.20111007git.tar.gz" } } }, @@ -12552,7 +12552,7 @@ "other": { "name": "mailx", "version": "12.5", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/mailx-12.5.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mailx-12.5.tar.xz" } } }, @@ -12832,7 +12832,7 @@ "other": { "name": "maven-surefire", "version": "3.2.2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/maven-surefire-3.2.2.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/maven-surefire-3.2.2.tar.gz" } } }, @@ -12922,7 +12922,7 @@ "other": { "name": "meanwhile", "version": "1.1.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/meanwhile-1.1.0.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/meanwhile-1.1.0.tar.gz" } } }, @@ -13583,7 +13583,7 @@ "other": { "name": "mythes-el", "version": "0.20070412", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/th_el.zip" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/th_el.zip" } } }, @@ -13653,7 +13653,7 @@ "other": { "name": "mythes-mi", "version": "0.20080630", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/mythes-mi-0.1.20080630-beta.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mythes-mi-0.1.20080630-beta.tar.gz" } } }, @@ -13713,7 +13713,7 @@ "other": { "name": "mythes-ru", "version": "0.20070613", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/thes_ru_RU_v2.zip" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/thes_ru_RU_v2.zip" } } }, @@ -13913,7 +13913,7 @@ "other": { "name": "netpbm", "version": "10.90.00", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/netpbm-10.90.00.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/netpbm-10.90.00.tar.xz" } } }, @@ -14113,7 +14113,7 @@ "other": { "name": "nodejs-nodemon", "version": "2.0.3", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/nodemon-v2.0.3-bundled.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/nodemon-v2.0.3-bundled.tar.gz" } } }, @@ -14263,7 +14263,7 @@ "other": { "name": "numad", "version": "0.5+20150602.aec1497e2b", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/numad-0.5+20150602.aec1497e2b.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/numad-0.5+20150602.aec1497e2b.tar.xz" } } }, @@ -14353,7 +14353,7 @@ "other": { "name": "objectweb-anttask", "version": "1.2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/ow_util_ant_tasks_1.2.zip" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/ow_util_ant_tasks_1.2.zip" } } }, @@ -14363,7 +14363,7 @@ "other": { "name": "objectweb-asm", "version": "9.6", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/objectweb-asm-9.6.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/objectweb-asm-9.6.tar.gz" } } }, @@ -14883,7 +14883,7 @@ "other": { "name": "ocaml-xml-light", "version": "2.3", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xml-light-234.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/xml-light-234.tar.gz" } } }, @@ -16094,7 +16094,7 @@ "other": { "name": "perl-Class-Data-Inheritable", "version": "0.08", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/Class-Data-Inheritable-0.08-clean.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/Class-Data-Inheritable-0.08-clean.tar.gz" } } }, @@ -17974,7 +17974,7 @@ "other": { "name": "perl-libnet", "version": "3.11", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/perl-libnet_repackaged-3.11.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/perl-libnet_repackaged-3.11.tar.gz" } } }, @@ -20574,7 +20574,7 @@ "other": { "name": "perl-XML-SAX", "version": "1.02", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/XML-SAX-1.02.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/XML-SAX-1.02.tar.gz" } } }, @@ -20914,7 +20914,7 @@ "other": { "name": "plexus-component-api", "version": "1.0~alpha15", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/plexus-component-api-1.0-alpha-15.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/plexus-component-api-1.0-alpha-15.tar.xz" } } }, @@ -21344,7 +21344,7 @@ "other": { "name": "psutils", "version": "1.23", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/psutils-1.23.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/psutils-1.23.tar.xz" } } }, @@ -21374,7 +21374,7 @@ "other": { "name": "publicsuffix", "version": "20201026", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/publicsuffix-20201026.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/publicsuffix-20201026.tar.gz" } } }, @@ -22594,7 +22594,7 @@ "other": { "name": "python-hwdata", "version": "2.3.7", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/python-hwdata-2.3.7.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/python-hwdata-2.3.7.tar.gz" } } }, @@ -24814,7 +24814,7 @@ "other": { "name": "python-waitress", "version": "1.4.4", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/python-waitress-1.4.4-nodocs.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/python-waitress-1.4.4-nodocs.tar.gz" } } }, @@ -25675,7 +25675,7 @@ "other": { "name": "rt-setup", "version": "2.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rt-setup-2.1.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/rt-setup-2.1.tar.bz2" } } }, @@ -25695,7 +25695,7 @@ "other": { "name": "rtctl", "version": "1.13", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/rtctl-1.13.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/rtctl-1.13.tar.bz2" } } }, @@ -27085,7 +27085,7 @@ "other": { "name": "sblim-cmpi-syslog", "version": "0.9.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sblim-cmpi-syslog-0.9.0.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/sblim-cmpi-syslog-0.9.0.tar.bz2" } } }, @@ -27325,7 +27325,7 @@ "other": { "name": "servletapi4", "version": "4.0.4", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jakarta-servletapi-4-src.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jakarta-servletapi-4-src.tar.gz" } } }, @@ -27335,7 +27335,7 @@ "other": { "name": "servletapi5", "version": "5.0.18", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/jakarta-servletapi-5-src.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/jakarta-servletapi-5-src.tar.gz" } } }, @@ -27396,7 +27396,7 @@ "other": { "name": "setuptool", "version": "1.19.11", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/setuptool-1.19.11.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/setuptool-1.19.11.tar.gz" } } }, @@ -27427,7 +27427,7 @@ "other": { "name": "sgabios", "version": "0.20180715git", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sgabios-20180715-git72f39d4.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/sgabios-20180715-git72f39d4.tar.xz" } } }, @@ -27447,7 +27447,7 @@ "other": { "name": "sgpio", "version": "1.2.0.10", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/sgpio-1.2-0.10-src.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/sgpio-1.2-0.10-src.tar.gz" } } }, @@ -27827,7 +27827,7 @@ "other": { "name": "splix", "version": "2.0.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/splix-2.0.1.20130902svn.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/splix-2.0.1.20130902svn.tar.bz2" } } }, @@ -28087,7 +28087,7 @@ "other": { "name": "symlinks", "version": "1.7", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/symlinks-1.7.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/symlinks-1.7.tar.gz" } } }, @@ -28197,7 +28197,7 @@ "other": { "name": "t1lib", "version": "5.1.2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/t1lib-5.1.2.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/t1lib-5.1.2.tar.gz" } } }, @@ -28677,7 +28677,7 @@ "other": { "name": "ttmkfdir", "version": "3.0.9", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/ttmkfdir-3.0.9.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/ttmkfdir-3.0.9.tar.bz2" } } }, @@ -28977,7 +28977,7 @@ "other": { "name": "usbip", "version": "6.6.14.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/usbip-6.6.14.1.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/usbip-6.6.14.1.tar.xz" } } }, @@ -29227,7 +29227,7 @@ "other": { "name": "virt-who", "version": "0.24.2", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/virt-who-0.24.2.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/virt-who-0.24.2.tar.gz" } } }, @@ -29887,7 +29887,7 @@ "other": { "name": "xhtml1-dtds", "version": "1.0", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xhtml1-dtds-20020801.tar.xz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/xhtml1-dtds-20020801.tar.xz" } } }, @@ -30038,7 +30038,7 @@ "other": { "name": "xml-commons-apis", "version": "1.4.01", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xml-commons-apis-1.4.01.tar.gz" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/xml-commons-apis-1.4.01.tar.gz" } } }, @@ -30058,7 +30058,7 @@ "other": { "name": "xmldb-api", "version": "0.1", - "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/xmldb-xapi-20041010-src.tar.bz2" + "downloadUrl": "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/xmldb-xapi-20041010-src.tar.bz2" } } }, diff --git a/toolkit/Makefile b/toolkit/Makefile index aa89eaef17f..8be8c8e29ca 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -122,7 +122,7 @@ SRPMS_DIR ?= $(OUT_DIR)/SRPMS IMAGES_DIR ?= $(OUT_DIR)/images # External source server -SOURCE_URL ?= https://cblmarinerstorage.blob.core.windows.net/sources/core +SOURCE_URL ?= https://azurelinuxsrcstorage.blob.core.windows.net/sources/core # Note on order of precedence: When a variable is passed from the commandline (i.e., make PACKAGE_URL_LIST="my list"), append # assignments do not take affect without using 'override'. This means that all of the following PACKAGE_URL_LIST values will diff --git a/toolkit/docs/building/add-package.md b/toolkit/docs/building/add-package.md index 5c8077f8d1a..daed08893c2 100644 --- a/toolkit/docs/building/add-package.md +++ b/toolkit/docs/building/add-package.md @@ -272,7 +272,7 @@ $ sudo make toolchain -j8 REBUILD_TOOLCHAIN=n REBUILD_TOOLS=y DAILY_BUILD_ID=3-0 Downloading toolchain RPM: ... # Let's build our package. # NOTE, if you also changed the packages used as BuildRequires, you should add them to SRPM_PACK_LIST. -$ sudo make build-packages REBUILD_TOOLS=y SOURCE_URL='https://cblmarinerstorage.blob.core.windows.net/sources/core' PACKAGE_REBUILD_LIST='ig' SRPM_PACK_LIST='ig' RUN_CHECK=y SRPM_FILE_SIGNATURE_HANDLING=update DAILY_BUILD_ID=3-0-2024028 +$ sudo make build-packages REBUILD_TOOLS=y SOURCE_URL='https://azurelinuxsrcstorage.blob.core.windows.net/sources/core' PACKAGE_REBUILD_LIST='ig' SRPM_PACK_LIST='ig' RUN_CHECK=y SRPM_FILE_SIGNATURE_HANDLING=update DAILY_BUILD_ID=3-0-2024028 ... INFO[0003][srpmpacker] Packing 1/1 SPECs ... diff --git a/toolkit/docs/building/building.md b/toolkit/docs/building/building.md index 1a40db1c8e4..9c37f07951b 100644 --- a/toolkit/docs/building/building.md +++ b/toolkit/docs/building/building.md @@ -363,12 +363,12 @@ sudo make image CONFIG_FILE="./imageconfigs/core-efi.json" CA_CERT=/path/to/root ## Building Everything From Scratch -**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=` may be provided, or DOWNLOAD_SRPMS=y may be used to use pre-packages sources. Core Azure Linux source packages are available at `SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core`** +**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=` may be provided, or DOWNLOAD_SRPMS=y may be used to use pre-packages sources. Core Azure Linux source packages are available at `SOURCE_URL=https://azurelinuxsrcstorage.blob.core.windows.net/sources/core`** The build system can operate without using pre-built components if desired. There are several variables which enable/disable build components and sources of data. They are listed here along with their default values: ```makefile -SOURCE_URL ?= https://cblmarinerstorage.blob.core.windows.net/sources/core +SOURCE_URL ?= https://azurelinuxsrcstorage.blob.core.windows.net/sources/core PACKAGE_URL_LIST ?= https://packages.microsoft.com/azurelinux/$(RELEASE_MAJOR_ID)/prod/base/$(build_arch) SRPM_URL_LIST ?= https://packages.microsoft.com/azurelinux/$(RELEASE_MAJOR_ID)/prod/base/srpms REPO_LIST ?= diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index e6449beb676..ddbb5c3a4a4 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -204,8 +204,8 @@ libltdl-2.4.7-1.azl3.aarch64.rpm libltdl-devel-2.4.7-1.azl3.aarch64.rpm lua-5.4.6-1.azl3.aarch64.rpm lua-libs-5.4.6-1.azl3.aarch64.rpm -azurelinux-rpm-macros-3.0-3.azl3.noarch.rpm -azurelinux-check-macros-3.0-3.azl3.noarch.rpm +azurelinux-rpm-macros-3.0-4.azl3.noarch.rpm +azurelinux-check-macros-3.0-4.azl3.noarch.rpm tdnf-3.5.6-1.azl3.aarch64.rpm tdnf-cli-libs-3.5.6-1.azl3.aarch64.rpm tdnf-devel-3.5.6-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 06c57d569c7..36480350aea 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -204,8 +204,8 @@ libltdl-2.4.7-1.azl3.x86_64.rpm libltdl-devel-2.4.7-1.azl3.x86_64.rpm lua-5.4.6-1.azl3.x86_64.rpm lua-libs-5.4.6-1.azl3.x86_64.rpm -azurelinux-rpm-macros-3.0-3.azl3.noarch.rpm -azurelinux-check-macros-3.0-3.azl3.noarch.rpm +azurelinux-rpm-macros-3.0-4.azl3.noarch.rpm +azurelinux-check-macros-3.0-4.azl3.noarch.rpm tdnf-3.5.6-1.azl3.x86_64.rpm tdnf-cli-libs-3.5.6-1.azl3.x86_64.rpm tdnf-devel-3.5.6-1.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 957ae3d03b2..ec8f354b3c8 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -5,7 +5,7 @@ audit-devel-3.1.2-1.azl3.aarch64.rpm audit-libs-3.1.2-1.azl3.aarch64.rpm autoconf-2.72-1.azl3.noarch.rpm automake-1.16.5-1.azl3.noarch.rpm -azurelinux-check-macros-3.0-3.azl3.noarch.rpm +azurelinux-check-macros-3.0-4.azl3.noarch.rpm azurelinux-repos-3.0-2.azl3.noarch.rpm azurelinux-repos-debug-3.0-2.azl3.noarch.rpm azurelinux-repos-debug-preview-3.0-2.azl3.noarch.rpm @@ -19,7 +19,7 @@ azurelinux-repos-ms-oss-3.0-2.azl3.noarch.rpm azurelinux-repos-ms-oss-preview-3.0-2.azl3.noarch.rpm azurelinux-repos-preview-3.0-2.azl3.noarch.rpm azurelinux-repos-shared-3.0-2.azl3.noarch.rpm -azurelinux-rpm-macros-3.0-3.azl3.noarch.rpm +azurelinux-rpm-macros-3.0-4.azl3.noarch.rpm bash-5.2.15-1.azl3.aarch64.rpm bash-debuginfo-5.2.15-1.azl3.aarch64.rpm bash-devel-5.2.15-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 97a81334f89..814b601579d 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -5,7 +5,7 @@ audit-devel-3.1.2-1.azl3.x86_64.rpm audit-libs-3.1.2-1.azl3.x86_64.rpm autoconf-2.72-1.azl3.noarch.rpm automake-1.16.5-1.azl3.noarch.rpm -azurelinux-check-macros-3.0-3.azl3.noarch.rpm +azurelinux-check-macros-3.0-4.azl3.noarch.rpm azurelinux-repos-3.0-2.azl3.noarch.rpm azurelinux-repos-debug-3.0-2.azl3.noarch.rpm azurelinux-repos-debug-preview-3.0-2.azl3.noarch.rpm @@ -19,7 +19,7 @@ azurelinux-repos-ms-oss-3.0-2.azl3.noarch.rpm azurelinux-repos-ms-oss-preview-3.0-2.azl3.noarch.rpm azurelinux-repos-preview-3.0-2.azl3.noarch.rpm azurelinux-repos-shared-3.0-2.azl3.noarch.rpm -azurelinux-rpm-macros-3.0-3.azl3.noarch.rpm +azurelinux-rpm-macros-3.0-4.azl3.noarch.rpm bash-5.2.15-1.azl3.x86_64.rpm bash-debuginfo-5.2.15-1.azl3.x86_64.rpm bash-devel-5.2.15-1.azl3.x86_64.rpm diff --git a/toolkit/scripts/build_cargo_cache.sh b/toolkit/scripts/build_cargo_cache.sh index 26943d8ac1c..bffef3bb30c 100755 --- a/toolkit/scripts/build_cargo_cache.sh +++ b/toolkit/scripts/build_cargo_cache.sh @@ -34,7 +34,7 @@ then cp "$tarball_name" "$temp_dir" else echo "Tarball '$tarball_name' doesn't exist. Will attempt to download from blobstorage." - if ! wget -q "https://cblmarinerstorage.blob.core.windows.net/sources/core/$tarball_name" -O "$temp_dir/$tarball_name" + if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$tarball_name" -O "$temp_dir/$tarball_name" then echo "ERROR: failed to download the source tarball." exit 1 diff --git a/toolkit/scripts/build_go_vendor_cache.sh b/toolkit/scripts/build_go_vendor_cache.sh index 7002d3022bf..7275859bc74 100755 --- a/toolkit/scripts/build_go_vendor_cache.sh +++ b/toolkit/scripts/build_go_vendor_cache.sh @@ -34,7 +34,7 @@ then cp "$tarball_name" "$temp_dir" else echo "Tarball '$tarball_name' doesn't exist. Will attempt to download from blobstorage." - if ! wget -q "https://cblmarinerstorage.blob.core.windows.net/sources/core/$tarball_name" -O "$temp_dir/$tarball_name" + if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$tarball_name" -O "$temp_dir/$tarball_name" then echo "ERROR: failed to download the source tarball." exit 1