From 965d142937823688ccee383e7683a9c1adf04f9e Mon Sep 17 00:00:00 2001 From: Richard Dale Date: Tue, 23 Jun 2015 17:05:41 +0100 Subject: Revert recent change to the attr chunk install command Use a more recent version of attr in baserock/2.4.47-musl --- strata/core-wrt.morph | 4 ++-- strata/core/attr.morph | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/strata/core-wrt.morph b/strata/core-wrt.morph index f20c7873..23baee5b 100644 --- a/strata/core-wrt.morph +++ b/strata/core-wrt.morph @@ -161,8 +161,8 @@ chunks: - name: attr morph: strata/core/attr.morph repo: upstream:attr - ref: fdcd484ed6f5df9a2d60ae446c325f12e3d9d0b3 - unpetrify-ref: baserock/morph-musl + ref: cc08f19afa5d88315772c912e3b57398e26cb298 + unpetrify-ref: baserock/2.4.47-musl build-depends: - autoconf-tarball - automake diff --git a/strata/core/attr.morph b/strata/core/attr.morph index 48c23225..0a4b2851 100644 --- a/strata/core/attr.morph +++ b/strata/core/attr.morph @@ -16,12 +16,4 @@ configure-commands: --datadir="$PREFIX"/share install-commands: - | - make DESTDIR="$DESTDIR" PKG_BIN_DIR="$DESTDIR$PREFIX"/bin \ - PKG_SBIN_DIR="$DESTDIR$PREFIX"/sbin \ - PKG_LIB_DIR="$DESTDIR$PREFIX"/lib64 \ - PKG_DEVLIB_DIR="$DESTDIR$PREFIX"/lib64 \ - PKG_INC_DIR="$DESTDIR$PREFIX"/include/attr \ - PKG_DATA_DIR="$DESTDIR$PREFIX"/share \ - PKG_MAN_DIR="$DESTDIR$PREFIX"/share/man \ - PKG_DOC_DIR="$DESTDIR$PREFIX"/share/doc/attr \ - install-lib install-dev + make DESTDIR="$DESTDIR" install-lib install-dev -- cgit v1.2.1