Merge branch 'jb36606' into 'master'

Support /usr merge by allowing /bin/perl to be accelerated JB#36606

See merge request mer-core/scratchbox2!23

scratchbox2/modes/obs-rpm-build+pp/config.lua

@@ -14,8 +14,12 @@ exec_policy_selection = {
 		-- Tools. at least qemu might be used from there.
 		{prefix = tools_prefix .. "/usr/bin/perl",
 		 exec_policy_name = "Tools-perl"},
+		{prefix = tools_prefix .. "/bin/perl",
+		 exec_policy_name = "Tools-perl"},
 		{prefix = tools_prefix .. "/usr/bin/python",
 		 exec_policy_name = "Tools-python"},
+		{prefix = tools_prefix .. "/bin/python",
+		 exec_policy_name = "Tools-python"},
 
                 -- the toolchain, if not from Tools:
                 {dir = sbox_target_toolchain_dir, exec_policy_name = "Toolchain"},

scratchbox2/modes/obs-rpm-build+pp/fs_rules.lua

@@ -62,9 +62,14 @@ perl_lib_test = {
 perl_bin_test = {
 	{ if_redirect_ignore_is_active = "/usr/bin/perl",
 	  map_to = target_root, readonly = true },
+	{ if_redirect_ignore_is_active = "/bin/perl",
+	  map_to = target_root, readonly = true },
 	{ if_redirect_force_is_active = "/usr/bin/perl",
 	  map_to = tools, readonly = true,
 	  exec_policy_name = "Tools-perl" },
+	{ if_redirect_force_is_active = "/bin/perl",
+	  map_to = tools, readonly = true,
+	  exec_policy_name = "Tools-perl" },
 	{ if_active_exec_policy_is = "Target",
 	  map_to = target_root, readonly = true },
 	{ if_active_exec_policy_is = "Tools-perl",
@@ -79,9 +84,14 @@ perl_bin_test = {
 python_bin_test = {
 	{ if_redirect_ignore_is_active = "/usr/bin/python",
 	  map_to = target_root, readonly = true },
+	{ if_redirect_ignore_is_active = "/bin/python",
+	  map_to = target_root, readonly = true },
 	{ if_redirect_force_is_active = "/usr/bin/python",
 	  map_to = tools, readonly = true,
 	  exec_policy_name = "Tools-python" },
+	{ if_redirect_force_is_active = "/bin/python",
+	  map_to = tools, readonly = true,
+	  exec_policy_name = "Tools-python" },
 	{ if_active_exec_policy_is = "Target",
 	  map_to = target_root, readonly = true },
 	{ if_active_exec_policy_is = "Tools-python",
@@ -471,7 +481,9 @@ emulate_mode_rules_usr_bin = {
 		--	(these are real prefixes, version number may
 		--	be included in the name (/usr/bin/python2.5 etc))
 		{prefix = "/usr/bin/perl", actions = perl_bin_test},
+		{prefix = "/bin/perl", actions = perl_bin_test},
 		{prefix = "/usr/bin/python", actions = python_bin_test},
+		{prefix = "/bin/python", actions = python_bin_test},
 
 		{path = "/usr/bin/sb2-show", use_orig_path = true,
 		 protection = readonly_fs_always},