Change name of pkg_ipkg_control_dir to pkg_xpkg_control_dir. Change name of pkg_ipkg_control to pkg_xpkg_control.
Signed-off-by: George McCollister <george.mccollis...@gmail.com> --- scripts/lib/ptxd_make_ipkg_common.sh | 7 ++++--- scripts/lib/ptxd_make_xpkg_fixup.sh | 3 ++- scripts/lib/ptxd_make_xpkg_prepare.sh | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/lib/ptxd_make_ipkg_common.sh b/scripts/lib/ptxd_make_ipkg_common.sh index b23fcff..450b4ab 100644 --- a/scripts/lib/ptxd_make_ipkg_common.sh +++ b/scripts/lib/ptxd_make_ipkg_common.sh @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright (C) 2009 by Marc Kleine-Budde <m...@pengutronix.de> +# 2011 by George McCollister <george.mccollis...@gmail.com> # # See CREDITS for details about who has contributed to this project. # @@ -14,8 +15,8 @@ # ptxd_make_ipkg_init() { pkg_ipkg_tmp="${pkg_xpkg_tmp}/ipkg" - pkg_ipkg_control_dir="${pkg_ipkg_tmp}/CONTROL" - pkg_ipkg_control="${pkg_ipkg_control_dir}/control" + pkg_xpkg_control_dir="${pkg_ipkg_tmp}/CONTROL" + pkg_xpkg_control="${pkg_xpkg_control_dir}/control" pkg_xpkg_conffiles="${pkg_xpkg_control_dir}/conffiles" } -export -f ptxd_make_ipkg_init \ No newline at end of file +export -f ptxd_make_ipkg_init diff --git a/scripts/lib/ptxd_make_xpkg_fixup.sh b/scripts/lib/ptxd_make_xpkg_fixup.sh index 42cebda..a698e89 100644 --- a/scripts/lib/ptxd_make_xpkg_fixup.sh +++ b/scripts/lib/ptxd_make_xpkg_fixup.sh @@ -2,6 +2,7 @@ # # Copyright (C) 2005, 2006, 2007 Robert Schwebel <r.schwe...@pengutronix.de> # 2008, 2009, 2010 by Marc Kleine-Budde <m...@pengutronix.de> +# 2011 by George McCollister <george.mccollis...@gmail.com> # # See CREDITS for details about who has contributed to this project. # @@ -25,7 +26,7 @@ ptxd_make_xpkg_fixup() { esac echo -n "install_fixup: @${pkg_xpkg_fixup_from}@ -> ${pkg_xpkg_fixup_to} ... " - sed -i -e "s,@$pkg_xpkg_fixup_from@,$pkg_xpkg_fixup_to,g" "${pkg_ipkg_control}" || return + sed -i -e "s,@$pkg_xpkg_fixup_from@,$pkg_xpkg_fixup_to,g" "${pkg_xpkg_control}" || return echo "done." } diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh index 5c72285..7a14c80 100644 --- a/scripts/lib/ptxd_make_xpkg_prepare.sh +++ b/scripts/lib/ptxd_make_xpkg_prepare.sh @@ -2,6 +2,7 @@ # # Copyright (C) 2005, 2006, 2007 Robert Schwebel <r.schwe...@pengutronix.de> # 2008, 2009, 2010 by Marc Kleine-Budde <m...@pengutronix.de> +# 2011 by George McCollister <george.mccollis...@gmail.com> # # See CREDITS for details about who has contributed to this project. # @@ -21,7 +22,7 @@ ptxd_make_xpkg_prepare() { "${pkg_xpkg_cmds}" \ "${pkg_xpkg_perms}" \ "${pkg_xpkg_install_deps}" && - mkdir -p -- "${pkg_ipkg_control_dir}" && + mkdir -p -- "${pkg_xpkg_control_dir}" && touch "${pkg_xpkg_cmds}" || return # @@ -36,7 +37,7 @@ install_init: @VERSION@ -> ${pkg_xpkg_version}" PACKAGE="${pkg_xpkg}" \ VERSION="${pkg_xpkg_version}" \ ptxd_replace_magic "${PTXDIST_TOPDIR}/config/xpkg/ipkg.control" > \ - "${pkg_ipkg_control}" || return + "${pkg_xpkg_control}" || return local script for script in preinst postinst prerm postrm; do @@ -45,7 +46,7 @@ install_init: @VERSION@ -> ${pkg_xpkg_version}" if ptxd_in_path PTXDIST_PATH_RULES "${pkg_xpkg}.${script}"; then install -m 0755 \ -D "${ptxd_reply}" \ - "${pkg_ipkg_control_dir}/${script}" || return + "${pkg_xpkg_control_dir}/${script}" || return echo "packaging: '$(ptxd_print_path "${ptxd_reply}")'" -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de