set opkg/ipkg variables in ptx/env

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

8 files changed, 14 insertions, 14 deletions

diff --git a/rules/post/ptxd_make_image_common.make b/rules/post/ptxd_make_image_common.make
index f7135ed57..4e6d499e7 100644
--- a/rules/post/ptxd_make_image_common.make
+++ b/rules/post/ptxd_make_image_common.make
@@ -20,7 +20,6 @@ image/env = \
 	$(call ptx/env) \
 	image_pkgs_selected_target="$(call ptx/escape,$(PTX_PACKAGES_INSTALL))" \
 	image_repo_dist_dir="$(IMAGE_REPO_DIST_DIR)" \
-	image_xpkg_type=$(PTXCONF_HOST_PACKAGE_MANAGEMENT) \
 	\
 	image_work_dir="$(call ptx/escape,$(image/work_dir))" \
 	image_permissions="$(call ptx/escape,$(image/permissions))"
diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make
index 55406fd85..678db7dca 100644
--- a/rules/post/ptxd_make_world_common.make
+++ b/rules/post/ptxd_make_world_common.make
@@ -44,7 +44,11 @@ ptx/env = \
 	ptx_path_cross="$(call ptx/escape,$(HOST_CROSS_PATH))"			\
 	ptx_conf_env_cross="$(call ptx/escape,$(HOST_CROSS_ENV))"		\
 	ptx_conf_opt_autoconf_cross="$(call ptx/escape,$(HOST_CROSS_AUTOCONF))"	\
-	ptx_conf_opt_autoconf_cross_sysroot="$(call ptx/escape,$(HOST_CROSS_AUTOCONF_SYSROOT))"
+	ptx_conf_opt_autoconf_cross_sysroot="$(call ptx/escape,$(HOST_CROSS_AUTOCONF_SYSROOT))"\
+										\
+	ptx_ipkg_extra_args=$(PTXCONF_IMAGE_IPKG_EXTRA_ARGS)			\
+	ptx_opkg_extra_args=$(PTXCONF_IMAGE_OPKG_EXTRA_ARGS)			\
+	ptx_xpkg_type=$(PTXCONF_HOST_PACKAGE_MANAGEMENT)
 
 world/env/impl = \
 	pkg_stamp="$(notdir $(@))"						\
diff --git a/rules/post/ptxd_make_xpkg_common.make b/rules/post/ptxd_make_xpkg_common.make
index 4a8554ce8..e5cfe988e 100644
--- a/rules/post/ptxd_make_xpkg_common.make
+++ b/rules/post/ptxd_make_xpkg_common.make
@@ -17,10 +17,7 @@ xpkg/env/impl = \
 	$(call world/env, $(2))							\
 	CROSS_STRIP="$(call ptx/escape,$(CROSS_STRIP))"				\
 	pkg_xpkg="$(call ptx/escape,$(1))"					\
-	pkg_xpkg_version="$(call ptx/escape,$($(2)_XPKG_VERSION))"		\
-	pkg_ipkg_extra_args=$(PTXCONF_IMAGE_IPKG_EXTRA_ARGS)			\
-	pkg_opkg_extra_args=$(PTXCONF_IMAGE_OPKG_EXTRA_ARGS)			\
-	pkg_xpkg_type=$(PTXCONF_HOST_PACKAGE_MANAGEMENT)
+	pkg_xpkg_version="$(call ptx/escape,$($(2)_XPKG_VERSION))"
 
 #
 # $1: xpkg label
diff --git a/scripts/lib/ptxd_make_image_prepare_work_dir.sh b/scripts/lib/ptxd_make_image_prepare_work_dir.sh
index c21eea7eb..369993bad 100644
--- a/scripts/lib/ptxd_make_image_prepare_work_dir.sh
+++ b/scripts/lib/ptxd_make_image_prepare_work_dir.sh
@@ -61,7 +61,7 @@ ${list[*]}
 	ptxd_replace_magic "${ptxd_reply}" >> "${xpkg_conf}" &&
 
     DESTDIR="${work_dir}" \
-	${image_xpkg_type}-cl -f "${xpkg_conf}" -o "${work_dir}" \
+	${ptx_xpkg_type}-cl -f "${xpkg_conf}" -o "${work_dir}" \
 	install "${ptxd_reply_ipkg_files[@]}"
 }
 export -f ptxd_make_image_extract_xpkg_files
