aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-01-24 16:52:02 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2011-04-22 19:41:19 +0200
commit0f9703178cf7ea12d28d82d953872724206048f6 (patch)
tree5aff3d7e69f318676e518a4e4da9194538fe5fb8
parent65c7a01bb7610a7b509548d752d1110e448d1717 (diff)
downloadopenembedded-0f9703178cf7ea12d28d82d953872724206048f6.zip
openembedded-0f9703178cf7ea12d28d82d953872724206048f6.tar.gz
openembedded-0f9703178cf7ea12d28d82d953872724206048f6.tar.bz2
stage-manager: Use opkg utilities
* Rename stage-manager-ipkg -> stage-manager-opkg * Rename stage-manager-ipkg-build -> stage-manager-opkg-build Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Graham Gower <graham.gower@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rwxr-xr-xrecipes/stage-manager/files/stage-manager-opkg (renamed from recipes/stage-manager/files/stage-manager-ipkg)2
-rwxr-xr-xrecipes/stage-manager/files/stage-manager-opkg-build (renamed from recipes/stage-manager/files/stage-manager-ipkg-build)14
-rw-r--r--recipes/stage-manager/stagemanager-native_0.0.1.bb8
3 files changed, 12 insertions, 12 deletions
diff --git a/recipes/stage-manager/files/stage-manager-ipkg b/recipes/stage-manager/files/stage-manager-opkg
index 105ea54..5a2347a 100755
--- a/recipes/stage-manager/files/stage-manager-ipkg
+++ b/recipes/stage-manager/files/stage-manager-opkg
@@ -1015,7 +1015,7 @@ ipkg_upgrade_pkg() {
if [ "$avail_ver" = "$inst_ver" ]; then
echo "Package $pkg ($inst_ver) installed in $dest_name is up to date"
- elif ipkg-compare-versions $avail_ver '>>' $inst_ver; then
+ elif opkg-compare-versions $avail_ver '>>' $inst_ver; then
echo "Upgrading $pkg ($dest_name) from $inst_ver to $avail_ver"
ipkg_get_install_dest $dest $pkg
else
diff --git a/recipes/stage-manager/files/stage-manager-ipkg-build b/recipes/stage-manager/files/stage-manager-opkg-build
index 77367ac..b7be3dc 100755
--- a/recipes/stage-manager/files/stage-manager-ipkg-build
+++ b/recipes/stage-manager/files/stage-manager-opkg-build
@@ -1,6 +1,6 @@
#!/bin/sh
-# ipkg-build -- construct a .ipk from a directory
+# opkg-build -- construct a .ipk from a directory
# Carl Worth <cworth@east.isi.edu>
# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
# 2003-04-25 rea@sr.unh.edu
@@ -11,14 +11,14 @@ set -e
version=1.0
-ipkg_extract_value() {
+opkg_extract_value() {
sed -e "s/^[^:]*:[[:space:]]*//"
}
required_field() {
field=$1
- value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value`
+ value=`grep "^$field:" < $CONTROL/control | opkg_extract_value`
if [ -z "$value" ]; then
echo "*** Error: $CONTROL/control is missing field $field" >&2
return 1
@@ -30,7 +30,7 @@ required_field() {
disallowed_field() {
field=$1
- value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value`
+ value=`grep "^$field:" < $CONTROL/control | opkg_extract_value`
if [ -n "$value" ]; then
echo "*** Error: $CONTROL/control contains disallowed field $field" >&2
return 1
@@ -128,7 +128,7 @@ You probably want to chown these to a system user: " >&2
bad_fields=`echo $bad_fields`
echo "*** Error: The following fields in $CONTROL/control are missing a ':'" >&2
echo " $bad_fields" >&2
- echo "ipkg-build: This may be due to a missing initial space for a multi-line field value" >&2
+ echo "opkg-build: This may be due to a missing initial space for a multi-line field value" >&2
PKG_ERROR=1
fi
@@ -153,7 +153,7 @@ You probably want to chown these to a system user: " >&2
}
###
-# ipkg-build "main"
+# opkg-build "main"
###
ogargs=""
outer=ar
@@ -218,7 +218,7 @@ fi
if ! pkg_appears_sane $pkg_dir; then
echo >&2
- echo "ipkg-build: Please fix the above errors and try again." >&2
+ echo "opkg-build: Please fix the above errors and try again." >&2
exit 1
fi
diff --git a/recipes/stage-manager/stagemanager-native_0.0.1.bb b/recipes/stage-manager/stagemanager-native_0.0.1.bb
index 9577749..8ad73ef 100644
--- a/recipes/stage-manager/stagemanager-native_0.0.1.bb
+++ b/recipes/stage-manager/stagemanager-native_0.0.1.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Helper script for packaged-staging.bbclass"
PR = "r15"
SRC_URI = "file://stage-manager \
- file://stage-manager-ipkg \
- file://stage-manager-ipkg-build "
+ file://stage-manager-opkg \
+ file://stage-manager-opkg-build "
LICENSE = "GPLv2"
PACKAGE_ARCH = "all"
@@ -21,6 +21,6 @@ NATIVE_INSTALL_WORKS = "1"
do_install() {
install -d ${STAGING_BINDIR}
install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR}
- install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR}
- install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR}
+ install -m 0755 ${WORKDIR}/stage-manager-opkg ${STAGING_BINDIR}
+ install -m 0755 ${WORKDIR}/stage-manager-opkg-build ${STAGING_BINDIR}
}