Syscall forwarding refactored from #21 #39

Thaodan · 2025-08-06T09:52:38Z

Originally based on work by Frajo Haider but completely reworked
to use the existing interface system.

Contains #32, obsoletes #21.

meson incorrectly tries to use ccache if it's accelerated even when it does not exist Signed-off-by: Ville Nummela <ville.nummela@jolla.com>

[sb2] Conditionally accelerate ccache. JB#61370

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

`egrep` and `fgrep` are deprecated, use `grep -E` or `grep -F` respectively. Replace `$(...)` notation instead of legacy backticks. Avoid useless `cat` where `read` can do the job better. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Replace deprecated egrep, fgrep and cleanup

[sb2] Add gate for statx. JB#49501

Our sed is to old for the POSIX option. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

…ption [sb2] Use GNU option for extended sed. JB#59434

Paths for ldconfig is relative to the root passed with -r. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Martin Kampas <martin.kampas@jolla.com>

Append to LD_PRELOAD instead of prepend, so that sb2, as the virtualization layer, sits at the very bottom. At least the Coverity scan build tool does not operate correctly if libsb2.so takes its action first. Signed-off-by: Martin Kampas <martin.kampas@jolla.com>

This (still) exists as a symlink to /usr/bin/env, so the rule should be included as we do in other similar cases.

[sb2] Fix ldconfig use at build time. JB#61808

[sb2] Fix compatibility with LD_PRELOAD-based tools. JB#61781

Accelerate sh/bash installed under /usr and more cleanups

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

lua.h isn't always inside in /usr/include, take LUA_CFLAGS as taken from pkgconfig. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

…JB#62204

Fix declaration of tmpnam with glibc < 2.34 and gcc >= 11

i_virtualize_struct_statx was only implicitly defined in vterm_statfuns.c as config.h which defines HAVE_STATX wasn't included. Consistently include config.h before any other header to avoid issues like these: preload/vperm_filestatgates.c: In function ‘statx_gate’: preload/vperm_filestatgates.c:272:17: error: implicit declaration of function ‘i_virtualize_struct_statx’; did you mean ‘i_virtualize_struct_stat’? [-Wimplicit-function-declaration] 272 | i_virtualize_struct_statx(realfnname, buf); | ^~~~~~~~~~~~~~~~~~~~~~~~~ | i_virtualize_struct_stat Also use consistent include order and naming in all files. Fixes: 0ecaef5 ([sb2] Add gate for statx. JB#49501) Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com> [sb2] Fix implicit declaration of function ‘i_virtualize_struct_statx’. Fixes JB#62739

include/elf.h:25:14: error: expected ‘;’ before ‘typedef’ 25 | __BEGIN_DECLS | ^ | ; Fixes: 055cb96 (Incomplete OS X support) Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Fixes errors such as: include/rule_tree.h:22:9: error: unknown type name ‘uint32_t’ 22 | typedef uint32_t ruletree_object_offset_t; Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

preload/vperm_statfuncts.c:122:5: warning: no previous prototype for ‘i_virtualize_struct_stat_internal’ [-Wmissing-prototypes] 122 | int i_virtualize_struct_stat_internal( Fixes: 0ecaef5 ([sb2] Add gate for statx. JB#49501) Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

To make it easier to detect where Scratchbox2 helper scripts and binaries are found on the host and partially on the tooling/target. This is especially important for helper binaries such as sb2dctl. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

The version used in the Makefile and version header was extracted using git with a phony target which resulted in unintended rebuilds. Using the autoconf script avoids these as now the version only updates when the autoconf script changes. Further the version originally set in the autoconf was also out of date. This change fixes both of these issues. The script in build-aux was taken from Gnulib. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Previously config.status was also clean as part of the clean making rebuilds impossible without calling configure again. Clean isn't supposed to clean the generated build- or distribution-system files. Further somefiles that should be clean where not cleaned at all. This change also aligns the name of the clean target which removes the distribution to the one configure mentions when it fails. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

When configure.ac or config.mak.in change but not their output their will be repeated rebuilds as the timestamp their output files such as config.mak stay older than their dependency. The timestamp file's timestamp will always update after the targets dependency changed. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Co-authored-by: Matti Viljanen <matti.viljanen@jolla.com> Co-authored-by: Björn Bidar <bjorn.bidar@jolla.com> Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

In case not available. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Sets basic indentation across editors and reviews on Github. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

The char arrays in sblog_vprintf_line_to_logfile where not initialized which can cause the the call to vsnprintf can fail. See for example the backtrace below: from ~/dev/vms/jolla/targets/SailfishOS-devel-i486/lib/libc.so.6 level=9, format=0xf7f6c488 "%s gate: calling mapped syscall(%s) to %s", ap=0xffcd9f10 "\304\035\367\367\005") at ~/dev/sailfish/jolla/pkgs/pj_oss/scratchbox2/sblib/sb_log.c:318 level=9, format=0xf7f6c488 "%s gate: calling mapped syscall(%s) to %s") at ~/dev/sailfish/jolla/pkgs/pj_oss/scratchbox2/sblib/sb_log.c:423 realfnname=0xf7f71988 <__func__.292> "syscall", number=5, ap=0xffcd9fc4 "\034\240\004\b") at preload/syscallgate.c:91

