summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-03-18 17:26:43 +0000
committerHéctor Orón Martínez <zumbi@debian.org>2019-09-01 01:59:08 +0200
commitf0339358fa82999cbb748ae35d91e6338b8f666d (patch)
tree671113dd82507a4ed908d30b6684509ee4ab1df0
parent66619c70e57d46b91f2265af1f3bd95839762eba (diff)
build-recipe-dsc: Move all build results, not just *.deb and *.changes
The purpose of the changes file is to list everything that is to be installed into the Debian (or derivative) archive, including *.deb, *.udeb (micro-debs for the Debian installer), *.ddeb (detached debug symbols, in Ubuntu and its derivatives) and *.buildinfo (details of the build environment, mainly for reproducible builds). If we're providing an equivalent of the Debian archive, then we should include all the same files. This change ensures that all build products get moved into the right place, even if they are file types that obs-build doesn't yet know about, or even file types that haven't been invented yet. When obs-build is used in conjunction with OBS, changes to bs_publish are also likely to be necessary for a full-stack solution. Signed-off-by: Simon McVittie <smcv@collabora.com> Forwarded: https://github.com/openSUSE/obs-build/pull/496 Gbp-Pq: Name build-recipe-dsc-Move-all-build-results-not-just-.deb-and.patch
-rw-r--r--build-recipe-dsc9
1 files changed, 7 insertions, 2 deletions
diff --git a/build-recipe-dsc b/build-recipe-dsc
index c104890..3ee4077 100644
--- a/build-recipe-dsc
+++ b/build-recipe-dsc
@@ -114,8 +114,13 @@ dsc_build() {
}
dsc_move_build_result() {
- for DEB in $BUILD_ROOT/$TOPDIR/*.{deb,changes} ; do
- test -e "$DEB" && mv "$DEB" "$BUILD_ROOT/$TOPDIR/DEBS"
+ local changes
+
+ for changes in $BUILD_ROOT/$TOPDIR/*.changes ; do
+ while read f ; do
+ mv "$BUILD_ROOT/$TOPDIR/$f" "$BUILD_ROOT/$TOPDIR/DEBS/"
+ done < <(sed -ne '/Files:/,$s/^ ................................ [0-9][0-9]* [^ ]* [^ ]* //p' "$changes")
+ mv "$changes" "$BUILD_ROOT/$TOPDIR/DEBS"
done
# link used sources over to DEB directory