Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable] tree: promote changes from testing at f9460a2167e5f10d95c1696faea9f7a96d1b83ab #2701

Merged
merged 1 commit into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/buildroot/buildroot-reqs-aarch64.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lld
1 change: 1 addition & 0 deletions ci/buildroot/buildroot-reqs-ppc64le.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lld
1 change: 1 addition & 0 deletions ci/buildroot/buildroot-reqs-x86_64.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lld
2 changes: 1 addition & 1 deletion ci/buildroot/buildroot-reqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ attr
gjs

# Also, add clang since it's useful at least in CI for C/C++ projects
clang lld
clang
# And the tools such as clang-format, used for style checking
clang-tools-extra
# All C/C++ projects should have CI that uses the sanitizers
Expand Down
15 changes: 14 additions & 1 deletion ci/buildroot/install-buildroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,27 @@ set -euo pipefail
dn=$(dirname "$0")
tmpd=$(mktemp -d) && trap 'rm -rf ${tmpd}' EXIT

arch=$(arch)

echo "Installing base build requirements"
dnf -y install /usr/bin/xargs 'dnf-command(builddep)'
deps=$(grep -v '^#' "${dn}"/buildroot-reqs.txt)
if [ -f "${dn}/buildroot-reqs-${arch}.txt" ]; then
deps+=" "
deps+=$(grep -v '^#' "${dn}/buildroot-reqs-${arch}.txt")
fi
echo "${deps}" | xargs dnf -y install

