Bastian Blank
2006-Aug-22 18:01 UTC
[Pkg-xen-changes] r267 - trunk/xen-unstable/debian/patches
Author: waldi
Date: Tue Aug 22 18:01:10 2006
New Revision: 267
Modified:
trunk/xen-unstable/debian/patches/prefix-utils.dpatch
Log:
debian/patches/prefix-utils.dpatch: Don''t use sbin.
Modified: trunk/xen-unstable/debian/patches/prefix-utils.dpatch
=============================================================================---
trunk/xen-unstable/debian/patches/prefix-utils.dpatch (original)
+++ trunk/xen-unstable/debian/patches/prefix-utils.dpatch Tue Aug 22 18:01:10
2006
@@ -8,22 +8,21 @@
@DPATCH@
diff -urNad xen-unstable~/Config.mk xen-unstable/Config.mk
--- xen-unstable~/Config.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/Config.mk 2006-08-22 11:45:43.582050172 +0000
-@@ -43,6 +43,11 @@
++++ xen-unstable/Config.mk 2006-08-22 12:34:47.773260049 +0000
+@@ -43,6 +43,10 @@
include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
+PREFIX = lib/xen-$(XEN_VERSION_TOOLS)
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
-+SBINDIR = $(PREFIX)/sbin
+
ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
diff -urNad xen-unstable~/config/ia64.mk xen-unstable/config/ia64.mk
--- xen-unstable~/config/ia64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/ia64.mk 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/config/ia64.mk 2006-08-22 12:34:47.773260049 +0000
@@ -1,5 +1,3 @@
CONFIG_IA64 := y
CONFIG_IOEMU := y
@@ -32,7 +31,7 @@
-LIBDIR := lib
diff -urNad xen-unstable~/config/powerpc64.mk xen-unstable/config/powerpc64.mk
--- xen-unstable~/config/powerpc64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/powerpc64.mk 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/config/powerpc64.mk 2006-08-22 12:34:47.773260049 +0000
@@ -1,4 +1,3 @@
CONFIG_POWERPC := y
@@ -40,7 +39,7 @@
-LIBDIR := lib
diff -urNad xen-unstable~/config/x86_32.mk xen-unstable/config/x86_32.mk
--- xen-unstable~/config/x86_32.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_32.mk 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/config/x86_32.mk 2006-08-22 12:34:47.773260049 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
@@ -48,7 +47,7 @@
-LIBDIR := lib
diff -urNad xen-unstable~/config/x86_64.mk xen-unstable/config/x86_64.mk
--- xen-unstable~/config/x86_64.mk 2006-08-22 09:56:42.000000000 +0000
-+++ xen-unstable/config/x86_64.mk 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/config/x86_64.mk 2006-08-22 12:34:47.773260049 +0000
@@ -6,4 +6,3 @@
CONFIG_MBOOTPACK := y
@@ -56,7 +55,7 @@
-LIBDIR = lib64
diff -urNad xen-unstable~/tools/Rules.mk xen-unstable/tools/Rules.mk
--- xen-unstable~/tools/Rules.mk 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/Rules.mk 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/Rules.mk 2006-08-22 12:34:47.773260049 +0000
@@ -12,6 +12,9 @@
XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore
XEN_LIBXENSTAT = $(XEN_ROOT)/tools/xenstat/libxenstat/src
@@ -69,13 +68,13 @@
CFLAGS += -D__XEN_TOOLS__
diff -urNad xen-unstable~/tools/blktap/drivers/Makefile
xen-unstable/tools/blktap/drivers/Makefile
--- xen-unstable~/tools/blktap/drivers/Makefile 2006-08-22 09:56:47.000000000
+0000
-+++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-22 11:46:26.031339565
+0000
++++ xen-unstable/tools/blktap/drivers/Makefile 2006-08-22 12:34:47.773260049
+0000
@@ -7,7 +7,7 @@
INSTALL_PROG = $(INSTALL) -m0755
IBIN = blktapctrl tapdisk
QCOW_UTIL = img2qcow qcow2raw qcow-create
-INSTALL_DIR = /usr/sbin
-+INSTALL_DIR = /usr/$(SBINDIR)
++INSTALL_DIR = /usr/$(BINDIR)
LIBAIO_DIR = ../../libaio/src
CFLAGS += -fPIC
@@ -95,19 +94,18 @@
qcow-util: img2qcow qcow2raw qcow-create
diff -urNad xen-unstable~/tools/console/Makefile
xen-unstable/tools/console/Makefile
--- xen-unstable~/tools/console/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/console/Makefile 2006-08-22 11:45:43.582050172 +0000
-@@ -2,8 +2,8 @@
++++ xen-unstable/tools/console/Makefile 2006-08-22 12:34:47.773260049 +0000
+@@ -2,8 +2,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-DAEMON_INSTALL_DIR = /usr/sbin
-CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-+DAEMON_INSTALL_DIR = /usr/$(SBINDIR)
-+CLIENT_INSTALL_DIR = /usr/$(BINDIR)
++DIR = /usr/$(BINDIR)
INSTALL = install
INSTALL_PROG = $(INSTALL) -m0755
-@@ -25,11 +25,11 @@
+@@ -25,16 +24,15 @@
$(RM) client/*.o daemon/*.o
xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
@@ -121,10 +119,27 @@
-lxenctrl -lxenstore
.PHONY: install
+ install: $(BIN)
+- $(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+- $(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
++ $(INSTALL_DIR) -p $(DESTDIR)/$(DIR)
++ $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR)
++ $(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
diff -urNad xen-unstable~/tools/misc/Makefile xen-unstable/tools/misc/Makefile
--- xen-unstable~/tools/misc/Makefile 2006-08-22 09:56:46.000000000 +0000
-+++ xen-unstable/tools/misc/Makefile 2006-08-22 11:45:43.582050172 +0000
-@@ -32,10 +32,10 @@
++++ xen-unstable/tools/misc/Makefile 2006-08-22 12:35:00.871373487 +0000
+@@ -16,7 +16,7 @@
+ TARGETS = xenperf xc_shadow
+
+ INSTALL_BIN = $(TARGETS) xencons
+-INSTALL_SBIN = netfix xm xen-bugtool xend xenperf
++INSTALL_BIN += netfix xm xen-bugtool xend
+
+ .PHONY: all
+ all: build
+@@ -32,10 +32,8 @@
.PHONY: install
install: build
@@ -133,13 +148,11 @@
- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
- $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
+ $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(SBINDIR)
+ $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/$(SBINDIR)
$(MAKE) -C cpuperf install
$(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
-@@ -55,4 +55,4 @@
+@@ -55,4 +53,4 @@
$(CC) -c $(CFLAGS) -o $@ $<
$(TARGETS): %: %.o Makefile
@@ -147,7 +160,7 @@
+ $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
diff -urNad xen-unstable~/tools/misc/cpuperf/Makefile
xen-unstable/tools/misc/cpuperf/Makefile
--- xen-unstable~/tools/misc/cpuperf/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-22 11:45:43.582050172
+0000
++++ xen-unstable/tools/misc/cpuperf/Makefile 2006-08-22 12:34:47.773260049
+0000
@@ -37,14 +37,14 @@
$(CC) $(CFLAGS) -o $@ $<
@@ -167,7 +180,7 @@
# End of $RCSfile: Makefile,v $
diff -urNad xen-unstable~/tools/misc/lomount/Makefile
xen-unstable/tools/misc/lomount/Makefile
--- xen-unstable~/tools/misc/lomount/Makefile 2006-08-22 09:56:46.000000000
+0000
-+++ xen-unstable/tools/misc/lomount/Makefile 2006-08-22 11:45:43.582050172
+0000
++++ xen-unstable/tools/misc/lomount/Makefile 2006-08-22 12:34:47.773260049
+0000
@@ -21,7 +21,7 @@
.PHONY: install
@@ -179,7 +192,7 @@
clean:
diff -urNad xen-unstable~/tools/pygrub/Makefile
xen-unstable/tools/pygrub/Makefile
--- xen-unstable~/tools/pygrub/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/pygrub/Makefile 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/pygrub/Makefile 2006-08-22 12:34:47.773260049 +0000
@@ -11,7 +11,7 @@
.PHONY: install
ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -191,7 +204,7 @@
CFLAGS="$(CFLAGS)" python setup.py install
--root="$(DESTDIR)"
diff -urNad xen-unstable~/tools/python/Makefile
xen-unstable/tools/python/Makefile
--- xen-unstable~/tools/python/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/Makefile 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/python/Makefile 2006-08-22 12:34:47.773260049 +0000
@@ -6,15 +6,15 @@
.PHONY: build
@@ -213,7 +226,7 @@
.PHONY: test
diff -urNad xen-unstable~/tools/python/setup.py
xen-unstable/tools/python/setup.py
--- xen-unstable~/tools/python/setup.py 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/python/setup.py 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/python/setup.py 2006-08-22 12:34:47.773260049 +0000
@@ -5,6 +5,8 @@
XEN_ROOT = "../.."
@@ -249,7 +262,7 @@
libraries = libraries,
diff -urNad xen-unstable~/tools/xcutils/Makefile
xen-unstable/tools/xcutils/Makefile
--- xen-unstable~/tools/xcutils/Makefile 2006-08-22 09:56:47.000000000 +0000
-+++ xen-unstable/tools/xcutils/Makefile 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/xcutils/Makefile 2006-08-22 12:34:47.773260049 +0000
@@ -15,7 +15,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
@@ -261,7 +274,7 @@
diff -urNad xen-unstable~/tools/xenmon/Makefile
xen-unstable/tools/xenmon/Makefile
--- xen-unstable~/tools/xenmon/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenmon/Makefile 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/xenmon/Makefile 2006-08-22 12:34:47.773260049 +0000
@@ -15,8 +15,6 @@
INSTALL_DIR = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
@@ -279,42 +292,49 @@
- $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
- $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask
- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py
-+ $(INSTALL_DIR) $(DESTDIR)/usr/$(SBINDIR)
-+ $(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(SBINDIR)/xenbaked
-+ $(INSTALL_PROG) xentrace_setmask $(DESTDIR)/usr/$(SBINDIR)/xentrace_setmask
-+ $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(SBINDIR)/xenmon.py
++ $(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
++ $(INSTALL_PROG) xenbaked $(DESTDIR)/usr/$(BINDIR)/xenbaked
++ $(INSTALL_PROG) xentrace_setmask $(DESTDIR)/usr/$(BINDIR)/xentrace_setmask
++ $(INSTALL_PROG) xenmon.py $(DESTDIR)/usr/$(BINDIR)/xenmon.py
.PHONY: clean
clean:
diff -urNad xen-unstable~/tools/xenstat/xentop/Makefile
xen-unstable/tools/xenstat/xentop/Makefile
--- xen-unstable~/tools/xenstat/xentop/Makefile 2006-08-22 09:56:47.000000000
+0000
-+++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-22 11:45:43.582050172
+0000
-@@ -25,7 +25,7 @@
++++ xen-unstable/tools/xenstat/xentop/Makefile 2006-08-22 12:34:47.773260049
+0000
+@@ -25,7 +25,6 @@
prefix=/usr
mandir=$(prefix)/share/man
man1dir=$(mandir)/man1
-sbindir=$(prefix)/sbin
-+sbindir=$(prefix)/$(SBINDIR)
CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
+@@ -36,7 +35,7 @@
+
+ .PHONY: install
+ install: xentop xentop.1
+- $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
++ $(INSTALL_PROG) xentop $(DESTDIR)/usr/$(BINDIR)/xentop
+ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
+
+ endif
diff -urNad xen-unstable~/tools/xenstore/Makefile
xen-unstable/tools/xenstore/Makefile
--- xen-unstable~/tools/xenstore/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xenstore/Makefile 2006-08-22 11:45:43.582050172 +0000
-@@ -174,13 +174,13 @@
++++ xen-unstable/tools/xenstore/Makefile 2006-08-22 12:34:47.773260049 +0000
+@@ -174,13 +174,12 @@
install: all
$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
- $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
- $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(BINDIR)
-+ $(INSTALL_DIR) -p $(DESTDIR)/usr/$(SBINDIR)
$(INSTALL_DIR) -p $(DESTDIR)/usr/include
- $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
- $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
- $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
- $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-+ $(INSTALL_PROG) xenstored $(DESTDIR)/usr/$(SBINDIR)
++ $(INSTALL_PROG) xenstored $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
+ $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
@@ -323,7 +343,7 @@
ln -sf libxenstore.so.$(MAJOR).$(MINOR)
$(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
diff -urNad xen-unstable~/tools/xentrace/Makefile
xen-unstable/tools/xentrace/Makefile
--- xen-unstable~/tools/xentrace/Makefile 2006-08-22 09:56:45.000000000 +0000
-+++ xen-unstable/tools/xentrace/Makefile 2006-08-22 11:45:43.582050172 +0000
++++ xen-unstable/tools/xentrace/Makefile 2006-08-22 12:34:47.773260049 +0000
@@ -15,21 +15,20 @@
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))