diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -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 | ||||
| -rwxr-xr-x | tests/exe/ob-gencontrol.sh | 4 | ||||
| -rwxr-xr-x | tests/exe/opkbuild.sh | 4 |
8 files changed, 16 insertions, 16 deletions
@@ -34,6 +34,9 @@ Utilities: the behavior in versions 3.0.0-alpha1 through 3.0.0-beta7. Since version 4.0.0, commands were run in separate (fake) superuser environments, which may not preserve superuser ownership of files. + * Source package names are now prefixed with "src:" instead of "src-". + pro-archman has supported this in its package name hashing since + version 2.0.0. libopkbuild: @@ -4,9 +4,6 @@ Future Tasks Functional Changes ------------------ - * ob-buildopk, ob-genchanges, ob-gencontrol, opkbuild: s/src-/src:/ - - pro-archman already handles this in package hashing (commit 83167fc, - version 2.0.0). * Split distribution packaging from upstream sources in source packages. - Non-native package: * `src:foo` is the distribution packaging, and it depends on 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 diff --git a/tests/exe/ob-gencontrol.sh b/tests/exe/ob-gencontrol.sh index 3f3d05f..4ea0cb5 100755 --- a/tests/exe/ob-gencontrol.sh +++ b/tests/exe/ob-gencontrol.sh @@ -26,8 +26,8 @@ plan_ 12 OB_DO_SOURCE='true' command_ok_ 'ob-gencontrol source package exit status' -- \ ob-gencontrol -cmd_is 'source package control file' cat 'src-foo.control/control' <<-EOF - Package: src-foo +cmd_is 'source package control file' cat 'src:foo.control/control' <<-EOF + Package: src:foo Source: foo Binary: bar baz-qux foo Version: 1.0-1 diff --git a/tests/exe/opkbuild.sh b/tests/exe/opkbuild.sh index b569986..a14f8d3 100755 --- a/tests/exe/opkbuild.sh +++ b/tests/exe/opkbuild.sh @@ -49,7 +49,7 @@ rm -Rf 'src/' 'tmp/' cp -Rp '../src/' 'src/' command_ok_ 'opkbuild exit status' -- opkbuild -a i686-linux-glibc -p x60 -dc -for opk in '../src-foo_1.0-1_src_all.opk' \ +for opk in '../src:foo_1.0-1_src_all.opk' \ '../foo_1.0-1_i686-linux-glibc_all.opk' \ '../bar_1.0-1_all_all.opk'; do command_ok_ 'opk exists' -- [ -f "${opk}" ] @@ -60,7 +60,7 @@ for opk in '../src-foo_1.0-1_src_all.opk' \ EOF done cmd_is 'control.tar.gz contents' \ - ls_inner '../src-foo_1.0-1_src_all.opk' control.tar.gz <<-EOF + ls_inner '../src:foo_1.0-1_src_all.opk' control.tar.gz <<-EOF ./ ./control ./md5sums |