Accepting request 766951 from openSUSE:Tools

- fix SLE 15 configurations
- Fix dist autodetection for sle15-sp2

- Fix crash when using preinstall dependency expansion in OBS
- build-vm-kvm: use /boot/kernel.obs.build and /boot/initrd.obs.build
  as fallback regardless of the platform to have a global fallback
  kernel to use for distros that do not use the "kernel-obs-build"
  package to provide the guests kernel and initrd as the system
  binaries are not reliable for use in a guest system
- use abuild user if $NOROOTFORBUILD is set.

- fix createrepo existens check for appimager and docker builds
  in chroot
- support to use virt-make-fs for ext3 VM builds

- Arch Linux zstd format support
- fix testbuild fail with latest rpm in SP2 and Leap 15.2
- do not retry automatically on disk full error

OBS-URL: https://build.opensuse.org/request/show/766951
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build?expand=0&rev=129

PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20200107
+pkgver=20200124.1
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')

_service

@@ -1,6 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="versionformat">%ad</param>
+    <param name="revision">20200124.1</param>
+    <param name="version">20200124.1</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>

build.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Fri Jan 24 15:44:00 UTC 2020 - Adrian Schröter <adrian@suse.de>
+
+- fix SLE 15 configurations
+- Fix dist autodetection for sle15-sp2
+
+-------------------------------------------------------------------
+Fri Jan 24 14:38:29 UTC 2020 - Adrian Schröter <adrian@suse.de>
+
+- Fix crash when using preinstall dependency expansion in OBS
+- build-vm-kvm: use /boot/kernel.obs.build and /boot/initrd.obs.build
+  as fallback regardless of the platform to have a global fallback
+  kernel to use for distros that do not use the "kernel-obs-build"
+  package to provide the guests kernel and initrd as the system
+  binaries are not reliable for use in a guest system
+- use abuild user if $NOROOTFORBUILD is set.
+
+-------------------------------------------------------------------
+Wed Jan 22 12:30:41 UTC 2020 - Adrian Schröter <adrian@suse.de>
+
+- fix createrepo existens check for appimager and docker builds
+  in chroot
+- support to use virt-make-fs for ext3 VM builds
+
+-------------------------------------------------------------------
+Fri Jan 10 09:28:39 UTC 2020 - Adrian Schröter <adrian@suse.de>
+
+- Arch Linux zstd format support
+- fix testbuild fail with latest rpm in SP2 and Leap 15.2
+- do not retry automatically on disk full error
+
 -------------------------------------------------------------------
 Tue Jan  7 12:54:44 UTC 2020 - Adrian Schröter <adrian@suse.de>
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20200107
+Version: 20200124.1
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all

build.spec

@@ -18,11 +18,17 @@
 # needsbinariesforbuild
 
 
-Name:           build
+%if 0%{?fedora} || 0%{?rhel}
+%define __pkg_name obs-build
+%else
+%define __pkg_name build
+%endif
+
+Name:           %{__pkg_name}
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0-only OR GPL-3.0-only
 Group:          Development/Tools/Building
-Version:        20200107
+Version:        20200124.1
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -67,11 +73,11 @@ Recommends:     /sbin/mkfs.ext3
 %endif
 
 %if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
-Requires:       build-mkbaselibs
+Requires:       %{__pkg_name}-mkbaselibs
 %endif
 
 %if 0%{?suse_version} > 1120 || 0%{?mdkversion}
-Recommends:     build-mkdrpms
+Recommends:     %{__pkg_name}-mkdrpms
 %endif
 
 %description
@@ -95,7 +101,7 @@ Summary:        Tools to generate delta rpms
 Group:          Development/Tools/Building
 Requires:       deltarpm
 # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq
-Requires:       build
+Requires:       %{__pkg_name}
 
 %description mkdrpms
 This package contains the parts which may be installed in the inner build system
@@ -110,11 +116,11 @@ for generating delta rpm packages.
 %package initvm-%{initvm_arch}
 Summary:        Virtualization initializer for emulated cross architecture builds
 Group:          Development/Tools/Building
-Requires:       build
+Requires:       %{__pkg_name}
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
-Provides:       build-initvm
+Provides:       %{__pkg_name}-initvm
-Obsoletes:      build-initvm
+Obsoletes:      %{__pkg_name}-initvm
 %if 0%{?suse_version} > 1200
 BuildRequires:  glibc-devel-static
 %endif
@@ -166,7 +172,7 @@ ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf
 ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf
 %endif
 %if 0%{?sles_version} == 1110
-# this is SUSE SLE 11 
+# this is SUSE SLE 11
 ln -s sles11sp2.conf default.conf
 %endif
 # make sure that we have a config

debian.changelog

@@ -1,4 +1,4 @@
-build (20200107) unstable; urgency=low
+build (20200124.1) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection

obs-build-20200107.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50bca045bb7aa3cff0addeb9b9410d20f0727659c1708cca7559533d8e022aeb
-size 355877

obs-build-20200124.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:798d77a7f3c9fa7f6b12bdfeb0026774cd39c6b7f56f88181ae5d40a5ac35752
+size 340455