Hello community, here is the log from the commit of package build for openSUSE:Leap:15.2:SLE-workarounds checked in at 2020-01-20 09:40:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:SLE-workarounds/build (Old) and /work/SRC/openSUSE:Leap:15.2:SLE-workarounds/.build.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Mon Jan 20 09:40:51 2020 rev:2 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Leap:15.2:SLE-workarounds/build/build.changes 2020-01-20 08:41:23.479175311 +0100 +++ /work/SRC/openSUSE:Leap:15.2:SLE-workarounds/.build.new.26092/build.changes 2020-01-20 09:40:52.329057618 +0100 @@ -1,0 +2,13 @@ +Mon Jan 20 08:33:37 UTC 2020 - Adrian Schröter <[email protected]> + +- fix source archive, last submit did not contain changes + => switching to git tags now to avoid this in future + +------------------------------------------------------------------- +Fri Jan 10 09:28:39 UTC 2020 - Adrian Schröter <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- obs-build-20200107.tar.gz New: ---- obs-build-20200110.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:52.961057947 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:52.965057949 +0100 @@ -22,7 +22,7 @@ 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: 20200110 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:53.005057970 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:53.005057970 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200107 +pkgver=20200110 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ _link ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:53.025057980 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:53.029057982 +0100 @@ -1,4 +1,4 @@ -<link project="openSUSE:Factory" package="build" baserev="4998740caf1d328e8ba51bc7d7a2086e"> +<link project="openSUSE:Factory" package="build" baserev="20ba07128f093051c7f355f16338cc0f"> <patches> <branch/> </patches> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:53.045057991 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:53.045057991 +0100 @@ -1,6 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="versionformat">%ad</param> + <param name="revision">20200110</param> + <param name="version">20200110</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.dsc ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:53.057057997 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:53.061057999 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200107 +Version: 20200110 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.v1qdjD/_old 2020-01-20 09:40:53.077058008 +0100 +++ /var/tmp/diff_new_pack.v1qdjD/_new 2020-01-20 09:40:53.081058010 +0100 @@ -1,4 +1,4 @@ -build (20200107) unstable; urgency=low +build (20200110) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20200107.tar.gz -> obs-build-20200110.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/Build/Arch.pm new/obs-build-20200110/Build/Arch.pm --- old/obs-build-20200107/Build/Arch.pm 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/Build/Arch.pm 2020-01-10 10:30:13.000000000 +0100 @@ -143,6 +143,16 @@ return $h eq "\3757zXZ"; } +sub iszstd { + my ($fn) = @_; + local *F; + return 0 unless open(F, '<', $fn); + my $h; + return 0 unless read(F, $h, 4) == 4; + close F; + return $h eq "(\265\057\375"; +} + sub lzmadec { my ($fn) = @_; my $nh; @@ -156,13 +166,28 @@ return $nh; } +sub zstddec { + my ($fn) = @_; + my $nh; + my $pid = open($nh, '-|'); + return undef unless defined $pid; + if (!$pid) { + $SIG{'PIPE'} = 'DEFAULT'; + exec('zstdcat', $fn); + die("zstdcat $!\n"); + } + return $nh; +} + sub queryvars { my ($handle) = @_; if (ref($handle)) { die("arch pkg query not implemented for file handles\n"); } - if ($handle =~ /\.xz$/ || islzma($handle)) { + if ($handle =~ /\.zst$/ || iszstd($handle)) { + $handle = zstddec($handle); + } elsif ($handle =~ /\.xz$/ || islzma($handle)) { $handle = lzmadec($handle); } my $tar = Archive::Tar->new; @@ -184,7 +209,9 @@ if (ref($handle)) { die("arch pkg query not implemented for file handles\n"); } - if ($handle =~ /\.xz$/ || islzma($handle)) { + if ($handle =~ /\.zst$/ || iszstd($handle)) { + $handle = zstddec($handle); + } elsif ($handle =~ /\.xz$/ || islzma($handle)) { $handle = lzmadec($handle); } my @files; @@ -251,7 +278,9 @@ if (ref($handle)) { die("arch pkg query not implemented for file handles\n"); } - if ($handle =~ /\.xz$/ || islzma($handle)) { + if ($handle =~ /\.zst$/ || iszstd($handle)) { + $handle = zstddec($handle); + } elsif ($handle =~ /\.xz$/ || islzma($handle)) { $handle = lzmadec($handle); } my $tar = Archive::Tar->new; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/Build.pm new/obs-build-20200110/Build.pm --- old/obs-build-20200107/Build.pm 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/Build.pm 2020-01-10 10:30:13.000000000 +0100 @@ -1799,7 +1799,7 @@ return Build::Rpm::query($handle, %opts) if $do_rpm && $binname =~ /\.d?rpm$/; return Build::Deb::query($handle, %opts) if $do_deb && $binname =~ /\.deb$/; return Build::Kiwi::queryiso($handle, %opts) if $do_kiwi && $binname =~ /\.iso$/; - return Build::Arch::query($handle, %opts) if $do_arch && $binname =~ /\.pkg\.tar(?:\.gz|\.xz)?$/; + return Build::Arch::query($handle, %opts) if $do_arch && $binname =~ /\.pkg\.tar(?:\.gz|\.xz|\.zst)?$/; return Build::Arch::query($handle, %opts) if $do_arch && $binname =~ /\.arch$/; return undef; } @@ -1829,7 +1829,7 @@ return Build::Kiwi::queryhdrmd5(@_) if $do_kiwi && $binname =~ /\.iso$/; return Build::Kiwi::queryhdrmd5(@_) if $do_kiwi && $binname =~ /\.raw$/; return Build::Kiwi::queryhdrmd5(@_) if $do_kiwi && $binname =~ /\.raw.install$/; - return Build::Arch::queryhdrmd5(@_) if $do_arch && $binname =~ /\.pkg\.tar(?:\.gz|\.xz)?$/; + return Build::Arch::queryhdrmd5(@_) if $do_arch && $binname =~ /\.pkg\.tar(?:\.gz|\.xz|\.zst)?$/; return Build::Arch::queryhdrmd5(@_) if $do_arch && $binname =~ /\.arch$/; return undef; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/build new/obs-build-20200110/build --- old/obs-build-20200107/build 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/build 2020-01-10 10:30:13.000000000 +0100 @@ -408,23 +408,24 @@ # add build time statistics recipe_build_time_statistics - # check for disk full - if test "$1" -eq 1 -a -x /bin/df ; then - echo - echo "$HOST failed \"build $RECIPEFILE\" at `date --utc`." - echo - # okay, it failed, but maybe because disk space? - if df $BUILD_ROOT 2>/dev/null | grep -q "100%"; then - df $BUILD_ROOT 2>/dev/null + # chroot environment only + if test -z "$VM_TYPE" -o -n "$RUNNING_IN_VM" ; then + # check for disk full for an automatic build retry + if test "$1" -eq 1 -a -x /bin/df ; then echo - echo "$HOST ran out of disk space. Please try again." + echo "$HOST failed \"build $RECIPEFILE\" at `date --utc`." echo - set 3 + # okay, it failed, but maybe because disk space? + if df $BUILD_ROOT 2>/dev/null | grep -q "100%"; then + df $BUILD_ROOT 2>/dev/null + echo + echo "$HOST ran out of disk space. Please try again." + echo + set 3 + fi fi - fi - # run recipe cleanup code - if test -z "$VM_TYPE" -o -n "$RUNNING_IN_VM" ; then + # run recipe cleanup code test -n "$BUILDTYPE" && recipe_cleanup fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/configs/sl15.2.conf new/obs-build-20200110/configs/sl15.2.conf --- old/obs-build-20200107/configs/sl15.2.conf 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/configs/sl15.2.conf 2020-01-10 10:30:13.000000000 +0100 @@ -51,6 +51,9 @@ Preinstall: liblua5_3-5 +# Needed with latest rpm (Use libgcrypt as crypto library for SP2 and Leap 15.2 [jsc#SLE-9552]) +Preinstall: libgcrypt20 libgpg-error0 + FileProvides: /bin/csh tcsh FileProvides: /bin/logger util-linux-systemd FileProvides: /sbin/netconfig sysconfig-netconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/configs/sle15.2.conf new/obs-build-20200110/configs/sle15.2.conf --- old/obs-build-20200107/configs/sle15.2.conf 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/configs/sle15.2.conf 2020-01-10 10:30:13.000000000 +0100 @@ -55,6 +55,9 @@ Preinstall: libpopt0 libelf1 liblua5_3-5 Preinstall: libpcre1 +# Needed with latest rpm (Use libgcrypt as crypto library for SP2 [jsc#SLE-9552]) +Preinstall: libgcrypt20 libgpg-error0 + Runscripts: aaa_base Prefer: libdb-4_8-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/dist/PKGBUILD new/obs-build-20200110/dist/PKGBUILD --- old/obs-build-20200107/dist/PKGBUILD 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/dist/PKGBUILD 2020-01-10 10:30:13.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20170320 +pkgver=20200110 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/dist/build.changes new/obs-build-20200110/dist/build.changes --- old/obs-build-20200107/dist/build.changes 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/dist/build.changes 2020-01-10 10:30:13.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 10 09:28:39 UTC 2020 - Adrian Schröter <[email protected]> + +- 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 <[email protected]> - allow to enter an existing buildroot w/o recipe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/dist/build.dsc new/obs-build-20200110/dist/build.dsc --- old/obs-build-20200107/dist/build.dsc 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/dist/build.dsc 2020-01-10 10:30:13.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20160531 +Version: 20200110 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/dist/build.spec new/obs-build-20200110/dist/build.spec --- old/obs-build-20200107/dist/build.spec 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/dist/build.spec 2020-01-10 10:30:13.000000000 +0100 @@ -22,7 +22,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20191204 +Version: 20200110 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20200107/init_buildsystem new/obs-build-20200110/init_buildsystem --- old/obs-build-20200107/init_buildsystem 2020-01-07 13:56:12.000000000 +0100 +++ new/obs-build-20200110/init_buildsystem 2020-01-10 10:30:13.000000000 +0100 @@ -425,6 +425,7 @@ local cachedir="$(getcachedir "$url")" local name="$(basename "$url")" + name=${name/%.pkg.tar.zst/.arch} name=${name/%.pkg.tar.?z/.arch} SRC="$cachedir/$name" local destdir="$cachedir/tmp" @@ -670,7 +671,8 @@ ;; esac fi - SRCSUF=${SRC/%.pkg.tar.?z/.arch} + SRCSUF=${SRC/%.pkg.tar.zst/.arch} + SRCSUF=${SRCSUF/%.pkg.tar.?z/.arch} ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRCSUF##*.}" done < $RPMLIST @@ -698,7 +700,8 @@ if test -s $BUILD_ROOT/.init_b_cache/rpmlist.download ; then echo "calculating packages to download..." while read PKG SRC ; do - SRCSUF=${SRC/%.pkg.tar.?z/.arch} + SRCSUF=${SRC/%.pkg.tar.zst/.arch} + SRCSUF=${SRCSUF/%.pkg.tar.?z/.arch} if test -s "$BUILD_ROOT/.init_b_cache/rpms/$PKG.id" ; then read cachepkgid < $BUILD_ROOT/.init_b_cache/rpms/$PKG.id echo "PKG $PKG $cachepkgid" @@ -717,7 +720,8 @@ # remove found packages from download list rm -f $BUILD_ROOT/.init_b_cache/rpmlist.download2 while read PKG SRC ; do - SRCSUF=${SRC/%.pkg.tar.?z/.arch} + SRCSUF=${SRC/%.pkg.tar.zst/.arch} + SRCSUF=${SRCSUF/%.pkg.tar.?z/.arch} test -L "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRCSUF##*.}" || echo "$PKG $SRC" >>$BUILD_ROOT/.init_b_cache/rpmlist.download2 done < $BUILD_ROOT/.init_b_cache/rpmlist.download rm -f $BUILD_ROOT/.init_b_cache/rpmlist.download @@ -732,7 +736,8 @@ progress_step PACKAGES_TO_DOWNLOAD downloadpkg "$SRC" # downloadpkg modified $SRC, so it has a right name for use - SRCSUF=${SRC/%.pkg.tar.?z/.arch} + SRCSUF=${SRC/%.pkg.tar.zst/.arch} + SRCSUF=${SRCSUF/%.pkg.tar.?z/.arch} ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/$PKG.${SRCSUF##*.}" done < $BUILD_ROOT/.init_b_cache/rpmlist.download rm -f $BUILD_ROOT/.init_b_cache/rpmlist.download