diff --git a/scripts/lib/ptxd_make_ipkg_finish.sh b/scripts/lib/ptxd_make_ipkg_finish.sh
index ab5f21c36..01a2bdde8 100644
--- a/scripts/lib/ptxd_make_ipkg_finish.sh
+++ b/scripts/lib/ptxd_make_ipkg_finish.sh
@@ -16,7 +16,7 @@
 ptxd_make_ipkg_finish_impl() {
     chown -R 0:0 "${pkg_xpkg_tmp}" &&
     ptxd_make_xpkg_pkg "${pkg_ipkg_tmp}" "${pkg_xpkg_cmds}" "${pkg_xpkg_perms}" &&
-    ipkg-build ${pkg_ipkg_extra_args} "${pkg_ipkg_tmp}" "${ptx_pkg_dir}"
+    ipkg-build ${ptx_ipkg_extra_args} "${pkg_ipkg_tmp}" "${ptx_pkg_dir}"
 }
 export -f ptxd_make_ipkg_finish_impl
 
diff --git a/scripts/lib/ptxd_make_opkg_finish.sh b/scripts/lib/ptxd_make_opkg_finish.sh
index d303c6d15..2485c247a 100644
--- a/scripts/lib/ptxd_make_opkg_finish.sh
+++ b/scripts/lib/ptxd_make_opkg_finish.sh
@@ -16,7 +16,7 @@
 ptxd_make_opkg_finish_impl() {
     chown -R 0:0 "${pkg_xpkg_tmp}" &&
     ptxd_make_xpkg_pkg "${pkg_opkg_tmp}" "${pkg_xpkg_cmds}" "${pkg_xpkg_perms}" &&
-    opkg-build ${pkg_opkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}"
+    opkg-build ${ptx_opkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}"
 }
 export -f ptxd_make_opkg_finish_impl
 
diff --git a/scripts/lib/ptxd_make_xpkg_common.sh b/scripts/lib/ptxd_make_xpkg_common.sh
index 111518c06..279348f55 100644
--- a/scripts/lib/ptxd_make_xpkg_common.sh
+++ b/scripts/lib/ptxd_make_xpkg_common.sh
@@ -56,8 +56,8 @@ export -f ptxd_do_xpkg_map
 # initialize variables needed for packaging
 #
 ptxd_make_xpkg_init() {
-    if [ -z "${pkg_xpkg_type}" -o -z "${pkg_xpkg}" ]; then
-	ptxd_bailout "'pkg_xpkg' or 'pkg_xpkg_type' undefined"
+    if [ -z "${ptx_xpkg_type}" -o -z "${pkg_xpkg}" ]; then
+	ptxd_bailout "'pkg_xpkg' or 'ptx_xpkg_type' undefined"
     fi
 
     #
@@ -94,6 +94,6 @@ ptxd_make_xpkg_init() {
     pkg_xpkg_cmds="${ptx_state_dir}/${pkg_xpkg}.cmds"
     pkg_xpkg_tmp="${ptx_pkg_dir}/${pkg_xpkg}.tmp"
 
-    "ptxd_make_${pkg_xpkg_type}_init"
+    "ptxd_make_${ptx_xpkg_type}_init"
 }
 export -f ptxd_make_xpkg_init
diff --git a/scripts/lib/ptxd_make_xpkg_finish.sh b/scripts/lib/ptxd_make_xpkg_finish.sh
index 64bed28cd..255a66fa1 100644
--- a/scripts/lib/ptxd_make_xpkg_finish.sh
+++ b/scripts/lib/ptxd_make_xpkg_finish.sh
@@ -20,7 +20,7 @@ ptxd_make_xpkg_finish_impl() {
     fake_args[${#fake_args[@]}]="-u"
 
     export ${!pkg_*} ${!ptx_*}
-    fakeroot "${fake_args[@]}" -- "ptxd_make_${pkg_xpkg_type}_finish_impl"
+    fakeroot "${fake_args[@]}" -- "ptxd_make_${ptx_xpkg_type}_finish_impl"
 }
 export -f ptxd_make_xpkg_finish_impl
 
@@ -86,7 +86,7 @@ EOF
     #
     # create pkg
     #
-    echo "xpkg_finish:	creating ${pkg_xpkg_type} package ... " &&
+    echo "xpkg_finish:	creating ${ptx_xpkg_type} package ... " &&
     ptxd_make_xpkg_finish_impl &&
     rm -rf "${pkg_xpkg_tmp}" || {
 	local ret=$?