diff options
| author | Lauri Aarnio <Lauri.Aarnio@iki.fi> | 2008-11-13 14:58:40 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2008-12-07 04:32:46 +0200 |
| commit | 236aef10174837c6fde8c7534dc03a2105b7a358 (patch) | |
| tree | b4e88f8dccb59696b599368175105873b4750f2a /lua_scripts | |
| parent | 89d6920a4770c56cec7ba65480419ac5b9390eb5 (diff) | |
Wrappers are now selected from modeconf.*
- previously, all wrappers were used in the "devel" mode, and two wrappers were
hardcoded to "emulate" mode. List of wrappers is now configurable from
sb2rc.devel and sb2rc.emulate:
- devel mode gets all wrappers
- emulate mode gets wrappers for gdb & ldconfig, those are now picked up
from /sb2/wrappers (those were mapped directly on top of the commands)
Diffstat (limited to 'lua_scripts')
| -rw-r--r-- | lua_scripts/pathmaps/devel/00_default.lua | 2 | ||||
| -rw-r--r-- | lua_scripts/pathmaps/emulate/00_default.lua | 19 |
2 files changed, 8 insertions, 13 deletions
diff --git a/lua_scripts/pathmaps/devel/00_default.lua b/lua_scripts/pathmaps/devel/00_default.lua index bdf0503..80bf244 100644 --- a/lua_scripts/pathmaps/devel/00_default.lua +++ b/lua_scripts/pathmaps/devel/00_default.lua @@ -116,7 +116,7 @@ simple_chain = { -- 2. Development environment special destinations: {prefix = "/sb2/wrappers", - replace_by = sbox_dir.."/share/scratchbox2/wrappers", + replace_by = session_dir .. "/wrappers." .. sbox_mapmode, readonly = true}, {prefix = "/sb2/scripts", diff --git a/lua_scripts/pathmaps/emulate/00_default.lua b/lua_scripts/pathmaps/emulate/00_default.lua index cfc6d3d..e816a61 100644 --- a/lua_scripts/pathmaps/emulate/00_default.lua +++ b/lua_scripts/pathmaps/emulate/00_default.lua @@ -52,6 +52,13 @@ mapall_chain = { {prefix = target_root, use_orig_path = true, readonly = target_root_is_readonly}, + -- ldconfig is static binary, and needs to be wrapped + -- Gdb needs some special parameters before it + -- can be run so we wrap it. + {prefix = "/sb2/wrappers", + replace_by = session_dir .. "/wrappers." .. sbox_mapmode, + readonly = true}, + -- Scratchbox 1 compatibility rules: { prefix = "/targets/", map_to = sb1_compat_dir, readonly = target_root_is_readonly}, @@ -62,18 +69,6 @@ mapall_chain = { map_to = sb1_compat_dir, readonly = target_root_is_readonly}, - -- ldconfig is static binary, and needs to be wrapped - {path = "/sbin/ldconfig", replace_by = sbox_dir .. - "/share/scratchbox2/wrappers/ldconfig", - readonly = true}, - - -- - -- Gdb needs some special parameters before it - -- can be run so we wrap it. - -- - {path = "/usr/bin/gdb", replace_by = sbox_dir .. - "/share/scratchbox2/wrappers/gdb", - readonly = true}, -- gdb wants to have access to our dynamic linker also. {path = "/usr/lib/libsb2/ld-2.5.so", use_orig_path = true, readonly = true}, |