diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-26 16:08:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-26 19:26:21 +0100 |
| commit | 96403fca4d9f26e548310177c7f13e431ff09669 (patch) | |
| tree | 3093b77a13e12fe44e5cba82787ad73f530096a0 | |
| parent | 9a43ab2dd7f4ac49e10f17cbc196f92bbf0e36e0 (diff) | |
use $(CPIO)
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/package.mk b/mk/package.mk index 21299455d..8f7f44665 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -262,7 +262,7 @@ ifeq (,$(filter nostaging,$(7))) 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' -e '^usr/lib/.*\.la$$$$' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_TARGET_DIR}' + $(CPIO) -padlmu '$${STAGING_TARGET_DIR}' endif ifeq (,$(filter noscripts,$(7))) @cd '$${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index b501d5a28..4e8161b31 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -185,11 +185,11 @@ ifneq (,$(filter dev,${PKG_OPTS})) @mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + $(CPIO) -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include @mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + $(CPIO) -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ @@ -204,7 +204,7 @@ ifeq (,$(filter nostaging,${PKG_OPTS})) -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \ -e '^/usr/lib/libpthread_nonshared.a' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '${STAGING_TARGET_DIR}' + $(CPIO) -padlmu '${STAGING_TARGET_DIR}' endif ifeq (,$(filter noscripts,${PKG_OPTS})) @cd '${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \ |