# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1261169316 0
# Node ID c6eff72def0786b1989ada4ca79d2617c45d15b3
# Parent 46616f7e84109e5dfca48f8e6116ac166682114a
CA-33440: Add an 'install.sh' into which we can place commands like 'chkconfig
--add fe'. Eventually we can trigger this from a proper package post-install
script.
The script is named by repo currently:
/etc/xensource/scripts/install/install-xen-api-libs.hg.sh
Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>
diff -r 46616f7e8410 -r c6eff72def07 Makefile.in
--- a/Makefile.in Fri Dec 18 20:48:35 2009 +0000
+++ b/Makefile.in Fri Dec 18 20:48:36 2009 +0000
@@ -124,6 +124,7 @@
$(MAKE) -C stdext bininstall
$(MAKE) -C close-and-exec bininstall
$(MAKE) -C forking_executioner bininstall
+ $(MAKE) -C scripts bininstall
binuninstall:
$(MAKE) -C pciutil binuninstall
@@ -132,6 +133,7 @@
$(MAKE) -C stdext binuninstall
$(MAKE) -C close-and-exec binuninstall
$(MAKE) -C forking_executioner binuninstall
+ $(MAKE) -C scripts binuninstall
.PHONY: doc
doc:
diff -r 46616f7e8410 -r c6eff72def07 mk/Makefile
--- a/mk/Makefile Fri Dec 18 20:48:35 2009 +0000
+++ b/mk/Makefile Fri Dec 18 20:48:36 2009 +0000
@@ -34,7 +34,7 @@
mkdir -p $(MY_MAIN_PACKAGES)
(cd $(REPO) && sh autogen.sh && ./configure)
$(MAKE) -C $(REPO) bins
- $(MAKE) -C $(REPO) DESTDIR=$(STAGING) bininstall
+ $(MAKE) -C $(REPO) DESTDIR=$(STAGING) REPO=$(REPO) bininstall
tar -C $(STAGING) -jcf $@ .
$(OUTPUT_XAPI_DEVEL_PKG):
diff -r 46616f7e8410 -r c6eff72def07 rebuild
--- a/rebuild Fri Dec 18 20:48:35 2009 +0000
+++ b/rebuild Fri Dec 18 20:48:36 2009 +0000
@@ -1,4 +1,6 @@
#!/bin/sh
+
+export REPO=/myrepos/xen-api-libs.hg
set -e
make clean; make cleanxen;
diff -r 46616f7e8410 -r c6eff72def07 scripts/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/Makefile Fri Dec 18 20:48:36 2009 +0000
@@ -0,0 +1,13 @@
+IPROG=install -m 755 -o root -g root
+
+SCRIPTS=/etc/xensource/scripts/install
+
+REPO_SUFFIX:=$(shell basename "${REPO}")
+
+.PHONY: bininstall
+bininstall:
+ mkdir -p $(DESTDIR)$(SCRIPTS)
+ $(IPROG) install.sh
$(DESTDIR)$(SCRIPTS)/install-$(REPO_SUFFIX).sh
+
+.PHONY: binuninstall
+ rm -f $(DESTDIR)$(SCRIPTS)/install-$(REPO_SUFFIX).sh
diff -r 46616f7e8410 -r c6eff72def07 scripts/install.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/install.sh Fri Dec 18 20:48:36 2009 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Run after the binaries are unpacked to complete installation
+
+chkconfig --add fe
\ No newline at end of file
5 files changed, 23 insertions(+), 1 deletion(-)
Makefile.in | 2 ++
mk/Makefile | 2 +-
rebuild | 2 ++
scripts/Makefile | 13 +++++++++++++
scripts/install.sh | 5 +++++
xen-api-libs.hg-6.patch
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home