Commit Graph

32 Commits

Author SHA1 Message Date
Jose Carlos Venegas Munoz
bfc9220663 package: fix path to qemu-vanilla in debs
Deb files has not a correct qemu vanilla path.

Fixes: #620

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-07-05 09:58:39 -05:00
Eric Ernst
4f0eb5308f packages: update default VMM to qemu-vanilla
We are looking to deprecate qemu-lite. As a first step,
let's go ahead and make qemu-vanilla (4.0) the default VMM.

We should probably rename qemu-vanilla to just qemu in a follow on
PR.

Fixes: #601

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2019-06-24 08:05:28 -07:00
Marco Vedovati
e7a643a064 runtime: omit the release number in RPM Requires:
For RPM packages (but not for DEBs), OBS does not use the release number
provided in the spec file, hence, when specifying a
`Requires: package = version-release` dependency, it's not possible to know
in advance the correct release number until that reuired package
is built.
Note that omitting the release number works for RPM packages but not for DEB.

This fixes/complements e6dac82
Fixes: #563

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2019-06-11 17:00:10 +02:00
Marco Vedovati
91cdeb1446 runtime: fix regression in package generation
Fix regression introduced with e6dac82 related to kata-runtime package
generation.

Fixes: #548

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2019-05-28 18:59:58 +02:00
Marco Vedovati
e6dac824fc runtime: fix strict "= VERSION" dependencies for deb pkg
When specifying a "Depends: (= VERSION" match in deb packages, the full
"VERSION" needs to be specified, including the trailing release number.

This fixes a regression introduced in: 63413814
Fixes: #531

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2019-05-28 10:33:13 +02:00
Nitesh Konkar
d4b1a328d0 runtime: qemu-lite required only for x86_64 arch
Make qemu-lite as requirement only
for x86_64 arch

Fixes: #529

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2019-05-22 18:59:29 +05:30
Marco Vedovati
f2100fd440 runtime: prettify Debian/Ubuntu package template
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2019-05-14 11:09:29 +02:00
Marco Vedovati
634138145e runtime: specify strict dependencies Debian package
Strict dependencies guarantees that an older version of the runtime will
not be installed together with a more recent version of the other kata
packages.
This complements commit e73473f.

Fixes: #508

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2019-05-14 11:09:29 +02:00
Jose Carlos Venegas Munoz
f8189fa9be pkgs: remove git hash from version
When a repository holds more than one kata version
it is difficult to ask dnf or zypper for a kata version
because the version includes a git commit.

This commit removes the sha from the package version.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-05-02 23:40:02 -05:00
Jose Carlos Venegas Munoz
e73473fc75 pkgs: restrict dependencies for runtime.
The runtime requiere the componets that were
build in are release. If other versions is used
it may fail.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-05-02 23:40:02 -05:00
Jose Carlos Venegas Munoz
7322f034b4 runtime: obs: remove unused variable
remove unused variable from spec

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-05-02 23:40:02 -05:00
Jose Carlos Venegas Munoz
4f02627d30 pkgs: runtime: spec fix qemu path
QEMUCMD is used to identify the defauly hypervisor on kata.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-01-30 08:49:34 -06:00
Jose Carlos Venegas Munoz
6e2677c456 pkgs: Fix spec file.
- Remove not needed require
- call %autosetup before apply patches.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-01-30 08:49:34 -06:00
Jose Carlos Venegas Munoz
6b11ed27a3 pkg: spec: add all files that match as config file.
New hypervisor configs could be added in the future, add
any possible new config file.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2019-01-28 14:32:19 -06:00
Peng Tao
7a269ea6e6 runtime-spec: add containerd-shim-kata-v2
Otherwise rpmbuild fails.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-12-24 16:53:07 +08:00
Marco Vedovati
b067be836d obs-packaging: remove dh-modaliases deb requirement
Remove the redundant dh-modaliases package as a build requirement
for deb packages. This allows to build packages for the Debian distro.

Fixes: #249

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-23 19:21:10 +01:00
Marco Vedovati
3084801cd8 runtime: skip golang version check in OBS pkg
Skip the golang version check when building the runtime, passing to make
`SKIP_GO_VERSION_CHECK=1`. This check requires yq, that's not packaged
for most distributions and it can't be downloaded at build time on OBS.
It is the responsibility of the package maintainer to verify that the
correct golang version is used.

Fixes: #242

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-11-20 11:47:35 +01:00
Graham Whaley
d3e3d9c32a Merge pull request #197 from bergwolf/fix-release
release: fix release scripts issues found in 1.3.0 and bump package versions
2018-10-02 10:41:41 +01:00
Jose Carlos Venegas Munoz
356de607fa Merge pull request #194 from marcov/qemu-version
obs-packaging: fix runtime qemu-* required version
2018-10-01 10:57:13 -05:00
Peng Tao
e074aa1099 spec: add kata-netmon to rpm spec
So that it is included in the package.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2018-09-29 11:09:32 +08:00
Nitesh Konkar
7fa02b2ef5 runtime: Skip qemu-lite dependency for non-amd64 packaging
Non-amd64 arch need not have qemu-lite as part of
their packaging dependency.

Fixes: #191

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
2018-09-26 22:47:06 +05:30
Marco Vedovati
dfabc9f08c obs-packaging: fix runtime qemu-* required version
The kata-runtime spec file, when specifying a `Requires:` version for
qemu-lite and qemu-vanilla, does not include the "+git.<commit hash>"
part.
As a result of this, versions of kata-runtime and qemu installed on a
system using RPM package management may be inconsistent.

Fixes: #193

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
2018-09-26 17:38:50 +02:00
Jose Carlos Venegas Munoz
2590f2b91e format: use shfmt to format sh files.
Use shfmt to format all the sh file.

https://github.com/mvdan/sh

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-16 16:45:35 -05:00
Jose Carlos Venegas Munoz
59e3ffcbfa obs: runtime: fix function call pkg_version.
pkg_version require 3 parameters.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-15 16:53:48 -05:00
Jose Carlos Venegas Munoz
f7074e178a obs: : Minor bash fixes (refactor)
Remove unused variables and set default value to variables.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
6c5c293f81 obs: scripts: Set bash options (refactor)
Add long name bash options.

Make xtrace optional when DEBUG variable is set.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-08-14 14:00:36 -05:00
Jose Carlos Venegas Munoz
a4355a7104 pkgs: Make constent variables names for versions.
Add `kata` prefix to versions variables.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-07-04 14:30:41 -05:00
Jose Carlos Venegas Munoz
6396e7c6d6 pkgs: Add commit to build.
We dont have commit when we build the pkg.
Lets define the COMMIT variable to kwnow the commit from each project.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-07-04 14:30:41 -05:00
Jose Carlos Venegas Munoz
90c62f8da1 pkgs: runtime: use DESTDIR variable.
Use DESTDIR to install kata-runtime.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-07-04 14:30:41 -05:00
Jose Carlos Venegas Munoz
2a55deb30d pkgs: runtime: Allow to build any commit.
Allow to build any commit instead of a tag.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-07-04 14:30:41 -05:00
Jose Carlos Venegas Munoz
e708c679e8 pkgs: update kernel paths.
Point to correct kernel config and patches paths.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-06-18 15:00:49 -05:00
Jose Carlos Venegas Munoz
c07d11c967 pkgs: move obs scripts to its own directory
This repository is growing is due to different projects are living
here, kernel config and patches, obs scripts, kata-deploy, release tools.

Lets move the obs scripts to its own directory.

Fixes: #75

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-06-18 15:00:49 -05:00