Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2022-03-17 17:01:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Thu Mar 17 17:01:19 2022 rev:140 rq:961965 version:20220315
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2022-03-11
11:40:43.226570895 +0100
+++ /work/SRC/openSUSE:Factory/.build.new.25692/build.changes 2022-03-17
17:01:26.677682890 +0100
@@ -1,0 +2,17 @@
+Tue Mar 15 15:55:55 UTC 2022 - Adrian Schr??ter <adr...@suse.de>
+
+- regression fix from last release, avoid calling shutdown handler
+ twice when building in vm
+
+-------------------------------------------------------------------
+Mon Mar 14 15:56:04 UTC 2022 - Adrian Schr??ter <adr...@suse.de>
+
+Changes:
+ * pbuild: add --debug option for building debuginfo packages
+ * rename --debug to --debuginfo to be more exact.
+ * docu: add buildflags:ccachtype and OBS-DoNotAppendProfileToContainername
+
+Fixes:
+ * Avoid shutdown of host when using nspawn
+
+-------------------------------------------------------------------
Old:
----
obs-build-20220307.tar.gz
New:
----
obs-build-20220315.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.heS8ea/_old 2022-03-17 17:01:27.445683477 +0100
+++ /var/tmp/diff_new_pack.heS8ea/_new 2022-03-17 17:01:27.449683481 +0100
@@ -28,7 +28,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0-only OR GPL-3.0-only
Group: Development/Tools/Building
-Version: 20220307
+Version: 20220315
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.heS8ea/_old 2022-03-17 17:01:27.489683511 +0100
+++ /var/tmp/diff_new_pack.heS8ea/_new 2022-03-17 17:01:27.493683514 +0100
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20220307
+pkgver=20220315
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.heS8ea/_old 2022-03-17 17:01:27.513683529 +0100
+++ /var/tmp/diff_new_pack.heS8ea/_new 2022-03-17 17:01:27.517683533 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="manual">
- <param name="revision">20220307</param>
- <param name="version">20220307</param>
+ <param name="revision">20220315</param>
+ <param name="version">20220315</param>
<param name="url">https://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
<param name="extract">dist/build.changes</param>
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.heS8ea/_old 2022-03-17 17:01:27.537683548 +0100
+++ /var/tmp/diff_new_pack.heS8ea/_new 2022-03-17 17:01:27.541683550 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20220307
+Version: 20220315
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.heS8ea/_old 2022-03-17 17:01:27.569683572 +0100
+++ /var/tmp/diff_new_pack.heS8ea/_new 2022-03-17 17:01:27.577683579 +0100
@@ -1,4 +1,4 @@
-build (20220307) unstable; urgency=low
+build (20220315) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20220307.tar.gz -> obs-build-20220315.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/Build.pm
new/obs-build-20220315/Build.pm
--- old/obs-build-20220307/Build.pm 2022-03-07 10:39:12.000000000 +0100
+++ new/obs-build-20220315/Build.pm 2022-03-15 16:56:55.000000000 +0100
@@ -688,14 +688,11 @@
}
my $buildtype = $config->{'type'} || '';
my $nobasepackages;
- if (grep {$_ eq $buildtype} qw{livebuild docker kiwi fissile helm flatpak}) {
- push @deps, @{$config->{'substitute'}->{"build-packages:$buildtype"}
- || $subst_defaults{"build-packages:$buildtype"} || []};
- if ($buildtype eq 'docker' || $buildtype eq 'kiwi') {
- $nobasepackages = 1 if
$config->{"expandflags:$buildtype-nobasepackages"};
- @deps = grep {!/^kiwi-image:/} @deps if $buildtype eq 'kiwi'; # only
needed for sysdeps
- @deps = grep {!/^kiwi-packagemanager:/} @deps if $buildtype eq 'kiwi' &&
$nobasepackages; # only needed for sysdeps
- }
+ push @deps, @{$config->{'substitute'}->{"build-packages:$buildtype"} ||
$subst_defaults{"build-packages:$buildtype"} || []};
+ if ($buildtype eq 'docker' || $buildtype eq 'kiwi') {
+ $nobasepackages = 1 if $config->{"expandflags:$buildtype-nobasepackages"};
+ @deps = grep {!/^kiwi-image:/} @deps if $buildtype eq 'kiwi'; # only
needed for sysdeps
+ @deps = grep {!/^kiwi-packagemanager:/} @deps if $buildtype eq 'kiwi' &&
$nobasepackages; # only needed for sysdeps
}
my @ndeps = grep {/^-/} @deps;
my %ndeps = map {$_ => 1} @ndeps;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/PBuild/Job.pm
new/obs-build-20220315/PBuild/Job.pm
--- old/obs-build-20220307/PBuild/Job.pm 2022-03-07 10:39:12.000000000
+0100
+++ new/obs-build-20220315/PBuild/Job.pm 2022-03-15 16:56:55.000000000
+0100
@@ -325,7 +325,7 @@
push @args, '--rpmlist', "$buildroot/.build.rpmlist";
push @args, '--logfile', "$buildroot/.build.log";
#push @args, '--release', "$release" if defined $release;
- push @args, '--debug' if $ctx->{'debuginfo'};
+ push @args, '--debuginfo' if $ctx->{'debuginfo'} || $opts->{'debuginfo'};
push @args, "--arch=$arch";
push @args, '--jobs', $opts->{'jobs'} if $opts->{'jobs'};
push @args, '--threads', $opts->{'threads'} if $opts->{'threads'};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/PBuild/Options.pm
new/obs-build-20220315/PBuild/Options.pm
--- old/obs-build-20220307/PBuild/Options.pm 2022-03-07 10:39:12.000000000
+0100
+++ new/obs-build-20220315/PBuild/Options.pm 2022-03-15 16:56:55.000000000
+0100
@@ -110,6 +110,8 @@
'vm-openstack-flavor' => ':',
'openstack-flavor' => 'vm-openstack-flavor:',
'vm-emulator-script' => ':',
+ 'debuginfo' => '',
+ 'debug' => 'debuginfo',
'emulator-script' => 'vm-emulator-script:',
'single' => ':',
'single-flavor' => ':',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/build new/obs-build-20220315/build
--- old/obs-build-20220307/build 2022-03-07 10:39:12.000000000 +0100
+++ new/obs-build-20220315/build 2022-03-15 16:56:55.000000000 +0100
@@ -418,8 +418,8 @@
Available options are -net, -netdev, -device
(This options in kvm can not guarantee reproducible builds)
- --debug
- Enable creation of a debuginfo package
+ --debuginfo
+ Enable creation of debuginfo packages
--buildflavor FLAVOR
Specify the flavor to build. For rpm builds, it replaces
@@ -1217,7 +1217,7 @@
-statistics)
DO_STATISTICS=1
;;
- -debug)
+ -debug|-debuginfo)
BUILD_DEBUG=1
;;
-incarnation)
@@ -1475,7 +1475,7 @@
if test -n "$LOGFILE" -a -z "$RUN_SHELL" ; then
echo "logging output to $LOGFILE..."
- rm -f $LOGFILE
+ rm -f "$LOGFILE" "$LOGFILE.pid"
touch $LOGFILE
# set start time, to be substracted for build log timestamps
STARTTIME=`perl -e 'print time()'`
@@ -1485,7 +1485,7 @@
:
elif test -n "$RUNNING_IN_VM" -o -n "$NO_TIMESTAMPS" ; then
# no additional timestamps in inner vm build system
- exec 1> >(echo "LOGGING_TEE_PID=$BASHPID" > $LOGFILE.pid ; exec -a
'build logging' tee -a $LOGFILE) 2>&1
+ exec 1> >(echo "$BASHPID" > $LOGFILE.pid ; exec -a 'build logging' tee
-a $LOGFILE) 2>&1
elif test -n "$VM_ROOT" ; then
# external run of virtualization build
exec 1> >(exec -a 'build logging' perl -e
'open(F,">>",$ARGV[0])||die("$ARGV[0]:
$!\n");$|=1;select(F);$|=1;while(<STDIN>){my $p=sprintf("[%5ds] ",
time()-'$STARTTIME');print STDOUT $p.$_;s/^\r//s;s/\r\n/\n/gs;print F $p.$_}'
$LOGFILE) 2>&1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/build-vm
new/obs-build-20220315/build-vm
--- old/obs-build-20220307/build-vm 2022-03-07 10:39:12.000000000 +0100
+++ new/obs-build-20220315/build-vm 2022-03-15 16:56:55.000000000 +0100
@@ -330,6 +330,9 @@
}
vm_shutdown_halt() {
+ # get rid of the exit handler
+ trap EXIT
+ test "$VM_TYPE" = lxc -o "$VM_TYPE" = docker -o "$VM_TYPE" = nspawn &&
exit $1
# shutdown from fresh shell to close out deleted inodes
exec -a "build: halt" -- $BASH -c "$(declare -f vm_shutdown_halt_helper);
vm_shutdown_halt_helper $1"
echo "Warning: clean shut down of the VM didn't work"
@@ -348,10 +351,10 @@
swapoff "$VM_SWAP" 2>/dev/null
echo -n "BUILDSTATUS$1" >"$VM_SWAP"
fi
- test "$VM_TYPE" = lxc -o "$VM_TYPE" = docker -o "$VM_TYPE" = nspawn &&
exit $1
# Wait for logging tee to finish
- test -f "$LOGFILE.pid" && . "$LOGFILE.pid"
+ LOGGING_TEE_PID=
+ test -f "$LOGFILE.pid" -a ! -L "$LOGFILE.pid" && read LOGGING_TEE_PID <
"$LOGFILE.pid"
if test -n "$LOGGING_TEE_PID"; then
while kill -0 "$LOGGING_TEE_PID" 2>/dev/null; do
sleep 0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/dist/build.changes
new/obs-build-20220315/dist/build.changes
--- old/obs-build-20220307/dist/build.changes 2022-03-07 10:39:12.000000000
+0100
+++ new/obs-build-20220315/dist/build.changes 2022-03-15 16:56:55.000000000
+0100
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Tue Mar 15 15:55:55 UTC 2022 - Adrian Schr??ter <adr...@suse.de>
+
+- regression fix from last release, avoid calling shutdown handler
+ twice when building in vm
+
+-------------------------------------------------------------------
+Mon Mar 14 15:56:04 UTC 2022 - Adrian Schr??ter <adr...@suse.de>
+
+Changes:
+ * pbuild: add --debug option for building debuginfo packages
+ * rename --debug to --debuginfo to be more exact.
+ * docu: add buildflags:ccachtype and OBS-DoNotAppendProfileToContainername
+
+Fixes:
+ * Avoid shutdown of host when using nspawn
+
+-------------------------------------------------------------------
Mon Mar 7 08:41:07 UTC 2022 - Adrian Schr??ter <adr...@suse.de>
Features:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/docs/build_config.adoc
new/obs-build-20220315/docs/build_config.adoc
--- old/obs-build-20220307/docs/build_config.adoc 2022-03-07
10:39:12.000000000 +0100
+++ new/obs-build-20220315/docs/build_config.adoc 2022-03-15
16:56:55.000000000 +0100
@@ -117,6 +117,10 @@
order they are configured in the meta configuration, starting from the
top.
+* ccachetype:
+
+Defines the ccache implementation, possible values are: ccache, sccache
+
* obsgendiff
OBS can run an external program that has access to the current build and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/docs/pbuild.adoc
new/obs-build-20220315/docs/pbuild.adoc
--- old/obs-build-20220307/docs/pbuild.adoc 2022-03-07 10:39:12.000000000
+0100
+++ new/obs-build-20220315/docs/pbuild.adoc 2022-03-15 16:56:55.000000000
+0100
@@ -173,6 +173,11 @@
<!-- OBS-CopyToImage: <source> <destination> -->
+The kiwi profile name is added to container names by default. This can be
+disabled via
+
+ <!-- OBS-DoNotAppendProfileToContainername -->
+
==== Dockerfile description
Has no support for assets yet.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20220307/docs/pbuild.html
new/obs-build-20220315/docs/pbuild.html
--- old/obs-build-20220307/docs/pbuild.html 2022-03-07 10:39:12.000000000
+0100
+++ new/obs-build-20220315/docs/pbuild.html 2022-03-15 16:56:55.000000000
+0100
@@ -735,9 +735,9 @@
<body class="article">
<div id="header">
<h1>pbuild Reference Guide</h1>
-<div id="toc">
- <div id="toctitle">Table of Contents</div>
- <noscript><p><b>JavaScript must be enabled in your browser to display the
table of contents.</b></p></noscript>
+<div id="toc">
+ <div id="toctitle">Table of Contents</div>
+ <noscript><p><b>JavaScript must be enabled in your browser to display the
table of contents.</b></p></noscript>
</div>
</div>
<div id="content">
@@ -1023,6 +1023,12 @@
<div class="content">
<pre><code><!-- OBS-CopyToImage: <source> <destination>
--></code></pre>
</div></div>
+<div class="paragraph"><p>The kiwi profile name is added to container names by
default. This can be
+disabled via</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code><!-- OBS-DoNotAppendProfileToContainername --></code></pre>
+</div></div>
</div>
<div class="sect3">
<h4 id="_dockerfile_description">2.4.3. Dockerfile description</h4>
@@ -1184,6 +1190,14 @@
<div class="ulist"><ul>
<li>
<p>
+ccachetype:
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Defines the ccache implementation, possible values
are: ccache, sccache</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
obsgendiff
</p>
</li>
@@ -1637,7 +1651,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2022-01-21 14:43:16 CET
+ 2022-03-07 10:46:30 CET
</div>
</div>
</body>
