daemonize mini-dinstall

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@191 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/trunk/R/build.R b/trunk/R/build.R
index f2e8100635e4798545ca04aaa7bae5f5b7bcadaf..e6b5a13d684ed6144da462d9cefd7dca817c0637 100644 (file)
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -28,12 +28,6 @@ build <- function(name,extra_deps,force=F) {
         # delete notes of upload
         file.remove(Sys.glob(file.path(pbuilder_results,'*.upload')))
 
-        # make mini-dinstall generate the skeleton of the archive
-        ret = log_system('umask 002;mini-dinstall --batch -c',dinstall_config)
-        if (ret != 0) {
-            fail('failed to create archive')
-        }
-
         notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
         build_debian(pkg)
 

diff --git a/trunk/inst/doc/README b/trunk/inst/doc/README
index 7065dbe74ef049459741de7c912cb944d3cb8dc7..91c837cfed858a9d8e61704679c689eec59accc9 100644 (file)
--- a/trunk/inst/doc/README
+++ b/trunk/inst/doc/README
@@ -28,8 +28,16 @@ Let SYS be the system you wish to build for (e.g., debian-amd64)
 
 3. cran2deb needs a persistent cache outside of R's control. therefore, create
     /var/cache/cran2deb, writable by whichever user(s) will run cran2deb.
-4. run: cran2deb update
-5. Try building a simple package: cran2deb build zoo
+4. add to /etc/rc.local:
+       # one mini-dinstall daemon for each apt repo
+       for sys in debian-i386 debian-amd64
+       do
+               mini-dinstall -c /etc/cran2deb/sys/$sys/mini-dinstall.conf
+       done
+   and execute.
+
+5. run: cran2deb update
+6. Try building a simple package: cran2deb build zoo
    (The result will be in /var/cache/cran2deb/results/SYS)
 
 

diff --git a/trunk/inst/etc/sys/debian-amd64/dput.cf b/trunk/inst/etc/sys/debian-amd64/dput.cf
index 05bfbd407da45cc1aafff483b0a5dfe9e7b538c6..4439493bb20faab04f34b77d2a9cd14378aa409a 100644 (file)
--- a/trunk/inst/etc/sys/debian-amd64/dput.cf
+++ b/trunk/inst/etc/sys/debian-amd64/dput.cf
@@ -4,5 +4,4 @@ incoming = /etc/cran2deb/archive/debian-amd64/mini-dinstall/incoming
 allow_non-us_software = 1
 run_dinstall = 0
 run_lintian = 1
-post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/sys/debian-amd64/mini-dinstall.conf
 allow_unsigned_uploads = 1

diff --git a/trunk/inst/etc/sys/debian-i386/dput.cf b/trunk/inst/etc/sys/debian-i386/dput.cf
index 3d76e3c960ddf6d2c55c6b6f3af7a392994df842..722ece3d1435e1d7d9e7c151b447953db4268747 100644 (file)
--- a/trunk/inst/etc/sys/debian-i386/dput.cf
+++ b/trunk/inst/etc/sys/debian-i386/dput.cf
@@ -4,5 +4,4 @@ incoming = /etc/cran2deb/archive/debian-i386/mini-dinstall/incoming
 allow_non-us_software = 1
 run_dinstall = 0
 run_lintian = 1
-post_upload_command = /usr/bin/mini-dinstall --batch -c /etc/cran2deb/sys/debian-i386/mini-dinstall.conf
 allow_unsigned_uploads = 1