Commit 9cee374a authored by Sjoerd Simons's avatar Sjoerd Simons

Merge branch 'fallback-stable-dist' into 'collabora/master'

Fallback stable dist

See merge request !19
parents d74f1e69 6793ad72
obs-build (20180831-2co2) unstable; urgency=medium
* Added fallback-stable-dist.patch: fallback dist to stable is lsb report
a non supported dist in debootstrap.
-- Andrew Lee (李健秋) <andrew.lee@collabora.co.uk> Fri, 04 Oct 2019 15:52:17 +0800
obs-build (20180831-2co1) unstable; urgency=medium
[ Simon McVittie ]
......
--- a/build-recipe-debootstrap
+++ b/build-recipe-debootstrap
@@ -35,6 +35,9 @@ recipe_build_debootstrap() {
local dist=unstable
else
local dist=$(chroot $BUILD_ROOT su -c "lsb_release --codename --short")
+ if [ ! -f "$BUILD_ROOT//usr/share/debootstrap/scripts/${dist}" ]; then
+ dist=stable
+ fi
fi
local myroot=debootstraproot
test -d $BUILD_ROOT/.build.binaries || cleanup_and_exit 1
......@@ -12,3 +12,4 @@ build-recipe-dsc-List-contents-of-build-results.patch
build-recipe-dsc-Show-information-about-the-build-chroot.patch
collabora/0001-Add-a-new-changelog-entry-for-debian-packages.patch
collabora/0002-workaround-ptmx-issues.patch
collabora/fallback-stable-dist.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment