ptxd_install_setup_src: refactor

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 25 insertions, 19 deletions

diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
index 8ebeba9c7..e874c0a16 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -130,36 +130,42 @@ ptxd_install_setup() {
 }
 export -f ptxd_install_setup
 
-ptxd_install_setup_src() {
-    ptxd_install_setup || return
-
-    if [ "${src}" = "-" -a -n "${dst}" ]; then
-	src="${pkg_pkg_dir}${dst}"
-    fi
-
-    local -a list
-
+ptxd_install_setup_src_list() {
     if [ "${cmd}" = "alternative" -o "${cmd}" = "config" ]; then
 	#
 	# if pkg_dir is empty we'll have some some empty entries in
 	# the array, but that's no problem for the "-e" below.
 	#
 	list=( \
-	    "${PTXDIST_WORKSPACE}/projectroot${PTXDIST_PLATFORMSUFFIX}${src}" \
-	    "${PTXDIST_WORKSPACE}/projectroot${src}${PTXDIST_PLATFORMSUFFIX}" \
-	    "${PTXDIST_PLATFORMCONFIGDIR}/projectroot${src}${PTXDIST_PLATFORMSUFFIX}" \
-	    "${PTXDIST_WORKSPACE}/projectroot${src}" \
-	    "${PTXDIST_PLATFORMCONFIGDIR}/projectroot${src}" \
-	    "${PTXDIST_TOPDIR}/projectroot${src}" \
-	    "${pkg_pkg_dir:+${pkg_pkg_dir}${src}}" \
-	    "${pkg_dir:+${pkg_dir}${src}}" \
+	    "${PTXDIST_WORKSPACE}/projectroot${PTXDIST_PLATFORMSUFFIX}${1}" \
+	    "${PTXDIST_WORKSPACE}/projectroot${1}${PTXDIST_PLATFORMSUFFIX}" \
+	    "${PTXDIST_PLATFORMCONFIGDIR}/projectroot${1}${PTXDIST_PLATFORMSUFFIX}" \
+	    "${PTXDIST_WORKSPACE}/projectroot${1}" \
+	    "${PTXDIST_PLATFORMCONFIGDIR}/projectroot${1}" \
+	    "${PTXDIST_TOPDIR}/projectroot${1}" \
+	    "${pkg_pkg_dir:+${pkg_pkg_dir}${1}}" \
+	    "${pkg_dir:+${pkg_dir}${1}}" \
 	    )
     else
 	list=( \
-	    "${src}${PTXDIST_PLATFORMSUFFIX}" \
-	    "${src}" \
+	    "${1}${PTXDIST_PLATFORMSUFFIX}" \
+	    "${1}" \
 	    )
     fi
+}
+export -f ptxd_install_setup_src_list
+
+ptxd_install_setup_src() {
+    ptxd_install_setup || return
+
+    if [ "${src}" = "-" -a -n "${dst}" ]; then
+	src="${pkg_pkg_dir}${dst}"
+    fi
+
+    local -a list
+
+    ptxd_install_setup_src_list "${src}"
+
     # Since the dependency to the source files is dynamic we store
     # the dependency information in a dependency file that can be
     # included in the make files itself.