From 9f270b40da5e6b34a241171cb8449e7722e8b9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Fri, 22 Dec 2017 10:43:56 +0000 Subject: subr/ex_rtl_install.subr: prepend ${_prefix} to source pathname as well. vars/build.vars:dash_minipix: copy bin/sh instead of symlinking. --- subr/ex_rtl_install.subr | 3 +++ vars/build.vars | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/subr/ex_rtl_install.subr b/subr/ex_rtl_install.subr index 19504a85..239dceed 100644 --- a/subr/ex_rtl_install.subr +++ b/subr/ex_rtl_install.subr @@ -32,6 +32,9 @@ ex_rtl_install() { *) _file_fname_src="${1%=*}"; _file_fname_dst="${1#*=}"; + if [ "${_file_fname_src#/}" = "${_file_fname_src}" ]; then + _file_fname_src="${_prefix:+${_prefix}/}${_file_fname_src}"; + fi; if [ "${_file_fname_dst#/}" = "${_file_fname_dst}" ]; then _file_fname_dst="${_prefix:+${_prefix}/}${_file_fname_dst}"; fi; diff --git a/vars/build.vars b/vars/build.vars index 8bc662f6..61679892 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1083,7 +1083,7 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip}; : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash}; : ${PKG_DASH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/dash-build-minipix}; -: ${PKG_DASH_MINIPIX_INSTALL_FILES:=@dash=bin/sh}; +: ${PKG_DASH_MINIPIX_INSTALL_FILES:=bin/dash=bin/sh}; : ${PKG_DASH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; : ${PKG_NANO_MINIPIX_INHERIT_FROM:=nano}; : ${PKG_NANO_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/nano-build-minipix}; -- cgit v1.2.3