aboutsummaryrefslogtreecommitdiff
path: root/linaro-hwpack-install
diff options
context:
space:
mode:
authorJames Tunnicliffe <james.tunnicliffe@linaro.org>2012-07-18 17:13:16 +0100
committerJames Tunnicliffe <james.tunnicliffe@linaro.org>2012-07-18 17:13:16 +0100
commiteebd6ed4e1f1ff0c282bf899bd28db0cbd8a1184 (patch)
tree75d0fcb33a36571998f96c8c7ac78ab9b9768832 /linaro-hwpack-install
parentbb7925b9e6a1d02ea521f0e599a9d72bb1253d00 (diff)
Bug fix to creation using YAML config.
Diffstat (limited to 'linaro-hwpack-install')
-rwxr-xr-xlinaro-hwpack-install6
1 files changed, 3 insertions, 3 deletions
diff --git a/linaro-hwpack-install b/linaro-hwpack-install
index 44435dd..56ffff0 100755
--- a/linaro-hwpack-install
+++ b/linaro-hwpack-install
@@ -178,8 +178,8 @@ if [ "$HWPACK_VERSION" = "" ]; then
HWPACK_VERSION=$(query_v3_metadata 'version')
fi
-if [ "$HWPACK_VERSION" = "3.0" ]; then
- HWPACK_ARCH=$(query_v3_metadata 'architectures 0')
+if [ "$hwpack_format" = "3.0" ]; then
+ HWPACK_ARCH=$(query_v3_metadata 'architecture')
else
HWPACK_ARCH=`grep ARCHITECTURE "${HWPACK_DIR}/metadata" | cut -d "=" -f2`
fi
@@ -267,7 +267,7 @@ echo -n "Installing packages ..."
# For "older" hwpacks that don't have a dependency package, we just
# manually install the contents of the hwpack.
-if [ "$HWPACK_VERSION" = "3.0" ]; then
+if [ "hwpack_format" = "3.0" ]; then
HWPACK_NAME=$(query_v3_metadata 'name')
else
HWPACK_NAME=`grep NAME "${HWPACK_DIR}/metadata" | cut -d "=" -f2`