pkg_source was defined as "$($(1)_DIR)" which is the same as pkg_dir in ptxd_make_world_common. We can use pkg_dir directly. Add a safe-guard to bail out early if that var is empty.
Signed-off-by: Alexander Dahl <a...@thorsis.com> --- rules/post/ptxd_make_world_inject.make | 3 +-- scripts/lib/ptxd_make_world_inject.sh | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make index b7d28e92f..3506ee114 100644 --- a/rules/post/ptxd_make_world_inject.make +++ b/rules/post/ptxd_make_world_inject.make @@ -9,8 +9,7 @@ world/inject/env = \ $(call world/env, $(1)) \ pkg_inject_path="$($(1)_INJECT_PATH)" \ - pkg_inject_files="$($(1)_INJECT_FILES)" \ - pkg_source="$($(1)_DIR)" + pkg_inject_files="$($(1)_INJECT_FILES)" world/inject = \ $(call world/inject/env,$(strip $(1))) \ diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh index 5c2d0dc5f..b74e464c6 100644 --- a/scripts/lib/ptxd_make_world_inject.sh +++ b/scripts/lib/ptxd_make_world_inject.sh @@ -10,7 +10,7 @@ ptxd_make_inject() { local source target source="$(echo ${inject_file} | cut -d ":" -f 1)" - target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)" + target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)" if [[ "${source}" =~ ^/.* ]]; then ptxd_bailout "'${source}' must not be an absolute path!" \ @@ -32,6 +32,10 @@ export -f ptxd_make_inject ptxd_make_world_inject() { ptxd_make_world_init || return + if [ -z "${pkg_dir}" ]; then + ptxd_bailout "<PKG>_DIR empty, no destination to inject to." + fi + for inject_file in ${pkg_inject_files}; do ptxd_make_inject || return done -- 2.39.2