Also remove some extra white space at end or in empty lines.

Originally based on work by Frajo Haider but completely reworked to use the existing interface system. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

piggz · 2025-10-06T07:03:45Z

This appears to fix the issues building qt6, with file permission errors. See https://build.sailfishos.org/project/monitor/home:piggz:qt6sb2?arch_aarch64=1&defaults=0&repo_sailfish_latest_aarch64=1&succeeded=1 i had to fork and make some build fixes, minor printf formatting placeholders.

vige · 2025-10-10T05:22:31Z

You should rebase the PR on top of current master. It would still be a huge PR but at least a bit more comprehensible.

piggz · 2025-10-13T20:31:00Z

execs/exec_policy_ruletree.c

 		if (str) {
 			SB_LOG(SB_LOGLEVEL_NOISE,
-				"%s: %s='%s'", __func__, s_name, str, fldoffs);
+				"%s: %s='%s' o=%lu", __func__, s_name, str, fldoffs);


Should be %u for size_t

Discussed with @mlehtima , %zu is probably better?

piggz · 2025-10-13T20:31:21Z

execs/exec_policy_ruletree.c

 		} else {
 			SB_LOG(SB_LOGLEVEL_NOISE,
-				"%s: No %s", __func__, s_name, fldoffs);
+				"%s: No %s o=%lu", __func__, s_name, fldoffs);


Should be %u

piggz · 2025-10-13T20:31:43Z

execs/exec_policy_ruletree.c

 		uip = ruletree_get_pointer_to_boolean(offs);
                SB_LOG(SB_LOGLEVEL_NOISE,
-                        "%s: @%u = *%p = %d",
+                        "%s: @%u = *%p = %d o=%lu",


Should be %u

piggz · 2025-10-13T20:32:24Z

execs/exec_policy_ruletree.c

 		uip = ruletree_get_pointer_to_uint32(offs);
 		SB_LOG(SB_LOGLEVEL_NOISE,
-			"%s: @%u = *%p = %u",
+			"%s: @%u = *%p = %u o=%lu",


Should be %u

piggz · 2025-10-13T20:32:50Z

execs/exec_policy_ruletree.c

 			eph.exec_policy_offset, r_name);
                SB_LOG(SB_LOGLEVEL_NOISE,
-                        "%s: @%u", __func__, offs, fldoffs);
+                        "%s: @%u o=%lu", __func__, offs, fldoffs);


Should be %u

piggz · 2025-10-13T20:33:02Z

execs/exec_policy_selection.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"%s: '%s' (%u), '%s' (%u) => %d (%s)",
+		"%s: '%s' (%lu), '%s' (%u) => %d (%s)",


Should be %u

piggz · 2025-10-13T20:34:06Z

pathmapping/paths_ruletree_mapping.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_test_path_match '%s' (%u), '%s' (%u) => %d (%s)",
+		"ruletree_test_path_match '%s' (%lu), '%s' (%u) => %d (%s)",


Should be %u

piggz · 2025-10-13T20:35:04Z

rule_tree/rule_tree.c

 		if (write(ruletree_ctx.rtree_ruletree_fd, ptr, size) < (int)size) {
 			SB_LOG(SB_LOGLEVEL_ERROR,
-				"Failed to append a struct (%d bytes) to the rule tree", size);
+				"Failed to append a struct (%lu bytes) to the rule tree", size);


Should be %u

piggz · 2025-10-13T20:35:34Z

