Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2017-11-03 16:20:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Fri Nov 3 16:20:31 2017 rev:108 rq:537597 version:20171023
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2017-10-28
14:17:45.184176514 +0200
+++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2017-11-03
16:20:39.457366241 +0100
@@ -6,0 +7,11 @@
+Thu Sep 21 08:55:08 UTC 2017 - co...@suse.com
+
+- Support getting the container tags from the Dockerfile
+- Put the disturl in the .buildenv file
+- Support rpm-buildroot-override buildflag
+- Support kvm builds on Debian
+- Support with/without/unless rich deps
+- Added obs-docker-support script for docker images
+- Initial SLE 15 config
+
+-------------------------------------------------------------------
Old:
----
obs-build-20171012.tar.gz
New:
----
obs-build-20171023.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build-mkbaselibs-sle.spec ++++++
--- /var/tmp/diff_new_pack.89sOs2/_old 2017-11-03 16:20:42.921240171 +0100
+++ /var/tmp/diff_new_pack.89sOs2/_new 2017-11-03 16:20:42.925240025 +0100
@@ -20,7 +20,7 @@
Summary: Tools to generate base lib packages
License: GPL-2.0+
Group: Development/Tools/Building
-Version: 20171012
+Version: 20171023
Release: 0
#!BuildIgnore: build-mkbaselibs
Provides: build-mkbaselibs
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.89sOs2/_old 2017-11-03 16:20:42.941239443 +0100
+++ /var/tmp/diff_new_pack.89sOs2/_new 2017-11-03 16:20:42.945239298 +0100
@@ -22,7 +22,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0+ and GPL-2.0
Group: Development/Tools/Building
-Version: 20171012
+Version: 20171023
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.89sOs2/_old 2017-11-03 16:20:42.973238279 +0100
+++ /var/tmp/diff_new_pack.89sOs2/_new 2017-11-03 16:20:42.973238279 +0100
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20171012
+pkgver=20171023
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.89sOs2/_old 2017-11-03 16:20:43.021236532 +0100
+++ /var/tmp/diff_new_pack.89sOs2/_new 2017-11-03 16:20:43.021236532 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20171012-0
+Version: 20171023
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.89sOs2/_old 2017-11-03 16:20:43.053235367 +0100
+++ /var/tmp/diff_new_pack.89sOs2/_new 2017-11-03 16:20:43.053235367 +0100
@@ -1,4 +1,4 @@
-build (20171012-0) unstable; urgency=low
+build (20171023) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20171012.tar.gz -> obs-build-20171023.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/Build/Deb.pm
new/obs-build-20171023/Build/Deb.pm
--- old/obs-build-20171012/Build/Deb.pm 2017-10-12 17:53:08.000000000 +0200
+++ new/obs-build-20171023/Build/Deb.pm 2017-10-23 17:03:21.000000000 +0200
@@ -112,7 +112,8 @@
@exclarch = sort keys %exclarch;
} elsif ($tag eq 'SOURCE') {
$name = $data;
- } elsif ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-CONFLICTS' || $tag eq
'BUILD-IGNORE' || $tag eq 'BUILD-DEPENDS-INDEP') {
+ } elsif ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-CONFLICTS' || $tag eq
'BUILD-IGNORE' ||
+ $tag eq 'BUILD-DEPENDS-INDEP' || $tag eq 'BUILD-DEPENDS-ARCH' || $tag
eq 'BUILD-CONFLICTS-ARCH' ) {
my @d = split(/\s*,\s*/, $data);
for my $d (@d) {
my @alts = split('\s*\|\s*', $d);
@@ -163,7 +164,7 @@
$d =~ s/ \(([^\)]*)\)/ $1/g;
$d =~ s/>>/>/g;
$d =~ s/<</</g;
- if ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-DEPENDS-INDEP') {
+ if ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-DEPENDS-INDEP' || $tag eq
'BUILD-DEPENDS-ARCH') {
push @deps, $d;
} else {
push @deps, "-$d";
@@ -178,8 +179,10 @@
return $ret;
}
-sub ungzip {
- my $data = shift;
+sub uncompress {
+ my ($data, $tool) = @_;
+ return $data if $tool eq 'cat';
+ return Compress::Zlib::memGunzip($data) if $have_zlib && $tool eq 'gunzip';
local (*TMP, *TMP2);
open(TMP, "+>", undef) or die("could not open tmpfile\n");
syswrite TMP, $data;
@@ -188,13 +191,13 @@
die("fork: $!\n") unless defined $pid;
if (!$pid) {
open(STDIN, "<&TMP");
- exec 'gunzip';
- die("gunzip: $!\n");
+ exec($tool);
+ die("$tool: $!\n");
}
close(TMP);
$data = '';
1 while sysread(TMP2, $data, 1024, length($data)) > 0;
- close(TMP2) || die("gunzip error");
+ close(TMP2) || die("$tool error\n");
return $data;
}
@@ -252,9 +255,16 @@
}
}
$data = substr($data, 8 + 60 + $len);
- if (substr($data, 0, 16) ne 'control.tar.gz ' &&
- substr($data, 0, 16) ne 'control.tar.gz/ ') {
- warn("$fn: control.tar.gz is not second ar entry\n");
+ my $controlname = substr($data, 0, 16);
+ my $decompressor;
+ if ($controlname eq 'control.tar.gz ' || $controlname eq 'control.tar.gz/
') {
+ $decompressor = 'gunzip';
+ } elsif ($controlname eq 'control.tar.xz ' || $controlname eq
'control.tar.xz/ ') {
+ $decompressor = 'unxz';
+ } elsif ($controlname eq 'control.tar ' || $controlname eq 'control.tar/
') {
+ $decompressor = 'cat';
+ } else {
+ warn("$fn: control.tar is not second ar entry\n");
close DEBF unless ref $fn;
return ();
}
@@ -270,13 +280,9 @@
close DEBF unless ref($fn);
$data = substr($data, 60, $len);
my $controlmd5 = Digest::MD5::md5_hex($data); # our header signature
- if ($have_zlib) {
- $data = Compress::Zlib::memGunzip($data);
- } else {
- $data = ungzip($data);
- }
+ $data = uncompress($data, $decompressor);
if (!$data) {
- warn("$fn: corrupt control.tar.gz file\n");
+ warn("$fn: corrupt control.tar file\n");
return ();
}
my $control;
@@ -286,7 +292,7 @@
my $len = oct('00'.substr($data, 124,12));
my $blen = ($len + 1023) & ~511;
if (length($data) < $blen) {
- warn("$fn: corrupt control.tar.gz file\n");
+ warn("$fn: corrupt control.tar file\n");
return ();
}
if ($n eq './control' || $n eq "control") {
@@ -387,9 +393,11 @@
}
}
$data = substr($data, 8 + 60 + $len);
- if (substr($data, 0, 16) ne 'control.tar.gz ' &&
- substr($data, 0, 16) ne 'control.tar.gz/ ') {
- warn("$bin: control.tar.gz is not second ar entry\n");
+ my $controlname = substr($data, 0, 16);
+ if ($controlname ne 'control.tar.gz ' && $controlname ne 'control.tar.gz/ '
&&
+ $controlname ne 'control.tar.xz ' && $controlname ne 'control.tar.xz/ '
&&
+ $controlname ne 'control.tar ' && $controlname ne 'control.tar/
') {
+ warn("$bin: control.tar is not second ar entry\n");
close F;
return undef;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/Build/Docker.pm
new/obs-build-20171023/Build/Docker.pm
--- old/obs-build-20171012/Build/Docker.pm 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/Build/Docker.pm 2017-10-23 17:03:21.000000000
+0200
@@ -204,6 +204,8 @@
}
sub showcontainerinfo {
+ my $disturl;
+ (undef, $disturl) = splice(@ARGV, 0, 2) if @ARGV > 2 && $ARGV[0] eq
'--disturl';
my ($fn, $image, $taglist, $annotationfile) = @ARGV;
local $Build::Kiwi::urlmapper = sub { return $_[0] };
my $d = {};
@@ -229,9 +231,10 @@
}
}
print "{\n";
- print ",\n \"tags\": [ ".join(', ', @tags)." ]" if @tags;
+ print " \"tags\": [ ".join(', ', @tags)." ]";
print ",\n \"repos\": [ ".join(', ', @repos)." ]" if @repos;
print ",\n \"file\": \"$image\"" if defined $image;
+ print ",\n \"disturl\": \"$disturl\"" if defined $disturl;
print "\n}\n";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/Build/Kiwi.pm
new/obs-build-20171023/Build/Kiwi.pm
--- old/obs-build-20171012/Build/Kiwi.pm 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/Build/Kiwi.pm 2017-10-23 17:03:21.000000000
+0200
@@ -385,6 +385,8 @@
}
sub showcontainerinfo {
+ my $disturl;
+ (undef, $disturl) = splice(@ARGV, 0, 2) if @ARGV > 2 && $ARGV[0] eq
'--disturl';
my ($fn, $image) = @ARGV;
local $urlmapper = sub { return $_[0] };
my $d = parse({}, $fn);
@@ -405,6 +407,7 @@
print ",\n \"tags\": [ ".join(', ', @tags)." ]" if @tags;
print ",\n \"repos\": [ ".join(', ', @repos)." ]" if @repos;
print ",\n \"file\": \"$image\"" if defined $image;
+ print ",\n \"disturl\": \"$disturl\"" if defined $disturl;
print "\n}\n";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/build-pkg-deb
new/obs-build-20171023/build-pkg-deb
--- old/obs-build-20171012/build-pkg-deb 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/build-pkg-deb 2017-10-23 17:03:21.000000000
+0200
@@ -123,7 +123,11 @@
pkg_preinstall_deb() {
ar x "$BUILD_ROOT/.init_b_cache/rpms/$PKG.deb"
mkdir -p .init_b_cache/scripts/control
+ if test -f "control.tar.gz" ; then
$TAR -C .init_b_cache/scripts/control -z -f control.tar.gz
+ elif test -f "control.tar.xz" ; then
+ $TAR -C .init_b_cache/scripts/control -J -f control.tar.xz
+ fi
if test -f "data.tar.gz" ; then
$TAR -z -f data.tar.gz
elif test -f "data.tar.xz" ; then
@@ -133,7 +137,7 @@
test -e .init_b_cache/scripts/control/preinst && mv
.init_b_cache/scripts/control/preinst ".init_b_cache/scripts/$PKG.pre"
test -e .init_b_cache/scripts/control/postinst && mv
.init_b_cache/scripts/control/postinst ".init_b_cache/scripts/$PKG.post"
fi
- rm -rf .init_b_cache/scripts/control control.tar.gz data.tar.{g,x}z
+ rm -rf .init_b_cache/scripts/control control.tar.{g,x}z data.tar.{g,x}z
}
pkg_runscripts_deb() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/build-recipe-docker
new/obs-build-20171023/build-recipe-docker
--- old/obs-build-20171012/build-recipe-docker 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/build-recipe-docker 2017-10-23 17:03:21.000000000
+0200
@@ -138,7 +138,9 @@
fi
# Create containerinfo
- perl -I$BUILD_DIR -MBuild::Docker -e Build::Docker::showcontainerinfo
"$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" "$FILENAME.tar" "$ALLTAGS"
containers/annotation> "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.containerinfo"
+ disturlarg=()
+ test -n "$DISTURL" && disturlarg=("--disturl" "$DISTURL")
+ perl -I$BUILD_DIR -MBuild::Docker -e Build::Docker::showcontainerinfo --
"${disturlarg[@]}" "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" "$FILENAME.tar"
"$ALLTAGS" containers/annotation>
"$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.containerinfo"
# We're done. Clean up.
recipe_cleanup_docker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/build-recipe-fissile
new/obs-build-20171023/build-recipe-fissile
--- old/obs-build-20171012/build-recipe-fissile 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/build-recipe-fissile 2017-10-23 17:03:21.000000000
+0200
@@ -117,7 +117,9 @@
cleanup_and_exit 1 "Docker save command failed"
fi
# Create containerinfo
- perl -I$BUILD_DIR -MBuild::Docker -e Build::Docker::showcontainerinfo
'' "$filename.tar" "$image" containers/annotation>
"$BUILD_ROOT$TOPDIR/FISSILE/$filename.containerinfo"
+ disturlarg=()
+` test -n "$DISTURL" && disturlarg=("--disturl" "$DISTURL")
+ perl -I$BUILD_DIR -MBuild::Docker -e Build::Docker::showcontainerinfo
-- "${disturlarg[@]}" '' "$filename.tar" "$image" containers/annotation>
"$BUILD_ROOT$TOPDIR/FISSILE/$filename.containerinfo"
done
recipe_cleanup_fissile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/build-recipe-kiwi
new/obs-build-20171023/build-recipe-kiwi
--- old/obs-build-20171012/build-recipe-kiwi 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/build-recipe-kiwi 2017-10-23 17:03:21.000000000
+0200
@@ -675,8 +675,10 @@
if test "$imagetype" = docker ; then
# get container info
+ disturlarg=()
+ test -n "$DISTURL" && disturlarg=("--disturl" "$DISTURL")
for r in $BUILD_ROOT/$TOPDIR/KIWI/*.tar.xz ; do
- test -e "$r" && perl -I$BUILD_DIR -MBuild::Kiwi -e
Build::Kiwi::showcontainerinfo $BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE "$r" >
"${r%.tar.xz}.containerinfo"
+ test -e "$r" && perl -I$BUILD_DIR -MBuild::Kiwi -e
Build::Kiwi::showcontainerinfo -- "${disturlarg[@]}"
$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE "$r" > "${r%.tar.xz}.containerinfo"
done
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20171012/dist/build.changes
new/obs-build-20171023/dist/build.changes
--- old/obs-build-20171012/dist/build.changes 2017-10-12 17:53:08.000000000
+0200
+++ new/obs-build-20171023/dist/build.changes 2017-10-23 17:03:21.000000000
+0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Thu Oct 12 16:00:09 UTC 2017 - adr...@suse.de
+
+- proper fix for for liblua, for factory and leap 15.0
+
+-------------------------------------------------------------------
+Thu Sep 21 08:55:08 UTC 2017 - co...@suse.com
+
+- Support getting the container tags from the Dockerfile
+- Put the disturl in the .buildenv file
+- Support rpm-buildroot-override buildflag
+- Support kvm builds on Debian
+- Support with/without/unless rich deps
+- Added obs-docker-support script for docker images
+- Initial SLE 15 config
+
+-------------------------------------------------------------------
Wed Aug 2 14:59:15 UTC 2017 - lnus...@suse.de
- Temporary hack to aid liblua5_3 -> liblua5_3-5 rename
