Mailing List Archive

# HG changeset patch
# User kfraser@localhost.localdomain
# Date 1188558747 -3600
# Node ID 16e01b0dcdbc7a4b737a5f80ba4ab8bf4e3db26c
# Parent 7e7e0ea6a0bbc093461f199947d6c99eaae01eba
Fix handling of auto-generated file xsm.py.
Signed-off-by: Keir Fraser <keir@xensource.com>
---
tools/python/xen/util/xsm/xsm.py | 9 ---------
.hgignore | 1 +
tools/python/Makefile | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)

diff -r 7e7e0ea6a0bb -r 16e01b0dcdbc .hgignore
--- a/.hgignore Fri Aug 31 12:05:07 2007 +0100
+++ b/.hgignore Fri Aug 31 12:12:27 2007 +0100
@@ -149,6 +149,7 @@
^tools/misc/xenperf$
^tools/pygrub/build/.*$
^tools/python/build/.*$
+^tools/python/xen/util/xsm/xsm\.py$
^tools/security/secpol_tool$
^tools/security/xen/.*$
^tools/security/xensec_tool$
diff -r 7e7e0ea6a0bb -r 16e01b0dcdbc tools/python/Makefile
--- a/tools/python/Makefile Fri Aug 31 12:05:07 2007 +0100
+++ b/tools/python/Makefile Fri Aug 31 12:12:27 2007 +0100
@@ -23,10 +23,10 @@ NLSDIR = /usr/share/locale
NLSDIR = /usr/share/locale

.PHONY: build buildpy
-buildpy:
+buildpy: xsm.py
CC="$(CC)" CFLAGS="$(CFLAGS)" XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build

-build: xsm.py buildpy refresh-pot refresh-po $(CATALOGS)
+build: buildpy refresh-pot refresh-po $(CATALOGS)

# NB we take care to only update the .pot file it strings have
# actually changed. This is complicated by the embedded date
diff -r 7e7e0ea6a0bb -r 16e01b0dcdbc tools/python/xen/util/xsm/xsm.py
--- a/tools/python/xen/util/xsm/xsm.py Fri Aug 31 12:05:07 2007 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-XEN_SECURITY_MODULE = "flask"
-from xsm_core import *
-
-import xen.util.xsm.flask.flask as xsm_module
-
-xsm_init(xsm_module)
-from xen.util.xsm.flask.flask import *
-del xsm_module
-

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog