diff --git a/Dockerfile b/Dockerfile index 79b9b03a6a9706c84329b81a50db51049ab648c1..37d1bf2e82321d0d3698d54347dfff738412f6b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ USER root RUN rm -rfv /usr/lib/coreos-assembler /usr/bin/coreos-assembler COPY ./src/print-dependencies.sh ./src/deps*.txt ./src/vmdeps*.txt ./src/build-deps.txt /root/containerbuild/src/ -COPY ./build.sh /root/containerbuild/ +COPY ./build.sh ./rpm-package/* /root/containerbuild/ RUN ./build.sh configure_yum_repos RUN ./build.sh install_rpms # nocache 03/03/22 diff --git a/build.sh b/build.sh index 10f1584e92aa7347065db3a8409288d05f84a815..4f966409ad62208ad0e8b0825b9fe65c19d8bd21 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,13 @@ install_rpms() { # freeze kernel due to https://github.com/coreos/coreos-assembler/issues/2707 frozendeps=$(echo kernel{,-core,-modules}-5.15.18-200.fc35) - + yum install -y systemd systemd-udev dracut linux-firmware + arch=$(uname -m) + case $arch in + "x86_64") rpm -iUh kernel-core-5.15.18-200.fc35.x86_64.rpm kernel-modules-5.15.18-200.fc35.x86_64.rpm ;; + "aarch64") rpm -iUh kernel-core-5.15.18-200.fc35.aarch64.rpm kernel-modules-5.15.18-200.fc35.aarch64.rpm ;; + *) fatal "Architecture ${arch} not supported" + esac # First, a general update; this is best practice. We also hit an issue recently # where qemu implicitly depended on an updated libusbx but didn't have a versioned # requires https://bugzilla.redhat.com/show_bug.cgi?id=1625641 @@ -69,6 +75,15 @@ install_rpms() { # Add --exclude for s390utils-base because we need it to not get removed. rpm -q grubby && yum remove --exclude=s390utils-base -y grubby + yum remove -y rpm-ostree + yum install -y bubblewrap ostree + arch=$(uname -m) + case $arch in + "x86_64") rpm -iUh rpm-ostree-2021.14-3.fc35.x86_64.rpm rpm-ostree-libs-2021.14-3.fc35.x86_64.rpm nestos-installer-0.14.0-2.x86_64.rpm ;; + "aarch64") rpm -iUh rpm-ostree-2021.14-3.fc35.aarch64.rpm rpm-ostree-libs-2021.14-3.fc35.aarch64.rpm nestos-installer-0.14.0-2.aarch64.rpm ;; + *) fatal "Architecture ${arch} not supported" + esac + # Allow Kerberos Auth to work from a keytab. The keyring is not # available in a Container. sed -e "s/^.*default_ccache_name/# default_ccache_name/g" -i /etc/krb5.conf diff --git a/rpm-package/kernel-core-5.15.18-200.fc35.aarch64.rpm b/rpm-package/kernel-core-5.15.18-200.fc35.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..f51b6f652848820bdcb2380a40a0fc58ef97dc4d Binary files /dev/null and b/rpm-package/kernel-core-5.15.18-200.fc35.aarch64.rpm differ diff --git a/rpm-package/kernel-core-5.15.18-200.fc35.x86_64.rpm b/rpm-package/kernel-core-5.15.18-200.fc35.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..e08806a0364277376836bcda52ab30c9c8b33ff0 Binary files /dev/null and b/rpm-package/kernel-core-5.15.18-200.fc35.x86_64.rpm differ diff --git a/rpm-package/kernel-modules-5.15.18-200.fc35.aarch64.rpm b/rpm-package/kernel-modules-5.15.18-200.fc35.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..bf2d3ef068f1dfead89d1d4b0eb69f481c540d13 Binary files /dev/null and b/rpm-package/kernel-modules-5.15.18-200.fc35.aarch64.rpm differ diff --git a/rpm-package/kernel-modules-5.15.18-200.fc35.x86_64.rpm b/rpm-package/kernel-modules-5.15.18-200.fc35.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..2f3cfe314fb693f5e1d3b19e1fcf01f00c0aacab Binary files /dev/null and b/rpm-package/kernel-modules-5.15.18-200.fc35.x86_64.rpm differ diff --git a/rpm-package/nestos-installer-0.14.0-2.aarch64.rpm b/rpm-package/nestos-installer-0.14.0-2.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..d54443eaa7436404066440f4fda26a18b597c812 Binary files /dev/null and b/rpm-package/nestos-installer-0.14.0-2.aarch64.rpm differ diff --git a/rpm-package/nestos-installer-0.14.0-2.x86_64.rpm b/rpm-package/nestos-installer-0.14.0-2.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..9da79cca33c6bf2fcc05e4bbbc737b222d4a1e43 Binary files /dev/null and b/rpm-package/nestos-installer-0.14.0-2.x86_64.rpm differ diff --git a/rpm-package/nestos-installer-bootinfra-0.14.0-2.aarch64.rpm b/rpm-package/nestos-installer-bootinfra-0.14.0-2.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..f14c56a6026ef7e2478786fa0d7135fad7974d47 Binary files /dev/null and b/rpm-package/nestos-installer-bootinfra-0.14.0-2.aarch64.rpm differ diff --git a/rpm-package/nestos-installer-bootinfra-0.14.0-2.x86_64.rpm b/rpm-package/nestos-installer-bootinfra-0.14.0-2.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..ce80a6d9e0dcdc3c1f19ade07eb1a4e24675cfbe Binary files /dev/null and b/rpm-package/nestos-installer-bootinfra-0.14.0-2.x86_64.rpm differ diff --git a/rpm-package/rpm-ostree-2021.14-3.fc35.aarch64.rpm b/rpm-package/rpm-ostree-2021.14-3.fc35.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..be6c90dfd2975aa31852b3418fceaa9a4e16fb21 Binary files /dev/null and b/rpm-package/rpm-ostree-2021.14-3.fc35.aarch64.rpm differ diff --git a/rpm-package/rpm-ostree-2021.14-3.fc35.src.rpm b/rpm-package/rpm-ostree-2021.14-3.fc35.src.rpm new file mode 100644 index 0000000000000000000000000000000000000000..c078392dbf925c6cf2e988b35e81122b66927974 Binary files /dev/null and b/rpm-package/rpm-ostree-2021.14-3.fc35.src.rpm differ diff --git a/rpm-package/rpm-ostree-2021.14-3.fc35.x86_64.rpm b/rpm-package/rpm-ostree-2021.14-3.fc35.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..d85cc3846570b4d72424fc33b1a015cc66f9a991 Binary files /dev/null and b/rpm-package/rpm-ostree-2021.14-3.fc35.x86_64.rpm differ diff --git a/rpm-package/rpm-ostree-libs-2021.14-3.fc35.aarch64.rpm b/rpm-package/rpm-ostree-libs-2021.14-3.fc35.aarch64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..0b570927f75e0b27bf25a7d560ca2836e0413c2d Binary files /dev/null and b/rpm-package/rpm-ostree-libs-2021.14-3.fc35.aarch64.rpm differ diff --git a/rpm-package/rpm-ostree-libs-2021.14-3.fc35.x86_64.rpm b/rpm-package/rpm-ostree-libs-2021.14-3.fc35.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..a69af5cc85d57a685ad78e595cf27ddc4c16ba44 Binary files /dev/null and b/rpm-package/rpm-ostree-libs-2021.14-3.fc35.x86_64.rpm differ diff --git a/rpm-package/rust-nestos-installer-0.14.0-2.src.rpm b/rpm-package/rust-nestos-installer-0.14.0-2.src.rpm new file mode 100644 index 0000000000000000000000000000000000000000..ccc037e421e0ac4d3d1680b1f3a00b2972e914e3 Binary files /dev/null and b/rpm-package/rust-nestos-installer-0.14.0-2.src.rpm differ diff --git a/tools/vendor/k8s.io/client-go/pkg/version/base.go b/tools/vendor/k8s.io/client-go/pkg/version/base.go index 51e34dda334aaa5e2658e5d8a3fc404bd5008f38..a331f391b057b30c296ae6b3cb2a6629c0f1b804 100644 --- a/tools/vendor/k8s.io/client-go/pkg/version/base.go +++ b/tools/vendor/k8s.io/client-go/pkg/version/base.go @@ -55,8 +55,8 @@ var ( // NOTE: The $Format strings are replaced during 'git archive' thanks to the // companion .gitattributes file containing 'export-subst' in this same // directory. See also https://git-scm.com/docs/gitattributes - gitVersion string = "v0.0.0-master+$Format:%H$" - gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) + gitVersion string = "v0.0.0-master+6fc811b4f8c15afb117c7539bbe5705431c2fecf" + gitCommit string = "6fc811b4f8c15afb117c7539bbe5705431c2fecf" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "" // state of git tree, either "clean" or "dirty" buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')