Hello community,
here is the log from the commit of package build for openSUSE:Factory checked in at 2017-02-01 09:49:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2016-12-11 13:21:38.379992841 +0100
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2017-02-03 17:33:44.910267823 +0100
@@ -1,0 +2,7 @@
+Wed Jan 25 16:06:13 UTC 2017 - adrian(a)suse.de
+
+- fix haskell builds (bsc#1018895)
+- fix multi type kiwi profile handling
+- minor distribution config and bug fixes
+
+-------------------------------------------------------------------
Old:
----
obs-build-20161206.tar.gz
New:
----
obs-build-20170112.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.AdFovu/_old 2017-02-03 17:33:45.682158572 +0100
+++ /var/tmp/diff_new_pack.AdFovu/_new 2017-02-03 17:33:45.682158572 +0100
@@ -1,7 +1,7 @@
#
# spec file for package build
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,13 @@
# needsbinariesforbuild
-%define version_unconverted 20161206
+%define version_unconverted 20170112
Name: build
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 20161206
+Version: 20170112
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.AdFovu/_old 2017-02-03 17:33:45.738150647 +0100
+++ /var/tmp/diff_new_pack.AdFovu/_new 2017-02-03 17:33:45.742150081 +0100
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20161206
+pkgver=20170112
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.AdFovu/_old 2017-02-03 17:33:45.790143288 +0100
+++ /var/tmp/diff_new_pack.AdFovu/_new 2017-02-03 17:33:45.790143288 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20161206
+Version: 20170112
Binary: build
Maintainer: Adrian Schroeter <adrian(a)suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.AdFovu/_old 2017-02-03 17:33:45.818139326 +0100
+++ /var/tmp/diff_new_pack.AdFovu/_new 2017-02-03 17:33:45.822138760 +0100
@@ -1,4 +1,4 @@
-build (20161206) unstable; urgency=low
+build (20170112) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control
--- old/debian/control 2009-12-09 09:47:57.000000000 +0100
+++ new/debian/control 2017-01-17 12:18:28.000000000 +0100
@@ -8,6 +8,9 @@
Package: build
Architecture: all
Depends: ${perl:Depends}, rpm
+Conflicts: obs-build
+Replaces: obs-build
+Provides: obs-build
Recommends: rpm2cpio
Description: A script to build SUSE Linux RPMs
This package provides a script for building RPMs for SUSE Linux
++++++ obs-build-20161206.tar.gz -> obs-build-20170112.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/build new/obs-build-20170112/build
--- old/obs-build-20161206/build 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/build 2017-01-12 15:42:22.000000000 +0100
@@ -696,7 +696,7 @@
fi
}
-wipe_build_environement() {
+wipe_build_environment() {
if test -n "$VM_TYPE"; then
vm_img_wipe
else
@@ -998,7 +998,7 @@
if test -n "$KILL" ; then
test -z "$SRCDIR" || usage
- if test -n "$VM_IMAGE" -a -n "$VM_SWAP" -a -n "$VM_TYPE"; then
+ if test -n "$VM_IMAGE" -a -n "$VM_SWAP" -a -n "$VM_TYPE" -a "$VM_SWAP" != __not_attached__ ; then
# mark job as failed so that we don't extract packages
if test "$VM_TYPE" != zvm ; then
echo -n "BUILDSTATUS1" >"$VM_SWAP"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/build-recipe-kiwi new/obs-build-20170112/build-recipe-kiwi
--- old/obs-build-20161206/build-recipe-kiwi 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/build-recipe-kiwi 2017-01-12 15:42:22.000000000 +0100
@@ -457,7 +457,7 @@
local profile=$3
local bundle_call
- kiwi_profile=""
+ local kiwi_profile=""
if [ "$profile" != "__not__set" ]; then
kiwi_profile="${profile}-"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/build-vm new/obs-build-20170112/build-vm
--- old/obs-build-20161206/build-vm 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/build-vm 2017-01-12 15:42:22.000000000 +0100
@@ -339,10 +339,10 @@
vm_img_wipe() {
vm_wipe_$VM_TYPE "$@"
- if test -n "$VM_IMAGE" -a ! -b "$VM_IMAGE" ; then
+ if test -n "$VM_IMAGE" -a "$VM_IMAGE" != __not_attached__ -a ! -b "$VM_IMAGE" ; then
rm -f "$VM_IMAGE"
fi
- if test -n "$VM_SWAP" -a ! -b "$VM_SWAP" ; then
+ if test -n "$VM_SWAP" -a "$VM_SWAP" != __not_attached__ -a ! -b "$VM_SWAP" ; then
rm -f "$VM_SWAP"
fi
}
@@ -410,6 +410,7 @@
background_watchdog() {
WATCHDOG_START=
WATCHDOG_TIMEOUT=300
+ BUILD_OPTIONS_PARSED=
while sleep 5 ; do
WATCH=`grep -a "### VM INTERACTION" "$LOGFILE" | tail -n 1`
case $WATCH in
@@ -421,11 +422,11 @@
ELAPSED=$((NOW-WATCHDOG_START))
if test $ELAPSED -gt $WATCHDOG_TIMEOUT ; then
# kill the VM
- echo "### WATCHDOG TRIGGERED, KILLING VM ###"
- fuser -k -TERM "$VM_IMAGE"
- exit 0
- fi
- fi
+ echo "### WATCHDOG TRIGGERED, KILLING VM ###"
+ vm_kill
+ exit 0
+ fi
+ fi
done
}
@@ -598,32 +599,32 @@
vm_set_mount_options
if test "$VM_IMAGE" = 1 ; then
VM_IMAGE="$BUILD_ROOT.img"
- if test -z "$VM_SWAP" -a "$VM_TYPE" != emulator; then
+ if test -z "$VM_SWAP" -a "$VM_TYPE" != emulator ; then
VM_SWAP="$BUILD_ROOT.swap"
fi
- echo "VM_IMAGE: $VM_IMAGE, VM_SWAP: $VM_SWAP"
- else
- echo "VM_IMAGE: $VM_IMAGE, VM_SWAP: $VM_SWAP"
- vm_attach_root
fi
+ echo "VM_IMAGE: $VM_IMAGE, VM_SWAP: $VM_SWAP"
+ vm_attach_root
# this should not be needed, but sometimes a xen instance got lost
test "$VM_TYPE" = xen && vm_purge_xen
if test -n "$VMDISK_CLEAN" ; then
# delete old root/swap to get rid of the old blocks
- if test -n "$VM_IMAGE" -a -f "$VM_IMAGE" ; then
+ if test -n "$VM_IMAGE" -a "$VM_IMAGE" != __not_attached__ -a -f "$VM_IMAGE" ; then
echo "Deleting old $VM_IMAGE"
rm -rf "$VM_IMAGE"
fi
- if test -n "$VM_SWAP" -a -f "$VM_SWAP" ; then
+ if test -n "$VM_SWAP" -a "$VM_SWAP" != __not_attached__ -a -f "$VM_SWAP" ; then
echo "Deleting old $VM_SWAP"
rm -rf "$VM_SWAP"
fi
fi
- test -b "$VM_IMAGE" || vm_img_create "$VM_IMAGE" "$VMDISK_ROOTSIZE"
+ if test ! -b "$VM_IMAGE" ; then
+ vm_img_create "$VM_IMAGE" "$VMDISK_ROOTSIZE"
+ fi
if test -z "$CLEAN_BUILD" ; then
vm_img_mkfs "$VMDISK_FILESYSTEM" "$VM_IMAGE"
fi
- if test -n "$VM_SWAP" -a ! -b "$VM_SWAP" ; then
+ if test -n "$VM_SWAP" -a "$VM_SWAP" != __not_attached__ -a ! -b "$VM_SWAP" ; then
vm_img_create "$VM_SWAP" "$VMDISK_SWAPSIZE"
fi
if test ! -e "$VM_IMAGE" ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/configs/arch.conf new/obs-build-20170112/configs/arch.conf
--- old/obs-build-20161206/configs/arch.conf 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/configs/arch.conf 2017-01-12 15:42:22.000000000 +0100
@@ -4,7 +4,7 @@
Preinstall: gawk gzip filesystem curl libidn acl gpgme libarchive
Preinstall: openssl libssh2 zlib libassuan libgpg-error attr
Preinstall: expat xz bzip2 readline lzo krb5 e2fsprogs keyutils
-Preinstall: ncurses lz4
+Preinstall: ncurses lz4 libpsl icu gcc-libs
VMinstall: util-linux libutil-linux binutils pcre libcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/init_buildsystem new/obs-build-20170112/init_buildsystem
--- old/obs-build-20161206/init_buildsystem 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/init_buildsystem 2017-01-12 15:42:22.000000000 +0100
@@ -515,7 +515,7 @@
# mount /proc and /dev/pts
mkdir -p $BUILD_ROOT/proc
mkdir -p $BUILD_ROOT/dev/pts
-if test "$UID" = 0 -a -n "$BUILD_ROOT" -a "$BUILD_ROOT" = / ; then
+if test "$UID" = 0 -a -n "$BUILD_ROOT" -a "$BUILD_ROOT" != / ; then
mount -n -tproc none "$BUILD_ROOT/proc"
mount -n -tdevpts -omode=0620,gid=5 none "$BUILD_ROOT/dev/pts"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20161206/vc new/obs-build-20170112/vc
--- old/obs-build-20161206/vc 2016-12-06 16:35:57.000000000 +0100
+++ new/obs-build-20170112/vc 2017-01-12 15:42:22.000000000 +0100
@@ -127,12 +127,14 @@
fi
if [ -n "$message" ]; then
echo -e "- $message"
- echo
elif [ -n "$content" ]; then
cat "$content"
- echo
elif [ ! $just_edit ]; then
echo "- "
+ fi
+ if [ -f "$changelog" ] && [ -s "$changelog" ]; then
+ # Avoid double newlines at EOF on a new blank .changes file,
+ # but do provide enough spacing between preexisting log entries.
echo
fi
cat $changelog