rule_tree/rule_tree.c

 	if ((wr_result == -1) || ((size_t)wr_result < list_size_in_bytes)) {
 		SB_LOG(SB_LOGLEVEL_ERROR,
-			"Failed to append a list (%d items, %d bytes) to the rule tree", 
+			"Failed to append a list (%d items, %lu bytes) to the rule tree",


Should be %u

piggz · 2025-10-13T20:35:58Z

rule_tree/rule_tree.c


 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_find_inodestat (dev=%lld,ino=%lld,key=%llX)",
+		"ruletree_find_inodestat (dev=%lld,ino=%lld,key=%lu)",


Should be %llu

piggz · 2025-10-13T20:36:12Z

rule_tree/rule_tree.c

 {
 	SB_LOG(SB_LOGLEVEL_NOISE,
-		"ruletree_set_inodestat (dev=%lld,ino=%lld,key=%llX))",
+		"ruletree_set_inodestat (dev=%lld,ino=%lld,key=%lu))",


Should be %llu

vigejolla and others added 30 commits January 9, 2024 14:29

[sb2] Conditionally accelerate ccache. JB#61370

75bbb13

meson incorrectly tries to use ccache if it's accelerated even when it does not exist Signed-off-by: Ville Nummela <ville.nummela@jolla.com>

Merge pull request #24 from sailfishos/jb61370

20befb6

[sb2] Conditionally accelerate ccache. JB#61370

[wrappers] Replace calls to deprecated egrep. JB#59434

d6003d3

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Merge pull request #26 from sailfishos/egrep_fpgrep

19f8f68

[sb2] Replace deprecated egrep, fgrep and cleanup

[sb2] Add gate for statx. JB#49501

0ecaef5

Merge pull request #25 from sailfishos/statx

0418b16

[sb2] Add gate for statx. JB#49501

[sb2] Use GNU option for extended sed. JB#59434

2aa05f5

Our sed is to old for the POSIX option. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Merge pull request #27 from sailfishos/sed_use_gnu_instead_of_Posix_o…

cdbddde

…ption [sb2] Use GNU option for extended sed. JB#59434

[sb2] Use correct path when scanning ld.so.cache. JB#59434

5eea920

Paths for ldconfig is relative to the root passed with -r. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Merge branch 'jb59434_ldso_cache' [#28]

e32c40b

[sb2] Fix ldconfig use at build time. JB#61808

04b140a

Signed-off-by: Martin Kampas <martin.kampas@jolla.com>

[sb2] Accelerate sh/bash installed under /usr. JB#61829

9ffea11

[sb2] Accelerate env installed under /bin

6dedec5

This (still) exists as a symlink to /usr/bin/env, so the rule should be included as we do in other similar cases.

[sb2] Fix acceleration of tar

39f3a3a

Drop duplicate mapping rules

8efd361

Merge pull request #29 from sailfishos/jb61808

9fb02fd

[sb2] Fix ldconfig use at build time. JB#61808

Merge pull request #30 from sailfishos/jb61781

a70de08

[sb2] Fix compatibility with LD_PRELOAD-based tools. JB#61781

Merge pull request #31 from sailfishos/jb61829

fb8b7ac

Accelerate sh/bash installed under /usr and more cleanups

[sb2] Use Version instead of non-standard V variable

c37287b

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

[sb2] Correctly use $LUA_CFAGS to find lua.h

ec1090b

lua.h isn't always inside in /usr/include, take LUA_CFLAGS as taken from pkgconfig. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Specify lua-posix dependency correctly for OpenSuSE

74abd6c

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Merge branch 'sb2_lua_fixes' [#22]

2cf92cb

[preload] Fix declaration of tmpnam with glibc < 2.34 and gcc >= 11. …

7ef2e91

…JB#62204

Merge pull request #33 from sailfishos/jb62204

0b3cc25

Fix declaration of tmpnam with glibc < 2.34 and gcc >= 11

[sb2] Fix expected ‘;’ before ‘typedef’

179d5e0

include/elf.h:25:14: error: expected ‘;’ before ‘typedef’ 25 | __BEGIN_DECLS | ^ | ; Fixes: 055cb96 (Incomplete OS X support) Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Include missing type headers

c929b53

Fixes errors such as: include/rule_tree.h:22:9: error: unknown type name ‘uint32_t’ 22 | typedef uint32_t ruletree_object_offset_t; Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan and others added 9 commits August 6, 2025 12:25

sb2: Remove trailing slash

6135c7e

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[sb2] Make sure config.h is updated and cleaned

541a69b

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

sb2: Move logic to functions, session checks to parser, shorten code

5789dc7

Co-authored-by: Matti Viljanen <matti.viljanen@jolla.com> Co-authored-by: Björn Bidar <bjorn.bidar@jolla.com> Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

packaging: Also include x86_64 in ExclusiveArch

6ff112c

In case not available. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Add EditorConfig and dir-locals

2d3ef0c

Sets basic indentation across editors and reviews on Github. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan mentioned this pull request Aug 6, 2025

Native static binaries cpu transparency fixes #40

Open

Thaodan added 5 commits August 6, 2025 12:56

[sblog] Add printf attribute to detect printf at compile time

d0f5eab

[sb2] Fix a bunch of wrong format string modifiers

1dd732c

Also remove some extra white space at end or in empty lines.

[sb2] Allow redirecting syscalls (not all are supported yet). JB#59837

0017558

Originally based on work by Frajo Haider but completely reworked to use the existing interface system. Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[preloader] Add gates for wait3 and wait4

e4a0ced

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Thaodan force-pushed the master branch from 9ac8bf4 to 5373beb Compare August 6, 2025 09:58

Thaodan force-pushed the syscall_forwarding_refactored_jb59837 branch from cf6e4fc to e4a0ced Compare August 6, 2025 09:58

piggz reviewed Oct 13, 2025

View reviewed changes

Syscall forwarding refactored from #21 #39

Are you sure you want to change the base?

Syscall forwarding refactored from #21 #39

Uh oh!

Conversation

Thaodan commented Aug 6, 2025

Uh oh!

piggz commented Oct 6, 2025

Uh oh!

vige commented Oct 10, 2025

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

piggz Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

piggz Oct 13, 2025 •

edited

Loading

piggz Oct 13, 2025 •

edited

Loading

piggz Oct 13, 2025 •

edited

Loading