diff --git a/SPECS/azurelinux-repos/azurelinux-amd-preview.repo b/SPECS/azurelinux-repos/azurelinux-amd-preview.repo new file mode 100644 index 00000000000..0434974db96 --- /dev/null +++ b/SPECS/azurelinux-repos/azurelinux-amd-preview.repo @@ -0,0 +1,19 @@ +[azurelinux-official-amd-preview] +name=Azure Linux Official AMD Preview $releasever $basearch +baseurl=https://packages.microsoft.com/azurelinux/$releasever/preview/amd/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 + +[azurelinux-official-amd-preview-source] +name=Azure Linux Official AMD Preview $releasever Source +baseurl=https://packages.microsoft.com/azurelinux/$releasever/preview/amd/srpms +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 diff --git a/SPECS/azurelinux-repos/azurelinux-amd.repo b/SPECS/azurelinux-repos/azurelinux-amd.repo new file mode 100644 index 00000000000..afcfbfe8537 --- /dev/null +++ b/SPECS/azurelinux-repos/azurelinux-amd.repo @@ -0,0 +1,19 @@ +[azurelinux-official-amd] +name=Azure Linux Official AMD $releasever $basearch +baseurl=https://packages.microsoft.com/azurelinux/$releasever/prod/amd/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 + +[azurelinux-official-amd-source] +name=Azure Linux Official AMD $releasever Source +baseurl=https://packages.microsoft.com/azurelinux/$releasever/prod/amd/srpms +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 diff --git a/SPECS/azurelinux-repos/azurelinux-repos.signatures.json b/SPECS/azurelinux-repos/azurelinux-repos.signatures.json index 0dbba725064..a2771db1bd0 100644 --- a/SPECS/azurelinux-repos/azurelinux-repos.signatures.json +++ b/SPECS/azurelinux-repos/azurelinux-repos.signatures.json @@ -1,6 +1,8 @@ { "Signatures": { "MICROSOFT-RPM-GPG-KEY": "1092f37ec429e58bf9c7f898df17c3c32eb2ce3c4c037afb8ffe2d2b42e16e89", + "azurelinux-amd.repo": "cbe8cefea3cf99c1450d0b329c57bdb647ae15c10468c243573e33b9c4891120", + "azurelinux-amd-preview.repo": "723c3505d064c3b9ef436d700f748de7deca0de845d07d3fdeeafaf45949c070", "azurelinux-debuginfo-preview.repo": "af36f823d923dd8b1a27efa7199552339f9e1315813078a4591ef855654b3017", "azurelinux-debuginfo.repo": "ac8c1c699122e46e7501f04f1f0240e1eec322e5bb6102f6db5d1ce7215d7f5b", "azurelinux-extended-debuginfo-preview.repo": "d29514a9962b0975cd4b32132f5cb5290930f6d0d582b46ef5d2cde6840dc9e0", @@ -14,4 +16,4 @@ "azurelinux-official-base.repo": "b3351f3121c0600a0445a322bea8d500edaaa3d021b7cef96c1c9539d0eccab8", "azurelinux-official-preview.repo": "a03ea4539f17fac3fdfe73fb295663778733ba84ed37bb3908784604e52b0da6" } -} \ No newline at end of file +} diff --git a/SPECS/azurelinux-repos/azurelinux-repos.spec b/SPECS/azurelinux-repos/azurelinux-repos.spec index 7afc1ba4195..8935e2bd716 100644 --- a/SPECS/azurelinux-repos/azurelinux-repos.spec +++ b/SPECS/azurelinux-repos/azurelinux-repos.spec @@ -1,7 +1,7 @@ Summary: AzureLinux repo files, gpg keys Name: azurelinux-repos Version: %{azl}.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -20,6 +20,8 @@ Source10: azurelinux-official-base.repo Source11: azurelinux-official-preview.repo Source12: azurelinux-extended-debuginfo.repo Source13: azurelinux-extended-debuginfo-preview.repo +Source14: azurelinux-amd.repo +Source15: azurelinux-amd-preview.repo Requires: %{name}-shared = %{version}-%{release} @@ -28,6 +30,24 @@ BuildArch: noarch %description Azure Linux repo files and gpg keys +%ifarch x86_64 +%package amd +Summary: Azure Linux AMD GPU repo file. +Group: System Environment/Base +Requires: %{name}-shared = %{version}-%{release} + +%description amd +%{summary} + +%package amd-preview +Summary: Azure Linux AMD GPU preview repo file. +Group: System Environment/Base +Requires: %{name}-shared = %{version}-%{release} + +%description amd-preview +%{summary} +%endif + %package debug Summary: Azure Linux Debuginfo repo file. Group: System Environment/Base @@ -142,6 +162,10 @@ install -m 644 %{SOURCE10} $REPO_DIRECTORY install -m 644 %{SOURCE11} $REPO_DIRECTORY install -m 644 %{SOURCE12} $REPO_DIRECTORY install -m 644 %{SOURCE13} $REPO_DIRECTORY +%ifarch x86_64 +install -m 644 %{SOURCE14} $REPO_DIRECTORY +install -m 644 %{SOURCE15} $REPO_DIRECTORY +%endif export RPM_GPG_DIRECTORY="%{buildroot}%{_sysconfdir}/pki/rpm-gpg" @@ -159,6 +183,16 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90 %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/yum.repos.d/azurelinux-official-base.repo +%ifarch x86_64 +%files amd +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/yum.repos.d/azurelinux-amd.repo + +%files amd-preview +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/yum.repos.d/azurelinux-amd-preview.repo +%endif + %files debug %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/yum.repos.d/azurelinux-debuginfo.repo @@ -208,6 +242,9 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90 %{_sysconfdir}/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY %changelog +* Thu Dec 19 2024 Gary Swalling - 3.0-4 +- Add amd .repo files. + * Thu May 30 2024 Andrew Phelps - 3.0-3 - Remove MICROSOFT-METADATA-GPG-KEY diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 07c4696ff4f..e4d38feea86 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -227,8 +227,8 @@ pinentry-1.2.1-1.azl3.aarch64.rpm gnupg2-2.4.4-2.azl3.aarch64.rpm gnupg2-lang-2.4.4-2.azl3.aarch64.rpm gpgme-1.23.2-2.azl3.aarch64.rpm -azurelinux-repos-shared-3.0-3.azl3.noarch.rpm -azurelinux-repos-3.0-3.azl3.noarch.rpm +azurelinux-repos-shared-3.0-4.azl3.noarch.rpm +azurelinux-repos-3.0-4.azl3.noarch.rpm libffi-3.4.4-1.azl3.aarch64.rpm libffi-devel-3.4.4-1.azl3.aarch64.rpm libtasn1-4.19.0-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 31e58640021..f34cbebc745 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -227,8 +227,8 @@ pinentry-1.2.1-1.azl3.x86_64.rpm gnupg2-2.4.4-2.azl3.x86_64.rpm gnupg2-lang-2.4.4-2.azl3.x86_64.rpm gpgme-1.23.2-2.azl3.x86_64.rpm -azurelinux-repos-shared-3.0-3.azl3.noarch.rpm -azurelinux-repos-3.0-3.azl3.noarch.rpm +azurelinux-repos-shared-3.0-4.azl3.noarch.rpm +azurelinux-repos-3.0-4.azl3.noarch.rpm libffi-3.4.4-1.azl3.x86_64.rpm libffi-devel-3.4.4-1.azl3.x86_64.rpm libtasn1-4.19.0-1.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 49865ecfdf8..afde1bfc09d 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -10,19 +10,19 @@ audit-libs-3.1.2-1.azl3.aarch64.rpm autoconf-2.72-2.azl3.noarch.rpm automake-1.16.5-2.azl3.noarch.rpm azurelinux-check-macros-3.0-7.azl3.noarch.rpm -azurelinux-repos-3.0-3.azl3.noarch.rpm -azurelinux-repos-debug-3.0-3.azl3.noarch.rpm -azurelinux-repos-debug-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-debug-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-debug-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-non-oss-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-non-oss-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-oss-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-shared-3.0-3.azl3.noarch.rpm +azurelinux-repos-3.0-4.azl3.noarch.rpm +azurelinux-repos-debug-3.0-4.azl3.noarch.rpm +azurelinux-repos-debug-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-debug-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-debug-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-non-oss-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-non-oss-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-oss-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-oss-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-shared-3.0-4.azl3.noarch.rpm azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm bash-5.2.15-3.azl3.aarch64.rpm bash-debuginfo-5.2.15-3.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 1b84d9210f3..4ead581cd2f 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -10,19 +10,21 @@ audit-libs-3.1.2-1.azl3.x86_64.rpm autoconf-2.72-2.azl3.noarch.rpm automake-1.16.5-2.azl3.noarch.rpm azurelinux-check-macros-3.0-7.azl3.noarch.rpm -azurelinux-repos-3.0-3.azl3.noarch.rpm -azurelinux-repos-debug-3.0-3.azl3.noarch.rpm -azurelinux-repos-debug-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-debug-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-debug-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-extended-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-non-oss-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-non-oss-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-oss-3.0-3.azl3.noarch.rpm -azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-preview-3.0-3.azl3.noarch.rpm -azurelinux-repos-shared-3.0-3.azl3.noarch.rpm +azurelinux-repos-3.0-4.azl3.noarch.rpm +azurelinux-repos-amd-3.0-4.azl3.noarch.rpm +azurelinux-repos-amd-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-debug-3.0-4.azl3.noarch.rpm +azurelinux-repos-debug-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-debug-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-debug-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-extended-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-non-oss-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-non-oss-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-oss-3.0-4.azl3.noarch.rpm +azurelinux-repos-ms-oss-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-preview-3.0-4.azl3.noarch.rpm +azurelinux-repos-shared-3.0-4.azl3.noarch.rpm azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm bash-5.2.15-3.azl3.x86_64.rpm bash-debuginfo-5.2.15-3.azl3.x86_64.rpm