Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2018-09-11 17:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Tue Sep 11 17:06:57 2018 rev:117 rq:633708 version:20180830 Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2018-08-24 16:49:24.541029525 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2018-09-11 17:07:03.844362520 +0200 @@ -1,0 +2,15 @@ +Wed Aug 29 13:57:07 UTC 2018 - Adrian Schröter <adr...@suse.de> + +- Fall back to $mailaddr if $VC_MAILADDR is unset/null +- don't crash with no rpm macros defined +- Kiwi: support parsing of repos where the .repo file got used +- package hostarch definition in preinstallimages +- avoid double creation of monitor fifo +- Debian: + - debootstrap: ensure /etc/hosts exists + - debootstrap: Add abuild shadow password entry + - livebuild: publish source tarball + - Adds Debian configurations for jessie and unstable + - collect *.ddeb, *.udeb files + +------------------------------------------------------------------- Old: ---- obs-build-20180816.tar.gz New: ---- obs-build-20180830.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.gBRPXw/_old 2018-09-11 17:07:05.372360126 +0200 +++ /var/tmp/diff_new_pack.gBRPXw/_new 2018-09-11 17:07:05.376360119 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # needsrootforbuild # needsbinariesforbuild @@ -22,7 +22,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20180816 +Version: 20180830 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.gBRPXw/_old 2018-09-11 17:07:05.408360069 +0200 +++ /var/tmp/diff_new_pack.gBRPXw/_new 2018-09-11 17:07:05.408360069 +0200 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20180816 +pkgver=20180830 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.gBRPXw/_old 2018-09-11 17:07:05.436360026 +0200 +++ /var/tmp/diff_new_pack.gBRPXw/_new 2018-09-11 17:07:05.436360026 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20180816 +Version: 20180830 Binary: build Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.gBRPXw/_old 2018-09-11 17:07:05.456359994 +0200 +++ /var/tmp/diff_new_pack.gBRPXw/_new 2018-09-11 17:07:05.460359988 +0200 @@ -1,4 +1,4 @@ -build (20180816) unstable; urgency=low +build (20180830) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20180816.tar.gz -> obs-build-20180830.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/Build/Appimage.pm new/obs-build-20180830/Build/Appimage.pm --- old/obs-build-20180816/Build/Appimage.pm 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/Build/Appimage.pm 2018-08-30 11:14:11.000000000 +0200 @@ -44,14 +44,21 @@ push @packdeps, $pkg; } } - if ($yml->{'build'}) { - for my $pkg (@{$yml->{'build'}->{'packages'} || {}}) { + if ($yml->{'build'} && $yml->{'build'}->{'packages'}) { + for my $pkg (@{$yml->{'build'}->{'packages'}}) { push @packdeps, $pkg; } } - $ret->{'deps'} = \@packdeps; + my @sources; + if ($yml->{'build'} && $yml->{'build'}->{'files'}) { + for my $source (@{$yml->{'build'}->{'files'}}) { + push @sources, $source; + } + } + $ret->{'sources'} = \@sources; + return $ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/Build/Docker.pm new/obs-build-20180830/Build/Docker.pm --- old/obs-build-20180816/Build/Docker.pm 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/Build/Docker.pm 2018-08-30 11:14:11.000000000 +0200 @@ -86,7 +86,11 @@ shift @args if $args[0] =~ /^--(?:repo|type)$/ || $args[0] =~ /^-[rt]$/; shift @args; } - addrepo($ret, $args[0]) if @args; + if (@args) { + my $path = $args[0]; + $path =~ s/\/[^\/]*\.repo$//; + addrepo($ret, $path); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/Build/Rpm.pm new/obs-build-20180830/Build/Rpm.pm --- old/obs-build-20180816/Build/Rpm.pm 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/Build/Rpm.pm 2018-08-30 11:14:11.000000000 +0200 @@ -218,7 +218,7 @@ $ret->{'error'} = "open $specfile: $!"; return $ret; } - my @macros = @{$config->{'macros'}}; + my @macros = @{$config->{'macros'} || []}; my $skip = 0; my $main_preamble = 1; my $preamble = 1; @@ -593,6 +593,8 @@ my $num = defined($2) ? $2 : ($1 eq 'source' ? 0 : -1); $macros{uc($1) . "URL$num"} = $val if $num >= 0; } + } elsif (!$preamble && ($line =~ /^(Source\d*|Patch\d*|Url|Icon|BuildRequires|BuildPrereq|BuildConflicts|\#\!BuildIgnore)\s*:\s*(\S.*)$/i)) { + print STDERR "Warning: spec file parser ".($lineno ? " line $lineno" : '').": Ignoring $1 used beyond the preamble.\n" if $config->{'warnings'}; } if ($line =~ /^\s*%package\s+(-n\s+)?(\S+)/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build new/obs-build-20180830/build --- old/obs-build-20180816/build 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build 2018-08-30 11:14:11.000000000 +0200 @@ -1462,7 +1462,7 @@ fi RPMS=`find $BUILD_ROOT/$TOPDIR/RPMS -type f -name "*.rpm" 2>/dev/null || true` -DEBS=`find $BUILD_ROOT/$TOPDIR/DEBS -type f -name "*.deb" 2>/dev/null || true` +DEBS=`find $BUILD_ROOT/$TOPDIR/DEBS -type f "(" -name "*.deb" -o -name "*.ddeb" -o -name "*.udeb" ")" 2>/dev/null || true` if test -n "$RPMS" -a -n "$BUILD_USER_ABUILD_USED" ; then recipe_check_file_owners diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build-pkg-deb new/obs-build-20180830/build-pkg-deb --- old/obs-build-20180816/build-pkg-deb 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build-pkg-deb 2018-08-30 11:14:11.000000000 +0200 @@ -48,7 +48,6 @@ :>> $BUILD_ROOT/var/lib/dpkg/available :>> $BUILD_ROOT/var/log/dpkg.log :>> $BUILD_ROOT/etc/ld.so.conf - :>> $BUILD_ROOT/etc/default/rcS } pkg_initdb_deb() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build-recipe-debootstrap new/obs-build-20180830/build-recipe-debootstrap --- old/obs-build-20180816/build-recipe-debootstrap 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build-recipe-debootstrap 2018-08-30 11:14:11.000000000 +0200 @@ -58,6 +58,7 @@ # adapt passwd if test $BUILD_USER = abuild ; then echo "abuild:x:${ABUILD_UID}:${ABUILD_GID}:Autobuild:/home/abuild:/bin/bash" >>$BUILD_ROOT/$myroot/etc/passwd + echo 'abuild:*:::::::' >>$BUILD_ROOT/$myroot/etc/shadow echo 'abuild:*::' >>$BUILD_ROOT/$myroot/etc/gshadow echo "abuild:x:${ABUILD_GID}:" >>$BUILD_ROOT/$myroot/etc/group mkdir -p $BUILD_ROOT/$myroot/home/abuild @@ -77,6 +78,10 @@ chroot $BUILD_ROOT/$myroot apt-cache gencaches + if ! test -e $BUILD_ROOT/$myroot/etc/hosts ; then + cp $BUILD_ROOT/etc/hosts $BUILD_ROOT/$myroot/etc/hosts + fi + # move topdir over mv "$BUILD_ROOT/$TOPDIR" "$BUILD_ROOT/$myroot/${TOPDIR%/*}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build-recipe-livebuild new/obs-build-20180830/build-recipe-livebuild --- old/obs-build-20180816/build-recipe-livebuild 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build-recipe-livebuild 2018-08-30 11:14:11.000000000 +0200 @@ -260,6 +260,10 @@ BUILD_SUCCEEDED=true done done + + # copy recipe source tarball so that it can be published + cp "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" \ + "$BUILD_ROOT/$TOPDIR/OTHER/${RECIPEFILE%.livebuild}${buildnum}".livebuild.tar } recipe_resultdirs_livebuild() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build-recipe-preinstallimage new/obs-build-20180830/build-recipe-preinstallimage --- old/obs-build-20180816/build-recipe-preinstallimage 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build-recipe-preinstallimage 2018-08-30 11:14:11.000000000 +0200 @@ -42,8 +42,9 @@ for DIR in .* * ; do case "$DIR" in .|..) continue ;; - .build.kernel*) ;; # to be packaged - .build.initrd*) ;; # to be packaged + .build.kernel.*) ;; # to be packaged + .build.hostarch.*) ;; # to be packaged + .build.initrd.*) ;; # to be packaged .build*) continue ;; .preinstallimage*) continue ;; .srcfiles*) continue ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/build-vm-kvm new/obs-build-20180830/build-vm-kvm --- old/obs-build-20180816/build-vm-kvm 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/build-vm-kvm 2018-08-30 11:14:11.000000000 +0200 @@ -243,9 +243,11 @@ elif test -n "$VM_CONSOLE_INPUT" ; then qemu_args=("${qemu_args[@]}" -serial mon:stdio) else - mkdir -p "${VM_ROOT}.qemu" - mkfifo "${VM_ROOT}.qemu/monitor" - chown "$VM_USER" "${VM_ROOT}.qemu" + if ! test -e "${VM_ROOT}.qemu/monitor"; then + mkdir -p "${VM_ROOT}.qemu" + mkfifo "${VM_ROOT}.qemu/monitor" + chown "$VM_USER" "${VM_ROOT}.qemu" + fi qemu_args=("${qemu_args[@]}" -serial stdio -chardev socket,id=monitor,server,nowait,path="${VM_ROOT}.qemu/monitor" -mon chardev=monitor,mode=readline) fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/configs/debian-jessie.conf new/obs-build-20180830/configs/debian-jessie.conf --- old/obs-build-20180816/configs/debian-jessie.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20180830/configs/debian-jessie.conf 2018-08-30 11:14:11.000000000 +0200 @@ -0,0 +1,39 @@ +Repotype: debian +type: dsc +buildengine: debootstrap + +Order: base-passwd:base-files +Order: init-system-helpers:util-linux + +Preinstall: dash bash sed grep coreutils debianutils +Preinstall: libc6 libncurses5 libacl1 libattr1 libpcre3 +Preinstall: diffutils tar dpkg libc-bin +Preinstall: gzip base-files base-passwd +Preinstall: libselinux1 libsepol1 +Preinstall: libgcc1 util-linux debconf tzdata findutils libdbus-1-3 +Preinstall: liblzma5 xz-utils libstdc++6 passwd +Preinstall: login zlib1g libbz2-1.0 libtinfo5 libsigsegv2 +Preinstall: dash insserv libmpfr4 libgmp10 libdebconfclient0 +Preinstall: perl-base perl mawk init-system-helpers + +Required: build-essential apt mount fakeroot dpkg-dev ncurses-base hostname +Required: libtool + +# Work around packge looking up variations of localhost .e.g glibc tries to look up localhost. +Support: libnss-myhostname + + + +Prefer: cvs libesd0 libfam0 libfam-dev expect +Prefer: mawk locales default-jdk +Prefer: xorg-x11-libs libpng fam mozilla mozilla-nss xorg-x11-Mesa +Prefer: unixODBC libsoup glitz java-1_4_2-sun gnome-panel +Prefer: desktop-data-SuSE gnome2-SuSE mono-nunit gecko-sharp2 +Prefer: apache2-prefork openmotif-libs ghostscript-mini gtk-sharp +Prefer: glib-sharp libzypp-zmd-backend +Prefer: sysv-rc make +Prefer: libjack-jackd2-dev libsndio-dev +Prefer: pkg-config +Prefer: texlive-htmlxml +Prefer: libjpeg-dev + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/configs/debian-unstable.conf new/obs-build-20180830/configs/debian-unstable.conf --- old/obs-build-20180816/configs/debian-unstable.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-20180830/configs/debian-unstable.conf 2018-08-30 11:14:11.000000000 +0200 @@ -0,0 +1,41 @@ +Repotype: debian +type: dsc +buildengine: debootstrap + +Order: base-passwd:base-files + +Preinstall: dash bash sed grep coreutils debianutils +Preinstall: libc6 libncurses5 libacl1 libattr1 libpcre3 +Preinstall: diffutils tar dpkg libc-bin +Preinstall: gzip base-files base-passwd +Preinstall: libselinux1 libsepol1 +Preinstall: libgcc1 util-linux debconf tzdata findutils libdbus-1-3 +Preinstall: liblzma5 xz-utils libstdc++6 passwd +Preinstall: login zlib1g libbz2-1.0 libtinfo5 libsigsegv2 +Preinstall: dash insserv libmpfr4 libgmp10 libdebconfclient0 +Preinstall: perl-base perl libperl-dev mawk init-system-helpers + +Required: build-essential apt mount fakeroot dpkg-dev ncurses-base hostname +Required: libtool + +# Work around packge looking up variations of localhost .e.g glibc tries to look up localhost. +Support: libnss-myhostname + +Prefer: mawk +Prefer: cvs libesd0 libfam0 libfam-dev expect +Prefer: locales default-jdk +Prefer: xorg-x11-libs libpng fam mozilla mozilla-nss xorg-x11-Mesa +Prefer: unixODBC libsoup glitz java-1_4_2-sun gnome-panel +Prefer: desktop-data-SuSE gnome2-SuSE mono-nunit gecko-sharp2 +Prefer: apache2-prefork openmotif-libs ghostscript-mini gtk-sharp +Prefer: glib-sharp libzypp-zmd-backend +Prefer: sysv-rc make +Prefer: libjack-jackd2-dev libsndio-dev +Prefer: pkg-config +Prefer: texlive-htmlxml + +Prefer: golang-github-miekg-dns-dev +Prefer: golang-gopkg-yaml.v2-dev +Prefer: golang-github-spf13-cobra-dev +Prefer: golang-github-burntsushi-toml-dev + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/dist/build.changes new/obs-build-20180830/dist/build.changes --- old/obs-build-20180816/dist/build.changes 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/dist/build.changes 2018-08-30 11:14:11.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Aug 29 13:57:07 UTC 2018 - Adrian Schröter <adr...@suse.de> + +- Fall back to $mailaddr if $VC_MAILADDR is unset/null +- don't crash with no rpm macros defined +- Kiwi: support parsing of repos where the .repo file got used +- package hostarch definition in preinstallimages +- avoid double creation of monitor fifo +- Debian: + - debootstrap: ensure /etc/hosts exists + - debootstrap: Add abuild shadow password entry + - livebuild: publish source tarball + - Adds Debian configurations for jessie and unstable + - collect *.ddeb, *.udeb files + +------------------------------------------------------------------- Thu Aug 16 14:55:53 UTC 2018 - adr...@suse.de - docker format: New podman/buildah build engine support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20180816/vc new/obs-build-20180830/vc --- old/obs-build-20180816/vc 2018-08-16 17:00:23.000000000 +0200 +++ new/obs-build-20180830/vc 2018-08-30 11:14:11.000000000 +0200 @@ -29,7 +29,7 @@ fi if [ -n "$VC_REALNAME" ]; then - packager="$VC_REALNAME <$VC_MAILADDR>" + packager="$VC_REALNAME <${VC_MAILADDR:-$mailaddr}>" elif [ -x /usr/bin/rpmdev-packager ]; then packager=`rpmdev-packager` else
