summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-09-16 22:45:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-09-16 22:45:57 +0200
commitcb4f3df4a9ffeee06b0ecf746172343eb442220f (patch)
tree3f7be7cd9af92877873834cfd05835837a404c0c /mk
parent81c4c7c2cf2c5ff27a6c02e41bf484a53ea942c2 (diff)
make libvirt usable, add python
not very well tested, but runs on shutlle
Diffstat (limited to 'mk')
-rw-r--r--mk/modules.mk16
-rw-r--r--mk/package.mk6
-rw-r--r--mk/pkg-bottom.mk4
3 files changed, 21 insertions, 5 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index d087a2ab9..409278015 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -2,6 +2,22 @@
# 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
#
$(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
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"; \