From 2e2a78e7f95b0bd1000ac05a650524cc731a3707 Mon Sep 17 00:00:00 2001 From: arifali Date: Sun, 8 Apr 2012 21:08:04 +0000 Subject: [PATCH] xcat-server: fixed further debian packaging * merging in fixes that were included in the spec file. * generalised rules file git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12161 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/debian/dirs | 7 +++++- xCAT-server/debian/install | 6 +++++ xCAT-server/debian/links | 1 - xCAT-server/debian/postrm | 2 ++ xCAT-server/debian/rules | 47 +++++++++++++++++++++----------------- 5 files changed, 40 insertions(+), 23 deletions(-) delete mode 100644 xCAT-server/debian/links diff --git a/xCAT-server/debian/dirs b/xCAT-server/debian/dirs index eafc743ed..158adb2d2 100644 --- a/xCAT-server/debian/dirs +++ b/xCAT-server/debian/dirs @@ -14,8 +14,11 @@ opt/xcat/share/xcat/image_data opt/xcat/share/xcat/cons opt/xcat/share/xcat/ib opt/xcat/share/xcat/ib/scripts +opt/xcat/share/xcat/ib/scripts/Mellanox +opt/xcat/share/xcat/ib/scripts/QLogic opt/xcat/share/xcat/ib/netboot opt/xcat/share/xcat/ib/netboot/sles +opt/xcat/share/xcat/ib/netboot/rh opt/xcat/lib opt/xcat/lib/perl opt/xcat/lib/perl/xCAT @@ -26,6 +29,8 @@ opt/xcat/lib/perl/xCAT_monitoring/samples opt/xcat/lib/perl/xCAT_monitoring/pcp opt/xcat/xdsh opt/xcat/xdsh/Context +opt/xcat/ws etc/init.d etc/xcat -opt/xcat/share/doc/packages/xCAT-server \ No newline at end of file +etc/apache2/conf.d +opt/xcat/share/doc/packages/xCAT-server diff --git a/xCAT-server/debian/install b/xCAT-server/debian/install index 0364adcee..376aadf4e 100644 --- a/xCAT-server/debian/install +++ b/xCAT-server/debian/install @@ -10,8 +10,13 @@ share/xcat/rollupdate/* opt/xcat/share/xcat/rollupdate share/xcat/installp_bundles/* opt/xcat/share/xcat/installp_bundles share/xcat/image_data/* opt/xcat/share/xcat/image_data share/xcat/cons/* opt/xcat/share/xcat/cons +share/xcat/cons/ivm opt/xcat/share/xcat/cons share/xcat/ib/scripts/* opt/xcat/share/xcat/ib/scripts +share/xcat/ib/scripts/Mellanox/* opt/xcat/share/xcat/ib/scripts/Mellanox +share/xcat/ib/scripts/QLogic/* opt/xcat/share/xcat/ib/scripts/QLogic share/xcat/ib/netboot/sles/* opt/xcat/share/xcat/ib/netboot/sles +share/xcat/ib/netboot/rh/* opt/xcat/share/xcat/ib/netboot/rh + lib/perl/xCAT/* opt/xcat/lib/perl/xCAT/ lib/xcat/plugins/* opt/xcat/lib/perl/xCAT_plugin/ @@ -22,5 +27,6 @@ lib/xcat/dsh/Context/* opt/xcat/xdsh/Context lib/xcat/shfunctions opt/xcat/lib etc/init.d/xcatd etc/init.d etc/xcat/postscripts.rules etc/xcat/ +xCAT-wsapi/* opt/xcat/ws/ LICENSE.html opt/xcat/share/doc/packages/xCAT-server diff --git a/xCAT-server/debian/links b/xCAT-server/debian/links deleted file mode 100644 index 4e7fec546..000000000 --- a/xCAT-server/debian/links +++ /dev/null @@ -1 +0,0 @@ -opt/xcat/share/xcat/cons/hmc opt/xcat/share/xcat/cons/ivm diff --git a/xCAT-server/debian/postrm b/xCAT-server/debian/postrm index 3f7776eb7..d2b136a25 100644 --- a/xCAT-server/debian/postrm +++ b/xCAT-server/debian/postrm @@ -29,6 +29,8 @@ case "$1" in fi update-rc.d xcatd disable rm -f /usr/sbin/xcatd #remove the symbolic + + rm -f /etc/apache2/conf.d/xcat-ws.conf ;; *) diff --git a/xCAT-server/debian/rules b/xCAT-server/debian/rules index ccf3f277d..61bea8b52 100644 --- a/xCAT-server/debian/rules +++ b/xCAT-server/debian/rules @@ -10,7 +10,9 @@ #export DH_VERBOSE=1 export DH_COMPAT=5 - +export buildroot=$(PWD)/debian/xcat-server +export prefix=/opt/xcat +export rootdir=$(buildroot)/$(prefix) build: pwd @@ -37,32 +39,35 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: pwd - ROOTDIR=`pwd`/debian/xcat-server/opt/xcat dh_testdir dh_testroot dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" - chmod 755 `pwd`/debian/xcat-server/opt/xcat/bin/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/sbin/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/share/xcat/ca/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/share/xcat/cons/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/share/xcat/ib/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/share/xcat/ib/netboot/sles/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_plugin/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/xdsh/Context/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_monitoring/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_monitoring/samples - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_monitoring/samples/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_monitoring/pcp - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_monitoring/pcp/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/* - chmod 755 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/samples - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/perl/xCAT_schema/samples/* - chmod 644 `pwd`/debian/xcat-server/opt/xcat/lib/shfunctions - chmod 644 `pwd`/debian/xcat-server/opt/xcat/share/doc/packages/xCAT-server/* + chmod 755 $(rootdir)/bin/* + chmod 755 $(rootdir)/sbin/* + chmod 644 $(rootdir)/share/xcat/ca/* + chmod 755 $(rootdir)/share/xcat/cons/* + chmod 755 $(rootdir)/share/xcat/ib/* + chmod 755 $(rootdir)/share/xcat/ib/netboot/sles/* + chmod 755 $(rootdir)/share/xcat/ib/netboot/rh/* + chmod 644 $(rootdir)/lib/perl/xCAT_plugin/* + chmod 644 $(rootdir)/lib/perl/xCAT/* + chmod 644 $(rootdir)/xdsh/Context/* + chmod 644 $(rootdir)/lib/perl/xCAT_monitoring/* + chmod 755 $(rootdir)/lib/perl/xCAT_monitoring/samples + chmod 644 $(rootdir)/lib/perl/xCAT_monitoring/samples/* + chmod 755 $(rootdir)/lib/perl/xCAT_monitoring/pcp + chmod 644 $(rootdir)/lib/perl/xCAT_monitoring/pcp/* + chmod 644 $(rootdir)/lib/perl/xCAT_schema/* + chmod 755 $(rootdir)/lib/perl/xCAT_schema/samples + chmod 644 $(rootdir)/lib/perl/xCAT_schema/samples/* + chmod 644 $(rootdir)/lib/shfunctions + chmod 644 $(rootdir)/share/doc/packages/xCAT-server/* + echo "ScriptAlias /xcatws $(prefix)/ws/xcatws.cgi" > $(buildroot)/etc/apache2/conf.d/xcat-ws.conf + cat $(PWD)/xCAT-wsapi/xcat-ws.conf.apache2 >> $(buildroot)/etc/apache2/conf.d/xcat-ws.conf + rm -rf $(rootdir)/ws/xcat-ws.conf* # dh_installmenu # dh_installdebconf # dh_installlogrotate