Merge branch 'jb44351' into 'master'

[scratchbox2] tar has been moved to /usr/bin. JB#44351. See merge request mer-core/scratchbox2!29
sailfishos · May 29, 2020 · 9007aa2 · 9007aa2
2 parents cd0f7e3 + 761dac7
commit 9007aa2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/scratchbox2/modes/emulate+toolchain+utils/fs_rules.lua b/scratchbox2/modes/emulate+toolchain+utils/fs_rules.lua
@@ -122,7 +122,7 @@ emulate_mode_rules_bin = {
 
 		{path = "/bin/gzip", use_orig_path = true,
 		 protection = readonly_fs_always},
-		{path = "/bin/tar", use_orig_path = true,
+		{path = "/usr/bin/tar", use_orig_path = true,
 		 protection = readonly_fs_always},
 
 		{name = "/bin default rule", dir = "/bin", map_to = target_root,

diff --git a/scratchbox2/modes/obs-deb-build/fs_rules.lua b/scratchbox2/modes/obs-deb-build/fs_rules.lua
@@ -203,7 +203,7 @@ emulate_mode_rules_bin = {
 		 actions=accelerated_program_actions},
 		{path="/bin/sort",
 		 actions=accelerated_program_actions},
-		{path="/bin/tar",
+		{path="/usr/bin/tar",
 		 actions=accelerated_program_actions},
 		{path="/bin/touch",
 		 actions=accelerated_program_actions},

diff --git a/scratchbox2/modes/obs-rpm-build+pp/fs_rules.lua b/scratchbox2/modes/obs-rpm-build+pp/fs_rules.lua
@@ -205,7 +205,7 @@ emulate_mode_rules_bin = {
 		 actions=accelerated_program_actions},
 		{path="/bin/sort",
 		 actions=accelerated_program_actions},
-		{path="/bin/tar",
+		{path="/usr/bin/tar",
 		 actions=accelerated_program_actions},
 		{path="/bin/touch",
 		 actions=accelerated_program_actions},

diff --git a/scratchbox2/modes/obs-rpm-build/fs_rules.lua b/scratchbox2/modes/obs-rpm-build/fs_rules.lua
@@ -140,7 +140,7 @@ emulate_mode_rules_bin = {
 		 actions=accelerated_program_actions},
 		{path="/bin/sort",
 		 actions=accelerated_program_actions},
-		{path="/bin/tar",
+		{path="/usr/bin/tar",
 		 actions=accelerated_program_actions},
 		{path="/bin/touch",
 		 actions=accelerated_program_actions},