From f9e215885d44fa1bbe0a1c2814e2f30a99dc02f3 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 02 Jul 2020 21:35:51 -0400 Subject: 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. --- (limited to 'tests/exe') 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 -- cgit v0.9.1