| 1 |
commit: bad2e17dfe93ffebc5467b187e2ded668be47632 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Mon Jan 28 22:27:42 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Mon Jan 28 23:37:04 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bad2e17d |
| 7 |
|
| 8 |
roverlay/config: new config entries |
| 9 |
|
| 10 |
* new entry [OVERLAY_]SYMLINK_DISTROOT |
| 11 |
* new entry [OVERLAY_]SYMLINK_DISTROOT_TMP with default value True |
| 12 |
* value choices changed for [OVERLAY_]MANIFEST_IMPLEMENTATION |
| 13 |
|
| 14 |
--- |
| 15 |
roverlay/config/const.py | 4 ++++ |
| 16 |
roverlay/config/entrymap.py | 27 ++++++++++++++++++++++----- |
| 17 |
2 files changed, 26 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/roverlay/config/const.py b/roverlay/config/const.py |
| 20 |
index 6eb30e6..9005c42 100644 |
| 21 |
--- a/roverlay/config/const.py |
| 22 |
+++ b/roverlay/config/const.py |
| 23 |
@@ -49,6 +49,10 @@ _CONSTANTS = dict ( |
| 24 |
name = 'R_Overlay', |
| 25 |
category = 'sci-R', |
| 26 |
manifest_implementation = 'default', |
| 27 |
+ SYMLINK_DISTROOT = dict ( |
| 28 |
+ root = "", |
| 29 |
+ tmp = True, |
| 30 |
+ ), |
| 31 |
), |
| 32 |
) |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py |
| 36 |
index 0d679c2..ed1dad8 100644 |
| 37 |
--- a/roverlay/config/entrymap.py |
| 38 |
+++ b/roverlay/config/entrymap.py |
| 39 |
@@ -215,15 +215,16 @@ CONFIG_ENTRY_MAP = dict ( |
| 40 |
|
| 41 |
overlay_manifest_implementation = dict ( |
| 42 |
desc = "manifest implementation to be used", |
| 43 |
+ path = [ 'OVERLAY', 'manifest_implementation' ], |
| 44 |
choices = frozenset (( |
| 45 |
'none', |
| 46 |
- 'default' |
| 47 |
- 'external:ebuild', |
| 48 |
-# 'external:portage', |
| 49 |
-# 'internal', |
| 50 |
+ 'default', |
| 51 |
+ 'ebuild', |
| 52 |
+ 'portage', |
| 53 |
+# 'e', |
| 54 |
+# 'p', |
| 55 |
)), |
| 56 |
), |
| 57 |
- |
| 58 |
# ebuild is used to create Manifest files |
| 59 |
ebuild_prog = dict ( |
| 60 |
path = [ 'TOOLS', 'ebuild_prog' ], |
| 61 |
@@ -238,11 +239,27 @@ CONFIG_ENTRY_MAP = dict ( |
| 62 |
description = 'number of ebuilds per R package to keep (if > 0)', |
| 63 |
), |
| 64 |
|
| 65 |
+ # overlay_symlink_distroot_ |
| 66 |
+ # used to create "virtual" DISTDIRs for Manifest file creation |
| 67 |
+ # This has nothing to do with DISTFILES_ROOT. |
| 68 |
+ overlay_symlink_distroot_root = dict ( |
| 69 |
+ path = [ 'OVERLAY', 'SYMLINK_DISTROOT', 'root' ], |
| 70 |
+ value_type = 'fs_dir', |
| 71 |
+ description = "symlink distroot directory", |
| 72 |
+ ), |
| 73 |
+ |
| 74 |
+ overlay_symlink_distroot_tmp = dict ( |
| 75 |
+ path = [ 'OVERLAY', 'SYMLINK_DISTROOT', 'tmp' ], |
| 76 |
+ value_type = yesno, |
| 77 |
+ description = "whether the symlink distroot is a tmpdir or not", |
| 78 |
+ ), |
| 79 |
|
| 80 |
# * alias |
| 81 |
eclass = 'overlay_eclass', |
| 82 |
keep_nth_latest = 'overlay_keep_nth_latest', |
| 83 |
manifest_implementation = 'overlay_manifest_implementation', |
| 84 |
+ symlink_distroot = 'overlay_symlink_distroot_root', |
| 85 |
+ symlink_distroot_tmp = 'overlay_symlink_distroot_tmp', |
| 86 |
|
| 87 |
# --- overlay |
Archives