Hello community, here is the log from the commit of package post-build-checks for openSUSE:Leap:15.2 checked in at 2020-02-16 18:25:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/post-build-checks (Old) and /work/SRC/openSUSE:Leap:15.2/.post-build-checks.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks" Sun Feb 16 18:25:58 2020 rev:28 rq:772174 version:84.88+git20181015.ceb5c96 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/post-build-checks/post-build-checks.changes 2020-01-15 15:44:40.399297096 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.post-build-checks.new.26092/post-build-checks.changes 2020-02-16 18:26:03.998647204 +0100 @@ -1,0 +2,17 @@ +Mon Jan 20 16:51:12 CET 2020 - [email protected] + +- add patches from git to allow a successful build of rpm-ndb + - pbc-git-01-6edb1a2b83562c0e9391e251b123dadb2c5a6fc9.patch + 99-check-remove-rpms: preserve libgomp variants + - pbc-git-02-e090a3d7738ee8752dc743068a192607d172a391.patch + Detect name of coreutils package and don't remove it + Handle cases of alterantive implemention. + - pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch + Tweaks to make rpm-ndb build + - we need to convert the rpm database from bdb to ndb before + rpm-ndb is installed because rpm-ndb cannot read a berkeley + db database + - we must not deinstall rpm-ndb because it is needed for + baselibs generation + +------------------------------------------------------------------- New: ---- pbc-git-01-6edb1a2b83562c0e9391e251b123dadb2c5a6fc9.patch pbc-git-02-e090a3d7738ee8752dc743068a192607d172a391.patch pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.4xkjwu/_old 2020-02-16 18:26:05.518648000 +0100 +++ /var/tmp/diff_new_pack.4xkjwu/_new 2020-02-16 18:26:05.550648016 +0100 @@ -36,6 +36,9 @@ # osc service dr # Source0: %{name}-%{version}.tar.xz +Patch0: pbc-git-01-6edb1a2b83562c0e9391e251b123dadb2c5a6fc9.patch +Patch1: pbc-git-02-e090a3d7738ee8752dc743068a192607d172a391.patch +Patch2: pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +55,9 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build # nothing to do ++++++ pbc-git-01-6edb1a2b83562c0e9391e251b123dadb2c5a6fc9.patch ++++++ commit 6edb1a2b83562c0e9391e251b123dadb2c5a6fc9 Author: Dominique Leuenberger <[email protected]> Date: Mon Dec 30 14:13:15 2019 +0100 99-check-remove-rpms: preserve libgomp variants The package libgomp1 is being pulled in by RPM (since 4.15, for parallel processing). While building alternative versions of gcc, the post-build-checks install (forcibly) libgomp1-gccX, overwriting /usr/lib64/libgomp.so.1. Later on, the RPMs are being uninstalled again, resulting in libgomp.so.1 being deleted (libgomp1 being broken) Any future call to RPM will fail, as depending libraries are now missing. Since this is the same special case as with libgcc and libstdc++, we handle libgomp the same way by keeping the freshly built RPM installed diff --git a/checks/99-check-remove-rpms b/checks/99-check-remove-rpms index a7fb2a7..01adf7f 100755 --- a/checks/99-check-remove-rpms +++ b/checks/99-check-remove-rpms @@ -65,9 +65,9 @@ for RPM in `reorder "${RPM_FILE_LIST[@]}"`; do echo "(keeping $PKG because of $N)" continue fi - # Do not remove libgcc or libstdc++ variants + # Do not remove libgcc, libstdc++ and libgomp variants case ${PKG} in - libgcc*|libstdc++*) + libgcc*|libgomp*|libstdc++*) ;; *) RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG" ++++++ pbc-git-02-e090a3d7738ee8752dc743068a192607d172a391.patch ++++++ commit e090a3d7738ee8752dc743068a192607d172a391 Author: Ludwig Nussel <[email protected]> Date: Fri Jan 10 10:17:44 2020 +0100 Detect name of coreutils package and don't remove it Handle cases of alterantive implemention. diff --git a/checks/99-check-remove-rpms b/checks/99-check-remove-rpms index 01adf7f..bebe459 100755 --- a/checks/99-check-remove-rpms +++ b/checks/99-check-remove-rpms @@ -46,6 +46,8 @@ export YAST_IS_RUNNING="instsys" RPM_ERASE_LIST= RPM_FILE_LIST=(`find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm"`) +coreutils=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/{date,cat,rm,chown}|sort -u` + for RPM in `reorder "${RPM_FILE_LIST[@]}"`; do PKG=${RPM##*/} PKG=${PKG%-*-*.*.rpm} @@ -69,6 +71,8 @@ for RPM in `reorder "${RPM_FILE_LIST[@]}"`; do case ${PKG} in libgcc*|libgomp*|libstdc++*) ;; + $coreutils) + ;; *) RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG" ;; ++++++ pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch ++++++ commit f347f2e1ffb7a22e1959d7435439dda2525f5176 Author: Michael Schroeder <[email protected]> Date: Tue Dec 10 13:06:23 2019 +0100 Tweaks to make rpm-ndb build - we need to convert the rpm database from bdb to ndb before rpm-ndb is installed because rpm-ndb cannot read a berkeley db database - we must not deinstall rpm-ndb because it is needed for baselibs generation diff --git a/checks/00-check-install-rpms b/checks/00-check-install-rpms index 9e56004..7c008a2 100755 --- a/checks/00-check-install-rpms +++ b/checks/00-check-install-rpms @@ -5,6 +5,15 @@ TOPDIR=/usr/src/packages test -d $BUILD_ROOT/.build.packages && TOPDIR=/.build.packages export YAST_IS_RUNNING="instsys" RPM_FILE_LIST=(`find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm"`) +for rpm in $RPM_FILE_LIST ; do + case ${rpm##*/} in + rpm-ndb-*) + echo "converting rpm database to ndb" + chroot $BUILD_ROOT rpmdb --define '_db_backend ndb' --rebuilddb + ;; + esac +done + ADDITIONAL_PARAMS= test "$ABUILD_INIT_WITH_IGNORE_ARCH" = true && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --ignorearch" chroot $BUILD_ROOT rpm $ADDITIONAL_PARAMS --force --nodeps -Uv ${RPM_FILE_LIST[*]#$BUILD_ROOT} || { diff --git a/checks/99-check-remove-rpms b/checks/99-check-remove-rpms index bebe459..0d6e1fc 100755 --- a/checks/99-check-remove-rpms +++ b/checks/99-check-remove-rpms @@ -67,12 +67,14 @@ for RPM in `reorder "${RPM_FILE_LIST[@]}"`; do echo "(keeping $PKG because of $N)" continue fi - # Do not remove libgcc, libstdc++ and libgomp variants + # Do not remove libgcc/libstdc++/libgomp variants or rpm/rpm-build/rpm-ndb case ${PKG} in libgcc*|libgomp*|libstdc++*) ;; $coreutils) ;; + rpm|rpm-build|rpm-ndb) + ;; *) RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG" ;;
