Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2023-03-16 22:57:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Thu Mar 16 22:57:14 2023 rev:151 rq:1071527 version:20230314 Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2023-03-02 23:03:11.623262661 +0100 +++ /work/SRC/openSUSE:Factory/.build.new.31432/build.changes 2023-03-16 22:57:16.131146052 +0100 @@ -1,0 +2,7 @@ +Tue Mar 14 13:33:33 UTC 2023 - Adrian Schröter <adr...@suse.de> + +- universal post-build hook, just place a file in /usr/lib/build/post_build.d/ +- mkbaselibs/hwcaps, fix pattern name once again (x86_64_v3) +- KiwiProduct: add --use-newest-package hint if the option is set + +------------------------------------------------------------------- Old: ---- obs-build-20230228.tar.gz New: ---- obs-build-20230314.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.y7PhE8/_old 2023-03-16 22:57:16.887149715 +0100 +++ /var/tmp/diff_new_pack.y7PhE8/_new 2023-03-16 22:57:16.891149733 +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: 20230228 +Version: 20230314 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.y7PhE8/_old 2023-03-16 22:57:16.923149888 +0100 +++ /var/tmp/diff_new_pack.y7PhE8/_new 2023-03-16 22:57:16.927149908 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20230228 +pkgver=20230314 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.y7PhE8/_old 2023-03-16 22:57:16.947150005 +0100 +++ /var/tmp/diff_new_pack.y7PhE8/_new 2023-03-16 22:57:16.951150025 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="manual"> - <param name="revision">20230228</param> - <param name="version">20230228</param> + <param name="revision">20230314</param> + <param name="version">20230314</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.y7PhE8/_old 2023-03-16 22:57:16.995150238 +0100 +++ /var/tmp/diff_new_pack.y7PhE8/_new 2023-03-16 22:57:16.999150257 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20230228 +Version: 20230314 Binary: build Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.y7PhE8/_old 2023-03-16 22:57:17.023150373 +0100 +++ /var/tmp/diff_new_pack.y7PhE8/_new 2023-03-16 22:57:17.031150412 +0100 @@ -1,4 +1,4 @@ -build (20230228) unstable; urgency=low +build (20230314) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20230228.tar.gz -> obs-build-20230314.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/Build/Kiwi.pm new/obs-build-20230314/Build/Kiwi.pm --- old/obs-build-20230228/Build/Kiwi.pm 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/Build/Kiwi.pm 2023-03-14 14:37:40.000000000 +0100 @@ -119,6 +119,7 @@ $ret->{'sourcemedium'} = -1; $ret->{'debugmedium'} = -1; + my $use_newest_package; if ($instsource->{'productoptions'}) { my $productoptions = $instsource->{'productoptions'}->[0] || {}; for my $po (@{$productoptions->{'productvar'} || []}) { @@ -129,6 +130,7 @@ $ret->{'sourcemedium'} = $po->{'_content'} if $po->{'name'} eq 'SOURCEMEDIUM'; $ret->{'debugmedium'} = $po->{'_content'} if $po->{'name'} eq 'DEBUGMEDIUM'; $ret->{'milestone'} = $po->{'_content'} if $po->{'name'} eq 'BETA_VERSION'; + $use_newest_package = $po->{'_content'} if $po->{'name'} eq 'USE_NEWEST_PACKAGE'; } } if ($instsource->{'architectures'}) { @@ -196,6 +198,7 @@ $_ = {'project' => $s[0], 'repository' => $s[1]}; $_->{'priority'} = $repoprio{"$s[0]/$s[1]"} if $repoextras && defined $repoprio{"$s[0]/$s[1]"}; } + push @{$ret->{'deps'}}, '--use-newest-package' if @packages && $use_newest_package; return $ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/baselibs_configs/baselibs_global.conf new/obs-build-20230314/baselibs_configs/baselibs_global.conf --- old/obs-build-20230228/baselibs_configs/baselibs_global.conf 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/baselibs_configs/baselibs_global.conf 2023-03-14 14:37:40.000000000 +0100 @@ -48,13 +48,13 @@ targettype x86-64-v4 baselib +^/usr/lib64/(.*\.so.*)$ -> /usr/lib64/glibc-hwcaps/x86-64-v4/$1 targettype x86-64-v2 requires "<match1> = <version>-<release>" targettype x86-64-v2 autoreqprov off -targettype x86-64-v2 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86-64-v2)" +targettype x86-64-v2 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86_64_v2)" targettype x86-64-v3 requires "<match1> = <version>-<release>" targettype x86-64-v3 autoreqprov off -targettype x86-64-v3 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86-64-v3)" +targettype x86-64-v3 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86_64_v3)" targettype x86-64-v4 requires "<match1> = <version>-<release>" targettype x86-64-v4 autoreqprov off -targettype x86-64-v4 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86-64-v4)" +targettype x86-64-v4 supplements "(<match1> = <version> and patterns-glibc-hwcaps-x86_64_v4)" post "/sbin/ldconfig" package /(.*)-debuginfo$/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/build new/obs-build-20230314/build --- old/obs-build-20230228/build 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/build 2023-03-14 14:37:40.000000000 +0100 @@ -1794,7 +1794,7 @@ rm -f $BUILD_ROOT/.unpack.command done - # macros may be used by buildtime servies + # macros may be used by buildtime services or non-rpm build types recipe_setup_macros if test -e _service; then @@ -1857,6 +1857,7 @@ test "$BUILD_SUCCEEDED" = true || cleanup_and_exit 1 BUILD_SUCCEEDED= + recipe_run_post_hook recipe_build_time_statistics recipe_gendiff recipe_cleanup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/build-recipe new/obs-build-20230314/build-recipe --- old/obs-build-20230228/build-recipe 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/build-recipe 2023-03-14 14:37:40.000000000 +0100 @@ -46,6 +46,18 @@ recipe_build_$BUILDTYPE "$@" } +recipe_run_post_hook() { + # Hook for running any post build modification scripts provided via a package + if test -d $BUILD_ROOT/usr/lib/build/post_build.d ; then + for hook in $BUILD_ROOT/usr/lib/build/post_build.d/*; do + test -x "$hook" || continue + if ! chroot $BUILD_ROOT su -c "/usr/lib/build/post_build.d/${hook##*/}" ; then + cleanup_and_exit 1 "/usr/lib/build/post_build.d/${hook##*/} script failed!" + fi + done + fi +} + recipe_resultdirs () { recipe_resultdirs_$BUILDTYPE "$@" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/build-vm-kvm new/obs-build-20230314/build-vm-kvm --- old/obs-build-20230228/build-vm-kvm 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/build-vm-kvm 2023-03-14 14:37:40.000000000 +0100 @@ -375,6 +375,7 @@ echo "could not kill build in $VM_ROOT, kvm instance is dead already" return fi + echo "Killed the instance, waiting for shutdown..." local tries=0 while test $tries -lt 1800 ; do sleep .1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20230228/dist/build.changes new/obs-build-20230314/dist/build.changes --- old/obs-build-20230228/dist/build.changes 2023-02-28 12:03:21.000000000 +0100 +++ new/obs-build-20230314/dist/build.changes 2023-03-14 14:37:40.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 14 13:33:33 UTC 2023 - Adrian Schröter <adr...@suse.de> + +- universal post-build hook, just place a file in /usr/lib/build/post_build.d/ +- mkbaselibs/hwcaps, fix pattern name once again (x86_64_v3) +- KiwiProduct: add --use-newest-package hint if the option is set + +------------------------------------------------------------------- Tue Feb 28 11:00:54 UTC 2023 - Adrian Schröter <adr...@suse.de> - Dockerfile support: