diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-07-02 21:35:51 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-07-02 21:41:02 (EDT) |
| commit | f9e215885d44fa1bbe0a1c2814e2f30a99dc02f3 (patch) | |
| tree | d55fbaa5f871b8afda65fe60e09fd628ca6a6c27 /src | |
| parent | 513f54e3b5bdd683332e93f7922215a56d7c54fb (diff) | |
ob-*, opkbuild: s/src-/src:/
pro-archman already handles this. The (outdated and probably broken)
initial port bootstrap scripts will need to be updated for this, if
they're ever used again. Some instructions in the wiki need to be
updated.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ob-buildopk.sh | 2 | ||||
| -rw-r--r-- | src/ob-genchanges.sh | 2 | ||||
| -rw-r--r-- | src/ob-gencontrol.sh | 10 | ||||
| -rw-r--r-- | src/opkbuild.sh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh index d22accc..5ffe56b 100644 --- a/src/ob-buildopk.sh +++ b/src/ob-buildopk.sh @@ -117,7 +117,7 @@ main() printf '2.0\n' >'debian-binary' ${TOUCH} -t "${date}" 'debian-binary' if [ x"${OB_DO_SOURCE:+set}" = x'set' ]; then - build_opk "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" \ + build_opk "src:${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" \ 'src' 'all' "${date}" else for pkg in ${OPK_PACKAGES_REDUCED}; do diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index f539e46..56070e5 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -63,7 +63,7 @@ write_files_src() local file= printf 'Files:\n' >&3 - file="src-${OPK_SOURCE}_${OPK_SOURCE_VERSION}_src_all.opk" + file="src:${OPK_SOURCE}_${OPK_SOURCE_VERSION}_src_all.opk" printf ' %s %s %s\n' \ "$(wc -c "../../${file}" | cut -d ' ' -f 1)" \ 'src' "${file}" >&3 diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 7d0cc55..b54c4b3 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -69,12 +69,12 @@ gen_control_src() local value= local homepage= - binary="src-${OPK_SOURCE}" + binary="src:${OPK_SOURCE}" mkdir -p -- "${binary}.control" cat >"${binary}.control/control" <<-EOF - Package: src-${OPK_SOURCE} + Package: src:${OPK_SOURCE} Source: ${OPK_SOURCE} Binary:$(printf '%s\n' $(ob_get_binary_packages) | \ LC_ALL='C' sort | xargs printf ' %s') @@ -97,7 +97,7 @@ gen_control_src() done cat >>"${binary}.control/control" <<-EOF - Installed-Size: $(calc_inst_size "src-${OPK_SOURCE}") + Installed-Size: $(calc_inst_size "src:${OPK_SOURCE}") Format: $(ob_get_source_parameter 'Format') Description: ${OPK_SOURCE} source package EOF @@ -272,9 +272,9 @@ main() ob_init_package '..' || return 1 if [ x"${OB_DO_SOURCE:+set}" = x'set' ]; then - ob_info "$(ob_get_msg 'gen_control')" "src-${OPK_SOURCE}" + ob_info "$(ob_get_msg 'gen_control')" "src:${OPK_SOURCE}" gen_control_src - gen_md5sums "src-${OPK_SOURCE}" + gen_md5sums "src:${OPK_SOURCE}" else for pkg in ${OPK_PACKAGES_REDUCED}; do ob_info "$(ob_get_msg 'gen_control')" "${pkg}" diff --git a/src/opkbuild.sh b/src/opkbuild.sh index ab768eb..2bd9c48 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -253,7 +253,7 @@ build_source() src="$(ob_get_source_parameter 'Source')" ver="$(ob_get_source_parameter 'Version')" - src_pkg_data_base="src-${src}.data$(ob_get_system_path \ + src_pkg_data_base="src:${src}.data$(ob_get_system_path \ 'package-source' "${src}" "${ver}")" if ! mkdir -p -- "${src_pkg_data_base}"; then @@ -287,7 +287,7 @@ build_source() return 1 fi - if ! rm -Rf "src-${src}.data"; then + if ! rm -Rf "src:${src}.data"; then ob_error "$(ob_get_msg 'cant_rm_src_pkg_data')" return 1 fi |