commit build for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2024-07-24 15:29:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new.1869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "build" Wed Jul 24 15:29:20 2024 rev:164 rq:1189210 version:20240723 Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2024-06-13 15:37:30.160842928 +0200 +++ /work/SRC/openSUSE:Factory/.build.new.1869/build.changes 2024-07-25 11:46:31.431857588 +0200 @@ -1,0 +2,13 @@ +Tue Jul 23 08:53:20 UTC 2024 - Adrian Schröter <adrian@suse.de> + +- providing fileprovides in createdirdeps tool +- Introduce buildflag nochecks + +------------------------------------------------------------------- +Thu Jul 11 13:00:30 UTC 2024 - Adrian Schröter <adrian@suse.de> + +- productcompose: support __all__ option +- config update: tumbleweed using preinstallexpand +- minor improvements + +------------------------------------------------------------------- Old: ---- obs-build-20240612.tar.gz New: ---- obs-build-20240723.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.l6abUJ/_old 2024-07-25 11:46:41.036236792 +0200 +++ /var/tmp/diff_new_pack.l6abUJ/_new 2024-07-25 11:46:41.076238371 +0200 @@ -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: 20240612 +Version: 20240723 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.l6abUJ/_old 2024-07-25 11:46:41.956273117 +0200 +++ /var/tmp/diff_new_pack.l6abUJ/_new 2024-07-25 11:46:42.024275802 +0200 @@ -1,6 +1,6 @@ pkgname=build -pkgver=20240612 -pkgrel=55d01635957160b09013643f53de17f9 +pkgver=20240723 +pkgrel=287886b34af76ded4080d7ff83294c9f pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') url="https://www.github.com/openSUSE/obs-build" ++++++ _service ++++++ --- /var/tmp/diff_new_pack.l6abUJ/_old 2024-07-25 11:46:42.448292543 +0200 +++ /var/tmp/diff_new_pack.l6abUJ/_new 2024-07-25 11:46:42.536296018 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="manual"> - <param name="revision">20240612</param> - <param name="version">20240612</param> + <param name="revision">20240723</param> + <param name="version">20240723</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.l6abUJ/_old 2024-07-25 11:46:42.912310864 +0200 +++ /var/tmp/diff_new_pack.l6abUJ/_new 2024-07-25 11:46:42.972313232 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20240612 +Version: 20240723 Binary: build Maintainer: Adrian Schroeter <adrian@suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.l6abUJ/_old 2024-07-25 11:46:43.400330131 +0200 +++ /var/tmp/diff_new_pack.l6abUJ/_new 2024-07-25 11:46:43.448332027 +0200 @@ -1,4 +1,4 @@ -build (20240612) unstable; urgency=low +build (20240723) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection ++++++ obs-build-20240612.tar.gz -> obs-build-20240723.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/Build/ProductCompose.pm new/obs-build-20240723/Build/ProductCompose.pm --- old/obs-build-20240612/Build/ProductCompose.pm 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/Build/ProductCompose.pm 2024-07-23 10:55:11.000000000 +0200 @@ -76,6 +76,10 @@ $flavor = '' unless defined $flavor; my @seenps; my $lasts; + + # asterisk is our internal marker for all packages + return ['*'] if $setname eq '__all__'; + for my $s (@$packagesets) { push @seenps, $lasts if defined $lasts; $lasts = $s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/PBuild/Job.pm new/obs-build-20240723/PBuild/Job.pm --- old/obs-build-20240612/PBuild/Job.pm 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/PBuild/Job.pm 2024-07-23 10:55:11.000000000 +0200 @@ -313,6 +313,7 @@ } push @args, '--clean' unless $opts->{'noclean'}; + push @args, '--checks' if $opts->{'checks'}; push @args, '--nochecks' if $opts->{'nochecks'}; push @args, '--shell' if $opts->{'shell'}; push @args, '--shell-after-fail' if $opts->{'shell-after-fail'}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/PBuild/Options.pm new/obs-build-20240723/PBuild/Options.pm --- old/obs-build-20240612/PBuild/Options.pm 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/PBuild/Options.pm 2024-07-23 10:55:11.000000000 +0200 @@ -33,6 +33,7 @@ 'reponame' => ':', 'noclean' => '', 'no-clean' => 'noclean', + 'checks' => '', 'nochecks' => '', 'no-checks' => 'nochecks', 'arch' => ':', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/build new/obs-build-20240723/build --- old/obs-build-20240612/build 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/build 2024-07-23 10:55:11.000000000 +0200 @@ -72,7 +72,7 @@ DO_INIT=true DO_INIT_TOPDIR=true DO_LINT= -DO_CHECKS=true +DO_CHECKS= CLEAN_BUILD= GENBUILDREQS_CLEAN_BUILD= RECIPEFILES=() @@ -1018,7 +1018,7 @@ export PATH=$BUILD_DIR:/sbin:/usr/sbin:/bin:/usr/bin:$PATH if vm_detect_2nd_stage ; then - set "/.build-srcdir/$RECIPEFILE" + set "$BUILD_ROOT/.build-srcdir/$RECIPEFILE" export PATH=/.build:$PATH fi @@ -1065,6 +1065,9 @@ test "$DO_INIT" = false && DO_INIT_TOPDIR=false DO_INIT=false ;; + -checks) + DO_CHECKS=true # default, but to overwrite possible config setting + ;; -nochecks|-no-checks) DO_CHECKS=false ;; @@ -1377,7 +1380,6 @@ # validate the buildroot validate_buildroot "$BUILD_ROOT" - if test -n "$VM_TYPE" -a -z "$RUNNING_IN_VM" ; then vm_verify_options vm_set_defaults @@ -1416,6 +1418,8 @@ cleanup_and_exit fi +recipe_checks_config + # done option parsing BUILD_OPTIONS_PARSED=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/build-recipe new/obs-build-20240723/build-recipe --- old/obs-build-20240612/build-recipe 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/build-recipe 2024-07-23 10:55:11.000000000 +0200 @@ -312,6 +312,16 @@ fi } +recipe_checks_config() { + if test -z "$DO_CHECKS"; then + local nochecks=$(queryconfig \ + --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" \ + --archpath "$BUILD_ARCH" buildflags nochecks + ) + test -n "$nochecks" && DO_CHECKS=false || DO_CHECKS=true + fi +} + recipe_gendiff() { local obsgendiff=$(queryconfig \ --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/build.1 new/obs-build-20240723/build.1 --- old/obs-build-20240612/build.1 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/build.1 2024-07-23 10:55:11.000000000 +0200 @@ -61,6 +61,12 @@ .B --clean Remove the build system and reinitialize it from scratch. .TP +.B --checks +Run checks during build (default). +.TP +.B --no-checks +Don't run checks during build. +.TP .B --no-init Skip the build system initialization and start with build immediately. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/configs/tumbleweed.conf new/obs-build-20240723/configs/tumbleweed.conf --- old/obs-build-20240612/configs/tumbleweed.conf 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/configs/tumbleweed.conf 2024-07-23 10:55:11.000000000 +0200 @@ -11,7 +11,6 @@ ExpandFlags: kiwi-nobasepackages ExpandFlags: docker-nobasepackages - PublishFlags: ympdist:openSUSE%20Tumbleweed # Use ext4 as FS in builder workers (instead of default ext3) @@ -90,7 +89,7 @@ %if "%_project" == "openSUSE:Factory" || "%_project" == "openSUSE:Factory:PowerPC" || "%_project" == "openSUSE:Factory:ARM" || "%_project" == "openSUSE:Factory:Rebuild" || "%_project" == "openSUSE:Factory:Live" || "%_project" == "openSUSE:Factory:NonFree" || "%_project" == "openSUSE:Factory:LegacyX86" Substitute: kiwi-image:docker python3-kiwi kiwi-systemdeps-containers container-build-checks-vendor-openSUSE container-build-checks-strict -Substitute: system-packages:docker kmod kernel-default docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci +Substitute: system-packages:docker docker createrepo_c container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci Substitute: system-packages:podman podman buildah createrepo_c release-compare container-build-checks-vendor-openSUSE container-build-checks-strict skopeo umoci %else # That ignore seems not to make sense - we only inject -strict based on specific projects already @@ -187,8 +186,6 @@ Prefer: %{lua_pref}-devel lua53-devel lua51-devel Prefer: libtolua++-5_4-devel libtolua++-5_3-devel libtolua++-5_1-devel -Preinstall: liblua5_4-5 - ExpandFlags: keepfilerequires # Generated by openSUSE-release-tools/repo2fileprovides.py @@ -575,9 +572,6 @@ # have choice for suse-kernel-rpm-scriptlets: sdbootutil-rpm-scriptlets suse-module-tools-scriptlets Prefer: -sdbootutil-rpm-scriptlets -# have choice for chromedriver needed by openQA-devel: chromedriver ungoogled-chromium-chromedriver -Prefer: -ungoogled-chromium-chromedriver - # have choice for pkgconfig(libmarkdown): libmarkdown-devel libmarkdown2-devel Prefer: -libmarkdown2-devel @@ -624,19 +618,23 @@ # have choice for registries-conf >= 20240408 needed by libcontainers-common: registries-conf-default registries-conf-suse Prefer: -registries-conf-suse -#--- +# have choice for cmake(cmocka): libcmocka-cmake libcmocka-cmake-32bit +Prefer: -libcmocka-cmake-32bit -Preinstall: aaa_base filesystem attr bash bash-sh coreutils diffutils -Preinstall: fillup glibc grep pam permissions rpm rpm-config-SUSE sed tar -Preinstall: libbz2-1 libgcc_s1 libncurses6 libreadline8 libz1 libselinux1 -Preinstall: libgcrypt20 libgpg-error0 liblzma5 libcap2 libacl1 libattr1 -Preinstall: libpopt0 libelf1 libzstd1 libpcre2-8-0 +#have choice for libcurl.so.4()(64bit) needed by cargo1.79: libcurl-mini4 libcurl4 +Prefer: -libcurl-mini4 -#Runscripts: aaa_base +#--- -Prefer: libdb-4_8-devel -VMinstall: util-linux libmount1 libeconf0 perl-base libdb-4_8 libblkid1 libuuid1 libsmartcols1 libcrypt1 +ExpandFlags: preinstallexpand +Preinstall: rpm + +VMinstall: perl-base +VMinstall: util-linux +# bootstrap-copy is an aggregate-only repository, no VMs are built up +%if "%_repository" != "bootstrap_copy" VMinstall: kernel-obs-build +%endif # Use the x86_64 kernel on i586 builds - boo#1178762 - Slow down in OBS since kernel 5.6.0 on 32bit ExportFilter: ^kernel-obs-build.*\.x86_64.rpm$ . i586 @@ -751,7 +749,6 @@ Prefer: mate-desktop-gschemas:mate-desktop-gschemas-branding-upstream Prefer: NetworkManager:NetworkManager-branding-openSUSE Prefer: PackageKit:PackageKit-branding-upstream -Prefer: sddm:sddm-branding-upstream Prefer: sway:sway-branding-upstream Prefer: systemd-presets-branding-openSUSE Prefer: wallpaper-branding-openSUSE @@ -872,8 +869,6 @@ # Cmake exists as a -mini flavor, which is not linked against curl. Prefer: cmake-mini -Prefer: -re2-10-devel - # python-pip inside OBS never connects to the net, so we don't use certs Ignore: python310-pip:ca-certificates Ignore: python311-pip:ca-certificates @@ -953,7 +948,6 @@ Prefer: -scout-command-not-found # have choice for kubernetes-kubelet-common (de-prefer the old versions, ensuring to have a new unresolvable when a new version shows up) -Prefer: -kubernetes1.20-kubelet-common -kubernetes1.21-kubelet-common -kubernetes1.22-kubelet-common -kubernetes1.23-client-common Prefer: -kubernetes1.24-client-common -kubernetes1.25-client-common # have choice for cmake(KWinDBusInterface) >= MACRO: deepin-kwin-devel kwin5-devel @@ -1022,9 +1016,6 @@ Prefer: -python310-nbclassic -python312-nbclassic prefer: -python310-notebook -python312-notebook -# have choice for container:opensuse/nginx:latest: container:opensuse-nginx-1.25 container:opensuse-nginx-image -Prefer: -container:opensuse-nginx-1.25 - # have choice for (sysvinit(network) or service(network)) needed by sysconfig: NetworkManager wicked-service Prefer: -NetworkManager @@ -1041,7 +1032,7 @@ Prefer: -libhs5-vectorscan5 # have choice for libpulse.so.0 needed by wine-32bit: apulse-32bit libpulse0-32bit - prefering the 'original' -Prefer: libpulse0-32bit libsane1-32bit -pipewire-pulseaudio +Prefer: libpulse0-32bit libsane1-32bit pipewire-pulseaudio # Have choice for vtk-java/vtk-tcl/python3-vtk needed by vtk-devel Prefer: vtk-java @@ -1500,8 +1491,6 @@ Prefer: libglfw3 # have choice for (xclip or wl-clipboard) needed by password-store: wl-clipboard xclip Prefer: -wl-clipboard -# have choice for pkgconfig(libhs): hyperscan-devel vectorscan-devel. hyperscan is no longer free - de-prefer it -Prefer: -hyperscan-devel Ignore: installation-images-openSUSE:cracklib-dict-full Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome @@ -1814,6 +1803,7 @@ BuildFlags: onlybuild:desktop-file-utils BuildFlags: onlybuild:devscripts BuildFlags: onlybuild:devscripts:checkbashisms +BuildFlags: onlybuild:dhcp BuildFlags: onlybuild:dialog BuildFlags: onlybuild:diffutils BuildFlags: onlybuild:dirac @@ -2039,6 +2029,7 @@ BuildFlags: onlybuild:knotifications BuildFlags: onlybuild:krb5 BuildFlags: onlybuild:krb5:krb5-mini +BuildFlags: onlybuild:kronosnet BuildFlags: onlybuild:kservice BuildFlags: onlybuild:kwallet BuildFlags: onlybuild:kwidgetsaddons @@ -2618,6 +2609,7 @@ BuildFlags: onlybuild:perl-Term-ReadKey BuildFlags: onlybuild:perl-Term-Table BuildFlags: onlybuild:perl-Test-Base +BuildFlags: onlybuild:perl-Test-Cmd BuildFlags: onlybuild:perl-Test-CPAN-Meta BuildFlags: onlybuild:perl-Test-Deep BuildFlags: onlybuild:perl-Test-Differences @@ -3020,12 +3012,13 @@ BuildFlags: onlybuild:rubygem-ronn BuildFlags: onlybuild:rust BuildFlags: onlybuild:rust-bindgen -BuildFlags: onlybuild:rust1.73 +BuildFlags: onlybuild:rust-cbindgen BuildFlags: onlybuild:rust1.74 BuildFlags: onlybuild:rust1.75 BuildFlags: onlybuild:rust1.76 BuildFlags: onlybuild:rust1.77 BuildFlags: onlybuild:rust1.78 +BuildFlags: onlybuild:rust1.79 BuildFlags: onlybuild:samba BuildFlags: onlybuild:sane-backends BuildFlags: onlybuild:sassc @@ -3155,6 +3148,7 @@ BuildFlags: onlybuild:tracker BuildFlags: onlybuild:transfig BuildFlags: onlybuild:translation-update-upstream +BuildFlags: onlybuild:tree BuildFlags: onlybuild:tslib BuildFlags: onlybuild:ttf-converter BuildFlags: onlybuild:twolame diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/createdirdeps new/obs-build-20240723/createdirdeps --- old/obs-build-20240612/createdirdeps 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/createdirdeps 2024-07-23 10:55:11.000000000 +0200 @@ -85,7 +85,7 @@ } } } - my $q = Build::query($path, 'addselfprovides' => 1, 'conflicts' => 1, 'evra' => 1, 'buildtime' => 1, 'weakdeps' => 1); + my $q = Build::query($path, 'addselfprovides' => 1, 'conflicts' => 1, 'evra' => 1, 'buildtime' => 1, 'weakdeps' => 1, 'filedeps' => 1); next unless $q && defined($q->{'name'}) && defined($q->{'arch'}) && defined($q->{'version'}); my $idx = "$q->{'name'}.$q->{'arch'}-$id"; next if $seen{$idx}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/dist/build.changes new/obs-build-20240723/dist/build.changes --- old/obs-build-20240612/dist/build.changes 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/dist/build.changes 2024-07-23 10:55:11.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Jul 23 08:53:20 UTC 2024 - Adrian Schröter <adrian@suse.de> + +- providing fileprovides in createdirdeps tool +- Introduce buildflag nochecks + +------------------------------------------------------------------- +Thu Jul 11 13:00:30 UTC 2024 - Adrian Schröter <adrian@suse.de> + +- productcompose: support __all__ option +- config update: tumbleweed using preinstallexpand +- minor improvements + +------------------------------------------------------------------- Wed Jun 12 11:47:43 CEST 2024 - mls@suse.de - tumbleweed build config update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/expanddeps new/obs-build-20240723/expanddeps --- old/obs-build-20240612/expanddeps 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/expanddeps 2024-07-23 10:55:11.000000000 +0200 @@ -27,6 +27,7 @@ use strict; use Build; +use Build::Expand; my ($dist, $rpmdeps, $archs, $configdir, $useusedforbuild, $installonly, $noinstall, $isvm); my ($obspackage, $buildflavor); @@ -93,6 +94,11 @@ $obspackage = shift @ARGV; next; } + if ($ARGV[0] eq '--debug') { + shift @ARGV; + $Build::Expand::expand_dbg = 1; + next; + } last; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/mkbaselibs new/obs-build-20240723/mkbaselibs --- old/obs-build-20240612/mkbaselibs 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/mkbaselibs 2024-07-23 10:55:11.000000000 +0200 @@ -611,7 +611,10 @@ } } } elsif (substr($r, 0, 1) eq '-') { - delete $files{$_} for grep {/$rr/} keys %files; + for (grep {/$rr/} keys %files) { + delete $files{$_}; + delete $moves{$_}; + } } elsif (substr($r, 0, 1) eq '"') { $rr =~ s/\"$//; if ($rr =~ /^(.*?)\s*->\s*(.*?)$/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20240612/pbuild.1 new/obs-build-20240723/pbuild.1 --- old/obs-build-20240612/pbuild.1 2024-06-12 11:49:28.000000000 +0200 +++ new/obs-build-20240723/pbuild.1 2024-07-23 10:55:11.000000000 +0200 @@ -111,6 +111,8 @@ .TP .B "\-\-xen, \-\-kvm, ..." .TP +.B "\-\-checks" +.TP .B "\-\-no-checks" .TP .B "\-\-no-clean"
participants (1)
-
Source-Sync