summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-18 11:39:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-18 11:39:44 +0100
commit0817f01f60b471aace092196e8b2d1dd2ceabac9 (patch)
treebaaeecb33e8af2ce45af5dd4e6f5debbffd23bfb /mk
parent9c877800eaccf6d41235dc6656c44d224729d4be (diff)
parent648ffb1bc515c65c97b964edb0054db83840f163 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk25
-rw-r--r--mk/buildhlp.mk6
-rw-r--r--mk/host.mk2
-rw-r--r--mk/image.mk28
-rw-r--r--mk/kernel-vars.mk2
-rw-r--r--mk/package.mk6
-rw-r--r--mk/pkg-bottom.mk6
-rw-r--r--mk/vars.mk24
8 files changed, 48 insertions, 51 deletions
diff --git a/mk/build.mk b/mk/build.mk
index b7fd053ad..c765d4e62 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -139,14 +139,15 @@ include $(TOPDIR)/rules.mk
all: world
${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
- $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk
+ $(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk
.NOTPARALLEL:
.PHONY: all world clean cleantarget cleandir distclean image_clean
world:
- mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \
- $(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)
+ mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+ $(PACKAGE_DIR) $(BIN_DIR) $(TOOLS_BUILD_DIR) \
+ $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
${BASH} ${TOPDIR}/scripts/update-sys
${BASH} ${TOPDIR}/scripts/update-pkg
@@ -258,7 +259,7 @@ clean:
rm $$f ; \
done \
done
- rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) \
+ rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
${TOPDIR}/package/pkglist.d
rm -f ${TOPDIR}/package/Depends.mk
@@ -269,7 +270,7 @@ cleankernel:
cleandir:
@$(TRACE) cleandir
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
- rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
+ rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@@ -278,14 +279,14 @@ cleandir:
cleantarget:
@$(TRACE) cleantarget
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
- rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR)
+ rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR)
rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_DIR) $(STAGING_PKG_DIR)
rm -f .tmpconfig.h all.config .defconfig
distclean:
@$(TRACE) distclean
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
- @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@@ -533,7 +534,7 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
distclean:
@$(MAKE) -C $(CONFIG) clean
- @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+ @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
@rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
@@ -649,12 +650,12 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TO
@$(TOPDIR)/bin/tools/pkgmaker
@:>.menu
-${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/tools/adk/depmaker.c
- $(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c
+${BIN_DIR}/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+ $(CC_FOR_BUILD) -g -o $(BIN_DIR)/depmaker $(TOPDIR)/tools/adk/depmaker.c
-dep: $(TOPDIR)/bin/tools/depmaker
+dep: $(BIN_DIR)/depmaker
@echo "Generating dependencies ..."
- @$(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk
+ @$(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk
.PHONY: menu dep
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 587a97125..701f0f4a2 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -24,11 +24,7 @@ else
_CHECKSUM_COOKIE=
endif
-${PACKAGE_DIR}/.stamps:
- @mkdir -p ${PACKAGE_DIR}/.stamps
-
-post-extract: ${PACKAGE_DIR}/.stamps
-
+post-extract:
ifeq ($(strip ${NO_DISTFILES}),1)
${WRKDIST}/.extract_done:
rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
diff --git a/mk/host.mk b/mk/host.mk
index 1f5f4c48a..3fcca0664 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -37,7 +37,7 @@ _HOST_PATCH_COOKIE= ${WRKDIST}/.prepared
_HOST_CONFIGURE_COOKIE= ${WRKDIR}/.host_configure_done
_HOST_BUILD_COOKIE= ${WRKDIR}/.host_build_done
_HOST_FAKE_COOKIE= ${HOST_WRKINST}/.host_fake_done
-_HOST_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}-host
+_HOST_COOKIE= ${STAGING_PKG_DIR}/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}-host
hostextract: ${_HOST_EXTRACT_COOKIE}
hostpatch: ${_HOST_PATCH_COOKIE}
diff --git a/mk/image.mk b/mk/image.mk
index 79d6102c6..9b60c2400 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -133,17 +133,17 @@ ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.
ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
endif
-${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
+${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
sed "s#\(.*\)#:0:0::::::\1#" | sort | \
- ${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
+ ${BIN_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
-${BIN_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
+${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \
sed "s#\(.*\)#:0:0::::::\1#" | sort | \
- ${TOOLS_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
+ ${BIN_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
-${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
+${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
bash ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
${TARGET_DIR}/ >$@
( \
@@ -157,8 +157,8 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
echo "nod /dev/ram 0655 0 0 b 1 1"; \
) >>$@
-${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
- ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
+${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list
+ ${LINUX_DIR}/usr/gen_init_cpio ${FW_DIR}/${INITRAMFS}_list | \
${ADK_COMPRESSION_TOOL} -c >$@
${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
@@ -166,16 +166,16 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
${BUILD_DIR}/root.squashfs -comp xz \
-nopad -noappend -root-owned $(MAKE_TRACE)
-${BIN_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
+${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
- --pad=$(ADK_TARGET_MTD_SIZE) -o ${BIN_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
+ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
-createinitramfs: ${BIN_DIR}/${INITRAMFS}_list
+createinitramfs: ${FW_DIR}/${INITRAMFS}_list
${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
${LINUX_DIR}/.config
( \
echo "CONFIG_BLK_DEV_INITRD=y"; \
- echo 'CONFIG_INITRAMFS_SOURCE="${BIN_DIR}/${INITRAMFS}_list"'; \
+ echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \
echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> ${LINUX_DIR}/.config; \
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> ${LINUX_DIR}/.config; \
@@ -236,16 +236,16 @@ endif
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
-${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
+${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
mkdir -p ${TARGET_DIR}/boot/syslinux
cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \
${TARGET_DIR}/boot/syslinux
echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \
${TARGET_DIR}/boot/syslinux/isolinux.cfg
- ${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
+ ${BIN_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
-b boot/syslinux/isolinux.bin \
-c boot/syslinux/boot.cat -no-emul-boot \
-boot-load-size 4 -boot-info-table ${TARGET_DIR}
imageclean:
- rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*
+ rm -f $(FW_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index cd5ef32ea..d668f7edb 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -25,4 +25,4 @@ ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x800000 \
endif
KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' \
- PATH="${TOOLS_DIR}:$$PATH"
+ PATH="${BIN_DIR}:$$PATH"
diff --git a/mk/package.mk b/mk/package.mk
index da04288c1..b9b198e57 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= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}
+_IPKGS_COOKIE= ${STAGING_PKG_DIR}/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE}
_IN_PACKAGE:= 1
include ${TOPDIR}/mk/buildhlp.mk
@@ -249,7 +249,7 @@ endif
find usr ! -type d 2>/dev/null | \
grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \
tee '$${STAGING_PKG_DIR}/$(1)' | \
- $(TOOLS_DIR)/cpio -padlmu '$${STAGING_DIR}'
+ $(BIN_DIR)/cpio -padlmu '$${STAGING_DIR}'
@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
'$${STAGING_PKG_DIR}/$(1)' | while read fn; do \
chmod u+w $$$$fn; \
@@ -321,7 +321,7 @@ clean-targets:
clean:
@$(CMD_TRACE) "cleaning... "
@$(MAKE) clean-targets $(MAKE_TRACE)
- rm -rf ${WRKDIR} ${ALL_IPKGS} ${PACKAGE_DIR}/.stamps/${PKG_NAME}*
+ rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/${PKG_NAME}*
distclean: clean
rm -f ${FULLDISTFILES}
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index eeca9495d..c6e328bbe 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -171,11 +171,11 @@ ifneq (,$(filter dev,${PKG_OPTS}))
@mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
@test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \
find . -name \*.h | \
- $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
+ $(BIN_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include
@mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
@test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \
find . -name \*.pc | \
- $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
+ $(BIN_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig
@for a in ${WRKINST}/usr/bin/*-config*; do \
[[ -e $$a ]] || continue; \
mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \
@@ -191,7 +191,7 @@ endif
find usr ! -type d 2>/dev/null | \
grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
- $(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}'
+ $(BIN_DIR)/cpio -padlmu '${STAGING_DIR}'
@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
'${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \
chmod u+w $$fn; \
diff --git a/mk/vars.mk b/mk/vars.mk
index c39f14a4b..eacf12395 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -34,16 +34,16 @@ STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI
TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build
-TOOLS_DIR:= $(BASE_DIR)/bin/tools
+BIN_DIR:= $(BASE_DIR)/bin
SCRIPT_DIR:= $(BASE_DIR)/scripts
-BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-BIN_DIR_PFX:= $(BASE_DIR)/bin
-PACKAGE_DIR:= $(BIN_DIR)/packages
+FW_DIR:= $(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+FW_DIR_PFX:= $(BASE_DIR)/firmware
+PACKAGE_DIR:= $(FW_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
-TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
-HOST_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
-AUTOTOOL_PATH= ${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+TARGET_PATH= ${SCRIPT_DIR}:${BIN_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+HOST_PATH= ${SCRIPT_DIR}:${BIN_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+AUTOTOOL_PATH= ${BIN_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
@@ -171,7 +171,7 @@ PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_TARGET_DIR)/etc \
IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- TOOLS_DIR=$(TOOLS_DIR) \
+ BIN_DIR=$(BIN_DIR) \
${BASH} ${SCRIPT_DIR}/ipkg \
-force-defaults -force-depends install
PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg
@@ -194,21 +194,21 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \
cd ${WRKDIR} && \
for file in ${FULLDISTFILES}; do case $$file in \
*.cpio) \
- cat $$file | $(TOOLS_DIR)/cpio -i -d ;; \
+ cat $$file | $(BIN_DIR)/cpio -i -d ;; \
*.tar) \
tar -xf $$file ;; \
*.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \
- gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \
+ gzip -dc $$file | $(BIN_DIR)/cpio -i -d ;; \
*.tar.xz | *.txz) \
xz -dc $$file | tar -xf - ;; \
*.tar.Z | *.tar.gz | *.taz | *.tgz) \
gzip -dc $$file | tar -xf - ;; \
*.cpio.bz2 | *.cbz) \
- bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \
+ bzip2 -dc $$file | $(BIN_DIR)/cpio -i -d ;; \
*.tar.bz2 | *.tbz | *.tbz2) \
bzip2 -dc $$file | tar -xf - ;; \
*.zip) \
- cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \
+ cat $$file | $(BIN_DIR)/cpio -ivd -H zip ;; \
*.arm) \
cp $$file ${WRKDIR} ;; \
*) \