Skip to content

Commit b0ca92d

Browse files
radaretrufae
authored andcommitted
Build rafs2 in meson too
1 parent b16f75b commit b0ca92d

File tree

5 files changed

+34
-16
lines changed

5 files changed

+34
-16
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ langs.cfg
2828
*.lib
2929
*.ilk
3030
libr/egg/p/sc/out
31+
binr/rafs2/rafs2
32+
binr/rafs2/rafs2.exe
3133
binr/r2agent/r2agent
3234
binr/r2agent/r2agent.exe
3335
binr/rvc2/rvc2

binr/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ if cli_enabled
2020
subdir('rapatch2')
2121
subdir('rafind2')
2222
subdir('rasign2')
23+
subdir('rafs2')
2324
subdir('ravc2')
2425
subdir('rax2')
2526
endif

binr/rafs2/meson.build

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
executable('rafs2', 'rafs2.c',
2+
include_directories: [platform_inc, libsdb_includes],
3+
dependencies: [
4+
r_core_dep,
5+
r_main_dep,
6+
r_util_dep,
7+
r_socket_dep,
8+
r_io_dep,
9+
r_fs_dep,
10+
r_bin_dep,
11+
r_flag_dep,
12+
r_esil_dep,
13+
r_arch_dep,
14+
r_cons_dep,
15+
r_asm_dep,
16+
r_debug_dep,
17+
r_config_dep,
18+
r_bp_dep,
19+
r_reg_dep,
20+
r_syscall_dep,
21+
r_anal_dep,
22+
r_egg_dep,
23+
r_search_dep,
24+
r_muta_dep,
25+
r_magic_dep
26+
],
27+
install: true,
28+
install_rpath: rpath_exe,
29+
implicit_include_directories: false
30+
)

libr/fs/p/fs_ubifs.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,6 @@ typedef struct {
296296
bool mounted;
297297
} ubifs_ctx_t;
298298

299-
// CRC32 verification is optional for read-only access
300-
// Reference ubi_reader implementation also skips CRC validation
301-
R_UNUSED static ut32 ubi_crc32(const ut8 *buf, ut32 len) {
302-
(void)buf;
303-
(void)len;
304-
return 0;
305-
}
306-
307-
static inline ut32 ubi_read_be32(const ut8 *buf) {
308-
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
309-
}
310-
311-
static inline ut64 ubi_read_be64(const ut8 *buf) {
312-
return ((ut64)ubi_read_be32 (buf) << 32) | ubi_read_be32 (buf + 4);
313-
}
314-
315299
static ubifs_key_t ubifs_parse_key(const ut8 *key_buf) {
316300
ubifs_key_t key = { 0 };
317301
ut32 hkey = r_read_le32 (key_buf);

libr/main/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ r_main_sources = [
1010
'rahash2.c',
1111
'rapatch2.c',
1212
'rarun2.c',
13+
'rafs2.c',
1314
'rasign2.c',
1415
'rasm2.c',
1516
'ravc2.c',

0 commit comments

Comments
 (0)