From cfc57be0a8b5159f5bb7954b8945ee1cda0c6e8c Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Wed, 5 Aug 2026 00:04:26 +0000 Subject: [PATCH] fix(golang-github-aws-sdk-2): disable bootstrap mode Fedora defaults this package to bootstrap mode while transitive Go dependencies are unavailable. Both Azure Linux build stages provide the dependency closure, so retaining bootstrap mode strips generated Go requirements and produces a conflicting ~bootstrap NVR. Use the native build.without configuration to select full mode without mutating the upstream spec. Both stages now generate complete dependency metadata and run the full test suite. Signed-off-by: Mitch Zhu --- base/comps/components.toml | 1 - .../golang-github-aws-sdk-2.comp.toml | 5 +++++ locks/golang-github-aws-sdk-2.lock | 2 +- .../golang-github-aws-sdk-2.azl.macros | 3 +++ .../golang-github-aws-sdk-2/golang-github-aws-sdk-2.spec | 9 ++++++++- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 base/comps/golang-github-aws-sdk-2/golang-github-aws-sdk-2.comp.toml create mode 100644 specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.azl.macros diff --git a/base/comps/components.toml b/base/comps/components.toml index 3e422e05cbf..39661c4443a 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -764,7 +764,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.golang-github-asaskevich-govalidator] [components.golang-github-aws-lambda] [components.golang-github-aws-sdk] -[components.golang-github-aws-sdk-2] [components.golang-github-aws-smithy] [components.golang-github-awslabs-aws-multi-module-repository-tools] [components.golang-github-azure-autorest] diff --git a/base/comps/golang-github-aws-sdk-2/golang-github-aws-sdk-2.comp.toml b/base/comps/golang-github-aws-sdk-2/golang-github-aws-sdk-2.comp.toml new file mode 100644 index 00000000000..1c77bf9d9e4 --- /dev/null +++ b/base/comps/golang-github-aws-sdk-2/golang-github-aws-sdk-2.comp.toml @@ -0,0 +1,5 @@ +# Fedora enabled bootstrap mode while F44 lacked transitive Go dependencies: +# https://src.fedoraproject.org/rpms/golang-github-aws-sdk-2/c/cb6b0ba3ea0781632fe9192449ec2bfeccdf2274 +# Azure Linux builds those prerequisites in both stages, so use full mode. +[components.golang-github-aws-sdk-2] +build.without = ["bootstrap"] diff --git a/locks/golang-github-aws-sdk-2.lock b/locks/golang-github-aws-sdk-2.lock index fb0e96177a3..733c3486ba1 100644 --- a/locks/golang-github-aws-sdk-2.lock +++ b/locks/golang-github-aws-sdk-2.lock @@ -2,5 +2,5 @@ version = 1 import-commit = 'e95a71869bf4417477bcd7c0e884654b21718ffa' upstream-commit = 'e95a71869bf4417477bcd7c0e884654b21718ffa' -input-fingerprint = 'sha256:3c2d2431b26101ce250f483933ece29954c676780af7bff7a9fa0c7da1777cb7' +input-fingerprint = 'sha256:5bdb802048d16e61d6d3af7663a5bfa5b1962deb5af49aacdafe8f7cc597ef96' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.azl.macros b/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.azl.macros new file mode 100644 index 00000000000..e5fbcc467fd --- /dev/null +++ b/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.azl.macros @@ -0,0 +1,3 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%_without_bootstrap 1 diff --git a/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.spec b/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.spec index 6370bd2f7b7..3a64c777cfe 100644 --- a/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.spec +++ b/specs/g/golang-github-aws-sdk-2/golang-github-aws-sdk-2.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 8; + release_number = 9; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -11,6 +11,9 @@ # This spec file has been modified by azldev to include build configuration overlays. # Do not edit manually; changes may be overwritten. +# All Azure Linux specs with overlays include this macro file, irrespective of whether new macros have been added. +%{load:%{_sourcedir}/golang-github-aws-sdk-2.azl.macros} + # Generated by go2rpm 1.15.0 %bcond check 1 %bcond bootstrap 1 @@ -43,6 +46,7 @@ Summary: AWS SDK for the Go programming language License: BSD-3-Clause AND Apache-2.0 URL: %{gourl} Source: %{gosource} +Source9999: golang-github-aws-sdk-2.azl.macros %description %{common_description} @@ -71,6 +75,9 @@ Source: %{gosource} %changelog ## START: Generated by rpmautospec +* Wed Aug 05 2026 Mitch Zhu - 20250103-9 +- fix(golang-github-aws-sdk-2): disable bootstrap mode + * Thu Apr 30 2026 Daniel McIlvaney - 20250103-8 - feat: introduce deterministic commit resolution via Azure Linux lock file