summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-03-13 21:01:08 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-03-13 21:01:08 (EDT)
commit37b1a510c5fa4af3c16bdaf32870b6badd98d262 (patch)
treeb87a83f63e98b41a8bf0a86b2ab646fb75485f63
parentc94515cd108fa6fd26702df321e68ca9538b589f (diff)
ob_get_doc_files(): Drop arch and plat parameters
The set of documentation files to be provided should not be dependent on the architecture and platform for which at least some of the binary packages are built.
-rw-r--r--lib/package.sh6
-rw-r--r--lib/package/2.sh3
-rw-r--r--src/ob-installdocs.sh3
3 files changed, 2 insertions, 10 deletions
diff --git a/lib/package.sh b/lib/package.sh
index c6979d7..09f700e 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -221,11 +221,7 @@ ob_get_doc_package()
ob_get_doc_files()
{
- local arch="${1}"
- local plat="${2}"
- shift 2 || _ob_abort
-
- _ob_package_do 'get_doc_files' "${arch}" "${plat}" || return ${?}
+ _ob_package_do 'get_doc_files' || return ${?}
return 0
}
diff --git a/lib/package/2.sh b/lib/package/2.sh
index 345eac3..c113dba 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -127,9 +127,6 @@ _ob_get_doc_package_2()
_ob_get_doc_files_2()
{
- local arch="${1}"
- local plat="${2}"
- shift 2 || _ob_abort
local doc_pkg=
doc_pkg="$(_ob_get_doc_package_2)"
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index 9418514..dc768ed 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -87,8 +87,7 @@ main()
install_docs "${srcs}" "${dest}" \
"${data_doc_dir}" || return 1
done <<-EOF
- $(ob_get_doc_files "${OPK_HOST_ARCH}" \
- "${OPK_HOST_PLAT}")
+ $(ob_get_doc_files)
EOF
fi
else