diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-05-10 08:21:34 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-13 19:49:06 +0200 |
| commit | 1321cfe984c33480d4b851e5095eaee958cfb889 (patch) | |
| tree | 86b0819ed8779dc2cca0d0ec1adf5fa0dfc5c9f1 /scripts/lib | |
| parent | a215dda9399ae57b0aa17453d09dad3206420e87 (diff) | |
| download | ptxdist-1321cfe984c33480d4b851e5095eaee958cfb889.tar.gz ptxdist-1321cfe984c33480d4b851e5095eaee958cfb889.tar.xz | |
set opkg/ipkg variables in ptx/env
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/ptxd_make_image_prepare_work_dir.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_ipkg_finish.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_opkg_finish.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_common.sh | 6 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_finish.sh | 4 |
5 files changed, 8 insertions, 8 deletions
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=$? |