From cb4f3df4a9ffeee06b0ecf746172343eb442220f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 16 Sep 2009 22:45:57 +0200 Subject: make libvirt usable, add python not very well tested, but runs on shutlle --- mk/modules.mk | 16 ++++++++++++++++ mk/package.mk | 6 +++--- mk/pkg-bottom.mk | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index d087a2ab9..409278015 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1,6 +1,22 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +# +# Virtualization +# +$(eval $(call KMOD_template,KVM,kvm,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm \ +,90)) + +$(eval $(call KMOD_template,KVM_AMD,kvm-adm,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-amd \ +,95)) + +$(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\ + $(MODULES_DIR)/kernel/arch/${ARCH}/kvm/kvm-intel \ +,95)) + + # # Serial ATA devices # diff --git a/mk/package.mk b/mk/package.mk index 9f40c337a..6538eb004 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -196,13 +196,13 @@ endif grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \ tee '$${STAGING_PARENT}/pkg/$(1)' | \ cpio -apdlmu --quiet '$${STAGING_DIR}' - cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ + @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ done ifeq (,$(filter noscripts,$(7))) - cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ + @cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ '$${STAGING_PARENT}/pkg/$(1)' | \ while read fn; do \ b="$$$$(dd if="$$$$fn" bs=2 count=1 2>/dev/null)"; \ @@ -218,7 +218,7 @@ clean-targets: clean-dev-$(1) clean-dev-$(1): ifeq (,$(filter noremove,$(7))) - if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ + @if test -s '$${STAGING_PARENT}/pkg/$(1)'; then \ cd '$${STAGING_DIR}'; \ while read fn; do \ rm -f "$$$$fn"; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index cf4c62f95..64baf190c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -122,7 +122,7 @@ endif done @env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE) ifeq (,$(filter noremove,${PKG_OPTS})) - if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ + @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ @@ -207,7 +207,7 @@ clean-targets: clean-dev-generic clean-dev-generic: ifeq (,$(filter noremove,${PKG_OPTS})) - if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ + @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ -- cgit v1.2.3