Skip to content

Commit 05005a4

Browse files
committed
Revert "build.sh: pin to kernel < 5.14 to unblock s390x builds"
This reverts commit 7852f67. This should be fixed now in 5.14.14 which is in Fedora 34. Closes: openshift/os#646
1 parent 4c8e460 commit 05005a4

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

build.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,10 @@ configure_yum_repos() {
3232
}
3333

3434
install_rpms() {
35-
local builddeps
36-
local frozendeps
37-
38-
# Pin to 5.13 until https://github.com/openshift/os/issues/646 is root caused
39-
# (May be related to https://bugzilla.redhat.com/show_bug.cgi?id=2008401)
40-
frozendeps=$(echo kernel{,-core,-modules}-5.13.19-200.fc34)
41-
4235
# First, a general update; this is best practice. We also hit an issue recently
4336
# where qemu implicitly depended on an updated libusbx but didn't have a versioned
4437
# requires https://bugzilla.redhat.com/show_bug.cgi?id=1625641
45-
#
46-
# In order to prevent the `distro-sync` operation from installing a newer
47-
# version of the kernel in addition to what we want to freeze, exclude the
48-
# kernel packages from the operation.
49-
yum -y distro-sync -x kernel -x kernel-core -x kernel-modules
38+
yum -y distro-sync
5039

5140
# xargs is part of findutils, which may not be installed
5241
yum -y install /usr/bin/xargs
@@ -59,7 +48,7 @@ install_rpms() {
5948
builddeps=$(grep -v '^#' "${srcdir}"/src/build-deps.txt)
6049

6150
# Process our base dependencies + build dependencies and install
62-
(echo "${frozendeps}" && echo "${builddeps}" && "${srcdir}"/src/print-dependencies.sh) | xargs yum -y install
51+
(echo "${builddeps}" && "${srcdir}"/src/print-dependencies.sh) | xargs yum -y install
6352

6453
# Commented out for now, see above
6554
#dnf remove -y ${builddeps}

0 commit comments

Comments
 (0)