diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2006-01-12 14:30:41 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2006-01-12 14:30:41 +0000 |
commit | 5cc7b262b29c1f3177f1b17fdcebbc1b888f00ae (patch) | |
tree | 5ad1acd2f7607c7316b64503fe46eca553097573 /sys-cluster/vzctl/files | |
parent | New patch from Zander to fix bugs in 8178 release. Closes bug #118252 and bug (diff) | |
download | historical-5cc7b262b29c1f3177f1b17fdcebbc1b888f00ae.tar.gz historical-5cc7b262b29c1f3177f1b17fdcebbc1b888f00ae.tar.bz2 historical-5cc7b262b29c1f3177f1b17fdcebbc1b888f00ae.zip |
fix PIC and multilib on amd64
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'sys-cluster/vzctl/files')
-rw-r--r-- | sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch | 110 | ||||
-rw-r--r-- | sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch | 66 |
2 files changed, 176 insertions, 0 deletions
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch b/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch new file mode 100644 index 000000000000..bc8c482277a8 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch @@ -0,0 +1,110 @@ +diff -NurpP vzctl-2.7.0-25/etc/ifup-venet vzctl-2.7.0-25-amd64/etc/ifup-venet +--- vzctl-2.7.0-25/etc/ifup-venet 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/ifup-venet 2006-01-12 16:54:15.145147672 +0300 +@@ -21,7 +21,7 @@ vznet=$DEVICE + modvenet="vznetdev vznet" + + . /etc/init.d/functions +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + . /etc/sysconfig/vz + + veinfo="/proc/vz/veinfo" +diff -NurpP vzctl-2.7.0-25/etc/vps-create vzctl-2.7.0-25-amd64/etc/vps-create +--- vzctl-2.7.0-25/etc/vps-create 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-create 2006-01-12 16:54:09.680978352 +0300 +@@ -16,7 +16,7 @@ + # VE_PRVT - path to root of VPS private areas + # PRIVATE_TEMPLATE - path to private template used as a source for copying + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar VE_PRVT PRIVATE_TEMPLATE + +diff -NurpP vzctl-2.7.0-25/etc/vps-net_add vzctl-2.7.0-25-amd64/etc/vps-net_add +--- vzctl-2.7.0-25/etc/vps-net_add 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-net_add 2006-01-12 16:54:09.681978200 +0300 +@@ -18,7 +18,7 @@ + # (several addresses should be divided by space) + # VE_STATE - state of VPS; could be one of: + # starting | stopping | running | stopped +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar VEID + +diff -NurpP vzctl-2.7.0-25/etc/vps-net_del vzctl-2.7.0-25-amd64/etc/vps-net_del +--- vzctl-2.7.0-25/etc/vps-net_del 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-net_del 2006-01-12 16:54:09.682978048 +0300 +@@ -18,7 +18,7 @@ + # VE_STATE - state of VPS; could be one of: + # starting | stopping | running | stopped + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar IP_ADDR VEID + +diff -NurpP vzctl-2.7.0-25/etc/vps-stop vzctl-2.7.0-25-amd64/etc/vps-stop +--- vzctl-2.7.0-25/etc/vps-stop 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-stop 2006-01-12 16:54:09.682978048 +0300 +@@ -15,7 +15,7 @@ + # VEID - VPS id + # IP_ADDR - VPS IP address(es) divided by spaces + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + # get list of network devices for vzarp + vzgetnetdev +diff -NurpP vzctl-2.7.0-25/etc/vpsnetclean vzctl-2.7.0-25-amd64/etc/vpsnetclean +--- vzctl-2.7.0-25/etc/vpsnetclean 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vpsnetclean 2006-01-12 16:54:09.683977896 +0300 +@@ -9,7 +9,7 @@ + # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + # + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + VEINFO=/proc/vz/veinfo + PROC_PROXY_TR=/proc/proxy/targets +diff -NurpP vzctl-2.7.0-25/include/modules.h vzctl-2.7.0-25-amd64/include/modules.h +--- vzctl-2.7.0-25/include/modules.h 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/include/modules.h 2006-01-12 16:52:10.262132776 +0300 +@@ -17,7 +17,7 @@ + #define TYPE_CMD 0 + #define TYPE_CONF 1 + +-#define MOD_DIR "/usr/lib/vzctl/modules/" ++#define MOD_DIR "/usr/lib64/vzctl/modules/" + + #define MOD_INFO_SYM "vz_get_mod_info" + +diff -NurpP vzctl-2.7.0-25/include/types.h vzctl-2.7.0-25-amd64/include/types.h +--- vzctl-2.7.0-25/include/types.h 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/include/types.h 2006-01-12 16:52:23.307149632 +0300 +@@ -13,8 +13,8 @@ + + #define GLOBAL_CFG "/etc/conf.d/vz" + #define VPS_CONF_DIR "/etc/vz/" +-#define LIB_DIR "/usr/lib/vzctl/lib/" +-#define VPS_SCRIPTS_DIR "/usr/lib/vzctl/scripts/" ++#define LIB_DIR "/usr/lib64/vzctl/lib/" ++#define VPS_SCRIPTS_DIR "/usr/lib64/vzctl/scripts/" + + #define VPS_STOP VPS_SCRIPTS_DIR "vps-stop" + #define VPS_NET_ADD VPS_SCRIPTS_DIR "vps-net_add" +diff -NurpP vzctl-2.7.0-25/src/Makefile vzctl-2.7.0-25-amd64/src/Makefile +--- vzctl-2.7.0-25/src/Makefile 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/src/Makefile 2006-01-12 16:51:56.383242688 +0300 +@@ -11,7 +11,7 @@ + INSTALL = install + PREFIX = /usr + SBINDIR = $(PREFIX)/sbin +- LIBDIR = $(PREFIX)/lib/vzctl ++ LIBDIR = $(PREFIX)/lib64/vzctl + CACHEDIR = /vz/template/cache + GLBCONFIG = /etc/sysconfig/vz + VPSCONFDIR = /etc/sysconfig/vz-scripts diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch new file mode 100644 index 000000000000..86601bb7ec32 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch @@ -0,0 +1,66 @@ +Index: src/Makefile +=================================================================== +RCS file: /home/l/cvs/Virtuozzo/Packages/swsoft/vzctl/src/Attic/Makefile,v +retrieving revision 1.1.2.44 +diff -u -r1.1.2.44 Makefile +--- src/Makefile 24 Oct 2005 13:09:05 -0000 1.1.2.44 ++++ src/Makefile 15 Nov 2005 12:37:19 -0000 +@@ -25,16 +25,17 @@ + + export LD_LIBRARY_PATH=. + CC = gcc +-CFLAGS = -Wall -g2 ++CFLAGS = -Wall -g2 ++SHAREDLIB_CFLAGS = -fPIC + VZKERNEL_HEADERS ?= /lib/modules/$(shell uname -r)/build/include + INC = -I ../include -I$(VZKERNEL_HEADERS) + ARCH=$(shell uname -i) + +-OBJ_libvzctl = lib/env.o lib/ub.o lib/net.o lib/logger.o lib/exec.o lib/cap.o \ +- lib/cpu.o lib/res.o lib/util.o lib/dist.o lib/list.o lib/script.o \ +- lib/dev.o lib/config.o lib/lock.o lib/quota.o lib/modules.o \ +- lib/iptables.o lib/fs.o lib/create.o +-OBJ_simfs=lib/fs_simfs.o ++OBJ_libvzctl = lib/env.lo lib/ub.lo lib/net.lo lib/logger.lo lib/exec.lo \ ++ lib/cap.lo lib/cpu.lo lib/res.lo lib/util.lo lib/dist.lo lib/list.lo \ ++ lib/script.lo lib/dev.lo lib/config.lo lib/lock.lo lib/quota.lo \ ++ lib/modules.lo lib/iptables.lo lib/fs.lo lib/create.lo ++OBJ_simfs=lib/fs_simfs.lo + OBJ_vzctl = vzctl.o vzctl-actions.o modules.o enter.o + OBJ_vzlist = vzlist.o + OBJ_arp = arpsend.o +@@ -42,7 +43,9 @@ + OBJ_memcheck = vzmemcheck.o validate.o + OBJ_cfgvalidate = vzcfgvalidate.o validate.o + OBJ_calc = vzcalc.o +-OBJ = $(OBJ_libvzctl) $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_split) ++OBJ = $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_arp) $(OBJ_split) $(OBJ_memcheck) \ ++ $(OBJ_cfgvalidate) $(OBJ_calc) ++SOBJ = $(OBJ_libvzctl) $(OBJ_simfs) + LIB_vzctl = libvzctl.so.$(LIB_VER) + LIB_simfs = libvzctl-simfs.so.$(LIB_VER) + LIB_fs = libvzctl-fs.so +@@ -69,6 +72,9 @@ + %.o: %.c + $(CC) -c $(CFLAGS) $(INC) $< -o $@ + ++%.lo: %.c ++ $(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@ ++ + $(LIB_simfs) : $(OBJ_simfs) + $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@ + +@@ -170,10 +176,10 @@ + install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ + inst-netscripts inst-configs inst-initd inst-cron + clean: +- rm -f *.o lib/*.o $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend ++ rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend + +-.depend:: $(OBJ:.o=.c) +- $(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $(OBJ:.o=.c) >.depend ++.depend:: $(OBJ:.o=.c) $(SOBJ:.lo=.c) ++ $(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $^ >.depend + + depend:: .depend + |