diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-01 22:42:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-01 22:42:20 +0100 |
| commit | d9730197219dda09ba7a0d5321c399e0d11d23e7 (patch) | |
| tree | 25e92753ba3a5beeb2785fe9508bdafa11538ea2 /mk | |
| parent | b252f7521306c28b8c46f3981cf4ea26d7993625 (diff) | |
fix ipkg and ipkg tools, consolidate mdev.conf
cpio under macosx or bsd creates tar archives via
stdin while using find . with leading ./.
heirloom cpio shipped with OpenADK does remove the
leading ./. Adopt ipkg busybox applet to work
without ./. Fix ipkg-build to be faster and to use
included cpio for inner tar creation.
Dependency to GNU tar can now be dropped.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/image.mk b/mk/image.mk index d6d57bb11..9a26434ae 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -52,17 +52,17 @@ endif ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ - ${TOPDIR}/bin/tools/cpio -o -Hustar -P | gzip -n9 >$@ + ${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@ ${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} cd ${TARGET_DIR}; find . | grep -v ./boot | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ - ${TOPDIR}/bin/tools/cpio -o -Hustar -P | gzip -n9 >$@ + ${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ - ${TOPDIR}/bin/tools/cpio -o -C512 -Hnewc -P | \ + ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P | \ ${ADK_COMPRESSION_TOOL} >$@ 2>/dev/null ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} @@ -70,7 +70,7 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} $(LINUX_DIR)/.config cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \ sed "s#\(.*\)#:0:0::::::\1#" | sort | \ - ${TOPDIR}/bin/tools/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null + ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} ${STAGING_TOOLS}/bin/mksquashfs ${TARGET_DIR} \ diff --git a/mk/vars.mk b/mk/vars.mk index 660f41775..88dad66fb 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -31,6 +31,7 @@ STAGING_DIR:= ${STAGING_PARENT}/target TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build +TOOLS_DIR:= $(BASE_DIR)/bin/tools SCRIPT_DIR:= $(BASE_DIR)/scripts ifeq ($(ADK_HW),) BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC} @@ -45,7 +46,7 @@ else TARGET_DIR:= $(BASE_DIR)/root_${ADK_HW}_${ADK_TARGET}_${ADK_LIBC} endif TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev @@ -85,7 +86,8 @@ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${HOSTCC}' \ PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) -PKG_BUILD:= ${BASH} ${SCRIPT_DIR}/ipkg-build -c +PKG_BUILD:= PATH='${TARGET_PATH}' \ + ${BASH} ${SCRIPT_DIR}/ipkg-build PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_DIR)/etc \ |