support latest mock version (2.1) for MythTV builds

The latest mock version (2.x) has introduced a number of significant changes to the mock build environment. Some of this patch set may eventually be able to be reverted or modified if/when the upstream makes further changes, but this works for now with mock 2.1
garybuhrmaster · Mar 12, 2020 · e490300 · e490300
1 parent 7849940
commit e490300
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MythTV/rpm/BUILD_MYTHTV_RPMS b/MythTV/rpm/BUILD_MYTHTV_RPMS
@@ -137,7 +137,7 @@ TMPSRCRPMDIR=`mktemp -d`
 #
 # Build buildable src.rpms
 #
-mock $MOCKOPTS --define="dist %{nil}" --spec=$TMPSDIR/SPECS/mythtv.spec --sources=$TMPSDIR/SOURCES --resultdir=$TMPSRCRPMDIR --buildsrpm
+mock $MOCKOPTS --no-bootstrap-chroot --isolation simple --define="dist %{nil}" --spec=$TMPSDIR/SPECS/mythtv.spec --sources=$TMPSDIR/SOURCES --resultdir=$TMPSRCRPMDIR --buildsrpm
 if [ $? -ne 0 ]; then
     echo "Unable to build source rpm"
     exit 1
@@ -149,7 +149,7 @@ if [ ! -f "$SRCBASERPM" ]; then
     exit 1
 fi
 
-mock $MOCKOPTS --define="dist %{nil}" --spec=$TMPSDIR/SPECS/mythtv-plugins.spec --sources=$TMPSDIR/SOURCES --resultdir=$TMPSRCRPMDIR --buildsrpm
+mock $MOCKOPTS --no-bootstrap-chroot --isolation simple --define="dist %{nil}" --spec=$TMPSDIR/SPECS/mythtv-plugins.spec --sources=$TMPSDIR/SOURCES --resultdir=$TMPSRCRPMDIR --buildsrpm
 if [ $? -ne 0 ]; then
     echo "Unable to build source rpm"
     exit 1
@@ -170,7 +170,7 @@ TMPLOCALREPODIR=`mktemp -p /var/tmp -d`
 #
 # Build the mythtv rpms
 #
-mock $MOCKOPTS --chain --localrepo=$TMPLOCALREPODIR $SRCBASERPM $SRCPLUGINSRPM
+mock $MOCKOPTS --no-bootstrap-chroot --isolation simple --chain --localrepo=$TMPLOCALREPODIR $SRCBASERPM $SRCPLUGINSRPM
 if [ $? -ne 0 ]; then
     echo "Unable to build mythtv rpms"
     exit 1

diff --git a/MythTV/rpm/BUILD_MYTHWEB_RPMS b/MythTV/rpm/BUILD_MYTHWEB_RPMS
@@ -129,7 +129,7 @@ fi
 #
 TMPSRCDIR=`mktemp -d`
 # Build src.rpm
-mock $MOCKOPTS --define="dist %{nil}" --resultdir=$TMPSRCDIR --spec=$TMPSDIR/SPECS/mythweb.spec --sources=$TMPSDIR/SOURCES --buildsrpm
+mock $MOCKOPTS --no-bootstrap-chroot --isolation simple --define="dist %{nil}" --resultdir=$TMPSRCDIR --spec=$TMPSDIR/SPECS/mythweb.spec --sources=$TMPSDIR/SOURCES --buildsrpm
 if [ $? -ne 0 ]; then
     echo "Unable to build source rpm"
     exit 1
@@ -141,7 +141,7 @@ if [ ! -f "$SRCRPM" ]; then
 fi
 
 TMPTGTDIR=`mktemp -d`
-mock $MOCKOPTS --resultdir=$TMPTGTDIR --rebuild $SRCRPM
+mock $MOCKOPTS --no-bootstrap-chroot --isolation simple --resultdir=$TMPTGTDIR --rebuild $SRCRPM
 if [ $? -ne 0 ]; then
     echo "Unable to build rpm"
     exit 1