Gentoo Attachment #52424 for bug #70161

View | Details | Raw Unified
Collapse All | Expand All

(-) xen-2.0/ChangeLog (-2 / +2 lines)

Lines 198-206	Link Here

  Signed-off-by: ian.pratt@cl.cam.ac.uk

  Signed-off-by: ian.pratt@cl.cam.ac.uk

ChangeSet@1.1676, 2005-01-22 22:03:34+00:00, iap10@labyrinth.cl.cam.ac.uk

ChangeSet@1.1676, 2005-01-22 22:03:34+00:00, iap10@labyrinth.cl.cam.ac.uk

  Description: use DESTDIR correctly

  Description: use XENDESTDIR correctly

  Standard makefiles always attempt to install to the root(/).  Setting

  Standard makefiles always attempt to install to the root(/).  Setting

  DESTDIR is the normal way to install to an alternative location.

  XENDESTDIR is the normal way to install to an alternative location.

  Setting prefix has the possibility of breaking programs, as the prefix

  Setting prefix has the possibility of breaking programs, as the prefix

  may have been embedded inside a compiled binary.

  may have been embedded inside a compiled binary.

(-) xen-2.0/Makefile (-11 / +11 lines)

Lines 3-10	Link Here

# Default is to install to local 'dist' directory.

# Default is to install to local 'dist' directory.

DISTDIR ?= $(CURDIR)/dist

XENDISTDIR ?= $(CURDIR)/dist

DESTDIR ?= $(DISTDIR)/install

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		:= install

INSTALL		:= install

INSTALL_DIR	:= $(INSTALL) -d -m0755

INSTALL_DIR	:= $(INSTALL) -d -m0755

Lines 19-25	Link Here

ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))

ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))

XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )

XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )

export DESTDIR

export XENDESTDIR

# Export target architecture overrides to Xen and Linux sub-trees.

# Export target architecture overrides to Xen and Linux sub-trees.

ifneq ($(TARGET_ARCH),)

ifneq ($(TARGET_ARCH),)

Lines 39-49	Link Here

# build and install everything into local dist directory

# build and install everything into local dist directory

dist: xen tools kernels docs

dist: xen tools kernels docs

	$(INSTALL_DIR) $(DISTDIR)/check

	$(INSTALL_DIR) $(XENDISTDIR)/check

	$(INSTALL_DATA) ./COPYING $(DISTDIR)

	$(INSTALL_DATA) ./COPYING $(XENDISTDIR)

	$(INSTALL_DATA) ./README $(DISTDIR)

	$(INSTALL_DATA) ./README $(XENDISTDIR)

	$(INSTALL_PROG) ./install.sh $(DISTDIR)

	$(INSTALL_PROG) ./install.sh $(XENDISTDIR)

	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DISTDIR)/check

	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(XENDISTDIR)/check

xen:

xen:

	$(MAKE) -C xen install

	$(MAKE) -C xen install

Lines 110-116	Link Here

	tar -jxf iptables-1.2.11.tar.bz2

	tar -jxf iptables-1.2.11.tar.bz2

	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install

	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install

install-%: DESTDIR=

install-%: XENDESTDIR=

install-%: %

install-%: %

	@: # do nothing

	@: # do nothing

Lines 152-159	Link Here

	@echo '                     with extreme care!)'

	@echo '                     with extreme care!)'

# Use this target with extreme care!

# Use this target with extreme care!

uninstall: DESTDIR=

uninstall: XENDESTDIR=

uninstall: D=$(DESTDIR)

uninstall: D=$(XENDESTDIR)

uninstall:

