diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-17 19:41:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-17 19:41:13 +0200 |
| commit | c008b8741447a77371f3fd487830bfd7952dbdcd (patch) | |
| tree | d93378254682782dbe0175dcf69edb1fbf65dbe3 /mk/vars.mk | |
| parent | 16b627883cdd2fb2258002b30dfa61c440373e9c (diff) | |
| parent | 6d26b19269a28ff576e872473cb3b4610a61fceb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/vars.mk')
| -rw-r--r-- | mk/vars.mk | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 63130507f..45975779f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -69,17 +69,24 @@ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${HOSTCC}' \ CPPFLAGS_FOR_BUILD='${HOSTCPPFLAGS}' \ LDFLAGS_FOR_BUILD='${HOSTLDFLAGS}' -# invoke ipkg-build with some default options -IPKG_BUILD:= PATH='${TARGET_PATH}' ${BASH} \ - ${TOPDIR}/scripts/ipkg-build -c -o 0 -g 0 -# where to build (and put) .ipk packages -IPKG_TARGET_DIR:= $(PACKAGE_DIR) -IPKG:= IPKG_TMP=$(BUILD_DIR)/tmp \ +PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) + +ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) +PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build -c -o 0 -g 0 + +PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ - ${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends -IPKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg + ${BASH} ${SCRIPT_DIR}/ipkg \ + -force-defaults -force-depends install +PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg +else +PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/tarpkg build +PKG_INSTALL:= INSTROOT=$(TARGET_DIR) \ + ${BASH} ${SCRIPT_DIR}/tarpkg install +PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/pkg +endif ifeq ($(ADK_NATIVE),y) RSTRIP:= prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh |