mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-02 00:02:01 +00:00
snap: release 1.5.1
bump release version and delete hotfix patches fixes #367 Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
parent
f8acf38d7f
commit
7a4ee11cd1
@ -1,27 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 1c11f74..9c4709b 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -248,11 +248,11 @@ ifeq (,$(findstring $(DEFAULT_HYPERVISOR),$(KNOWN_HYPERVISORS)))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_QEMU))
|
|
||||||
- DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_QEMU)
|
|
||||||
+ DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_QEMU)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_FC))
|
|
||||||
- DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_FC)
|
|
||||||
+ DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_FC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
CONFDIR := $(DEFAULTSDIR)/$(PROJECT_DIR)
|
|
||||||
@@ -546,7 +546,7 @@ install-bin-libexec: $(BINLIBEXECLIST)
|
|
||||||
|
|
||||||
install-configs: $(CONFIGS)
|
|
||||||
$(QUIET_INST)$(foreach f,$(CONFIGS),$(call INSTALL_CONFIG,$f,$(dir $(CONFIG_PATH))))
|
|
||||||
- $(QUIET_INST)ln -sf $(DEFAULT_HYPERVISOR_CONFIG_PATH) $(CONFIG_PATH)
|
|
||||||
+ $(QUIET_INST)(cd $(dir $(DESTDIR)/$(CONFIG_PATH)) && ln -sf $(DEFAULT_HYPERVISOR_CONFIG_FILE) $(CONFIG_FILE))
|
|
||||||
|
|
||||||
install-scripts: $(SCRIPTS)
|
|
||||||
$(QUIET_INST)$(foreach f,$(SCRIPTS),$(call INSTALL_EXEC,$f,$(SCRIPTS_DIR)))
|
|
@ -1,22 +0,0 @@
|
|||||||
diff --git a/cli/main.go b/cli/main.go
|
|
||||||
index a01a02dc5..a021a0a77 100644
|
|
||||||
--- a/cli/main.go
|
|
||||||
+++ b/cli/main.go
|
|
||||||
@@ -250,6 +250,8 @@ func beforeSubcommands(c *cli.Context) error {
|
|
||||||
var runtimeConfig oci.RuntimeConfig
|
|
||||||
var err error
|
|
||||||
|
|
||||||
+ katautils.SetConfigOptions(name, defaultRuntimeConfiguration, defaultSysConfRuntimeConfiguration)
|
|
||||||
+
|
|
||||||
handleShowConfig(c)
|
|
||||||
|
|
||||||
if userWantsUsage(c) || (c.NArg() == 1 && (c.Args()[0] == checkCmd)) {
|
|
||||||
@@ -302,8 +304,6 @@ func beforeSubcommands(c *cli.Context) error {
|
|
||||||
ignoreLogging = true
|
|
||||||
}
|
|
||||||
|
|
||||||
- katautils.SetConfigOptions(name, defaultRuntimeConfiguration, defaultSysConfRuntimeConfiguration)
|
|
||||||
-
|
|
||||||
configFile, runtimeConfig, err = katautils.LoadConfiguration(c.GlobalString(configFilePathOption), ignoreLogging, false)
|
|
||||||
if err != nil {
|
|
||||||
fatal(err)
|
|
@ -1,5 +1,5 @@
|
|||||||
name: kata-containers
|
name: kata-containers
|
||||||
version: "1.5.0"
|
version: "1.5.1"
|
||||||
summary: Build lightweight VMs that seamlessly plug into the containers ecosystem
|
summary: Build lightweight VMs that seamlessly plug into the containers ecosystem
|
||||||
description: |
|
description: |
|
||||||
Kata Containers is an open source project and community working to build a
|
Kata Containers is an open source project and community working to build a
|
||||||
@ -33,8 +33,6 @@ parts:
|
|||||||
build-attributes: [no-patchelf]
|
build-attributes: [no-patchelf]
|
||||||
override-build: |
|
override-build: |
|
||||||
pkg_name=runtime
|
pkg_name=runtime
|
||||||
patch1="$(realpath ../../../snap/1162-runtime.patch)"
|
|
||||||
patch2="$(realpath ../../../snap/1185-runtime.patch)"
|
|
||||||
|
|
||||||
# set GOPATH
|
# set GOPATH
|
||||||
export GOPATH=$(realpath go)
|
export GOPATH=$(realpath go)
|
||||||
@ -48,11 +46,6 @@ parts:
|
|||||||
git clone -b ${SNAPCRAFT_PROJECT_VERSION} https://github.com/kata-containers/${pkg_name} ${pkg_gopath}
|
git clone -b ${SNAPCRAFT_PROJECT_VERSION} https://github.com/kata-containers/${pkg_name} ${pkg_gopath}
|
||||||
cd ${pkg_gopath}
|
cd ${pkg_gopath}
|
||||||
|
|
||||||
#Issue: https://github.com/kata-containers/runtime/pull/1162
|
|
||||||
patch -p1 < "${patch1}"
|
|
||||||
#Issue: https://github.com/kata-containers/runtime/issues/1185
|
|
||||||
patch -p1 < "${patch2}"
|
|
||||||
|
|
||||||
# build and install
|
# build and install
|
||||||
make \
|
make \
|
||||||
PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \
|
PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr \
|
||||||
|
Loading…
Reference in New Issue
Block a user