uninstall:

	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old

	[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old

	rm -rf $(D)/etc/init.d/xend*

	rm -rf $(D)/etc/init.d/xend*

(-) xen-2.0/buildconfigs/Rules.mk (-2 / +2 lines)

Lines 1-8	Link Here

# We expect these two to already be set if people

# We expect these two to already be set if people

# are using the top-level Makefile

# are using the top-level Makefile

DISTDIR	?= $(CURDIR)/dist

XENDISTDIR	?= $(CURDIR)/dist

DESTDIR	?= $(DISTDIR)/install

XENDESTDIR	?= $(XENDISTDIR)/install

.PHONY:	mkpatches mrproper

.PHONY:	mkpatches mrproper

(-) xen-2.0/buildconfigs/mk.linux-2.4-xen0 (-4 / +4 lines)

Lines 15-23	Link Here

build: $(LINUX_DIR)/include/linux/autoconf.h

build: $(LINUX_DIR)/include/linux/autoconf.h

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \

fi

fi

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

patches/tmp/ebtables.diff:

patches/tmp/ebtables.diff:

	mkdir -p patches/tmp

	mkdir -p patches/tmp

Lines 37-44	Link Here

	# add ebtables patch

	# add ebtables patch

	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )

	( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )

	# Re-use config from install dir if one exits else use default config

	# Re-use config from install dir if one exits else use default config

	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \

	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \

	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \

	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \

		$(LINUX_DIR)/.config

		$(LINUX_DIR)/.config

	make -C $(LINUX_DIR) ARCH=xen oldconfig

	make -C $(LINUX_DIR) ARCH=xen oldconfig

(-) xen-2.0/buildconfigs/mk.linux-2.4-xenU (-4 / +4 lines)

Lines 15-23	Link Here

build: $(LINUX_DIR)/include/linux/autoconf.h

build: $(LINUX_DIR)/include/linux/autoconf.h

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \

fi

fi

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

	rm -rf $(LINUX_DIR)

	rm -rf $(LINUX_DIR)

Lines 30-37	Link Here

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  rm -f Makefile ; mv Mk.tmp Makefile )

	  rm -f Makefile ; mv Mk.tmp Makefile )

	# Re-use config from install dir if one exits else use default config

	# Re-use config from install dir if one exits else use default config

	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \

	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \

	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \

	  || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \

		$(LINUX_DIR)/.config

		$(LINUX_DIR)/.config

	make -C $(LINUX_DIR) ARCH=xen oldconfig

	make -C $(LINUX_DIR) ARCH=xen oldconfig

(-) xen-2.0/buildconfigs/mk.linux-2.6-xen0 (-4 / +4 lines)

Lines 15-23	Link Here

build: $(LINUX_DIR)/include/linux/autoconf.h

build: $(LINUX_DIR)/include/linux/autoconf.h

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \

fi

fi

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

	rm -rf $(LINUX_DIR)

	rm -rf $(LINUX_DIR)

Lines 30-37	Link Here

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  rm -f Makefile ; mv Mk.tmp Makefile )

	  rm -f Makefile ; mv Mk.tmp Makefile )

	# Re-use config from install dir if one exits else use default config

	# Re-use config from install dir if one exits else use default config

	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \

	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \

	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \

	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \

		$(LINUX_DIR)/.config

		$(LINUX_DIR)/.config

	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

(-) xen-2.0/buildconfigs/mk.linux-2.6-xenU (-4 / +4 lines)

Lines 15-23	Link Here

build: $(LINUX_DIR)/include/linux/autoconf.h

build: $(LINUX_DIR)/include/linux/autoconf.h

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \

	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(XENDESTDIR) modules_install ; \

fi

fi

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install

	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(XENDESTDIR) install

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)

	rm -rf $(LINUX_DIR)

	rm -rf $(LINUX_DIR)

