From 695f3401ca995d67ccdce140ed87faa1035e8dbe Mon Sep 17 00:00:00 2001
From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sun, 8 Feb 2009 11:10:12 +0000
Subject: [PATCH] daemonize mini-dinstall
git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@191 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
trunk/R/build.R | 6 ------
trunk/inst/doc/README | 12 ++++++++++--
trunk/inst/etc/sys/debian-amd64/dput.cf | 1 -
trunk/inst/etc/sys/debian-i386/dput.cf | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/trunk/R/build.R b/trunk/R/build.R
index f2e8100..e6b5a13 100644
--- 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 7065dbe..91c837c 100644
--- 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 05bfbd4..4439493 100644
--- 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 3d76e3c..722ece3 100644
--- 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
--
2.39.5