Merge branch 'jb50161' into 'master'

Support 32 bit 'tools' accelerating 64 bit binaries See merge request mer-core/scratchbox2!30
sailfishos · Jun 11, 2020 · 7530bee · 7530bee
2 parents 16dd119 + 8747162
commit 7530bee
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 28 deletions.
diff --git a/scratchbox2/modes/obs-rpm-build+pp/fs_rules.lua b/scratchbox2/modes/obs-rpm-build+pp/fs_rules.lua
@@ -195,8 +195,6 @@ emulate_mode_rules_bin = {
 		 actions=accelerated_program_actions},
 		{path="/bin/rmdir",
 		 actions=accelerated_program_actions},
-		{path="/bin/rpm",
-		 actions=accelerated_program_actions},
 		{path="/bin/sed",
 		 actions=accelerated_program_actions},
 		{path="/bin/sh",
@@ -631,12 +629,31 @@ emulate_mode_rules_usr = {
 		  {if_active_exec_policy_is = "Tools",
 		   if_exists_then_map_to = tools,
 		   protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_replace_by = tools .. "/usr/lib64",
-			protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_map_to = tools,
-			protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib64",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  { map_to = target_root, protection = readonly_fs_always },
+		 },
+		},
+		-- and if the program looks in lib64 and the emulator can't find
+		-- it (because it's 32 bit) then look in /usr/lib...
+		{dir = "/usr/lib64", func_class = FUNC_CLASS_DLOPEN,
+		 actions = {
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
 		  { map_to = target_root, protection = readonly_fs_always },
 		 },
 		},

diff --git a/scratchbox2/modes/obs-rpm-build/fs_rules.lua b/scratchbox2/modes/obs-rpm-build/fs_rules.lua
@@ -130,8 +130,6 @@ emulate_mode_rules_bin = {
 		 actions=accelerated_program_actions},
 		{path="/bin/rmdir",
 		 actions=accelerated_program_actions},
-		{path="/bin/rpm",
-		 actions=accelerated_program_actions},
 		{path="/bin/sed",
 		 actions=accelerated_program_actions},
 		{path="/bin/sh",
@@ -494,12 +492,31 @@ emulate_mode_rules_usr = {
 		  {if_active_exec_policy_is = "Tools",
 		   if_exists_then_map_to = tools,
 		   protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_replace_by = tools .. "/usr/lib64",
-			protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_map_to = tools,
-			protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib64",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  { map_to = target_root, protection = readonly_fs_always },
+		 },
+		},
+		-- and if the program looks in lib64 and the emulator can't find
+		-- it (because it's 32 bit) then look in /usr/lib...
+		{dir = "/usr/lib64", func_class = FUNC_CLASS_DLOPEN,
+		 actions = {
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
 		  { map_to = target_root, protection = readonly_fs_always },
 		 },
 		},

diff --git a/scratchbox2/modes/obs-rpm-install/fs_rules.lua b/scratchbox2/modes/obs-rpm-install/fs_rules.lua
@@ -187,12 +187,6 @@ emulate_mode_rules_bin = {
 		 func_class = FUNC_CLASS_EXEC,
 		 actions = accelerated_program_actions},
 
-		-- rpm rules
-		{path = "/bin/rpm",
-		 func_class = FUNC_CLASS_EXEC,
-		 actions = rpm_program_actions},
-		-- end of rpm rules
-
 		{name = "/bin default rule", dir = "/bin", map_to = target_root,
 		 protection = readonly_fs_if_not_root}
 }
@@ -321,12 +315,31 @@ emulate_mode_rules_usr = {
 		  {if_active_exec_policy_is = "Tools",
 		   if_exists_then_map_to = tools,
 		   protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_replace_by = tools .. "/usr/lib64",
-			protection = readonly_fs_always},
-		   {if_active_exec_policy_is = "Host",
-			if_exists_then_map_to = tools,
-			protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib64",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  { map_to = target_root, protection = readonly_fs_always },
+		 },
+		},
+		-- and if the program looks in lib64 and the emulator can't find
+		-- it (because it's 32 bit) then look in /usr/lib...
+		{dir = "/usr/lib64", func_class = FUNC_CLASS_DLOPEN,
+		 actions = {
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Tools",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_replace_by = tools .. "/usr/lib",
+		   protection = readonly_fs_always},
+		  {if_active_exec_policy_is = "Host",
+		   if_exists_then_map_to = tools,
+		   protection = readonly_fs_always},
 		  { map_to = target_root, protection = readonly_fs_always },
 		 },
 		},