File pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f... of Package post-build-checks

Overview Repositories Revisions Requests Users Attributes Meta

File pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch of Package post-build-checks (Revision d40a36e000f8f18195714583d3898389)

Currently displaying revision d40a36e000f8f18195714583d3898389 , Show latest

commit f347f2e1ffb7a22e1959d7435439dda2525f5176
Author: Michael Schroeder <mls@suse.de>
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"
 	;;

Places

File pbc-git-03-f347f2e1ffb7a22e1959d7435439dda2525f5176.patch of Package post-build-checks (Revision d40a36e000f8f18195714583d3898389)

Places