diff options
author | P. J. McDermott <pjm@nac.net> | 2012-04-10 16:36:04 (EDT) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-04-10 16:36:04 (EDT) |
commit | 1270c3b52f55a1ec0f7a9608ab8197cc2b58a20b (patch) | |
tree | 841548135635c57a7c497d36f9d0d1c44525a32c | |
parent | 6aec87109397ec433e9877322ce03250e54a8c71 (diff) |
Resolve path to status override file in opkbuild.
The path to the file as provided to opkbuild should be relative to the
package directory (the directory from which opkbuild is called).
Instead, opkbuild simply passed the file path unmodified to
oh-checkbuilddeps, which runs within the packaging work area (and looks
for the status override file relative to the work area).
This commit fixes this behavior by resolving the file path before
passing it to oh-checkbuilddeps.
-rw-r--r-- | src/opkbuild.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 8856eaf..0f397a4 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -151,6 +151,12 @@ elif [ $(echo "${arch}" | wc -l) -gt 1 ]; then exit 1 fi +# Resolve status override file path. +pkg_dir="${PWD}" +cd "$(dirname "${status_override}")" +status_override="${PWD}/$(basename "${status_override}")" +cd "${pkg_dir}" + # Make work area. printf 'opkbuild: Making work area...\n' mkdir tmp |