52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
|
xenpaging: add XEN_PAGING_DIR / libxl_xenpaging_dir_path()
|
||
|
|
|
||
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
Config.mk | 1 +
|
||
|
|
config/StdGNU.mk | 2 ++
|
||
|
|
tools/xenpaging/Makefile | 2 +-
|
||
|
|
3 files changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: xen-4.1.2-testing/Config.mk
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.1.2-testing.orig/Config.mk
|
||
|
|
+++ xen-4.1.2-testing/Config.mk
|
||
|
|
@@ -124,6 +124,7 @@ define buildmakevars2file-closure
|
||
|
|
echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1).tmp; \
|
||
|
|
echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1).tmp; \
|
||
|
|
echo "XEN_LOCK_DIR=\"$(XEN_LOCK_DIR)\"" >> $(1).tmp; \
|
||
|
|
+ echo "XEN_PAGING_DIR=\"$(XEN_PAGING_DIR)\"" >> $(1).tmp; \
|
||
|
|
if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi
|
||
|
|
endef
|
||
|
|
|
||
|
|
Index: xen-4.1.2-testing/config/StdGNU.mk
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.1.2-testing.orig/config/StdGNU.mk
|
||
|
|
+++ xen-4.1.2-testing/config/StdGNU.mk
|
||
|
|
@@ -46,9 +46,11 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
|
||
|
|
ifeq ($(PREFIX),/usr)
|
||
|
|
CONFIG_DIR = /etc
|
||
|
|
XEN_LOCK_DIR = /var/lock
|
||
|
|
+XEN_PAGING_DIR = /var/lib/xen/xenpaging
|
||
|
|
else
|
||
|
|
CONFIG_DIR = $(PREFIX)/etc
|
||
|
|
XEN_LOCK_DIR = $(PREFIX)/var/lock
|
||
|
|
+XEN_PAGING_DIR = $(PREFIX)/var/lib/xen/xenpaging
|
||
|
|
endif
|
||
|
|
|
||
|
|
SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
|
||
|
|
Index: xen-4.1.2-testing/tools/xenpaging/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/Makefile
|
||
|
|
+++ xen-4.1.2-testing/tools/xenpaging/Makefile
|
||
|
|
@@ -28,7 +28,7 @@ xenpaging: $(OBJS)
|
||
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
|
||
|
|
|
||
|
|
install: all
|
||
|
|
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/xenpaging
|
||
|
|
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR)
|
||
|
|
$(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
|
||
|
|
$(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
|
||
|
|
|