[libvirt] [jenkins-ci PATCH] guests: Install EPEL on CentOS 7 container
by Fabiano Fidêncio
Since commit d63d6a59cc we're installing EPEL on CentOS7 in order to
have both "ninja" and "python36-*" packages in the system.
However, we've forgot to add the very code to the lcitool so the
containers would also have EPEL release installed.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
guests/lcitool | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/guests/lcitool b/guests/lcitool
index a3ef137..0d11d37 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -714,6 +714,14 @@ class Application:
{package_manager} autoremove -y && \\
{package_manager} clean all -y
""").format(**varmap))
+ else if os_name == "CentOS" and os_version == "7":
+ sys.stdout.write(textwrap.dedent("""
+ RUN {package_manager} update -y && \\
+ {package_manager} install -y epel-release && \\
+ {package_manager} install -y {pkgs} && \\
+ {package_manager} autoremove -y && \\
+ {package_manager} clean all -y
+ """).format(**varmap))
else:
sys.stdout.write(textwrap.dedent("""
RUN {package_manager} update -y && \\
--
2.23.0
5 years, 1 month
[libvirt] [jenkins-ci PATCH 0/3] Add python3 & python3-setup tools to the base project
by Fabiano Fidêncio
The former can be added to tbe base project as a direct or indirect
dependency of the most part of the projects in libvirt-jenkins-ci. The
latter is needed in order to use pip module for ansible, which is used
to install meson in platforms where it's either not supported or doesn't
match the minimum required version.
Fabiano Fidêncio (3):
guests: Move python3 to the base project
mappings: Add python3-setuptools
guests: Add python3-setuptools to the base project
guests/vars/mappings.yml | 4 ++++
guests/vars/projects/base.yml | 2 ++
guests/vars/projects/libvirt-dbus.yml | 1 -
guests/vars/projects/libvirt-python.yml | 1 -
guests/vars/projects/osinfo-db-tools.yml | 1 -
guests/vars/projects/osinfo-db.yml | 1 -
guests/vars/projects/virt-manager.yml | 1 -
7 files changed, 6 insertions(+), 5 deletions(-)
--
2.23.0
5 years, 1 month
[libvirt] Update the release note of released version
by Han Han
Hi,
Although libvirt-5.8 is released, however some features or improvement like
"slirp helper process" are missing in release note now. Can I update the
news.xml
even after v5.8 ?
--
Best regards,
-----------------------------------
Han Han
Quality Engineer
Redhat.
Email: hhan(a)redhat.com
Phone: +861065339333
5 years, 1 month
[libvirt] [PATCH 0/7] security: apparmor: prep for qcow2 data_file
by Cole Robinson
This series does some preparation cleanup and refactoring to
simplify adding qcow2 data_file support to the apparmor driver.
More info on the qcow2 feature and libvirt work here:
https://www.redhat.com/archives/libvir-list/2019-October/msg00303.html
Cole Robinson (7):
conf: Move -virDomainDiskDefForeachPath to virt-aa-helper
security: apparmor: Remove unused ignoreOpenFailure
security: apparmor: Drop disk_foreach_iterator
security: apparmor: Pass virStorageSource to add_file_path
security: apparmor: Push virStorageSource checks to add_file_path
security: apparmor: Use only virStorageSource for disk paths
security: apparmor: Make storage_source_add_files recursively callable
src/conf/domain_conf.c | 42 ----------------------------------
src/conf/domain_conf.h | 10 --------
src/libvirt_private.syms | 1 -
src/security/virt-aa-helper.c | 43 ++++++++++++++++++++++++-----------
4 files changed, 30 insertions(+), 66 deletions(-)
--
2.23.0
5 years, 1 month
[libvirt] [PATCH] tests: delete objectlocking test code
by Daniel P. Berrangé
The object locking test code is not run by any CI tests and has
bitrotted to the point where it isn't worth the effort to try to
fix it.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
.gitignore | 3 -
configure.ac | 12 -
tests/Makefile.am | 29 +-
tests/objectlocking.ml | 819 -----------------------------------------
4 files changed, 1 insertion(+), 862 deletions(-)
delete mode 100644 tests/objectlocking.ml
diff --git a/.gitignore b/.gitignore
index 82495e8692..6b4b2096cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,9 +231,6 @@
!/tests/virsh-self-test
!/tests/virt-aa-helper-test
!/tests/virt-admin-self-test
-/tests/objectlocking
-/tests/objectlocking-files.txt
-/tests/objectlocking.cm[ix]
/tests/reconnect
/tests/ssh
/tests/test_file_access.txt
diff --git a/configure.ac b/configure.ac
index 40e93e251e..74d3aea10c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -770,18 +770,6 @@ if test "$enable_test_coverage" = yes; then
WARN_CFLAGS=$save_WARN_CFLAGS
fi
-LIBVIRT_ARG_ENABLE([TEST_LOCKING], [thread locking tests using CIL], [no])
-case "$enable_test_locking" in
- yes|no) ;;
- *) AC_MSG_ERROR([bad value ${enable_test_locking} for test-locking option]) ;;
-esac
-
-if test "$enable_test_locking" = "yes"; then
- LOCK_CHECKING_CFLAGS="-save-temps"
- AC_SUBST([LOCK_CHECKING_CFLAGS])
-fi
-AM_CONDITIONAL([WITH_CIL],[test "$enable_test_locking" = "yes"])
-
dnl Cygwin, MinGW and MSVC checks
LIBVIRT_WIN_CHECK_COMMON
LIBVIRT_WIN_CHECK_CYGWIN
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d88ad7f686..10e1a5d78d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -332,10 +332,6 @@ test_programs += bhyvexml2argvtest bhyvexml2xmltest bhyveargv2xmltest
test_libraries += libbhyvexml2argvmock.la libbhyveargv2xmlmock.la
endif WITH_BHYVE
-if WITH_CIL
-test_programs += objectlocking
-endif WITH_CIL
-
if WITH_YAJL
test_programs += virjsontest
endif WITH_YAJL
@@ -1547,27 +1543,4 @@ else ! WITH_LINUX
EXTRA_DIST += virscsitest.c
endif ! WITH_LINUX
-if WITH_CIL
-CILOPTFLAGS =
-CILOPTINCS =
-CILOPTPACKAGES = -package unix,str,cil
-CILOPTLIBS = -linkpkg
-
-objectlocking_SOURCES = objectlocking.ml
-
-%.cmx: %.ml
- ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) -c $<
-
-objectlocking: objectlocking.cmx objectlocking-files.txt
- ocamlfind ocamlopt $(CILOPTFLAGS) $(CILOPTINCS) $(CILOPTPACKAGES) \
- $(CILOPTLIBS) $< -o $@
-
-objectlocking-files.txt:
- find $(top_builddir)/src/ -name '*.i' > $@
-
-else ! WITH_CIL
-EXTRA_DIST += objectlocking.ml
-endif ! WITH_CIL
-
-CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.cmi *.cmx \
- objectlocking-files.txt
+CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
diff --git a/tests/objectlocking.ml b/tests/objectlocking.ml
deleted file mode 100644
index 6726d29e73..0000000000
--- a/tests/objectlocking.ml
+++ /dev/null
@@ -1,819 +0,0 @@
-(*
- * Analyse libvirt driver API methods for mutex locking mistakes
- *
- * Copyright (C) 2008-2010, 2012, 2014 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *)
-
-open Pretty
-open Cil
-
-(*
- * Convenient routine to load the contents of a file into
- * a list of strings
- *)
-let input_file filename =
- let chan = open_in filename in
- let lines = ref [] in
- try while true; do lines := input_line chan :: !lines done; []
- with
- End_of_file -> close_in chan; List.rev !lines
-
-module DF = Dataflow
-module UD = Usedef
-module IH = Inthash
-module E = Errormsg
-module VS = UD.VS
-
-let debug = ref false
-
-
-let driverTables = [
- "virDriver";
- "virNetworkDriver";
- "virStorageDriver";
- "virNodeDeviceDriver";
-(* "virStateDriver"; Disable for now, since shutdown/startup have weird locking rules *)
-]
-
-(*
- * This is the list of all libvirt methods which return
- * pointers to locked objects
- *)
-let lockedObjMethods = [
- "virDomainFindByID";
- "virDomainFindByUUID";
- "virDomainFindByName";
- "virDomainAssignDef";
-
- "virNetworkObjFindByUUID";
- "virNetworkObjFindByName";
- "virNetworkAssignDef";
-
- "virNodeDeviceFindByName";
- "virNodeDeviceAssignDef";
-
- "virStoragePoolObjFindByUUID";
- "virStoragePoolObjFindByName";
- "virStoragePoolObjAssignDef"
-]
-
-
-(*
- * This is the list of all libvirt methods which
- * can release an object lock. Technically we
- * ought to pair them up correctly with previous
- * ones, but the compiler can already complain
- * about passing a virNetworkObjPtr to a virDomainObjUnlock
- * method so lets be lazy
- *)
-let objectLockMethods = [
- "virDomainObjLock";
- "virStoragePoolObjLock";
- "virNodeDevObjLock"
-]
-
-(*
- * This is the list of all libvirt methods which
- * can release an object lock. Technically we
- * ought to pair them up correctly with previous
- * ones, but the compiler can already complain
- * about passing a virNetworkObjPtr to a virDomainObjUnlock
- * method so lets be lazy
- *)
-let objectUnlockMethods = [
- "virDomainObjUnlock";
- "virStoragePoolObjUnlock";
- "virNodeDevObjUnlock"
-]
-
-(*
- * The data types that the previous two sets of
- * methods operate on
- *)
-let lockableObjects = [
- "virDomainObjPtr";
- "virNetworkObjPtr";
- "virStoragePoolObjPtr";
- "virNodeDevObjPtr"
-]
-
-
-
-(*
- * The methods which globally lock an entire driver
- *)
-let driverLockMethods = [
- "qemuDriverLock";
- "openvzDriverLock";
- "testDriverLock";
- "lxcDriverLock";
- "nodedevDriverLock";
- "networkDriverLock";
- "storageDriverLock";
- "oneDriverLock"
-]
-
-(*
- * The methods which globally unlock an entire driver
- *)
-let driverUnlockMethods = [
- "qemuDriverUnlock";
- "openvzDriverUnlock";
- "testDriverUnlock";
- "lxcDriverUnlock";
- "nodedevDriverUnlock";
- "networkDriverUnlock";
- "storageDriverUnlock";
- "oneDriverUnlock"
-]
-
-(*
- * The data types that the previous two sets of
- * methods operate on. These may be structs or
- * typedefs, we don't care
- *)
-let lockableDrivers = [
- "qemud_driver";
- "openvz_driver";
- "testConnPtr";
- "lxc_driver_t";
- "virStorageDriverStatePtr";
- "network_driver";
- "virNodeDeviceState";
- "one_driver_t";
-]
-
-
-let isFuncCallLval lval methodList =
- match lval with
- Var vi, o ->
- List.mem vi.vname methodList
- | _ -> false
-
-let isFuncCallExp exp methodList =
- match exp with
- Lval lval ->
- isFuncCallLval lval methodList
- | _ -> false
-
-let isFuncCallInstr instr methodList =
- match instr with
- Call (retval,exp,explist,srcloc) ->
- isFuncCallExp exp methodList
- | _ -> false
-
-
-
-let findDriverFunc init =
- match init with
- SingleInit (exp) -> (
- match exp with
- AddrOf (lval) -> (
- match lval with
- Var vi, o ->
- true
- | _ -> false
- )
- | _ -> false
- )
- | _ ->false
-
-let findDriverFuncs init =
- match init with
- CompoundInit (typ, list) ->
- List.filter (
- fun l ->
- match l with
- (offset, init) ->
- findDriverFunc init
-
- ) list;
- | _ -> ([])
-
-
-let getDriverFuncs initinfo =
- match initinfo.init with
- Some (i) ->
- let ls = findDriverFuncs i in
- ls
- | _ -> []
-
-let getDriverFuncName init =
- match init with
- SingleInit (exp) -> (
- match exp with
- AddrOf (lval) -> (
- match lval with
- Var vi, o ->
-
- vi.vname
- | _ -> "unknown"
- )
- | _ -> "unknown"
- )
- | _ -> "unknown"
-
-
-let getDriverFuncNames initinfo =
- List.map (
- fun l ->
- match l with
- (offset, init) ->
- getDriverFuncName init
- ) (getDriverFuncs initinfo)
-
-
-(*
- * Convenience methods which take a Cil.Instr object
- * and ask whether its associated with one of the
- * method sets defined earlier
- *)
-let isObjectFetchCall instr =
- isFuncCallInstr instr lockedObjMethods
-
-let isObjectLockCall instr =
- isFuncCallInstr instr objectLockMethods
-
-let isObjectUnlockCall instr =
- isFuncCallInstr instr objectUnlockMethods
-
-let isDriverLockCall instr =
- isFuncCallInstr instr driverLockMethods
-
-let isDriverUnlockCall instr =
- isFuncCallInstr instr driverUnlockMethods
-
-
-let isWantedType typ typeList =
- match typ with
- TNamed (tinfo, attrs) ->
- List.mem tinfo.tname typeList
- | TPtr (ptrtyp, attrs) ->
- let f = match ptrtyp with
- TNamed (tinfo2, attrs) ->
- List.mem tinfo2.tname typeList
- | TComp (cinfo, attrs) ->
- List.mem cinfo.cname typeList
- | _ ->
- false in
- f
- | _ -> false
-
-(*
- * Convenience methods which take a Cil.Varinfo object
- * and ask whether it matches a variable datatype that
- * we're interested in tracking for locking purposes
- *)
-let isLockableObjectVar varinfo =
- isWantedType varinfo.vtype lockableObjects
-
-let isLockableDriverVar varinfo =
- isWantedType varinfo.vtype lockableDrivers
-
-let isDriverTable varinfo =
- isWantedType varinfo.vtype driverTables
-
-
-(*
- * Take a Cil.Exp object (ie an expression) and see whether
- * the expression corresponds to a check for NULL against
- * one of our interesting objects
- * eg
- *
- * if (!vm) ...
- *
- * For a variable 'virDomainObjPtr vm'
- *)
-let isLockableThingNull exp funcheck =
- match exp with
- | UnOp (op,exp,typ) -> (
- match op with
- LNot -> (
- match exp with
- Lval (lhost, off) -> (
- match lhost with
- Var vi ->
- funcheck vi
- | _ -> false
- )
- | _ -> false
- )
- | _ -> false
- )
- | _ ->
- false
-
-let isLockableObjectNull exp =
- isLockableThingNull exp isLockableObjectVar
-
-let isLockableDriverNull exp =
- isLockableThingNull exp isLockableDriverVar
-
-
-(*
- * Prior to validating a function, initialize these
- * to VS.empty
- *
- * They contain the list of driver and object variables
- * objects declared as local variables
- *
- *)
-let lockableObjs: VS.t ref = ref VS.empty
-let lockableDriver: VS.t ref = ref VS.empty
-
-(*
- * Given a Cil.Instr object (ie a single instruction), get
- * the list of all used & defined variables associated with
- * it. Then caculate intersection with the driver and object
- * variables we're interested in tracking and return four sets
- *
- * List of used driver variables
- * List of defined driver variables
- * List of used object variables
- * List of defined object variables
- *)
-let computeUseDefState i =
- let u, d = UD.computeUseDefInstr i in
- let useo = VS.inter u !lockableObjs in
- let defo = VS.inter d !lockableObjs in
- let used = VS.inter u !lockableDriver in
- let defd = VS.inter d !lockableDriver in
- (used, defd, useo, defo)
-
-
-(* Some crude helpers for debugging this horrible code *)
-let printVI vi =
- ignore(printf " | %a %s\n" d_type vi.vtype vi.vname)
-
-let printVS vs =
- VS.iter printVI vs
-
-
-let prettyprint2 stmdat () (_, ld, ud, lo, ui, uud, uuo, loud, ldlo, dead) =
- text ""
-
-
-type ilist = Cil.instr list
-
-(*
- * This module implements the Cil.DataFlow.ForwardsTransfer
- * interface. This is what 'does the interesting stuff'
- * when walking over a function's code paths
- *)
-module Locking = struct
- let name = "Locking"
- let debug = debug
-
- (*
- * Our state currently consists of
- *
- * The set of driver variables that are locked
- * The set of driver variables that are unlocked
- * The set of object variables that are locked
- * The set of object variables that are unlocked
- *
- * Lists of Cil.Instr for:
- *
- * Instrs using an unlocked driver variable
- * Instrs using an unlocked object variable
- * Instrs locking a object variable while not holding a locked driver variable
- * Instrs locking a driver variable while holding a locked object variable
- * Instrs causing deadlock by fetching a lock object, while an object is already locked
- *
- *)
- type t = (unit * VS.t * VS.t * VS.t * VS.t * ilist * ilist * ilist * ilist * ilist)
-
- (* This holds an instance of our state data, per statement *)
- let stmtStartData = IH.create 32
-
- let pretty =
- prettyprint2 stmtStartData
-
- let copy (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- ((), ld, ud, lo, uo, uud, uuo, loud, ldlo, dead)
-
- let computeFirstPredecessor stm (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- ((), ld, ud, lo, uo, uud, uuo, loud, ldlo, dead)
-
-
- (*
- * Merge existing state for a statement, with new state
- *
- * If new and old state is the same, this returns None,
- * If they are different, then returns the union.
- *)
- let combinePredecessors (stm:stmt) ~(old:t) ((_, ldn, udn, lon, uon, uudn, uuon, loudn, ldlon, deadn):t) =
- match old with (_, ldo, udo, loo,uoo, uudo, uuoo, loudo, ldloo, deado)-> begin
- let lde= (VS.equal ldo ldn) || ((VS.is_empty ldo) && (VS.is_empty ldn)) in
- let ude= VS.equal udo udn || ((VS.is_empty udo) && (VS.is_empty udn)) in
- let loe= VS.equal loo lon || ((VS.is_empty loo) && (VS.is_empty lon)) in
- let uoe= VS.equal uoo uon || ((VS.is_empty uoo) && (VS.is_empty uon)) in
-
- if lde && ude && loe && uoe then
- None
- else (
- let ldret = VS.union ldo ldn in
- let udret = VS.union udo udn in
- let loret = VS.union loo lon in
- let uoret = VS.union uoo uon in
- Some ((), ldret, udret, loret, uoret, uudn, uuon, loudn, ldlon, deadn)
- )
- end
-
-
- (*
- * This handles a Cil.Instr object. This is sortof a C level statement.
- *)
- let doInstr i (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- let transform (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- let used, defd, useo, defo = computeUseDefState i in
-
-
- if isDriverLockCall i then (
- (*
- * A driver was locked, so add to the list of locked
- * driver variables, and remove from the unlocked list
- *)
- let retld = VS.union ld used in
- let retud = VS.diff ud used in
-
- (*
- * Report if any objects are locked already since
- * thats a deadlock risk
- *)
- if VS.is_empty lo then
- ((), retld, retud, lo, uo, uud, uuo, loud, ldlo, dead)
- else
- ((), retld, retud, lo, uo, uud, uuo, loud, List.append ldlo [i], dead)
- ) else if isDriverUnlockCall i then (
- (*
- * A driver was unlocked, so add to the list of unlocked
- * driver variables, and remove from the locked list
- *)
- let retld = VS.diff ld used in
- let retud = VS.union ud used in
-
- ((), retld, retud, lo, uo, uud, uuo, loud, ldlo, dead);
- ) else if isObjectFetchCall i then (
- (*
- * A object was fetched & locked, so add to the list of
- * locked driver variables. Nothing to remove from unlocked
- * list here.
- *
- * XXX, not entirely true. We should check if they're
- * blowing away an existing non-NULL value in the lval
- * really.
- *)
- let retlo = VS.union lo defo in
-
- (*
- * Report if driver is not locked, since that's a safety
- * risk
- *)
- if VS.is_empty ld then (
- if VS.is_empty lo then (
- ((), ld, ud, retlo, uo, uud, uuo, List.append loud [i], ldlo, dead)
- ) else (
- ((), ld, ud, retlo, uo, uud, uuo, List.append loud [i], ldlo, List.append dead [i])
- )
- ) else (
- if VS.is_empty lo then (
- ((), ld, ud, retlo, uo, uud, uuo, loud, ldlo, dead)
- ) else (
- ((), ld, ud, retlo, uo, uud, uuo, loud, ldlo, List.append dead [i])
- )
- )
- ) else if isObjectLockCall i then (
- (*
- * A driver was locked, so add to the list of locked
- * driver variables, and remove from the unlocked list
- *)
- let retlo = VS.union lo useo in
- let retuo = VS.diff uo useo in
-
- (*
- * Report if driver is not locked, since that's a safety
- * risk
- *)
- if VS.is_empty ld then
- ((), ld, ud, retlo, retuo, uud, uuo, List.append loud [i], ldlo, dead)
- else
- ((), ld, ud, retlo, retuo, uud, uuo, loud, ldlo, dead)
- ) else if isObjectUnlockCall i then (
- (*
- * A object was unlocked, so add to the list of unlocked
- * driver variables, and remove from the locked list
- *)
- let retlo = VS.diff lo useo in
- let retuo = VS.union uo useo in
- ((), ld, ud, retlo, retuo, uud, uuo, loud, ldlo, dead);
- ) else (
- (*
- * Nothing special happened, at best an assignment.
- * So add any defined variables to the list of unlocked
- * object or driver variables.
- * XXX same edge case as isObjectFetchCall about possible
- * overwriting
- *)
- let retud = VS.union ud defd in
- let retuo = VS.union uo defo in
-
- (*
- * Report is a driver is used while unlocked
- *)
- let retuud =
- if not (VS.is_empty used) && (VS.is_empty ld) then
- List.append uud [i]
- else
- uud in
- (*
- * Report is a object is used while unlocked
- *)
- let retuuo =
- if not (VS.is_empty useo) && (VS.is_empty lo) then
- List.append uuo [i]
- else
- uuo in
-
- ((), ld, retud, lo, retuo, retuud, retuuo, loud, ldlo, dead)
- );
- in
-
- DF.Post transform
-
- (*
- * This handles a Cil.Stmt object. This is sortof a C code block
- *)
- let doStmt stm (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- DF.SUse ((), ld, ud, lo, uo, [], [], [], [], [])
-
-
- (*
- * This handles decision making for a conditional statement,
- * ie an if (foo). It is called twice for each conditional
- * ie, once per possible choice.
- *)
- let doGuard exp (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- (*
- * If we're going down a branch where our object variable
- * is set to NULL, then we must remove it from the
- * list of locked objects. This handles the case of...
- *
- * vm = virDomainFindByUUID(..)
- * if (!vm) {
- * .... this code branch ....
- * } else {
- * .... leaves default handling for this branch ...
- * }
- *)
- let lonull = UD.computeUseExp exp in
-
- let loret =
- if isLockableObjectNull exp then
- VS.diff lo lonull
- else
- lo in
- let uoret =
- if isLockableObjectNull exp then
- VS.union uo lonull
- else
- uo in
- let ldret =
- if isLockableDriverNull exp then
- VS.diff ld lonull
- else
- ld in
- let udret =
- if isLockableDriverNull exp then
- VS.union ud lonull
- else
- ud in
-
- DF.GUse ((), ldret, udret, loret, uoret, uud, uuo, loud, ldlo, dead)
-
- (*
- * We're not filtering out any statements
- *)
- let filterStmt stm = true
-
-end
-
-module L = DF.ForwardsDataFlow(Locking)
-
-let () =
- (* Read the list of files from "libvirt-files". *)
- let files = input_file "objectlocking-files.txt" in
-
- (* Load & parse each input file. *)
- let files =
- List.map (
- fun filename ->
- (* Why does parse return a continuation? *)
- let f = Frontc.parse filename in
- f ()
- ) files in
-
- (* Merge them. *)
- let file = Mergecil.merge files "test" in
-
- (* Do control-flow-graph analysis. *)
- Cfg.computeFileCFG file;
-
- print_endline "";
-
- let driverVars = List.filter (
- function
- | GVar (varinfo, initinfo, loc) -> (* global variable *)
- if isDriverTable varinfo then
- true
- else
- false
- | _ -> false
- ) file.globals in
-
- let driverVarFuncs = List.map (
- function
- | GVar (varinfo, initinfo, loc) -> (* global variable *)
- if isDriverTable varinfo then
- getDriverFuncNames initinfo
- else
- []
- | _ -> []
- ) driverVars in
-
- let driverFuncsAll = List.flatten driverVarFuncs in
- let driverFuncsSkip = [
- "testClose";
- "openvzClose";
- ] in
- let driverFuncs = List.filter (
- fun st ->
- if List.mem st driverFuncsSkip then
- false
- else
- true
- ) driverFuncsAll in
-
- (*
- * Now comes our fun.... iterate over every global symbol
- * definition Cfg found..... but...
- *)
- List.iter (
- function
- (* ....only care about functions *)
- | GFun (fundec, loc) -> (* function definition *)
- let name = fundec.svar.vname in
-
- if List.mem name driverFuncs then (
- (* Initialize list of driver & object variables to be empty *)
- ignore (lockableDriver = ref VS.empty);
- ignore (lockableObjs = ref VS.empty);
-
- (*
- * Query all local variables, and figure out which correspond
- * to interesting driver & object variables we track
- *)
- List.iter (
- fun var ->
- if isLockableDriverVar var then
- lockableDriver := VS.add var !lockableDriver
- else if isLockableObjectVar var then
- lockableObjs := VS.add var !lockableObjs;
- ) fundec.slocals;
-
- List.iter (
- fun gl ->
- match gl with
- GVar (vi, ii, loc) ->
- if isLockableDriverVar vi then
- lockableDriver := VS.add vi !lockableDriver
- | _ -> ()
- ) file.globals;
-
- (*
- * Initialize the state for each statement (ie C code block)
- * to be empty
- *)
- List.iter (
- fun st ->
- IH.add Locking.stmtStartData st.sid ((),
- VS.empty, VS.empty, VS.empty, VS.empty,
- [], [], [], [], [])
- ) fundec.sallstmts;
-
- (*
- * This walks all the code paths in the function building
- * up the state for each statement (ie C code block)
- * ie, this is invoking the "Locking" module we created
- * earlier
- *)
- L.compute fundec.sallstmts;
-
- (*
- * Find all statements (ie C code blocks) which have no
- * successor statements. This means they are exit points
- * in the function
- *)
- let exitPoints = List.filter (
- fun st ->
- List.length st.succs = 0
- ) fundec.sallstmts in
-
- (*
- * For each of the exit points, check to see if there are
- * any with locked driver or object variables & grab them
- *)
- let leaks = List.filter (
- fun st ->
- let (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- IH.find Locking.stmtStartData st.sid in
- let leakDrivers = not (VS.is_empty ld) in
- let leakObjects = not (VS.is_empty lo) in
- leakDrivers || leakObjects
- ) exitPoints in
-
- let mistakes = List.filter (
- fun st ->
- let (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- IH.find Locking.stmtStartData st.sid in
- let lockDriverOrdering = (List.length ldlo) > 0 in
- let lockObjectOrdering = (List.length loud) > 0 in
-
- let useDriverUnlocked = (List.length uud) > 0 in
- let useObjectUnlocked = (List.length uuo) > 0 in
-
- let deadLocked = (List.length dead) > 0 in
-
- lockDriverOrdering || lockObjectOrdering || useDriverUnlocked || useObjectUnlocked || deadLocked
- ) fundec.sallstmts in
-
- if (List.length leaks) > 0 || (List.length mistakes) > 0 then (
- print_endline "================================================================";
- ignore (printf "Function: %s\n" name);
- print_endline "----------------------------------------------------------------";
- ignore (printf " - Total exit points with locked vars: %d\n" (List.length leaks));
-
- (*
- * Finally tell the user which exit points had locked varaibles
- * And show them the line number and code snippet for easy fixing
- *)
- List.iter (
- fun st ->
- ignore (Pretty.printf " - At exit on %a\n^^^^^^^^^\n" d_stmt st);
- let (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- IH.find Locking.stmtStartData st.sid in
- print_endline " variables still locked are";
- printVS ld;
- printVS lo
- ) leaks;
-
-
- ignore (printf " - Total blocks with lock ordering mistakes: %d\n" (List.length mistakes));
- List.iter (
- fun st ->
- let (_, ld, ud, lo, uo, uud, uuo, loud, ldlo, dead) =
- IH.find Locking.stmtStartData st.sid in
- List.iter (
- fun i ->
- ignore (Pretty.printf " - Driver locked while object is locked on %a\n" d_instr i);
- ) ldlo;
- List.iter (
- fun i ->
- ignore (Pretty.printf " - Object locked while driver is unlocked on %a\n" d_instr i);
- ) loud;
- List.iter (
- fun i ->
- ignore (Pretty.printf " - Driver used while unlocked on %a\n" d_instr i);
- ) uud;
- List.iter (
- fun i ->
- ignore (Pretty.printf " - Object used while unlocked on %a\n" d_instr i);
- ) uuo;
- List.iter (
- fun i ->
- ignore (Pretty.printf " - Object fetched while locked objects exist %a\n" d_instr i);
- ) dead;
- ) mistakes;
- print_endline "================================================================";
- print_endline "";
- print_endline "";
- );
-
- ()
- )
- | _ -> ()
- ) file.globals;
--
2.21.0
5 years, 1 month
[libvirt] [PATCH 00/10] scripts: fix nearly all flake8 style violations
by Daniel P. Berrangé
We recently introduced flake8 to check for bogus semicolon at the end of
line in python code. It can check for sooo much more than this. In
general it is desirable to comply with as much as possible, since this
results in python code that is more consistent in style to that seen in
other projects. Thus the goal was to enable everything. At the end there
are only two flake8 warnings that are surpressed. The line length one
leads to horrible code which I felt cannot be justified. The knuth line
break / operators one which I felt was of dubious value and though I
wouldn't object if someone wanted todo the work to address it.
Daniel P. Berrangé (10):
docs: remove some dead code in apibuild.py
build: change flake8 to use blacklist instead of whitelist
python: fix use of undeclared variables in python scripts
python: mark regex strings with 'r' prefix
python: avoid variable named 'l'
python: avoid bare 'except:' clause
python: sanitize blank line usage
python: sanitize spaces either side of operators
python: sanitize indentation after line continuations
build: comment on why we're not adopting certain flake8 rules
build-aux/syntax-check.mk | 15 +-
docs/apibuild.py | 446 ++++++++++++++---------------
docs/reformat-news.py | 1 +
src/esx/esx_vi_generator.py | 237 ++++++---------
src/hyperv/hyperv_wmi_generator.py | 29 +-
tests/cputestdata/cpu-cpuid.py | 5 +-
6 files changed, 326 insertions(+), 407 deletions(-)
--
2.21.0
5 years, 1 month
[libvirt] [dockerfiles PATCH] Refresh libosinfo containers after adding Meson to more platforms
by Fabiano Fidêncio
This will bring back the ability to have CentOS7, Debian9, Ubuntu16 and
Ubuntu18 containers.
The corresponding libvirt-jenkins-ci commit is b6aabedc67ca.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
https://gitlab.com/fidencio/libvirt-dockerfiles/tree/wip/more_libosinfo_c...
---
buildenv-libosinfo-centos-7.zip | Bin 0 -> 532 bytes
buildenv-libosinfo-debian-9.zip | Bin 0 -> 659 bytes
buildenv-libosinfo-ubuntu-16.zip | Bin 0 -> 662 bytes
buildenv-libosinfo-ubuntu-18.zip | Bin 0 -> 662 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 buildenv-libosinfo-centos-7.zip
create mode 100644 buildenv-libosinfo-debian-9.zip
create mode 100644 buildenv-libosinfo-ubuntu-16.zip
create mode 100644 buildenv-libosinfo-ubuntu-18.zip
diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip
new file mode 100644
index 0000000..2d98e00
Binary files /dev/null and b/buildenv-libosinfo-centos-7.zip differ
diff --git a/buildenv-libosinfo-debian-9.zip b/buildenv-libosinfo-debian-9.zip
new file mode 100644
index 0000000..23a57b2
Binary files /dev/null and b/buildenv-libosinfo-debian-9.zip differ
diff --git a/buildenv-libosinfo-ubuntu-16.zip b/buildenv-libosinfo-ubuntu-16.zip
new file mode 100644
index 0000000..6205134
Binary files /dev/null and b/buildenv-libosinfo-ubuntu-16.zip differ
diff --git a/buildenv-libosinfo-ubuntu-18.zip b/buildenv-libosinfo-ubuntu-18.zip
new file mode 100644
index 0000000..f443c20
Binary files /dev/null and b/buildenv-libosinfo-ubuntu-18.zip differ
--
2.23.0
5 years, 1 month
[libvirt] [dockerfiles PATCH] Re-introduce some libosinfo platforms
by Andrea Bolognani
Now that we can install Meson from pip, building libosinfo and
friends is once again possible on these platforms.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Plain-text diff below.
buildenv-libosinfo-centos-7.zip | Bin 0 -> 532 bytes
buildenv-libosinfo-debian-9.zip | Bin 0 -> 659 bytes
buildenv-libosinfo-ubuntu-16.zip | Bin 0 -> 662 bytes
buildenv-libosinfo-ubuntu-18.zip | Bin 0 -> 662 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 buildenv-libosinfo-centos-7.zip
create mode 100644 buildenv-libosinfo-debian-9.zip
create mode 100644 buildenv-libosinfo-ubuntu-16.zip
create mode 100644 buildenv-libosinfo-ubuntu-18.zip
diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip
new file mode 100644
index 0000000..fa8131e
--- /dev/null
+++ b/buildenv-libosinfo-centos-7.zip
@@ -0,0 +1,54 @@
+FROM centos:centos7
+
+RUN yum update -y && \
+ yum install -y \
+ autoconf \
+ automake \
+ bash \
+ bash-completion \
+ ca-certificates \
+ check-devel \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ gettext-devel \
+ git \
+ glib2-devel \
+ glibc-common \
+ glibc-devel \
+ gobject-introspection-devel \
+ gtk-doc \
+ hwdata \
+ intltool \
+ json-glib-devel \
+ libarchive-devel \
+ libsoup-devel \
+ libtool \
+ libxml2 \
+ libxml2-devel \
+ libxslt-devel \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconfig \
+ python2-setuptools \
+ python3 \
+ python3-pip \
+ python36-lxml \
+ python36-pytest \
+ python36-requests \
+ rpm-build \
+ screen \
+ strace \
+ sudo \
+ vala \
+ vim && \
+ yum autoremove -y && \
+ yum clean all -y
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libosinfo-debian-9.zip b/buildenv-libosinfo-debian-9.zip
new file mode 100644
index 0000000..35e894a
--- /dev/null
+++ b/buildenv-libosinfo-debian-9.zip
@@ -0,0 +1,58 @@
+FROM debian:9
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ check \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ hwdata \
+ intltool \
+ libarchive-dev \
+ libc6-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ libjson-glib-dev \
+ libsoup2.4-dev \
+ libtool \
+ libtool-bin \
+ libxml2-dev \
+ libxml2-utils \
+ libxslt1-dev \
+ locales \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-lxml \
+ python3-pip \
+ python3-pytest \
+ python3-requests \
+ screen \
+ strace \
+ sudo \
+ valac \
+ vim && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libosinfo-ubuntu-16.zip b/buildenv-libosinfo-ubuntu-16.zip
new file mode 100644
index 0000000..0fbfcd1
--- /dev/null
+++ b/buildenv-libosinfo-ubuntu-16.zip
@@ -0,0 +1,58 @@
+FROM ubuntu:16.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ check \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ hwdata \
+ intltool \
+ libarchive-dev \
+ libc6-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ libjson-glib-dev \
+ libsoup2.4-dev \
+ libtool \
+ libtool-bin \
+ libxml2-dev \
+ libxml2-utils \
+ libxslt1-dev \
+ locales \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-lxml \
+ python3-pip \
+ python3-pytest \
+ python3-requests \
+ screen \
+ strace \
+ sudo \
+ valac \
+ vim && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libosinfo-ubuntu-18.zip b/buildenv-libosinfo-ubuntu-18.zip
new file mode 100644
index 0000000..bb2edd6
--- /dev/null
+++ b/buildenv-libosinfo-ubuntu-18.zip
@@ -0,0 +1,58 @@
+FROM ubuntu:18.04
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get dist-upgrade -y && \
+ apt-get install --no-install-recommends -y \
+ autoconf \
+ automake \
+ autopoint \
+ bash \
+ bash-completion \
+ ca-certificates \
+ ccache \
+ check \
+ chrony \
+ gcc \
+ gdb \
+ gettext \
+ git \
+ gtk-doc-tools \
+ hwdata \
+ intltool \
+ libarchive-dev \
+ libc6-dev \
+ libgirepository1.0-dev \
+ libglib2.0-dev \
+ libjson-glib-dev \
+ libsoup2.4-dev \
+ libtool \
+ libtool-bin \
+ libxml2-dev \
+ libxml2-utils \
+ libxslt1-dev \
+ locales \
+ lsof \
+ make \
+ net-tools \
+ ninja-build \
+ patch \
+ perl \
+ pkgconf \
+ python3 \
+ python3-lxml \
+ python3-pip \
+ python3-pytest \
+ python3-requests \
+ screen \
+ strace \
+ sudo \
+ valac \
+ vim && \
+ apt-get autoremove -y && \
+ apt-get autoclean -y && \
+ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
+ dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
--
2.21.0
5 years, 1 month
[libvirt] [dockerfiles PATCH] Refresh after adding Meson to more platforms
by Andrea Bolognani
The corresponding libvirt-jenkins-ci commit is b6aabedc67ca.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed under the Dockerfile refresh rule. Plain-text diff below.
buildenv-libvirt-centos-7.zip | Bin 671 -> 715 bytes
buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 991 -> 1021 bytes
buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 983 -> 1013 bytes
buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 988 -> 1019 bytes
buildenv-libvirt-debian-9-cross-mips.zip | Bin 978 -> 1008 bytes
buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 989 -> 1024 bytes
buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 986 -> 1015 bytes
buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 990 -> 1021 bytes
buildenv-libvirt-debian-9-cross-s390x.zip | Bin 984 -> 1015 bytes
buildenv-libvirt-debian-9.zip | Bin 871 -> 901 bytes
buildenv-libvirt-ubuntu-16.zip | Bin 877 -> 907 bytes
buildenv-libvirt-ubuntu-18.zip | Bin 877 -> 909 bytes
12 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/buildenv-libvirt-centos-7.zip b/buildenv-libvirt-centos-7.zip
index 1d3c53a..871c20b 100644
--- a/buildenv-libvirt-centos-7.zip
+++ b/buildenv-libvirt-centos-7.zip
@@ -66,6 +66,8 @@ RUN yum update -y && \
perl \
pkgconfig \
polkit \
+ python2-setuptools \
+ python3-pip \
qemu-img \
radvd \
readline-devel \
@@ -81,3 +83,6 @@ RUN yum update -y && \
yajl-devel && \
yum autoremove -y && \
yum clean all -y
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip
index b2ed6ce..16ad2f1 100644
--- a/buildenv-libvirt-debian-9-cross-aarch64.zip
+++ b/buildenv-libvirt-debian-9-cross-aarch64.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -101,6 +102,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "aarch64-linux-gnu"
ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu \
--target=aarch64-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip
index 6c4bcd0..5642c86 100644
--- a/buildenv-libvirt-debian-9-cross-armv6l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv6l.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -99,6 +100,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "arm-linux-gnueabi"
ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi \
--target=arm-linux-gnueabi"
diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip
index 448933d..094b155 100644
--- a/buildenv-libvirt-debian-9-cross-armv7l.zip
+++ b/buildenv-libvirt-debian-9-cross-armv7l.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "arm-linux-gnueabihf"
ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf \
--target=arm-linux-gnueabihf"
diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip
index 0663d31..e9e113a 100644
--- a/buildenv-libvirt-debian-9-cross-mips.zip
+++ b/buildenv-libvirt-debian-9-cross-mips.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "mips-linux-gnu"
ENV CONFIGURE_OPTS "--host=mips-linux-gnu \
--target=mips-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip
index 7f93925..5022ccd 100644
--- a/buildenv-libvirt-debian-9-cross-mips64el.zip
+++ b/buildenv-libvirt-debian-9-cross-mips64el.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "mips64el-linux-gnuabi64"
ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64 \
--target=mips64el-linux-gnuabi64"
diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip
index b27758d..5d3eff7 100644
--- a/buildenv-libvirt-debian-9-cross-mipsel.zip
+++ b/buildenv-libvirt-debian-9-cross-mipsel.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "mipsel-linux-gnu"
ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu \
--target=mipsel-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip
index 97c54cb..91017a8 100644
--- a/buildenv-libvirt-debian-9-cross-ppc64le.zip
+++ b/buildenv-libvirt-debian-9-cross-ppc64le.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "powerpc64le-linux-gnu"
ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu \
--target=powerpc64le-linux-gnu"
diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip
index 64007ca..4f46538 100644
--- a/buildenv-libvirt-debian-9-cross-s390x.zip
+++ b/buildenv-libvirt-debian-9-cross-s390x.zip
@@ -41,6 +41,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -100,6 +101,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoremove -y && \
apt-get autoclean -y
+RUN pip3 install \
+ meson==0.49.0
+
ENV ABI "s390x-linux-gnu"
ENV CONFIGURE_OPTS "--host=s390x-linux-gnu \
--target=s390x-linux-gnu"
diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip
index 5166521..03347de 100644
--- a/buildenv-libvirt-debian-9.zip
+++ b/buildenv-libvirt-debian-9.zip
@@ -77,6 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -94,3 +95,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libvirt-ubuntu-16.zip b/buildenv-libvirt-ubuntu-16.zip
index d8f16e6..0c949f7 100644
--- a/buildenv-libvirt-ubuntu-16.zip
+++ b/buildenv-libvirt-ubuntu-16.zip
@@ -78,6 +78,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -95,3 +96,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
diff --git a/buildenv-libvirt-ubuntu-18.zip b/buildenv-libvirt-ubuntu-18.zip
index fc73330..6a293d7 100644
--- a/buildenv-libvirt-ubuntu-18.zip
+++ b/buildenv-libvirt-ubuntu-18.zip
@@ -78,6 +78,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
perl \
pkgconf \
policykit-1 \
+ python3-pip \
qemu-utils \
radvd \
screen \
@@ -95,3 +96,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales
+
+RUN pip3 install \
+ meson==0.49.0
--
2.21.0
5 years, 1 month
[libvirt] [PATCH v2 0/5] build: take full ownership of syntax-check from gnulib
by Daniel P. Berrangé
Our syntax-check rule relies in various files imported during the gnulib
bootstrap process. As we switch to meson & try to eliminate gnulib, we
need to take ownership of syntax-check.
This patch series follows the approach taken for libosinfo & other
projects wrt syntax-check rules, but goes a step further and eliminates
alot of baggage we don't care about & merges all logic into one file.
Changed in v2:
- Keep a top level GNUmakefile to preserve the hack
that forced serialization of build targets
Daniel P. Berrangé (5):
build: import gnulib's syntax-check make rules
build: move syntax-check code into build-aux directory
build: remove all logic unrelated to syntax-check
build: delete all syntax check rules we're skipping
build: merge all syntax-check logic into one file
.gitignore | 9 +-
GNUmakefile | 74 ++
Makefile.am | 7 +-
bootstrap.conf | 4 -
cfg.mk => build-aux/syntax-check.mk | 1122 +++++++++++++++++++++++++--
build-aux/useless-if-before-free | 226 ++++++
build-aux/vc-list-files | 113 +++
configure.ac | 6 +
8 files changed, 1482 insertions(+), 79 deletions(-)
create mode 100644 GNUmakefile
rename cfg.mk => build-aux/syntax-check.mk (53%)
create mode 100755 build-aux/useless-if-before-free
create mode 100755 build-aux/vc-list-files
--
2.21.0
5 years, 1 month
