summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_xpkg_prepare.sh
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2011-04-28 16:13:27 -0500
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-05-12 09:03:05 +0200
commit6904e50d8bb566b4af24df2cd1b54eb04a4bf161 (patch)
tree6900a99e8c80a70269de1e0b52f6877d0478e43b /scripts/lib/ptxd_make_xpkg_prepare.sh
parent8889b0a49241add542a26b09f5e188a00f46a8a6 (diff)
downloadptxdist-6904e50d8bb566b4af24df2cd1b54eb04a4bf161.tar.gz
ptxdist-6904e50d8bb566b4af24df2cd1b54eb04a4bf161.tar.xz
make ptxd_make_xpkg more generic
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.mccollister@gmail.com> [mol: added on missing replacement] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_xpkg_prepare.sh')
-rw-r--r--scripts/lib/ptxd_make_xpkg_prepare.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh
index 5c7228534..7a14c8041 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.schwebel@pengutronix.de>
# 2008, 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2011 by George McCollister <george.mccollister@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}")'"