diff options
author | 2006-09-06 14:41:33 +0000 | |
---|---|---|
committer | 2006-09-06 14:41:33 +0000 | |
commit | c097ff019ef9ac12f2ad59cd0e1241e6fcbcd487 (patch) | |
tree | 1581ce87510393aa9b8975a087d5e38e939f0f1f /sys-cluster/vzctl/files | |
parent | fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev rules... (diff) | |
download | gentoo-2-c097ff019ef9ac12f2ad59cd0e1241e6fcbcd487.tar.gz gentoo-2-c097ff019ef9ac12f2ad59cd0e1241e6fcbcd487.tar.bz2 gentoo-2-c097ff019ef9ac12f2ad59cd0e1241e6fcbcd487.zip |
fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev rules for /dev/vzctl; fix check for /dev/vzctl
(Portage version: 2.1.1_pre4-r3)
(Signed Manifest commit)
Diffstat (limited to 'sys-cluster/vzctl/files')
-rw-r--r-- | sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 | 3 | ||||
-rw-r--r-- | sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch | 59 | ||||
-rw-r--r-- | sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch | 66 |
3 files changed, 0 insertions, 128 deletions
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 b/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 deleted file mode 100644 index d1e71e8f4e47..000000000000 --- a/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 790dc15a779764a453b11c2368bccc40 vzctl-3.0.10.tar.bz2 124070 -RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 vzctl-3.0.10.tar.bz2 124070 -SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f vzctl-3.0.10.tar.bz2 124070 diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch deleted file mode 100644 index 68bef8cd1dd8..000000000000 --- a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: vzctl-3.0.10/src/Makefile -=================================================================== ---- vzctl-3.0.10.orig/src/Makefile -+++ vzctl-3.0.10/src/Makefile -@@ -23,7 +23,6 @@ - VPSCONFDIR = /etc/vz/conf - LIBSCRIPTSDIR = /usr/lib/vzctl/scripts/ - SCRIPTSDIR = /usr/share/vzctl/scripts --NETSCRIPTDIR = /etc/sysconfig/network-scripts - CRONDDIR = /etc/cron.d - INITDDIR = /etc/init.d - VZDIR = /vz -@@ -70,10 +69,8 @@ LIBSCRIPTS = vps-create vps-postcreate v - PROGS = vzctl vzlist arpsend vzsplit vzcfgvalidate vzmemcheck vzcalc - LIBS = $(LIB_vzctl) $(LIB_simfs) - --INITSCRIPTS = vz - CRONSCRIPTS = vpsreboot vpsnetclean - SCRIPTS = vpsreboot vpsnetclean --NETSCRIPTS = ifcfg-venet0 ifdown-venet ifup-venet - VE0CONFIG = 0.conf - VECONFIG = ve-light.conf-sample ve-vps.basic.conf-sample - VECONFIG_IA64 = ve-light.conf-sample ve-vps.basic.conf-sample -@@ -155,13 +152,6 @@ inst-scripts: - for file in $(SCRIPTS); do \ - $(INSTALL) -m755 ../etc/$$file $(DESTDIR)$(SCRIPTSDIR)/$$file; \ - done --inst-netscripts: --ifneq "" "$(NETSCRIPTS)" -- $(INSTALL) -d $(DESTDIR)$(NETSCRIPTDIR) -- for file in $(NETSCRIPTS); do \ -- $(INSTALL) -m 755 ../etc/$$file $(DESTDIR)$(NETSCRIPTDIR)/$$file; \ -- done --endif - inst-configs: - $(INSTALL) -m 644 ../etc/vz.conf $(DESTDIR)$(GLBCONFIG) - ifeq ($(ARCH),ia64) -@@ -182,11 +172,6 @@ else - $(INSTALL) -m 644 ../etc/$(VE0CONFIG) $(DESTDIR)$(VPSCONFDIR)/$(VE0CONFIG) - endif - endif --inst-initd: -- for file in $(INITSCRIPTS); do \ -- $(INSTALL) -m 755 ../etc/init.d/$$file $(DESTDIR)$(INITDDIR)/$$file; \ -- done -- - inst-cron: - for file in $(CRONSCRIPTS); do \ - $(INSTALL) -m 644 ../etc/cron.d/$$file $(DESTDIR)$(CRONDDIR)/$$file; \ -@@ -208,8 +193,7 @@ inst-dirs: - $(INSTALL) -d $(DESTDIR)$(IPSTATEDIR) - $(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl - --install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ -- inst-netscripts inst-configs inst-initd inst-cron -+install: $(PROGS) inst-dirs install-lib inst-sbin inst-configs inst-cron inst-scripts - clean: - rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend - diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch deleted file mode 100644 index afe717e34402..000000000000 --- a/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Igor Sukhih <igor@openvz.org> -Date: Wed, 14 Jun 2006 13:28:00 +0000 (+0400) -Subject: Move LDFLAGS after libraries list for workaround for Wl,--as-needed -X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff;h=1da5df6aedd33b141374bf3c738d9fb6589f0d0d - -Move LDFLAGS after libraries list for workaround for Wl,--as-needed ---- - -Index: vzctl-3.0.10/src/Makefile -=================================================================== ---- vzctl-3.0.10.orig/src/Makefile -+++ vzctl-3.0.10/src/Makefile -@@ -102,7 +102,7 @@ check-version: - $(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@ - - $(LIB_simfs) : $(OBJ_simfs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_simfs) $(LDFLAGS) -shared -o $@ - - $(LIB_fs): $(LIB_simfs) - ln -sf $(LIB_simfs) $(LIB_fs) -@@ -112,16 +112,16 @@ libvzctl.a: $(OBJ_libvzctl) - ranlib $@ - - $(LIB_vzctl) : $(LIB_simfs) $(OBJ_libvzctl) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_libvzctl) $(LD_FLAGS) -shared -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_libvzctl) $(LD_FLAGS) $(LDFLAGS) -shared -o $@ - - vzctl-static: $(OBJ_vzctl) libvzctl.a - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(OBJ_simfs) libvzctl.a -rdynamic -ldl -lutil -o $@ - - vzctl: check-version $(LIB_vzctl) $(OBJ_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) -lutil -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) $(LDFLAGS) -lutil -o $@ - - vzlist: $(OBJ_vzlist) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - arpsend: $(OBJ_arp) - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@ -@@ -130,13 +130,13 @@ vzsplit: $(OBJ_split) - $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@ - - vzmemcheck: $(OBJ_memcheck) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $^ -o $@ -+ $(CC) $(CFLAGS) $(INC) $(LD_FLAGS) $(LIB_fs) $(LDFLAGS) $(LIB_vzctl) $^ -o $@ - - vzcfgvalidate: $(OBJ_cfgvalidate) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - vzcalc: $(OBJ_calc) $(LIB_vzctl) $(LIB_fs) -- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@ -+ $(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@ - - inst-sbin :$(PROGS) - for file in $(PROGS); do \ -@@ -205,7 +205,6 @@ inst-dirs: - $(INSTALL) -d $(DESTDIR)$(LOGRDIR) - $(INSTALL) -d $(DESTDIR)$(CACHEDIR) - $(INSTALL) -d $(DESTDIR)$(VEIPDUMPDIR) -- $(INSTALL) -d $(DESTDIR)$(IPSTATEDIR) - $(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl - - install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ |