summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-26 14:29:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-26 14:29:47 +0100
commit8ce8412b8200de0d91617b9dc20455a6f8582b1b (patch)
tree1d27e250c3f5fe2fbb75eb1cde7a2deef66a73e9 /mk
parentc2538805045d5a958ceb7974dec056ad45367d98 (diff)
use separate stamp dir, enable openjdk for hudson
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk3
-rw-r--r--mk/host-bottom.mk8
-rw-r--r--mk/package.mk6
-rw-r--r--mk/pkg-bottom.mk2
4 files changed, 9 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk
index b322ba6a2..1a458c870 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -35,7 +35,6 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_URLGRABBER=n \
ADK_PACKAGE_LIBSSP=n \
ADK_PACKAGE_OPENAFS=n \
- ADK_PACKAGE_OPENJDK7=n \
ADK_PKG_XORG=n \
ADK_PKG_MPDBOX=n \
ADK_PKG_DEVELOPMENT=n \
@@ -146,7 +145,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/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}),)