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

5 files changed, 12 insertions, 14 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 3d92f30e8..eadccdcb3 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -22,8 +22,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_INSTALLER=n \
-			ADK_PACKAGE_HEIMDAL_SERVER=n \
-			ADK_PACKAGE_LIBHEIMDAL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -148,7 +146,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 world:
 	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(PACKAGE_DIR) $(BIN_DIR) $(TOOLS_BUILD_DIR) \
-		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)
+		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 4b75a3f42..23d5652ba 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -96,14 +96,14 @@ endif
 	exec ${MAKE} host-extract $(MAKE_TRACE)
 	mkdir -p ${HOST_WRKINST}
 	# avoid rebuild
-	touch ${_HOST_CONFIGURE_COOKIE} 
-	touch ${_HOST_BUILD_COOKIE}
-	touch $@
+	@touch ${_HOST_CONFIGURE_COOKIE} 
+	@touch ${_HOST_BUILD_COOKIE}
+	@touch $@
 
 ${_HOST_COOKIE}:
 	exec ${MAKE} hostpackage
 
 ifeq ($(HOST_LINUX_ONLY),)
 hostpackage: ${ALL_HOSTDIRS}
-	touch ${_HOST_COOKIE}
+	@touch ${_HOST_COOKIE}
 endif
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 4555e6aa6..17f189d04 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -22,9 +22,9 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_71),y)
-KERNEL_VERSION:=	3.4.71
+ifeq ($(ADK_KERNEL_VERSION_3_4_82),y)
+KERNEL_VERSION:=	3.4.82
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		d6183a3809c6d3f6779043b6e9f482ca
+KERNEL_MD5SUM:=		9ee57efa65417a7a9ac931122c2b7377
 endif
diff --git a/mk/package.mk b/mk/package.mk
index b9b198e57..125ed3d26 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -78,7 +78,7 @@ _PATCH_COOKIE=		${WRKDIST}/.prepared
 _CONFIGURE_COOKIE=	${WRKBUILD}/.configure_done
 _BUILD_COOKIE=		${WRKBUILD}/.build_done
 _FAKE_COOKIE=		${WRKINST}/.fake_done
-_IPKGS_COOKIE=		${STAGING_PKG_DIR}/${PKG_NAME}
${PKG_VERSION}-${PKG_RELEASE}
+_IPKGS_COOKIE=		${STAGING_PKG_DIR}/stamps/${PKG_NAME}
${PKG_VERSION}-${PKG_RELEASE}
 
 _IN_PACKAGE:=		1
 include ${TOPDIR}/mk/buildhlp.mk
@@ -225,7 +225,7 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y)
 	-rm -rf $${IDIR_$(1)}/etc/network
 endif
 endif
-	@mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \
+	@mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \
 	    '$${STAGING_DIR}/scripts'
 ifeq (,$(filter noremove,$(7)))
 	@if test -s '$${STAGING_PKG_DIR}/$(1)'; then \
@@ -321,7 +321,7 @@ clean-targets:
 clean:
 	@$(CMD_TRACE) "cleaning... "
 	@$(MAKE) clean-targets $(MAKE_TRACE)
-	rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/${PKG_NAME}
*
+	rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}
*
 
 distclean: clean
 	rm -f ${FULLDISTFILES}
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index c6e328bbe..d82a653ea 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -126,7 +126,7 @@ post-install:
 spkg-install: ${ALL_POSTINST}
 ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
 	@-rm -f ${_ALL_CONTROLS}
-	@mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_DIR}/scripts'
+	@mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_DIR}/scripts'
 	@${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE)
 	@env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE)
 ifneq ($(filter manual,${INSTALL_STYLE}),)