Skip to content

Commit

Permalink
kata-containers: adapt for msft-main sources
Browse files Browse the repository at this point in the history
* Removes all patches. See
  microsoft/kata-containers#122 (comment)
  for a discussion. Since then, the memory patch was included in msft-main
  and patch 0004 is included in microsoft/kata-containers#154.

* Requires the new Rust virtiosfd 1.8.0.

* Adds BuildRequires for devmapper code paths in msft-main.

* Cleans up runtime make flags:
  * Set DEFVIRTIOFSDAEMON to the Rust binary path.
  * The following were redundant as we were setting the default:
    * DEFSHAREDFS (now DEFSHAREDFS_CLH_VIRTIOFS)
    * DEFVIRTIOFSCACHESIZE
    * DEFSANDBOXCGROUPONLY
    * DEFSTATICRESOURCEMGMT_CLH
  * The following were referring to macros that do NOT expand to a value:
    * QEMUPATH
    * MACHINETYPE
  * FEATURE_SELINUX does not exist in the Kata source code.
  * DEFENABLEANNOTATIONS should not be set to ".*".

* Ensures sed doesn't break symlinks. For configuration.toml, sed would
  convert that file from a symlink to a regular, so it'd become out of sync
  with configuration-clh.toml. rootfs.sh isn't a symlink but added the flag as
  well for good measure.
  • Loading branch information
sprt committed Jan 24, 2024
1 parent cc1b3c5 commit c20754a
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 646 deletions.

This file was deleted.

This file was deleted.

122 changes: 0 additions & 122 deletions SPECS/kata-containers/0001-osbuilder-Add-support-for-CBL-Mariner.patch

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit c20754a

Please sign in to comment.