#10 update to kata-osbuilder-1.11.1-1
Closed 3 years ago by pmores. Opened 3 years ago by pmores.
rpms/ pmores/kata-osbuilder update-f32-to-1.11.1  into  master

file modified
+2
@@ -17,6 +17,8 @@ 

  drivers+="virtio_console "

  # virtio 9p. Could be dropped eventually, virtio-fs covers us

  drivers+="9p 9pnet_virtio "

+ # vfio

+ drivers+="vfio-pci vfio"

  

  

  # Fedora: extra dracut modules

@@ -3,8 +3,8 @@ 

  

  [Service]

  Type=oneshot

- ExecStart=/usr/libexec/kata-containers/osbuilder/fedora-kata-osbuilder.sh -c

- ExecReload=/usr/libexec/kata-containers/osbuilder/fedora-kata-osbuilder.sh

+ ExecStart=/usr/libexec/kata-containers/osbuilder/kata-osbuilder.sh -c

+ ExecReload=/usr/libexec/kata-containers/osbuilder/kata-osbuilder.sh

  

  [Install]

  WantedBy=multi-user.target

kata-osbuilder.sh fedora-kata-osbuilder.sh
file renamed
+5 -3
@@ -17,6 +17,8 @@ 

  readonly GENERATED_IMAGE="${DRACUT_IMAGES}/kata-containers.img"

  readonly GENERATED_INITRD="${DRACUT_IMAGES}/kata-containers-initrd.img"

  

+ readonly DISTRO=`grep '^ID' /etc/os-release | awk '{print $2}' FS='='`

+ 

  

  KVERSION=`uname -r`

  KERNEL_PATH=""
@@ -168,7 +170,7 @@ 

      fi

  

      local agent_source_bin="${agent_dir}/usr/bin/kata-agent"

-     local osbuilder_version="fedora-osbuilder-version-unknown"

+     local osbuilder_version="${DISTRO}-osbuilder-version-unknown"

      local dracut_conf_dir="./dracut/dracut.conf.d"

      local tmp_initrd=`mktemp --tmpdir=${DRACUT_IMAGES}`

      unlink "$tmp_initrd"
@@ -210,8 +212,8 @@ 

      # Move images into place

      local image_osbuilder_dir="${IMAGE_TOPDIR}/osbuilder-images"

      local image_dir="${image_osbuilder_dir}/$KVERSION"

-     local initrd_dest_path="${image_dir}/fedora-kata-${KVERSION}.initrd"

-     local image_dest_path="${image_dir}/fedora-kata-${KVERSION}.img"

+     local initrd_dest_path="${image_dir}/${DISTRO}-kata-${KVERSION}.initrd"

+     local image_dest_path="${image_dir}/${DISTRO}-kata-${KVERSION}.img"

      local image_dest_link="${IMAGE_TOPDIR}/kata-containers.img"

  

      # This blows away the entire osbuilder-images/ dir, deleting any

file modified
+12 -4
@@ -5,7 +5,7 @@ 

  %global rcstr -%{rcver}

  %endif

  

- Version: 1.11.0

+ Version: 1.11.1

  

  %global katalibexecdir          %{_libexecdir}/kata-containers

  %global kataosbuilderdir        %{katalibexecdir}/osbuilder
@@ -26,7 +26,7 @@ 

  ExcludeArch: %{ix86}

  

  Source0: %{git0}/archive/%{version}%{?rcstr}/osbuilder-%{version}%{?rcstr}.tar.gz

- Source2: fedora-kata-osbuilder.sh

+ Source2: kata-osbuilder.sh

  Source3: kata-osbuilder-generate.service

  %if 0%{?fedora}

  Source5: 15-dracut-fedora.conf
@@ -96,7 +96,7 @@ 

      KVERSION="$(echo $kernelpath | cut -d "/" -f 4)"

      break

  done

- TEST_MODE=1 %{buildroot}%{kataosbuilderdir}/fedora-kata-osbuilder.sh \

+ TEST_MODE=1 %{buildroot}%{kataosbuilderdir}/kata-osbuilder.sh \

      -o %{buildroot}%{kataosbuilderdir} \

      -k "$KVERSION"

  
@@ -112,7 +112,7 @@ 

  

      TMPOUT="$(mktemp -t kata-rpm-post-XXXXXX.log)"

      echo "Creating kata appliance initrd..."

-     bash %{kataosbuilderdir}/fedora-kata-osbuilder.sh > ${TMPOUT} 2>&1

+     bash %{kataosbuilderdir}/kata-osbuilder.sh > ${TMPOUT} 2>&1

      if test "$?" != "0" ; then

          echo "Building failed. Here is the log details:"

          cat ${TMPOUT}
@@ -145,6 +145,14 @@ 

  

  

  %changelog

+ * Fri Jun 26 2020 Pavel Mores <pmores@redhat.com> - 1.11.1-1

+ - Update to version 1.11.1

+ - Make fedora-kata-osbuilder.sh distro-agnostic

+ - Rename fedora-kata-osbuilder.sh to kata-osbuilder.sh

+ 

+ * Tue Jun 02 2020 Fabiano FidĂȘncio <fidencio@redhat.com> - 1.11.0-2

+ - Add VFIO modules to the initrd

+ 

  * Fri May 08 2020 Cole Robinson <crobinso@redhat.com> - 1.11.0-1

  - Update to version 1.11.0

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (osbuilder-1.11.0.tar.gz) = cdca1124ba77afa149c98c734448fd1ffae03a2a6a2187e99bd636838deff81d71f8507cc4dbd18021f911cefb2601fc2c2647b1c3eecc28c475c30d5e6ac47b

+ SHA512 (osbuilder-1.11.1.tar.gz) = b7918dc429ca926c44bfe76468142f4a0eea47a79b23ad0cec363f3780543f2fda16ae77f7c7c75c99fa9a35665d6eb67473243e1002934f057e45f03036a68d

  • Update to version 1.11.1
  • Make fedora-kata-osbuilder.sh distro-agnostic
  • Rename fedora-kata-osbuilder.sh to kata-osbuilder.sh

Also backporting an older change:
- Add VFIO modules to the initrd

This looks good; but for some reason, it looks like this was not done on the tip of the branch (I'm given the choice to merge or rebase).

Just for the sake of learning, could you please rebase it and submit again? :-)

This won't merge directly because the PR is against master, but I suspect the intent is a PR against f32

Pull-Request has been closed by pmores

3 years ago