echo "Installing build dependencies of primary packages"
brs=$(grep -v '^#' "${dn}"/buildroot-buildreqs.txt)
echo "${brs}" | xargs dnf -y builddep
(cd "${tmpd}" && mkdir rpmbuild
echo "${brs}" | xargs dnf download --source
# rebuild the SRPM for this arch; see
# https://bugzilla.redhat.com/show_bug.cgi?id=1402784#c6
find . -name '*.src.rpm' -print0 | xargs -0n 1 rpmbuild -rs --nodeps \
-D "%_topdir $PWD/rpmbuild" -D "%_tmppath %{_topdir}/tmp"
dnf builddep -y rpmbuild/SRPMS/*.src.rpm)
rm -rf "${tmpd:?}"/*

echo "Installing build dependencies from canonical spec files"
specs=$(grep -v '^#' "${dn}"/buildroot-specs.txt)
Expand Down
4 changes: 2 additions & 2 deletions kola-denylist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
- testing-devel
- pattern: coreos.ignition.ssh.key
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1553
# snooze: 2023-10-13 (disabled on promotion)
# snooze: 2023-10-31 (disabled on promotion)
# warn: true (disabled on promotion)
platforms:
- azure
- pattern: ext.config.docker.basic
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1578
# snooze: 2023-10-13 (disabled on promotion)
# snooze: 2023-10-31 (disabled on promotion)
# warn: true (disabled on promotion)
streams:
- rawhide
Expand Down
94 changes: 47 additions & 47 deletions manifest-lock.aarch64.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"evra": "2.9.0.4-1.fc38.noarch"
},
"aardvark-dns": {
"evra": "1.7.0-1.fc38.aarch64"
"evra": "1.8.0-1.fc38.aarch64"
},
"acl": {
"evra": "2.3.1-6.fc38.aarch64"
Expand Down Expand Up @@ -100,7 +100,7 @@
"evra": "1.19.1-1.fc38.aarch64"
},
"ca-certificates": {
"evra": "2023.2.60-2.fc38.noarch"
"evra": "2023.2.60_v7.0.306-1.0.fc38.noarch"
},
"catatonit": {
"evra": "0.1.7-14.fc38.aarch64"
Expand Down Expand Up @@ -193,7 +193,7 @@
"evra": "2.6.1-1.fc38.aarch64"
},
"curl": {
"evra": "8.0.1-4.fc38.aarch64"
"evra": "8.0.1-5.fc38.aarch64"
},
"cyrus-sasl-gssapi": {
"evra": "2.1.28-9.fc38.aarch64"
Expand Down Expand Up @@ -244,13 +244,13 @@
"evra": "4.2-6.fc38.aarch64"
},
"dracut": {
"evra": "059-3.fc38.aarch64"
"evra": "059-4.fc38.aarch64"
},
"dracut-network": {
"evra": "059-3.fc38.aarch64"
"evra": "059-4.fc38.aarch64"
},
"dracut-squash": {
"evra": "059-3.fc38.aarch64"
"evra": "059-4.fc38.aarch64"
},
"duktape": {
"evra": "2.7.0-2.fc38.aarch64"
Expand Down Expand Up @@ -349,7 +349,7 @@
"evra": "3.14.1-1.fc38.aarch64"
},
"fwupd": {
"evra": "1.9.5-1.fc38.aarch64"
"evra": "1.9.6-1.fc38.aarch64"
},
"gawk": {
"evra": "5.1.1-5.fc38.aarch64"
Expand All @@ -376,16 +376,16 @@
"evra": "2.76.5-2.fc38.aarch64"
},
"glibc": {
"evra": "2.37-5.fc38.aarch64"
"evra": "2.37-10.fc38.aarch64"
},
"glibc-common": {
"evra": "2.37-5.fc38.aarch64"
"evra": "2.37-10.fc38.aarch64"
},
"glibc-gconv-extra": {
"evra": "2.37-5.fc38.aarch64"
"evra": "2.37-10.fc38.aarch64"
},
"glibc-minimal-langpack": {
"evra": "2.37-5.fc38.aarch64"
"evra": "2.37-10.fc38.aarch64"
},
"gmp": {
"evra": "1:6.2.1-4.fc38.aarch64"
Expand All @@ -397,7 +397,7 @@
"evra": "3.8.1-1.fc38.aarch64"
},
"google-compute-engine-guest-configs-udev": {
"evra": "20230808.00-1.fc38.noarch"
"evra": "20230929.00-1.fc38.noarch"
},
"gpgme": {
"evra": "1.17.1-5.fc38.aarch64"
Expand All @@ -406,19 +406,19 @@
"evra": "3.8-3.fc38.aarch64"
},
"grub2-common": {
"evra": "1:2.06-100.fc38.noarch"
"evra": "1:2.06-102.fc38.noarch"
},
"grub2-efi-aa64": {
"evra": "1:2.06-100.fc38.aarch64"
"evra": "1:2.06-102.fc38.aarch64"
},
"grub2-tools": {
"evra": "1:2.06-100.fc38.aarch64"
"evra": "1:2.06-102.fc38.aarch64"
},
"grub2-tools-minimal": {
"evra": "1:2.06-100.fc38.aarch64"
"evra": "1:2.06-102.fc38.aarch64"
},
"gvisor-tap-vsock-gvforwarder": {
"evra": "6:0.7.0-6.fc38.aarch64"
"evra": "6:0.7.1-1.fc38.aarch64"
},
"gzip": {
"evra": "1.12-3.fc38.aarch64"
Expand Down Expand Up @@ -505,16 +505,16 @@
"evra": "2.5.1-5.fc38.noarch"
},
"kernel": {
"evra": "6.5.5-200.fc38.aarch64"
"evra": "6.5.6-200.fc38.aarch64"
},
"kernel-core": {
"evra": "6.5.5-200.fc38.aarch64"
"evra": "6.5.6-200.fc38.aarch64"
},
"kernel-modules": {
"evra": "6.5.5-200.fc38.aarch64"
"evra": "6.5.6-200.fc38.aarch64"
},
"kernel-modules-core": {
"evra": "6.5.5-200.fc38.aarch64"
"evra": "6.5.6-200.fc38.aarch64"
},
"kexec-tools": {
"evra": "2.0.26-3.fc38.aarch64"
Expand Down Expand Up @@ -556,7 +556,7 @@
"evra": "2.5.6-1.fc38.aarch64"
},
"libatomic": {
"evra": "13.2.1-1.fc38.aarch64"
"evra": "13.2.1-4.fc38.aarch64"
},
"libattr": {
"evra": "2.5.1-6.fc38.aarch64"
Expand Down Expand Up @@ -589,7 +589,7 @@
"evra": "1.46.5-4.fc38.aarch64"
},
"libcurl-minimal": {
"evra": "8.0.1-4.fc38.aarch64"
"evra": "8.0.1-5.fc38.aarch64"
},
"libdaemon": {
"evra": "0.14-25.fc38.aarch64"
Expand Down Expand Up @@ -622,7 +622,7 @@
"evra": "1.5-2.fc38.aarch64"
},
"libgcc": {
"evra": "13.2.1-1.fc38.aarch64"
"evra": "13.2.1-4.fc38.aarch64"
},
"libgcrypt": {
"evra": "1.10.2-1.fc38.aarch64"
Expand Down Expand Up @@ -691,7 +691,7 @@
"evra": "1.8-5.fc38.aarch64"
},
"libnet": {
"evra": "1.2-7.fc38.aarch64"
"evra": "1.3-1.fc38.aarch64"
},
"libnetfilter_conntrack": {
"evra": "1.0.9-1.fc38.aarch64"
Expand Down Expand Up @@ -739,7 +739,7 @@
"evra": "0.1.5-53.fc38.aarch64"
},
"librepo": {
"evra": "1.15.2-1.fc38.aarch64"
"evra": "1.16.0-2.fc38.aarch64"
},
"libreport-filesystem": {
"evra": "2.17.11-1.fc38.noarch"
Expand Down Expand Up @@ -769,10 +769,10 @@
"evra": "2.38.1-4.fc38.aarch64"
},
"libsmbclient": {
"evra": "2:4.18.7-1.fc38.aarch64"
"evra": "2:4.18.8-1.fc38.aarch64"
},
"libsolv": {
"evra": "0.7.22-4.fc38.aarch64"
"evra": "0.7.25-1.fc38.aarch64"
},
"libss": {
"evra": "1.46.5-4.fc38.aarch64"
Expand All @@ -790,7 +790,7 @@
"evra": "2.9.1-1.fc38.aarch64"
},
"libstdc++": {
"evra": "13.2.1-1.fc38.aarch64"
"evra": "13.2.1-4.fc38.aarch64"
},
"libtalloc": {
"evra": "2.4.0-2.fc38.aarch64"
Expand Down Expand Up @@ -838,7 +838,7 @@
"evra": "0.3.2-5.fc38.aarch64"
},
"libwbclient": {
"evra": "2:4.18.7-1.fc38.aarch64"
"evra": "2:4.18.8-1.fc38.aarch64"
},
"libxcrypt": {
"evra": "4.4.36-1.fc38.aarch64"
Expand Down Expand Up @@ -925,7 +925,7 @@
"evra": "2.0-0.65.20160912git.fc38.aarch64"
},
"netavark": {
"evra": "1.7.0-1.fc38.aarch64"
"evra": "1.8.0-2.fc38.aarch64"
},
"nettle": {
"evra": "3.8-3.fc38.aarch64"
Expand Down Expand Up @@ -955,7 +955,7 @@
"evra": "20230919-1.fc38.noarch"
},
"nvme-cli": {
"evra": "2.4-2.fc38.aarch64"
"evra": "2.4-3.fc38.aarch64"
},
"oniguruma": {
"evra": "6.9.8-2.D20220919gitb041f6d.fc38.1.aarch64"
Expand Down Expand Up @@ -1000,10 +1000,10 @@
"evra": "1.5.2-16.fc38.aarch64"
},
"passt": {
"evra": "0^20230908.g05627dc-1.fc38.aarch64"
"evra": "0^20231004.gf851084-1.fc38.aarch64"
},
"passt-selinux": {
"evra": "0^20230908.g05627dc-1.fc38.noarch"
"evra": "0^20231004.gf851084-1.fc38.noarch"
},
"passwd": {
"evra": "0.80-14.fc38.aarch64"
Expand Down Expand Up @@ -1078,10 +1078,10 @@
"evra": "4.18.1-3.fc38.aarch64"
},
"rpm-ostree": {
"evra": "2023.7-1.fc38.aarch64"
"evra": "2023.8-2.fc38.aarch64"
},
"rpm-ostree-libs": {
"evra": "2023.7-1.fc38.aarch64"
"evra": "2023.8-2.fc38.aarch64"
},
"rpm-plugin-selinux": {
"evra": "4.18.1-3.fc38.aarch64"
Expand All @@ -1096,22 +1096,22 @@
"evra": "2:1.1.8-1.fc38.aarch64"
},
"samba-client-libs": {
"evra": "2:4.18.7-1.fc38.aarch64"
"evra": "2:4.18.8-1.fc38.aarch64"
},
"samba-common": {
"evra": "2:4.18.7-1.fc38.noarch"
"evra": "2:4.18.8-1.fc38.noarch"
},
"samba-common-libs": {
"evra": "2:4.18.7-1.fc38.aarch64"
"evra": "2:4.18.8-1.fc38.aarch64"
},
"sed": {
"evra": "4.8-12.fc38.aarch64"
},
"selinux-policy": {
"evra": "38.28-1.fc38.noarch"
"evra": "38.29-1.fc38.noarch"
},
"selinux-policy-targeted": {
"evra": "38.28-1.fc38.noarch"
"evra": "38.29-1.fc38.noarch"
},
"setup": {
"evra": "2.14.3-2.fc38.noarch"
Expand Down Expand Up @@ -1237,10 +1237,10 @@
"evra": "2.38.1-4.fc38.aarch64"
},
"vim-data": {
"evra": "2:9.0.1927-1.fc38.noarch"
"evra": "2:9.0.1984-1.fc38.noarch"
},
"vim-minimal": {
"evra": "2:9.0.1927-1.fc38.aarch64"
"evra": "2:9.0.1984-1.fc38.aarch64"
},
"which": {
"evra": "2.21-39.fc38.aarch64"
Expand All @@ -1264,7 +1264,7 @@
"evra": "2.1.0-21.fc38.aarch64"
},
"zchunk-libs": {
"evra": "1.3.1-1.fc38.aarch64"
"evra": "1.3.2-1.fc38.aarch64"
},
"zincati": {
"evra": "0.0.25-4.fc38.aarch64"
Expand All @@ -1280,16 +1280,16 @@
}
},
"metadata": {
"generated": "2023-10-02T00:00:00Z",
"generated": "2023-10-14T00:00:00Z",
"rpmmd_repos": {
"fedora": {
"generated": "2023-04-13T20:36:48Z"
},
"fedora-coreos-pool": {
"generated": "2023-10-01T23:23:09Z"
"generated": "2023-10-14T02:09:06Z"
},
"fedora-updates": {
"generated": "2023-10-02T01:19:32Z"
"generated": "2023-10-14T01:22:50Z"
}
}
}
Expand Down
Loading