Skip to content
Snippets Groups Projects
Commit caa52c38 authored by Héctor Orón Martínez's avatar Héctor Orón Martínez Committed by Simon McVittie
Browse files

Import Debian changes 20180302-2~bpo9+1

obs-build (20180302-2~bpo9+1) stretch-backports; urgency=medium

  * Rebuild for stretch-backports.
  * debian/control: drop depends on ext2fsprogs (essential package)
  * debian/control: set stretch standards version

obs-build (20180302-2) unstable; urgency=medium

  * debian/patches: avoid source package rebuilds
  * debian/patches: add fallback for Debian SID
  * debian/gbp.conf: add gbp configuration file
  * debian/control: recommend xzdec for arch linux support
parent 0e8e922d
No related branches found
No related tags found
No related merge requests found
obs-build (20180302-2~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
* debian/control: drop depends on ext2fsprogs (essential package)
* debian/control: set stretch standards version
-- Héctor Orón Martínez <zumbi@debian.org> Mon, 19 Mar 2018 19:41:23 +0100
obs-build (20180302-2) unstable; urgency=medium
* debian/patches: avoid source package rebuilds
* debian/patches: add fallback for Debian SID
* debian/gbp.conf: add gbp configuration file
* debian/control: recommend xzdec for arch linux support
-- Héctor Orón Martínez <zumbi@debian.org> Tue, 06 Mar 2018 00:55:57 +0100
obs-build (20180302-1) unstable; urgency=medium
* New upstream release
......
......@@ -6,14 +6,14 @@ Uploaders: Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>,
Andrew Lee (李健秋) <ajqlee@debian.org>,
Héctor Orón Martínez <zumbi@debian.org>
Build-Depends: debhelper (>= 9)
Standards-Version: 4.1.3
Standards-Version: 3.9.8
Package: obs-build
Architecture: all
Depends:
${misc:Depends}, ${perl:Depends}, rpm, debootstrap, sudo, libarchive-tools,
python
Recommends: rpm2cpio, osc, libcrypt-ssleay-perl, e2fsprogs
Recommends: rpm2cpio, osc, libcrypt-ssleay-perl, xzdec
Suggests: xfsprogs, btrfs-tools
Description: scripts for building RPM/debian packages for multiple distributions
This package provides scripts for building RPM and debian packages in
......
[DEFAULT]
debian-branch = debian/master
debian-tag = debian/%(version)s
pristine-tar = True
[pq]
patch-numbers = False
From: Andrew Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 6 Nov 2017 10:22:03 +0100
Subject: build-recipe-dsc: don't rebuild the source package
If we use build suffixes, rebuilding the source package will
result in the build suffix being included into the source package,
which we'd rather avoid.
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
---
build-recipe-dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: obs-build/build-recipe-dsc
===================================================================
--- obs-build.orig/build-recipe-dsc 2018-03-06 00:44:00.132983994 +0100
+++ obs-build/build-recipe-dsc 2018-03-06 00:44:00.132983994 +0100
@@ -95,7 +95,7 @@
# this allows the build environment to be manipulated
# and alternate build commands can be used
DSC_BUILD_CMD="$(queryconfig --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" substitute dsc:build_cmd)"
- test -z "$DSC_BUILD_CMD" && DSC_BUILD_CMD="dpkg-buildpackage -us -uc"
+ test -z "$DSC_BUILD_CMD" && DSC_BUILD_CMD="dpkg-buildpackage -us -uc -b"
if test -e $buildroot/$TOPDIR/SOURCES/build.script ; then
echo "Sourcing build.script to build - it should normally run 'dpkg-buildpackage -us -uc'"
DSC_BUILD_CMD="source $TOPDIR/SOURCES/build.script"
From: =?utf-8?b?SMOpY3RvciBPcsOzbiBNYXJ0w61uZXo=?=
<hector.oron@collabora.co.uk>
Date: Mon, 6 Nov 2017 15:55:02 +0100
Subject: debootstrap: add fallback for Debian SID distro
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
ICBXaGVuIGF0dGVtcHRpbmcgdG8gYnVpbGQgRGViaWFuIHVuc3RhYmxlLCBkaXN0cmlidXRpb24g
aXMKICBjYWxjdWxhdGVkIHVzaW5nIGxzYiwgd2hpY2ggcmVsaWVzIG9uIGFwdCBjYWNoZS4gQXMg
b3VyCiAgYnVpbGQgc3lzdGVtcyBsYWNrIGFwdCBjYWNoZSBhbmQgbmV0d29yayB3ZSBjYW5ub3Qg
ZGV0ZWN0CiAgd2UgYXJlIGJ1aWxkaW5nIGZvciBEZWJpYW4gU0lEIChha2EgdW5zdGFibGUpLgog
IEZvciBtb3JlIGJhY2tncm91bmQgaW5mb3JtYXRpb24gc2VlOiBEZWJpYW5CdWcjODQ1NjUxCgpT
aWduZWQtb2ZmLWJ5OiBIw6ljdG9yIE9yw7NuIE1hcnTDrW5leiA8aGVjdG9yLm9yb25AY29sbGFi
b3JhLmNvLnVrPgpUZXN0ZWQtYnk6IEjDqWN0b3IgT3LDs24gTWFydMOtbmV6IDxoZWN0b3Iub3Jv
bkBjb2xsYWJvcmEuY28udWs+Cg==
---
build-recipe-debootstrap | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build-recipe-debootstrap b/build-recipe-debootstrap
index 72fb599..c06ef34 100644
--- a/build-recipe-debootstrap
+++ b/build-recipe-debootstrap
@@ -31,7 +31,11 @@ recipe_prepare_debootstrap() {
recipe_build_debootstrap() {
local arch=$(chroot $BUILD_ROOT su -c "dpkg-architecture -qDEB_BUILD_ARCH")
- local dist=$(chroot $BUILD_ROOT su -c "lsb_release --codename --short")
+ if $(chroot $BUILD_ROOT grep -q '/sid' /etc/debian_version) ; then
+ local dist=unstable
+ else
+ local dist=$(chroot $BUILD_ROOT su -c "lsb_release --codename --short")
+ fi
local myroot=debootstraproot
test -d $BUILD_ROOT/.build.binaries || cleanup_and_exit 1
if test "$DO_INIT" = true -o ! -d "$BUILD_ROOT/.build.binaries/dists" ; then
......@@ -3,3 +3,5 @@
0003-HACK-make-glibc-build.patch
0004-deb-don-t-create-an-empty-rcS.patch
0005-dsc-keep-everything.patch
build-recipe-dsc-don-t-rebuild-the-source-package.patch
debootstrap-add-fallback-for-Debian-SID-distro.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment