[svn] r6354 - trunk/tools/dar

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-06-11 22:41:12 +0100 (Wed, 11 Jun 2008)
New Revision: 6354

Modified:
   trunk/tools/dar/dar-build
   trunk/tools/dar/dar-perl.py
   trunk/tools/dar/dar-prepare
Log:
Small improvements.

Modified: trunk/tools/dar/dar-build
===================================================================
--- trunk/tools/dar/dar-build	2008-06-11 00:53:03 UTC (rev 6353)
+++ trunk/tools/dar/dar-build	2008-06-11 21:41:12 UTC (rev 6354)
@@ -96,6 +96,10 @@
             continue
         fi
 
+        if [ "$TAG" ]; then
+            TAGS="$TAG"
+        fi
+
         if [ "$NODIST" ]; then
             DISTTAG="0"
             DISTNAME="nodist"
@@ -163,11 +167,11 @@
 #                       echo $rpmfile
                         if [ -z "$FORCE_OVERWRITE" -a -f "$PACKAGEDIR/$app/$rpmfile" ]; then
                             warning "Package \"$PACKAGEDIR/$app/$rpmfile\" already exists."
-            
+
 #                           if [ -z "$SOURCE_DISTS" ]; then
 #                               SOURCE_DISTS="$DISTNICK"
 #                           fi
-            
+
                             continue 4
                         fi
                     done

Modified: trunk/tools/dar/dar-perl.py
===================================================================
--- trunk/tools/dar/dar-perl.py	2008-06-11 00:53:03 UTC (rev 6353)
+++ trunk/tools/dar/dar-perl.py	2008-06-11 21:41:12 UTC (rev 6354)
@@ -519,7 +519,7 @@
 else:
     print >>out, 'BuildRequires: perl'
 
-if not package_make and package_build:
+if package_build:
     print >>out, 'BuildRequires: perl(Module::Build)'
 
 if meta.has_key('build_requires'):
@@ -559,23 +559,34 @@
 
 print >>out, "%build"
 if noarch:
-    if not package_make and package_build:
-        print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
+
+    if package_build:
+        print >>out, '#%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
+        print >>out, '#%{__make} %{?_smp_mflags}'
+        print >>out, '%{__perl} Build.PL'
+        print >>out, './Build'
+#        print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
     else:
         print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
-    print >>out, '%{__make} %{?_smp_mflags}'
+        print >>out, '%{__make} %{?_smp_mflags}'
 else:
-    if not package_make and package_build:
-        print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
+    if package_build:
+        print >>out, '#CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
+        print >>out, '#%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
+        print >>out, 'CFLAGS="%{optflags}" %{__perl} Build.PL'
+        print >>out, './Build'
+#        print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
     else:
         print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
-    print >>out, '%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
+        print >>out, '%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
 print >>out
 
 print >>out, '%install'
 print >>out, '%{__rm} -rf %{buildroot}'
-if not package_make and package_build:
-    print >>out, '%{__make} install'
+if package_build:
+    print >>out, '#%{__make} pure_install'
+    print >>out, 'PERL_INSTALL_ROOT="%{buildroot}" ./Build install installdirs="vendor"'
+#    print >>out, '%{__make} install'
 else:
     print >>out, '%{__make} pure_install'
 print >>out

Modified: trunk/tools/dar/dar-prepare
===================================================================
--- trunk/tools/dar/dar-prepare	2008-06-11 00:53:03 UTC (rev 6353)
+++ trunk/tools/dar/dar-prepare	2008-06-11 21:41:12 UTC (rev 6354)
@@ -15,15 +15,18 @@
 		ln -f $CHROOTDIR/${DEFAULT_DISTS// */}/root/.bash_history $CHROOTDIR/$distname/root/.bash_history
 	fi
 
-	umount $CHROOTDIR/$distname{/dev/pts,/proc,/tmp,$ROOT/build,$ROOT/} 2>/dev/null
+	umount $CHROOTDIR/$distname{/dev/pts,/proc,/sys,/tmp,$ROOT/build,$ROOT/} 2>/dev/null
 
 #	rm -rf $CHROOTDIR/$distname{$RPMTMPPATH}/*
-	mkdir -p $CHROOTDIR/$distname$ROOT/
-	mount -o bind $ROOT $CHROOTDIR/$distname$ROOT/
+	mkdir -p $CHROOTDIR/$distname/$ROOT/
+	mount -o bind $ROOT $CHROOTDIR/$distname/$ROOT/
 
 	mkdir -p $CHROOTDIR/$distname/proc/
 	mount -t proc proc $CHROOTDIR/$distname/proc/
 
+	mkdir -p $CHROOTDIR/$distname/sys/
+	mount -t sysfs sys $CHROOTDIR/$distname/sys/
+
 	mkdir -p $CHROOTDIR/$distname/dev/pts/
 	mount -t devpts devpts $CHROOTDIR/$distname/dev/pts/