diff --git a/Dockerfile b/Dockerfile index 3b3dfc26c097048bb762f4f11d528dc73dd87d8a..ab3c299af8cdb29b46cb6ced13fadc957b379d46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -#FROM registry.fedoraproject.org/fedora:35 -FROM openeuler/openeuler:22.03-lts +FROM docker.nju.edu.cn/openeuler/openeuler:22.03-lts-sp3 WORKDIR /root/containerbuild # Keep this Dockerfile idempotent for local development rebuild use cases. @@ -7,9 +6,9 @@ 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 ./rpm-package/* /root/containerbuild/ +COPY ./build.sh /root/containerbuild/ RUN ./build.sh configure_yum_repos -RUN ./build.sh install_rpms # nocache 03/03/22 +RUN ./build.sh install_rpms # This allows Prow jobs for other projects to use our cosa image as their # buildroot image (so clonerefs can copy the repo into `/go`). For cosa itself, @@ -30,6 +29,9 @@ RUN rm -rf /root/containerbuild /go # https://docs.openshift.com/container-platform/4.8/openshift_images/create-images.html RUN chmod g=u /etc/passwd +# also allow adding certificates +RUN chmod -R g=u /etc/pki/ca-trust + # run as `builder` user USER builder ENTRYPOINT ["/usr/bin/dumb-init", "/usr/bin/coreos-assembler"] diff --git a/build.sh b/build.sh index 93fd31161e18842889dfc172bb0a45e881ecea36..ca7c8a671649d127f5c6f8109c6fd37ed89a691f 100755 --- a/build.sh +++ b/build.sh @@ -25,48 +25,23 @@ configure_yum_repos() { # Add continuous tag for latest build tools and mark as required so we # can depend on those latest tools being available in all container # builds. - #echo -e "[${version_id}-nestos]\nenabled=1\nmetadata_expire=1m\nbaseurl=http://10.1.110.88/nestos-assembler/\ngpgcheck=0\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos.repo rm -rf /etc/yum.repos.d/* - # openeuler 22.03-LTS - echo -e "[${version_id}]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://mirrors.nju.edu.cn/openeuler/openEuler-22.03-LTS/everything/$arch/\ngpgcheck=0\npriority=1\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos-LTS.repo - echo -e "[${version_id}-Next]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://mirrors.nju.edu.cn/openeuler/openEuler-22.03-LTS/EPOL/main/$arch/\ngpgcheck=0\npriority=1\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos-EPOL.repo - echo -e "[${version_id}-SP1]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://mirrors.nju.edu.cn/openeuler/openEuler-22.03-LTS-SP1/everything/$arch/\ngpgcheck=0\npriority=2\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos-SP1.repo - echo -e "[${version_id}-SP1-epol]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://mirrors.nju.edu.cn/openeuler/openEuler-22.03-LTS-SP1/EPOL/main/$arch/\ngpgcheck=0\npriority=2\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos-sp1-epol.repo + # openeuler 22.03-LTS-SP3 + echo -e "[${version_id}-SP3-extra]\nenabled=1\nmetadata_expire=1m\nbaseurl=http://nestos.org.cn/NestOS-22.03-LTS-SP3/NestOS-for-Container/20231231/$arch/\ngpgcheck=0\npriority=1\nskip_if_unavailable=False\n" > /etc/yum.repos.d/nestos-sp3.repo + echo -e "[${version_id}-SP3-multiversion-20231231]\nenabled=1\nmetadata_expire=1m\nbaseurl=http://mirrors.tuna.tsinghua.edu.cn/openeuler/openEuler-22.03-LTS-SP3/EPOL/multi_version/NestOS/For-Container/20231231/$arch/\ngpgcheck=0\npriority=2\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo + echo -e "[${version_id}-SP3-everything]\nenabled=1\nmetadata_expire=1m\nbaseurl=http://mirrors.tuna.tsinghua.edu.cn/openeuler/openEuler-22.03-LTS-SP3/everything/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo + echo -e "[${version_id}-SP3-EPOL]\nenabled=1\nmetadata_expire=1m\nbaseurl=http://mirrors.tuna.tsinghua.edu.cn/openeuler/openEuler-22.03-LTS-SP3/EPOL/main/$arch/\ngpgcheck=0\nskip_if_unavailable=False\n" >> /etc/yum.repos.d/nestos-sp3.repo } install_rpms() { local builddeps local frozendeps - # freeze kernel due to https://github.com/coreos/nestos-assembler/issues/2707 - #frozendeps=$(echo kernel-5.10.0-60.41.0.73.oe2203) - - yum install -y qemu-img qemu-block-iscsi qemu-block-curl qemu-hw-usb-host qemu-system-x86_64 qemu liburing-devel glib2-devel - arch=$(uname -m) - - case $arch in - "x86_64") yum install -y virglrenderer;; - *) echo "Only x86_64 need to install virglrenderer additionally" - esac - - case $arch in - "x86_64") rpm -iUh qemu-*.x86_64.rpm;; - "aarch64") rpm -iUh qemu-*.aarch64.rpm;; - *) fatal "Architecture ${arch} not supported" - esac - - yum install -y libsolv rpm-devel grubby initscripts iptables nftables python3-setuptools linux-firmware bubblewrap json-c ostree json-glib polkit-libs ostree-devel dnf-plugins-core container-selinux oci-runtime - case $arch in - "x86_64") rpm -iUh libsolv-0.7.22-1.x86_64.rpm libsolv-devel-0.7.22-1.x86_64.rpm kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm buildah-1.26.1-1.x86_64.rpm butane-0.14.0-1.oe2203.x86_64.rpm dumb-init-1.2.5-4.oe2203.x86_64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.x86_64.rpm rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm supermin-5.3.2-1.x86_64.rpm;; - "aarch64") rpm -iUh libsolv-0.7.22-1.aarch64.rpm libsolv-devel-0.7.22-1.aarch64.rpm kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm buildah-1.26.1-1.oe2203.aarch64.rpm butane-0.14.0-2.oe2203.aarch64.rpm dumb-init-1.2.5-1.oe2203.aarch64.rpm python3-semver-2.10.2-2.oe2203.noarch.rpm containers-common-1-1.oe2203.noarch.rpm netavark-1.0.2-1.oe2203.aarch64.rpm rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm supermin-5.3.2-1.oe2203.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 - #yum -y distro-sync + yum -y distro-sync # xargs is part of findutils, which may not be installed yum -y install /usr/bin/xargs @@ -84,7 +59,7 @@ install_rpms() { # Add fast-tracked packages here. We don't want to wait on bodhi for rpm-ostree # as we want to enable fast iteration there. - #yum --enablerepo=updates-testing upgrade rpm-ostree + #yum -y --enablerepo=updates-testing upgrade rpm-ostree # Allow Kerberos Auth to work from a keytab. The keyring is not # available in a Container. @@ -102,7 +77,10 @@ install_rpms() { } make_and_makeinstall() { - make && make install + make + make install + # Remove go build cache + # https://github.com/coreos/coreos-assembler/issues/2872 rm -rf /root/.cache/go-build } @@ -129,16 +107,16 @@ configure_user(){ echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel-nopasswd # Contents of /etc/sudoers.d need not to be world writable chmod 600 /etc/sudoers.d/wheel-nopasswd + # Allow the builder user to run rootless podman + # Referenced at: https://github.com/containers/podman/issues/4056#issuecomment-1245715492 + # Lifted from: https://github.com/containers/podman/blob/6e382d9ec2e6eb79a72537544341e496368b6c63/contrib/podmanimage/stable/Containerfile#L25-L26 + echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subuid + echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subgid } write_archive_info() { - cp -f ./packages /usr/lib64/guestfs/supermin.d/packages - #head -n -1 /etc/bashrc > ./bashrc - - #mv -f ./bashrc /etc/bashrc head -n -1 /etc/bashrc echo "TMOUT=32400" >> /etc/bashrc - #source /etc/bashrc # shellcheck source=src/cmdlib.sh . "${srcdir}/src/cmdlib.sh" mkdir -p /cosa /lib/coreos-assembler @@ -150,7 +128,9 @@ if [ $# -ne 0 ]; then # Run the function specified by the calling script ${1} else - # Otherwise, just run all the steps + # Otherwise, just run all the steps. NOTE: This is presently not actually + # used in `Dockerfile`, so if you add a stage you'll need to do it both + # here and there. configure_yum_repos install_rpms write_archive_info diff --git a/mantle/Makefile b/mantle/Makefile index b39d9ab06341d37fcd0ed636ba51fafff130ed82..b7edb6a3f2b30323c8ed45c97ad0eedd2c3b0c9d 100644 --- a/mantle/Makefile +++ b/mantle/Makefile @@ -5,10 +5,11 @@ MANTLE_BINARIES := ore kola plume KOLET_ARCHES := aarch64 ppc64le s390x x86_64 .PHONY: build -build: $(MANTLE_BINARIES) kolet +build: $(MANTLE_BINARIES) #kolet -.PHONY: $(MANTLE_BINARIES) kolet -$(MANTLE_BINARIES) kolet: +.PHONY: $(MANTLE_BINARIES) #kolet +#$(MANTLE_BINARIES) kolet: +$(MANTLE_BINARIES): ./build cmd/$(basename $@) .PHONY: schema-update @@ -18,7 +19,7 @@ schema-update: .PHONY: install install: cd bin && install -D -t $(DESTDIR)$(PREFIX)/bin $(MANTLE_BINARIES) - for arch in $(KOLET_ARCHES); do \ +# for arch in $(KOLET_ARCHES); do \ install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/$${arch} bin/$${arch}/kolet; \ done diff --git a/packages b/packages deleted file mode 100644 index 948a5b49cdf973551d22baba803dfa839ace6fa5..0000000000000000000000000000000000000000 --- a/packages +++ /dev/null @@ -1,57 +0,0 @@ -acl -attr -augeas-libs -bash -binutils -btrfs-progs -bzip2 -coreutils -cpio -cryptsetup -dhcp-client -diffutils -dosfstools -e2fsprogs -file -findutils -gawk -gdisk -glibc -glibc-gconv-extra -grep -gzip -hivex-libs -iproute -jansson -kernel -kmod -less -libacl -libcap -libgcc -libselinux -libtirpc -lsscsi -lvm2 -lzop -mdadm -ntfs-3g -ntfs-3g-system-compression -ntfsprogs -parted -pcre2 -policycoreutils -procps-ng -psmisc -rpm-libs -scrub -sed -squashfs-tools -systemd -systemd-libs -systemd-udev -tar -util-linux -xz -zerofree -hivex \ No newline at end of file diff --git a/rpm-package/buildah-1.26.1-1.oe2203.aarch64.rpm b/rpm-package/buildah-1.26.1-1.oe2203.aarch64.rpm deleted file mode 100644 index cdcd020ef7696cf91c3d299b477de3d7840ba02d..0000000000000000000000000000000000000000 Binary files a/rpm-package/buildah-1.26.1-1.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/buildah-1.26.1-1.x86_64.rpm b/rpm-package/buildah-1.26.1-1.x86_64.rpm deleted file mode 100755 index d19000350a112506522dd8c7e93b37f09d572137..0000000000000000000000000000000000000000 Binary files a/rpm-package/buildah-1.26.1-1.x86_64.rpm and /dev/null differ diff --git a/rpm-package/butane-0.14.0-1.oe2203.x86_64.rpm b/rpm-package/butane-0.14.0-1.oe2203.x86_64.rpm deleted file mode 100755 index 3dda8318141f1eba51fe120e5d775252e97ea908..0000000000000000000000000000000000000000 Binary files a/rpm-package/butane-0.14.0-1.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/butane-0.14.0-2.oe2203.aarch64.rpm b/rpm-package/butane-0.14.0-2.oe2203.aarch64.rpm deleted file mode 100644 index c3051c6fa6232a6c433e6fc4b5130e891202f2a0..0000000000000000000000000000000000000000 Binary files a/rpm-package/butane-0.14.0-2.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/containers-common-1-1.oe2203.noarch.rpm b/rpm-package/containers-common-1-1.oe2203.noarch.rpm deleted file mode 100644 index 3e98a2db75b2862ba58a8d7d6ffea71d2c771110..0000000000000000000000000000000000000000 Binary files a/rpm-package/containers-common-1-1.oe2203.noarch.rpm and /dev/null differ diff --git a/rpm-package/dumb-init-1.2.5-1.oe2203.aarch64.rpm b/rpm-package/dumb-init-1.2.5-1.oe2203.aarch64.rpm deleted file mode 100644 index f3b96a86cf6c85d241f039da0896584d38c0069c..0000000000000000000000000000000000000000 Binary files a/rpm-package/dumb-init-1.2.5-1.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/dumb-init-1.2.5-4.oe2203.x86_64.rpm b/rpm-package/dumb-init-1.2.5-4.oe2203.x86_64.rpm deleted file mode 100755 index dd039386bbb618938c5e0af2de0e3f092f70cd6d..0000000000000000000000000000000000000000 Binary files a/rpm-package/dumb-init-1.2.5-4.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm b/rpm-package/kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm deleted file mode 100644 index 035f1bd3e389ba5b9ab8468bf75ac353154d9df1..0000000000000000000000000000000000000000 Binary files a/rpm-package/kernel-5.10.0-118.0.0.64.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm b/rpm-package/kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm deleted file mode 100755 index 37ba92222206f45cf3c54a4e08885a917030760e..0000000000000000000000000000000000000000 Binary files a/rpm-package/kernel-5.10.0-60.41.0.73.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm b/rpm-package/kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm deleted file mode 100644 index aae859cd388efe6daec40c414b4d8f180d51e939..0000000000000000000000000000000000000000 Binary files a/rpm-package/kernel-headers-5.10.0-118.0.0.64.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm b/rpm-package/kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm deleted file mode 100755 index 43cb6969cbc8436ee9118d798e430f3a70f10016..0000000000000000000000000000000000000000 Binary files a/rpm-package/kernel-headers-5.10.0-60.41.0.73.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/libsolv-0.7.22-1.aarch64.rpm b/rpm-package/libsolv-0.7.22-1.aarch64.rpm deleted file mode 100644 index 95c19ad65b9bee9b7e0d1d5e10804197776f6281..0000000000000000000000000000000000000000 Binary files a/rpm-package/libsolv-0.7.22-1.aarch64.rpm and /dev/null differ diff --git a/rpm-package/libsolv-0.7.22-1.x86_64.rpm b/rpm-package/libsolv-0.7.22-1.x86_64.rpm deleted file mode 100644 index a1bcc733fbd72c2a85e4c5917e8f443baaf1d7db..0000000000000000000000000000000000000000 Binary files a/rpm-package/libsolv-0.7.22-1.x86_64.rpm and /dev/null differ diff --git a/rpm-package/libsolv-devel-0.7.22-1.aarch64.rpm b/rpm-package/libsolv-devel-0.7.22-1.aarch64.rpm deleted file mode 100644 index 8701e934933b56df6b64e6c6092280fc2839c4e9..0000000000000000000000000000000000000000 Binary files a/rpm-package/libsolv-devel-0.7.22-1.aarch64.rpm and /dev/null differ diff --git a/rpm-package/libsolv-devel-0.7.22-1.x86_64.rpm b/rpm-package/libsolv-devel-0.7.22-1.x86_64.rpm deleted file mode 100644 index 4a44212821a09593739af90fe2e1796f97df304a..0000000000000000000000000000000000000000 Binary files a/rpm-package/libsolv-devel-0.7.22-1.x86_64.rpm and /dev/null differ diff --git a/rpm-package/netavark-1.0.2-1.oe2203.aarch64.rpm b/rpm-package/netavark-1.0.2-1.oe2203.aarch64.rpm deleted file mode 100644 index 50ac4152c8c6367f789325033975504cfb61b58c..0000000000000000000000000000000000000000 Binary files a/rpm-package/netavark-1.0.2-1.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/netavark-1.0.2-1.x86_64.rpm b/rpm-package/netavark-1.0.2-1.x86_64.rpm deleted file mode 100755 index cafb0392f589434870999db4e9db31e555d8b739..0000000000000000000000000000000000000000 Binary files a/rpm-package/netavark-1.0.2-1.x86_64.rpm and /dev/null differ diff --git a/rpm-package/python3-semver-2.10.2-2.oe2203.noarch.rpm b/rpm-package/python3-semver-2.10.2-2.oe2203.noarch.rpm deleted file mode 100755 index ca10972db03cfd8c1dfc36bc6a7f63d2edbe4250..0000000000000000000000000000000000000000 Binary files a/rpm-package/python3-semver-2.10.2-2.oe2203.noarch.rpm and /dev/null differ diff --git a/rpm-package/qemu-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index 091af133b27100483e63636678cdd218c0aec079..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index 45b3dc7c1f34e728c9774f9b49ac4d61dc94d85f..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/qemu-block-curl-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-block-curl-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index ab0ad40f8892d5be5b84d36d18f0d216efad1fc0..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-block-curl-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-block-curl-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-block-curl-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index e2fb55772e3750c764b19044cadaafa70b4cdf8b..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-block-curl-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index 32d034d9ad679f8f3c7cea3c0442165d2707bff9..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index e33a884dab4934d53447ed0c268e0fca311594ae..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-block-iscsi-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index 814407a3cfacfac7d9e04ba5d9830aede1f8bae4..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index d82aa3e302e3673038fd515a4bb21825c0f7656d..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-hw-usb-host-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/qemu-img-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-img-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index 43aee2f64cd4799a2c817e9db48ef44e203cda46..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-img-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-img-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-img-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index d2482ca014c68a027d3c3241c44f5da261cf2088..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-img-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/qemu-system-aarch64-6.2.0-100.oe2203.aarch64.rpm b/rpm-package/qemu-system-aarch64-6.2.0-100.oe2203.aarch64.rpm deleted file mode 100644 index 32cd0e38f16a7e615d36c3013a384bf2358fcf53..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-system-aarch64-6.2.0-100.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/qemu-system-x86_64-6.2.0-100.oe2203.x86_64.rpm b/rpm-package/qemu-system-x86_64-6.2.0-100.oe2203.x86_64.rpm deleted file mode 100644 index 75f8d471247cc358dea85c52baee388f74304aea..0000000000000000000000000000000000000000 Binary files a/rpm-package/qemu-system-x86_64-6.2.0-100.oe2203.x86_64.rpm and /dev/null differ diff --git a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm deleted file mode 100644 index eb03488758c1ea32ad231a69bd73741e44f35d9c..0000000000000000000000000000000000000000 Binary files a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.aarch64.rpm and /dev/null differ diff --git a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm b/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm deleted file mode 100644 index 97b7f0b4c623603d9a080239511e202436b0d64a..0000000000000000000000000000000000000000 Binary files a/rpm-package/rpm-ostree-2022.16-3.oe2203sp2.x86_64.rpm and /dev/null differ diff --git a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm deleted file mode 100644 index 302291ae4df07233614942675b0aa7374856e6b6..0000000000000000000000000000000000000000 Binary files a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.aarch64.rpm and /dev/null differ diff --git a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm b/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm deleted file mode 100644 index ca1f1ba03c587f055ec580f540ef6dcded4480d6..0000000000000000000000000000000000000000 Binary files a/rpm-package/rpm-ostree-devel-2022.16-3.oe2203sp2.x86_64.rpm and /dev/null differ diff --git a/rpm-package/supermin-5.3.2-1.oe2203.aarch64.rpm b/rpm-package/supermin-5.3.2-1.oe2203.aarch64.rpm deleted file mode 100644 index 6d1b5fa60d97f88af06b80c23cf09869b04e856e..0000000000000000000000000000000000000000 Binary files a/rpm-package/supermin-5.3.2-1.oe2203.aarch64.rpm and /dev/null differ diff --git a/rpm-package/supermin-5.3.2-1.x86_64.rpm b/rpm-package/supermin-5.3.2-1.x86_64.rpm deleted file mode 100755 index 7e9495dbc11c3622fe79745e84ab9f94c986d9a3..0000000000000000000000000000000000000000 Binary files a/rpm-package/supermin-5.3.2-1.x86_64.rpm and /dev/null differ diff --git a/rpm-package/supermin-devel-5.3.2-1.x86_64.rpm b/rpm-package/supermin-devel-5.3.2-1.x86_64.rpm deleted file mode 100755 index 7d3066ab54c17a66ef7c03d1add8317467d25596..0000000000000000000000000000000000000000 Binary files a/rpm-package/supermin-devel-5.3.2-1.x86_64.rpm and /dev/null differ diff --git a/src/vmdeps.txt b/src/vmdeps.txt index b1830f9911e420220ff51fc70b26288adbe6ea85..50049fe0b6bbdaa7f6be9897f3c99b63c6200d35 100644 --- a/src/vmdeps.txt +++ b/src/vmdeps.txt @@ -3,7 +3,7 @@ # rpm-ostree runs (when run unprivileged) and create-disk.sh. # bare essentials -bash vim-minimal coreutils util-linux procps-ng kmod +bash vim-minimal coreutils util-linux procps-ng kmod NestOS-kernel # for composes rpm-ostree jq