diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-09 13:39:28 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-15 13:28:10 +0200 |
| commit | 98d64c43791b97077c35f1ab418c9680bb1004c8 (patch) | |
| tree | 2d5f5021743282cc8313587592f39a4b9b575fae /scripts | |
| parent | 6def60e366004905f0b59fb1e8f185bbeff96210 (diff) | |
| download | ptxdist-98d64c43791b97077c35f1ab418c9680bb1004c8.tar.gz ptxdist-98d64c43791b97077c35f1ab418c9680bb1004c8.tar.xz | |
[ptxd_make_xpkg_prepare] use pkg_xpkg_version for ipkg control file
This patch uses the sanitized pkg_xpkg_version for ipkg's VERSION
variable. The actual replacement of PACKAGE is moved to
ptxd_make_xpkg_prepare.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_fixup.sh | 5 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_prepare.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_fixup.sh b/scripts/lib/ptxd_make_xpkg_fixup.sh index 3c7c2c677..42cebdaf2 100644 --- a/scripts/lib/ptxd_make_xpkg_fixup.sh +++ b/scripts/lib/ptxd_make_xpkg_fixup.sh @@ -19,10 +19,7 @@ ptxd_make_xpkg_fixup() { AUTHOR) pkg_xpkg_fixup_to="`echo ${pkg_xpkg_fixup_to} | sed -e 's/\([^\\]\)@/\1\\\@/g'`" ;; - VERSION) - pkg_xpkg_fixup_to="${pkg_xpkg_fixup_to//[-_]/.}" - ;; - DEPENDS|PACKAGE) + DEPENDS|PACKAGE|VERSION) return ;; esac diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh index 665803ba7..079b13dd0 100644 --- a/scripts/lib/ptxd_make_xpkg_prepare.sh +++ b/scripts/lib/ptxd_make_xpkg_prepare.sh @@ -28,10 +28,12 @@ ptxd_make_xpkg_prepare() { # echo -e "\ install_init: @ARCH@ -> ${PTXDIST_IPKG_ARCH_STRING} -install_init: @PACKAGE@ -> ${pkg_xpkg}" +install_init: @PACKAGE@ -> ${pkg_xpkg} +install_init: @VERSION@ -> ${pkg_xpkg_version}" ARCH="${PTXDIST_IPKG_ARCH_STRING}" \ PACKAGE="${pkg_xpkg}" \ + VERSION="${pkg_xpkg_version}" \ ptxd_replace_magic "${PTXDIST_TOPDIR}/config/xpkg/ipkg.control" > \ "${pkg_ipkg_control}" || return |