Merge branch 'master' of git+ssh://openadk.org/git/openadk

4 files changed, 41 insertions, 7 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..c28f22a7c 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,9 +3,15 @@
 
 all: build-all-ipkgs
 
+ifeq ($(ADK_STATIC),y)
+TCFLAGS:=		${TARGET_CFLAGS} -static
+TCXXFLAGS:=		${TARGET_CFLAGS} -static
+TCPPFLAGS:=		${TARGET_CPPFLAGS} -static
+else
 TCFLAGS:=		${TARGET_CFLAGS}
 TCXXFLAGS:=		${TARGET_CFLAGS}
 TCPPFLAGS:=		${TARGET_CPPFLAGS}
+endif
 ifeq ($(ADK_DEBUG),)
 TCPPFLAGS+=		-DNDEBUG
 endif
@@ -136,6 +142,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@echo "Package: $(2)" > $(WRKDIR)/.$(2).control
 	@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
 	@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
 	@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
 		comma=; \
@@ -155,6 +162,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@for file in conffiles preinst postinst prerm postrm; do \
 		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
+endif
 
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
 ifeq ($(ADK_DEBUG),)
@@ -174,7 +182,7 @@ endif
 	@mkdir -p $${PACKAGE_DIR} '$${STAGING_PARENT}/pkg' \
 	    '$${STAGING_DIR}/scripts'
 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"; \
@@ -196,13 +204,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)"; \
@@ -212,13 +220,18 @@ ifeq (,$(filter noscripts,$(7)))
 		    >>'$${STAGING_PARENT}/pkg/$(1)'; \
 	done
 endif
+ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	$${IPKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE)
+endif
+ifeq ($(ADK_TARGET_PACKAGE_TGZ),y)
+	(cd $${IDIR_$(1)} && tar czf $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.tar.gz .);
+endif
 
 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"; \
diff --git a/mk/vars.mk b/mk/vars.mk
index b3215a24c..63130507f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -39,9 +39,14 @@ TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
 GNU_TARGET_NAME=	$(CPU_ARCH)-linux
-TARGET_CROSS:=		$(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
 TOOLCHAIN_SYSROOT:=	$(TOOLCHAIN_BUILD_DIR)/libc_dev
+ifeq ($(ADK_NATIVE),y) 
+TARGET_COMPILER_PREFIX?=
+TARGET_CROSS:=		
+else
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
+TARGET_CROSS:=		$(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
+endif
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
 TARGET_CPPFLAGS+=	-I${STAGING_DIR}/usr/include