Lines 30-37	Link Here

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \

	  rm -f Makefile ; mv Mk.tmp Makefile )

	  rm -f Makefile ; mv Mk.tmp Makefile )

	# Re-use config from install dir if one exits else use default config

	# Re-use config from install dir if one exits else use default config

	[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \

	[ -r $(XENDESTDIR)/boot/config-$(FULLVERSION) ] && \

	  cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  cp $(XENDESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \

	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \

	  || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \

		$(LINUX_DIR)/.config

		$(LINUX_DIR)/.config

	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

	$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

(-) xen-2.0/buildconfigs/mk.netbsd-2.0-xenU (-1 / +1 lines)

Lines 34-40	Link Here

netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools

netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools

	$(MAKE) -C netbsd-$(FULLVERSION) config

	$(MAKE) -C netbsd-$(FULLVERSION) config

	$(MAKE) -C netbsd-$(FULLVERSION) netbsd

	$(MAKE) -C netbsd-$(FULLVERSION) netbsd

	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install

	$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(XENDESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install

clean:

clean:

	$(MAKE) -C netbsd-$(FULLVERSION) clean

	$(MAKE) -C netbsd-$(FULLVERSION) clean

(-) xen-2.0/docs/Makefile (-5 / +5 lines)

Lines 35-45	Link Here

	rm -rf $(GFX) ps pdf html

	rm -rf $(GFX) ps pdf html

install: all

install: all

	rm -rf $(DESTDIR)$(pkgdocdir)

	rm -rf $(XENDESTDIR)$(pkgdocdir)

	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)

	$(INSTALL_DIR) $(XENDESTDIR)$(pkgdocdir)

	cp -dR ps $(DESTDIR)$(pkgdocdir)

	cp -dR ps $(XENDESTDIR)$(pkgdocdir)

	cp -dR pdf $(DESTDIR)$(pkgdocdir)

	cp -dR pdf $(XENDESTDIR)$(pkgdocdir)

	cp -dR html $(DESTDIR)$(pkgdocdir)

	cp -dR html $(XENDESTDIR)$(pkgdocdir)

pdf/%.pdf: ps/%.ps

pdf/%.pdf: ps/%.ps

	$(INSTALL_DIR) $(@D)

	$(INSTALL_DIR) $(@D)

(-) xen-2.0/linux-2.4.29-xen-sparse/drivers/scsi/aic7xxx/Makefile (-1 / +1 lines)

Lines 49-55	Link Here

endif

endif

# Override our module desitnation

# Override our module desitnation

MOD_DESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)

MOD_XENDESTDIR = $(shell cd .. && $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)

include $(TOPDIR)/Rules.make

include $(TOPDIR)/Rules.make

(-) xen-2.0/netbsd-2.0-xen-sparse/nbmake-xen (-1 / +1 lines)

Lines 16-22	Link Here

esac

esac

NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR

NETBSDSRCDIR="$TOPDIR"; export NETBSDSRCDIR

DESTDIR="$TOPDIR/root"; export DESTDIR

XENDESTDIR="$TOPDIR/root"; export XENDESTDIR

unset MAKEOBJDIRPREFIX

unset MAKEOBJDIRPREFIX

MAKEOBJDIR='${.CURDIR:C,^'"$TOPDIR,$TOPDIR/obj,}"; export MAKEOBJDIR

MAKEOBJDIR='${.CURDIR:C,^'"$TOPDIR,$TOPDIR/obj,}"; export MAKEOBJDIR

RELEASEDIR="$TOPDIR/release"; export RELEASEDIR

RELEASEDIR="$TOPDIR/release"; export RELEASEDIR

(-) xen-2.0/tools/examples/Makefile (-13 / +16 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

Lines 25-50	Link Here

install: all install-initd install-configs install-scripts

install: all install-initd install-configs install-scripts

install-initd:

install-initd:

	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d

	[ -d $(XENDESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(XENDESTDIR)/etc/init.d

	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d

	$(INSTALL_PROG) $(XEND_INITD) $(XENDESTDIR)/etc/init.d

	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d

	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(XENDESTDIR)/etc/init.d

install-configs:

install-configs:

	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \

	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR) ] || \

		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)

		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)

	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \

	[ -d $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto ] || \

		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto

		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_CONFIG_DIR)/auto

	for i in $(XEN_CONFIGS); \

	for i in $(XEN_CONFIGS); \

	    do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \

	    do [ -a $(XENDESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \

	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \

	    $(INSTALL_DATA) $$i $(XENDESTDIR)$(XEN_CONFIG_DIR); \

	done

	done

install-scripts:

install-scripts:

	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \

	[ -d $(XENDESTDIR)$(XEN_SCRIPT_DIR) ] || \

		$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)

		$(INSTALL_DIR) $(XENDESTDIR)$(XEN_SCRIPT_DIR)

	for i in $(XEN_SCRIPTS); \

	for i in $(XEN_SCRIPTS); \

	    do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \

	    do [ -a $(XENDESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \

	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \

	    $(INSTALL_PROG) $$i $(XENDESTDIR)$(XEN_SCRIPT_DIR); \

	done

	done

clean:

clean:

(-) xen-2.0/tools/libxc/Makefile (-6 / +9 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_DATA	= $(INSTALL) -m0644

INSTALL_DATA	= $(INSTALL) -m0644

Lines 66-77	Link Here

	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )

	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )

install: all

install: all

	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib

	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/lib

	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include

	[ -d $(XENDESTDIR)/usr/include ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/include

	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib

	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib

	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)

	ln -sf libxc.so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/libxc.so.$(MAJOR)

	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so

	ln -sf libxc.so.$(MAJOR) $(XENDESTDIR)/usr/lib/libxc.so

	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include

	$(INSTALL_DATA) xc.h $(XENDESTDIR)/usr/include

clean:

clean:

	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen

	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen

(-) xen-2.0/tools/libxutil/Makefile (-4 / +7 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

XEN_ROOT = ../..

XEN_ROOT = ../..

INSTALL		= install

INSTALL		= install

INSTALL_DATA	= $(INSTALL) -m0644

INSTALL_DATA	= $(INSTALL) -m0644

Lines 63-72	Link Here

fi

fi

install: all

install: all

	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib

	[ -d $(XENDESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(XENDESTDIR)/usr/lib

	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib

	$(INSTALL_PROG) $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib

	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)

	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)

	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so

	ln -sf $(LIB_NAME).so.$(MAJOR) $(XENDESTDIR)/usr/lib/$(LIB_NAME).so

clean:

clean:

	$(RM) *.a *.so *.so.* *.o *.rpm

	$(RM) *.a *.so *.so.* *.o *.rpm

(-) xen-2.0/tools/misc/Makefile (-4 / +7 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

Lines 23-32	Link Here

	$(MAKE) -C miniterm

	$(MAKE) -C miniterm

install: all

install: all

	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin

	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin

	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin

	[ -d $(XENDESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/sbin

	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin

	$(INSTALL_PROG) $(INSTALL_BIN) $(XENDESTDIR)/usr/bin

	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin

	$(INSTALL_PROG) $(INSTALL_SBIN) $(XENDESTDIR)/usr/sbin

#       No sense in installing miniterm on the Xen box.

#       No sense in installing miniterm on the Xen box.

#	$(MAKE) -C miniterm install

#	$(MAKE) -C miniterm install

(-) xen-2.0/tools/misc/miniterm/Makefile (-2 / +5 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

Lines 9-16	Link Here

all: $(TARGET)

all: $(TARGET)

install: all

install: all

	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin

	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin

	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin

	$(INSTALL_PROG) $(TARGET) $(XENDESTDIR)/usr/bin

clean:

clean:

	$(RM) *.o $(TARGET) *~

	$(RM) *.o $(TARGET) *~

(-) xen-2.0/tools/python/Makefile (-2 / +4 lines)

Lines 1-4	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

XEN_ROOT = ../..

XEN_ROOT = ../..

include $(XEN_ROOT)/tools/Rules.mk

include $(XEN_ROOT)/tools/Rules.mk

Lines 6-12	Link Here

	CFLAGS="$(CFLAGS)" python setup.py build

	CFLAGS="$(CFLAGS)" python setup.py build

install: all

install: all

	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"

	CFLAGS="$(CFLAGS)" python setup.py install --home="$(XENDESTDIR)/usr"

clean:

clean:

	rm -rf build *.pyc *.pyo *.o *.a *~

	rm -rf build *.pyc *.pyo *.o *.a *~

(-) xen-2.0/tools/sv/Makefile (-8 / +11 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../../dist

XENDESTDIR ?= $(XENDISTDIR)/install

sv_insdir := /var/lib/xen/sv

sv_insdir := /var/lib/xen/sv

INSTALL		= install

INSTALL		= install

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

Lines 17-34	Link Here

install:

install:

	# copy XenSV Main.rpy file

	# copy XenSV Main.rpy file

	@[ -d $(DESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(DESTDIR)$(sv_insdir)

	@[ -d $(XENDESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)

	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)

	@$(INSTALL_DATA) Main.rpy $(XENDESTDIR)$(sv_insdir)

	# copy XenSV images

	# copy XenSV images

	@[ -d $(DESTDIR)$(sv_insdir)/images ] || \

	@[ -d $(XENDESTDIR)$(sv_insdir)/images ] || \

		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images

		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/images

	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)

	# @(cd images && $(INSTALL_DATA) $(IMAGES) $(XENDESTDIR)$(sv_insdir)/images)

	# copy XenSV stylesheet

	# copy XenSV stylesheet

	@[ -d $(DESTDIR)$(sv_insdir)/inc ] || \

	@[ -d $(XENDESTDIR)$(sv_insdir)/inc ] || \

		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc

		$(INSTALL_DIR) $(XENDESTDIR)$(sv_insdir)/inc

	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc

	@$(INSTALL_DATA) inc/style.css inc/script.js $(XENDESTDIR)$(sv_insdir)/inc

clean:

clean:

(-) xen-2.0/tools/vnet/examples/Makefile (-2 / +2 lines)

Lines 6-12	Link Here

all:

all:

install:

install:

	install -m 0755 -d $(DESTDIR)$(XEN_SCRIPT_DIR)

	install -m 0755 -d $(XENDESTDIR)$(XEN_SCRIPT_DIR)

	install -m 0554 network-vnet $(DESTDIR)$(XEN_SCRIPT_DIR)

	install -m 0554 network-vnet $(XENDESTDIR)$(XEN_SCRIPT_DIR)

clean:

clean:

(-) xen-2.0/tools/vnet/vnet-module/Makefile-2.4 (-2 / +6 lines)

Lines 32-37	Link Here

VNET_OBJ += $(VNET_LIB_OBJ)

VNET_OBJ += $(VNET_LIB_OBJ)

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

#----------------------------------------------------------------------------

#----------------------------------------------------------------------------

vpath %.h $(KERNEL_SRC)/include

vpath %.h $(KERNEL_SRC)/include

Lines 82-89	Link Here

.PHONY: install install-module modules_install

.PHONY: install install-module modules_install

install install-module modules_install: module

install install-module modules_install: module

	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)

TAGS:

TAGS:

	etags *.c *.h

	etags *.c *.h

(-) xen-2.0/tools/vnet/vnet-module/Makefile-2.6 (-2 / +6 lines)

Lines 29-34	Link Here

#----------------------------------------------------------------------------

#----------------------------------------------------------------------------

#export KBUILD_VERBOSE=1

#export KBUILD_VERBOSE=1

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

.PHONY: all

.PHONY: all

all: module

all: module

Lines 38-45	Link Here

.PHONY: install install-module modules_install

.PHONY: install install-module modules_install

install install-module modules_install: module

install install-module modules_install: module

	install -m 0755 -d $(DESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0755 -d $(XENDESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0554 $(KERNEL_MODULE) $(DESTDIR)$(KERNEL_MODULE_DIR)

	install -m 0554 $(KERNEL_MODULE) $(XENDESTDIR)$(KERNEL_MODULE_DIR)

.PHONY: clean

.PHONY: clean

clean:

clean:

(-) xen-2.0/tools/vnet/vnetd/Makefile (-2 / +5 lines)

Lines 20-25	Link Here

#----------------------------------------------------------------------------

#----------------------------------------------------------------------------

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

XEN_ROOT  = ../../..

XEN_ROOT  = ../../..

include $(XEN_ROOT)/tools/Rules.mk

include $(XEN_ROOT)/tools/Rules.mk

Lines 91-98	Link Here

	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread

	$(CC) $(CFLAGS) -o $@ $^ $(VNETD_LIBS) -ldl -lpthread

install: vnetd

install: vnetd

	mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)

	mkdir -p $(XENDESTDIR)$(VNETD_INSTALL_DIR)

	install -m 0755 vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)

	install -m 0755 vnetd $(XENDESTDIR)$(VNETD_INSTALL_DIR)

clean:

clean:

	-rm -f *.a *.o *~

	-rm -f *.a *.o *~

(-) xen-2.0/tools/xentrace/Makefile (-8 / +11 lines)

Lines 1-3	Link Here

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

Lines 24-37	Link Here

all: $(BIN)

all: $(BIN)

install: all

install: all

	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin

	[ -d $(XENDESTDIR)/usr/bin ] || $(INSTALL_DIR) $(XENDESTDIR)/usr/bin

	[ -d $(DESTDIR)/usr/man/man1 ] || \

	[ -d $(XENDESTDIR)/usr/man/man1 ] || \

		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1

		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man1

	[ -d $(DESTDIR)/usr/man/man8 ] || \

	[ -d $(XENDESTDIR)/usr/man/man8 ] || \

		$(INSTALL_DIR) $(DESTDIR)/usr/man/man8

		$(INSTALL_DIR) $(XENDESTDIR)/usr/man/man8

	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin

	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(XENDESTDIR)/usr/bin

	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1

	$(INSTALL_DATA) $(MAN1) $(XENDESTDIR)/usr/man/man1

	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8

	$(INSTALL_DATA) $(MAN8) $(XENDESTDIR)/usr/man/man8

clean:

clean:

	$(RM) *.a *.so *.o *.rpm $(BIN)

	$(RM) *.a *.so *.o *.rpm $(BIN)

(-) xen-2.0/tools/xfrd/Makefile (-3 / +6 lines)

Lines 4-9	Link Here

# Mike Wray <mike.wray@hp.com>

# Mike Wray <mike.wray@hp.com>

#============================================================================

#============================================================================

# Default is to install to local 'dist' directory.

XENDISTDIR ?= ../dist

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL		= install

INSTALL		= install

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_PROG	= $(INSTALL) -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

INSTALL_DIR	= $(INSTALL) -d -m0755

Lines 70-78	Link Here

.PHONY: install

.PHONY: install

install: xfrd

install: xfrd

	[ -d $(DESTDIR)$(XFRD_INSTALL_DIR) ] || \

	[ -d $(XENDESTDIR)$(XFRD_INSTALL_DIR) ] || \

		$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)

		$(INSTALL_DIR) $(XENDESTDIR)$(XFRD_INSTALL_DIR)

	$(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)

	$(INSTALL_PROG) xfrd $(XENDESTDIR)$(XFRD_INSTALL_DIR)

.PHONY: libutil

.PHONY: libutil

libutil: $(UTIL_LIB)

libutil: $(UTIL_LIB)

(-) xen-2.0/xen/Makefile (-10 / +10 lines)

Lines 1-6	Link Here

# Default is to install to local 'dist' directory.

# Default is to install to local 'dist' directory.

DISTDIR ?= ../dist

XENDISTDIR ?= ../dist

DESTDIR ?= $(DISTDIR)/install

XENDESTDIR ?= $(XENDISTDIR)/install

INSTALL			= install

INSTALL			= install

INSTALL_DATA		= $(INSTALL) -m0644

INSTALL_DATA		= $(INSTALL) -m0644

Lines 28-41	Link Here

	$(MAKE) install

	$(MAKE) install

install: $(TARGET).gz

install: $(TARGET).gz

	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot

	[ -d $(XENDESTDIR)/boot ] || $(INSTALL_DIR) $(XENDESTDIR)/boot

	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot

	$(INSTALL_DATA) $(TARGET).gz $(XENDESTDIR)/boot

	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot

	$(INSTALL_DATA) $(TARGET)-syms $(XENDESTDIR)/boot

	[ -d $(DESTDIR)/usr/include/xen/io ] || \

	[ -d $(XENDESTDIR)/usr/include/xen/io ] || \

		$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io

		$(INSTALL_DIR) $(XENDESTDIR)/usr/include/xen/io

	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen

	$(INSTALL_DATA) include/public/*.h $(XENDESTDIR)/usr/include/xen

	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io

	$(INSTALL_DATA) include/public/io/*.h $(XENDESTDIR)/usr/include/xen/io

	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen

	$(INSTALL_DATA) include/public/COPYING $(XENDESTDIR)/usr/include/xen

clean:

clean:

	$(MAKE) -C tools clean

	$(MAKE) -C tools clean

Attachment #52424: xen-2.0.4.patch for bug #70161