summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-02-03 13:53:57 (EST)
committer P. J. McDermott <pjm@nac.net>2012-02-03 13:53:57 (EST)
commitb3fa3341e50d6a761fe20c6ca4ce4de27529b38b (patch)
treeaf91bc9802ac155cefb6f5feea1e6e49aa5a5623
parent99702095780dd12910e5cd8e0780ef2133564da0 (diff)
Remove distinct version and revision variables.
-rw-r--r--src/oh-buildopk4
-rw-r--r--src/opkbuild3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/oh-buildopk b/src/oh-buildopk
index 77c5e0f..1855173 100644
--- a/src/oh-buildopk
+++ b/src/oh-buildopk
@@ -67,7 +67,7 @@ if [ -n "${is_srcpkg}" ]; then
cd ..
# Pack opk file.
- tar -czf ../../${pkg}_${OH_PKGVER}-${OH_PKGREV}_all.opk \
+ tar -czf ../../${pkg}_${OH_PKGVER}_all.opk \
debian-binary data.tar.gz control.tar.gz || exit 2
rm -Rf debian-binary control data.tar.gz control.tar.gz || exit 2
else
@@ -96,7 +96,7 @@ else
cd ..
# Pack opk file.
- tar -czf ../../${1}_${OH_PKGVER}-${OH_PKGREV}_${arch}.opk \
+ tar -czf ../../${1}_${OH_PKGVER}_${arch}.opk \
debian-binary data.tar.gz control.tar.gz || exit 2
rm -Rf debian-binary control data.tar.gz control.tar.gz || exit 2
diff --git a/src/opkbuild b/src/opkbuild
index 542fe4e..902e331 100644
--- a/src/opkbuild
+++ b/src/opkbuild
@@ -145,8 +145,7 @@ ${OH_ARCH}
EOF
export OH_ARCH_CPU OH_ARCH_VENDOR OH_ARCH_KERNEL OH_ARCH_LIBS
export OH_SRCPKG="${srcpkg}"
-export OH_PKGVER=${version%'-'*}
-export OH_PKGREV=${version#*'-'}
+export OH_PKGVER=${version}
# Check build dependencies.
oh-checkbuilddeps || error "${srcpkg}-src"