From 2ddb616b87a2a4684d03c9b54e95f800e73017d9 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 17:02:36 -0400 Subject: ob_parse_package_metadata(): Eliminate caching Cf. commit da45b6d. --- (limited to 'src') diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh index 0ab3308..e4e8531 100644 --- a/src/ob-applypatches.sh +++ b/src/ob-applypatches.sh @@ -61,7 +61,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 apply_patches || return 1 diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh index 685852a..e224c54 100644 --- a/src/ob-buildenv.sh +++ b/src/ob-buildenv.sh @@ -91,7 +91,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 ob_info "$(ob_get_msg 'setup_build_env')" diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh index 41db005..670740f 100644 --- a/src/ob-buildopk.sh +++ b/src/ob-buildopk.sh @@ -46,7 +46,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 printf '2.0\n' >'debian-binary' if [ -n "${OB_DO_SOURCE}" ]; then diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh index aea3d9a..05826ad 100644 --- a/src/ob-checkbuilddeps.sh +++ b/src/ob-checkbuilddeps.sh @@ -89,7 +89,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 ob_set_package_substvars '' check_build_deps || return ${?} diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index 42e2633..37f96a9 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -93,7 +93,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 if [ -n "${OB_DO_SOURCE}" ]; then changes="${OPK_SOURCE}_${OPK_SOURCE_VERSION}_src_all.changes" diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 822dda6..551e6de 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -172,7 +172,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 if [ -n "${OB_DO_SOURCE}" ]; then gen_control "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" 'src' 'all' \ diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh index 06707ee..6b15e2c 100644 --- a/src/ob-installdocs.sh +++ b/src/ob-installdocs.sh @@ -64,7 +64,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 if ! doc_pkg="$(ob_get_doc_package)"; then ob_error "$(ob_get_msg 'cant_get_doc_pkg')" diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh index d81628a..4eac903 100644 --- a/src/ob-installplatconf.sh +++ b/src/ob-installplatconf.sh @@ -75,7 +75,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 copied='false' diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh index 4a95aec..98b2da1 100644 --- a/src/ob-unpacksource.sh +++ b/src/ob-unpacksource.sh @@ -138,7 +138,7 @@ main() fi ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 if [ -d 'src' ]; then ob_info "$(ob_get_msg 'already_unpacked')" diff --git a/src/opkbuild.sh b/src/opkbuild.sh index b7bc160..6f3246b 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -226,7 +226,7 @@ setup_package() ob_info "$(ob_get_msg 'parse_package_metadata')" ob_init_package '..' || return 1 - ob_parse_package_metadata -c '.opkbuild.cache' || return 1 + ob_parse_package_metadata || return 1 OPK_SOURCE="$(ob_get_source_parameter 'Source')" OPK_SOURCE_VERSION="$(ob_get_source_parameter 'Version')" -- cgit v0.9.1