Skip to content

Commit

Permalink
refactor vm handling
Browse files Browse the repository at this point in the history
- move common vm code into build-vm
- split vm-types into multiple build-vm-* plugins
- support xen 4.3
  • Loading branch information
mlschroe committed Mar 18, 2014
1 parent a46ebe9 commit 6f116f3
Show file tree
Hide file tree
Showing 17 changed files with 2,304 additions and 2,155 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SCM=$(shell if test -d .svn; then echo svn; elif test -d .git; then echo git; fi
DATE=$(shell date +%Y%m%d%H%M)
BUILD=build

INITVM_ARCH=$(shell bash detect_architecture.sh)
INITVM_ARCH=$(shell bash -c '. common_functions ; build_host_arch; echo $$BUILD_INITVM_ARCH')

ifeq ($(SCM),svn)
SVNVER=_SVN$(shell LANG=C svnversion .)
Expand Down Expand Up @@ -43,7 +43,6 @@ install:
getoptflags \
common_functions \
init_buildsystem \
initscript_qemu_vm \
substitutedeps \
debtransform \
debtransformbz2 \
Expand All @@ -60,11 +59,11 @@ install:
spectool \
signdummy \
unrpm \
zvm_functions \
$(DESTDIR)$(pkglibdir)
install -m755 emulator/emulator.sh $(DESTDIR)$(pkglibdir)/emulator/
install -m644 Build/*.pm $(DESTDIR)$(pkglibdir)/Build
install -m644 qemu-reg $(DESTDIR)$(pkglibdir)
install -m644 build-vm build-vm-* $(DESTDIR)$(pkglibdir)
install -m644 *.pm baselibs_global*.conf lxc.conf $(DESTDIR)$(pkglibdir)
install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs
install -m644 build.1 $(DESTDIR)$(man1dir)
Expand Down
Loading

0 comments on commit 6f116f3

Please sign in to comment.