diff options
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/host.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 1 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 7 |
5 files changed, 11 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index c13ba95b4..78079bea9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -146,7 +146,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .PHONY: all world clean cleandir cleantoolchain distclean image_clean world: - mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ + mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ${BASH} ${TOPDIR}/scripts/update-sys diff --git a/mk/host.mk b/mk/host.mk index 8d3e7d74e..88f8d2e01 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -3,7 +3,7 @@ # This is where all package operation is done in ifneq (,$(findstring host,$(MAKECMDGOALS))) -WRKDIR?= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host +WRKDIR?= ${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host endif HOST_CONFIGURE_ENV+= AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 2cec6ac2c..2ccc6ff1e 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -125,8 +125,6 @@ do-install: post-install: spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} - echo FOO - echo $(HOST_WRKDIR) @-rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_TARGET_DIR}/scripts' @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @@ -186,7 +184,7 @@ ifneq (,$(filter dev,${PKG_OPTS})) done endif @-cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" -a "${PKG_NAME}" != "tzdata" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ diff --git a/mk/vars.mk b/mk/vars.mk index 3cf0a9344..e6fe41946 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -20,6 +20,7 @@ endif SCRIPT_DIR:= $(BASE_DIR)/scripts STAGING_HOST_DIR:= ${BASE_DIR}/host_${GNU_HOST_NAME} TOOLCHAIN_DIR:= ${BASE_DIR}/toolchain_${GNU_HOST_NAME} +HOST_BUILD_DIR:= ${BASE_DIR}/host_build_${GNU_HOST_NAME} # dirs for cleandir FW_DIR_PFX:= $(BASE_DIR)/firmware diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index c9b8029d5..103f37411 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -273,6 +273,12 @@ if ! which ccache >/dev/null 2>&1; then host_build_ccache=1 fi +host_build_genext2fs=0 +if ! which genext2fs >/dev/null 2>&1; then + echo "No genext2fs found, will build one when required." + host_build_genext2fs=1 +fi + host_build_lzma=0 if ! which lzma >/dev/null 2>&1; then echo "No lzma found, will build one when required." @@ -301,6 +307,7 @@ if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_F if [ $host_build_xz -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq ;fi # optional if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCACHE if ADK_HOST_NEED_CCACHE" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi |