Changeset 918 in MondoRescue for branches/stable

Timestamp:

Nov 3, 2006, 2:00:54 AM (17 years ago)

Author:

Bruno Cornec

Message:

New improvement for build system. By default now try to build in the rpm _topdir and check if it fails, rather than creating a different directory.

Location:

branches/stable

Files:

• mindi-busybox/distributions/rpm/mindi-busybox.spec (modified) (1 diff)
• mondo/src/restore-scripts/usr.bin (deleted)
• tools/distro-env (modified) (1 diff)

branches/stable/mindi-busybox/distributions/rpm/mindi-busybox.spec

@@ -33 +33 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%post
-
 %files
 %defattr(-,root,root)

branches/stable/tools/distro-env

@@ -121 +121 @@
 
 # Default
-export TOPBUILDDIR=${TOPDIR}/../build
+export TOPBUILDDIR=`rpm --showrc | grep -E '[   ]_topdir[   ]' | awk '{print $3}'`
 
 if [ _"$dtype" = _"rpm" ]; then
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
     if [ -f ${HOME}/.rpmmacros ]; then
-        export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
+        _TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
+        if [ _"$_TOPBUILDDIR" != _"" ]; then
+            export TOPBUILDDIR=$_TOPBUILDDIR
+        fi
     fi
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
+    if [ $? -ne 0 ]; then
+        echo "Please ensure that you can write into ${TOPBUILDDIR}"
+        echo "Solution: setup _topdir in your ~/.rpmmacros or"
+        echo "chown the ${TOPBUILDDIR} to your uid"
+        exit -1
+    fi
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}