diff options
| author | Mika Westerberg <mika.westerberg@iki.fi> | 2009-03-12 09:53:11 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2009-03-18 23:29:20 +0200 |
| commit | b0fa5d08f9841e31d565ba8055ab2d7a413edaa9 (patch) | |
| tree | 945895060e06ee3932315e57fc04dcbc7aa4bbb1 | |
| parent | 08969758069ec73f171b98234ecca45674d434ba (diff) | |
Now sb1-compat wrappers scripts are mapped to target_root for dpkg.
- Previously it was not possible to install, for example, package
osso-af-sb-startup because it tried to install file
/usr/bin/scratchbox-launcher.sh and other that were wrapped
with sb1 compatibility scripts (readonly).
- Now dpkg has its own rules chain that allows it to install packages
regardless of what we have wrapped.
Signed-off-by: Lauri Aarnio <Lauri.Aarnio@iki.fi>
| -rw-r--r-- | lua_scripts/pathmaps/emulate/00_default.lua | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/lua_scripts/pathmaps/emulate/00_default.lua b/lua_scripts/pathmaps/emulate/00_default.lua index d505287..13026e2 100644 --- a/lua_scripts/pathmaps/emulate/00_default.lua +++ b/lua_scripts/pathmaps/emulate/00_default.lua @@ -61,7 +61,11 @@ mapall_chain = { replace_by = session_dir .. "/wrappers." .. active_mapmode, readonly = true}, + -- -- Scratchbox 1 compatibility rules: + -- Note that when you add/remove these, check + -- also that dpkg_chain rules match these. + -- { prefix = "/targets/", map_to = sb1_compat_dir, readonly = target_root_is_readonly}, { path = "/usr/bin/scratchbox-launcher.sh", @@ -134,7 +138,26 @@ mapall_chain = { } } +-- +-- Special case for dpkg: we don't want to use wrapped +-- launcher scripts here because we might be installing +-- (over) them. +-- +local dpkg_chain = { + next_chain = mapall_chain, + binary = "dpkg", + rules = { + { path = "/usr/bin/scratchbox-launcher.sh", + map_to = target_root, + readonly = target_root_is_readonly }, + { path = "/etc/osso-af-init/dbus-systembus.sh", + map_to = target_root, + readonly = target_root_is_readonly }, + }, +} + export_chains = { + dpkg_chain, mapall_chain } |