diff --git a/base/comps/components.toml b/base/comps/components.toml index cfd8c7008da..dc62783db33 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -1,4 +1,9 @@ -includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-mingw-disablement.toml", "components-publish-channels.toml"] +includes = [ + "**/*.comp.toml", + "component-check-disablement.toml", + "component-mingw-disablement.toml", + "components-publish-channels.toml", +] # # Components imported from Fedora with no per-component modifications. @@ -6781,6 +6786,14 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min [components.texi2html] [components.texinfo] [components.texlive] +# DUMMY test change (revert before merge): forces texlive into the PR change set +# to exercise the ADO PR package-build pipeline against a long-building component. +[[components.texlive.overlays]] +description = "DUMMY test trigger (revert before merge): prepend a build-neutral comment so the PR build pipeline picks up texlive" +type = "spec-prepend-lines" +lines = [ + "# AZL PR build-pipeline test trigger - dummy change, revert before merge", +] [components.texlive-base] [components.tftp] [components.thermald] diff --git a/base/comps/csnappy/csnappy.comp.toml b/base/comps/csnappy/csnappy.comp.toml index bd40c19a3af..d74c0235260 100644 --- a/base/comps/csnappy/csnappy.comp.toml +++ b/base/comps/csnappy/csnappy.comp.toml @@ -1,3 +1,10 @@ [components.csnappy] # Release: 32.20211216git%{shortcommit}%{?dist} release = { calculation = "manual" } + +# TEMPORARY — CI VALIDATION ONLY. REMOVE BEFORE MERGE. +# Forces csnappy to rebuild so the ADO PR check has a second, small, fast, +# GREEN component alongside cpio — proving multiple packages build in one run. +# `foo` is not a real bcond, so `--without foo` is a harmless no-op (same debug +# idiom used by dtc). +build.without = ["foo"] diff --git a/base/comps/dtc/dtc.comp.toml b/base/comps/dtc/dtc.comp.toml index 97bdbc6664e..f8c9175a510 100644 --- a/base/comps/dtc/dtc.comp.toml +++ b/base/comps/dtc/dtc.comp.toml @@ -1,5 +1,6 @@ [components.dtc] - +# Debug, add a build flag to force an update +build.without = ["foo"] # Azure Linux does not ship mingw cross-compilation toolchains. # The upstream spec hard-codes `%global with_mingw 1` whenever %fedora is # defined (true in our build environment) rather than gating on a %bcond, so diff --git a/locks/csnappy.lock b/locks/csnappy.lock index 8ce787ca9f9..208a81c18ec 100644 --- a/locks/csnappy.lock +++ b/locks/csnappy.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '47da162b8b4a064b2c693ab17cf80eec3b8ac5ba' upstream-commit = '47da162b8b4a064b2c693ab17cf80eec3b8ac5ba' -input-fingerprint = 'sha256:650fc96aa907b116a11031396bae4433bf03707b61c9ba575c40ccb1b21a9ed0' +input-fingerprint = 'sha256:074d33a2c309fc1f0773d7b3de4fbf953ef1412af38d1039e30c0f4dc2ad9b67' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/locks/dtc.lock b/locks/dtc.lock index 2b4433f9c74..b2944ace9c8 100644 --- a/locks/dtc.lock +++ b/locks/dtc.lock @@ -2,5 +2,5 @@ version = 1 import-commit = 'c0fba5f636d30bf22f62445b2e1ce4de0de1c23c' upstream-commit = 'c0fba5f636d30bf22f62445b2e1ce4de0de1c23c' -input-fingerprint = 'sha256:10435c0fa958d16dc78ff97be777bbc45c35bfee5e541fab241d048d51b9be8a' +input-fingerprint = 'sha256:e25ec0ed9233d05c7f2fd05fb18b5223564df10dfa3dfa5fda78587cbe9781b4' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/locks/texlive.lock b/locks/texlive.lock index 72638997605..1ebe0a53490 100644 --- a/locks/texlive.lock +++ b/locks/texlive.lock @@ -2,5 +2,5 @@ version = 1 import-commit = 'f5f486ecd487e3c34a8e747c0fc561fa1eaff9fe' upstream-commit = 'f5f486ecd487e3c34a8e747c0fc561fa1eaff9fe' -input-fingerprint = 'sha256:ab6ace119655091b35794aa6dad08a409ac867934cec32cb5a0230afac1b5b02' +input-fingerprint = 'sha256:5ffac985cc76e2c5097d7a259cc84912954ad561d27144019f26d3b491c29ae1' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/c/cpio/cpio.spec b/specs/c/cpio/cpio.spec index 9b0972df780..9c7e8db1718 100644 --- a/specs/c/cpio/cpio.spec +++ b/specs/c/cpio/cpio.spec @@ -4,7 +4,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.15 -Release: 8%{?dist} +Release: 10%{?dist} License: GPL-3.0-or-later URL: https://www.gnu.org/software/cpio/ Source0: https://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2 diff --git a/specs/c/csnappy/csnappy.azl.macros b/specs/c/csnappy/csnappy.azl.macros new file mode 100644 index 00000000000..d14d25e3410 --- /dev/null +++ b/specs/c/csnappy/csnappy.azl.macros @@ -0,0 +1,3 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%_without_foo 1 diff --git a/specs/c/csnappy/csnappy.spec b/specs/c/csnappy/csnappy.spec index 8a962746181..adb19259969 100644 --- a/specs/c/csnappy/csnappy.spec +++ b/specs/c/csnappy/csnappy.spec @@ -1,6 +1,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}/csnappy.azl.macros} + # Run valgrind test # valgrind is available only on selected arches %ifarch %{valgrind_arches} @@ -19,6 +22,7 @@ Summary: Snappy compression library ported to C License: BSD-3-Clause URL: https://github.com/zeevt/%{name} Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz +Source9999: csnappy.azl.macros # Fix parallel tests, Patch0: csnappy-6c10c305e8dde193546e6b33cf8a785d5dc123e2-Fix-parallel-tests-by-only-testing-the-current-optim.patch diff --git a/specs/d/dtc/dtc.azl.macros b/specs/d/dtc/dtc.azl.macros new file mode 100644 index 00000000000..d14d25e3410 --- /dev/null +++ b/specs/d/dtc/dtc.azl.macros @@ -0,0 +1,3 @@ +# Macros file automatically generated by azldev. +# Do not edit manually; changes will be overwritten. +%_without_foo 1 diff --git a/specs/d/dtc/dtc.spec b/specs/d/dtc/dtc.spec index c4cd5e55bef..deb30834ebf 100644 --- a/specs/d/dtc/dtc.spec +++ b/specs/d/dtc/dtc.spec @@ -1,6 +1,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}/dtc.azl.macros} + %global with_mingw 0 %if 0%{?fedora} @@ -11,12 +14,13 @@ Name: dtc Version: 1.7.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Device Tree Compiler License: GPL-2.0-or-later URL: https://devicetree.org/ Source0: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz +Source9999: dtc.azl.macros Patch0001: 0001-build-fix-Dtools-false-build.patch BuildRequires: gcc make diff --git a/specs/t/texlive/texlive.spec b/specs/t/texlive/texlive.spec index 71e93e104b1..f43dc7c3a40 100644 --- a/specs/t/texlive/texlive.spec +++ b/specs/t/texlive/texlive.spec @@ -1,6 +1,7 @@ # This spec file has been modified by azldev to include build configuration overlays. # Do not edit manually; changes may be overwritten. +# AZL PR build-pipeline test trigger - dummy change, revert before merge # PACKAGER NOTES # 1. If you update biblatex, be sure the versioned Requires on biber is correct. Email Colin . @@ -18,7 +19,7 @@ Name: texlive Version: %{tl_version} -Release: 81%{?dist} +Release: 82%{?dist} Epoch: 11 Summary: TeX formatting system License: Apache-2.0 AND Artistic-2.0 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND LPPL-1.3a AND LPPL-1.3c AND MIT AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Utopia