mirror of
https://gitee.com/openharmony/third_party_f2fs-tools
synced 2024-11-23 10:10:00 +00:00
!10 gn文件格式刷新，subsystem_name的值改为filemanagement，路径/e2fsprogs/f2fs-tools-1.14.0改为/f2fs-tools/,config名称e2fsprogs-defaults改为f2fs-defaults 。fsck/BUILD.gn增加symlink_target_name。
Merge pull request !10 from xlfeng/master
This commit is contained in:
openharmony_sig_ci
Gitee
commit
ba2974652d
@ -5,7 +5,7 @@
|
||||
# published by the Free Software Foundation.
|
||||
|
||||
import("//build/ohos.gni")
|
||||
config("e2fsprogs-defaults") {
|
||||
config("f2fs-defaults") {
|
||||
cflags = [
|
||||
"-Wno-pointer-sign",
|
||||
"-Wno-unused-variable",
|
||||
@ -20,14 +20,14 @@ config("e2fsprogs-defaults") {
|
||||
###################################################
|
||||
##Build fsck
|
||||
ohos_executable("fsck.f2fs") {
|
||||
configs = [ ":e2fsprogs-defaults" ]
|
||||
configs = [ ":f2fs-defaults" ]
|
||||
sources = [
|
||||
"fsck.c",
|
||||
"main.c",
|
||||
"defrag.c",
|
||||
"dict.c",
|
||||
"dir.c",
|
||||
"dump.c",
|
||||
"fsck.c",
|
||||
"main.c",
|
||||
"mkquota.c",
|
||||
"mount.c",
|
||||
"node.c",
|
||||
@ -42,25 +42,26 @@ ohos_executable("fsck.f2fs") {
|
||||
|
||||
include_dirs = [
|
||||
".",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/include",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib",
|
||||
"//third_party/f2fs-tools",
|
||||
"//third_party/f2fs-tools/include",
|
||||
"//third_party/f2fs-tools/lib",
|
||||
"//third_party/e2fsprogs/contrib/android",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib:libf2fs",
|
||||
"//third_party/e2fsprogs/contrib/android:libdacconfig",
|
||||
"//third_party/f2fs-tools/lib:libf2fs",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"HAVE_CONFIG_H",
|
||||
defines = [ "HAVE_CONFIG_H" ]
|
||||
|
||||
symlink_target_name = [
|
||||
"resize.f2fs",
|
||||
"sload.f2fs",
|
||||
]
|
||||
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
16
lib/BUILD.gn
16
lib/BUILD.gn
@ -5,7 +5,7 @@
|
||||
# published by the Free Software Foundation.
|
||||
|
||||
import("//build/ohos.gni")
|
||||
config("e2fsprogs-defaults") {
|
||||
config("f2fs-defaults") {
|
||||
cflags = [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
@ -18,31 +18,29 @@ config("e2fsprogs-defaults") {
|
||||
config("libf2fs-headers") {
|
||||
include_dirs = [
|
||||
".",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/include",
|
||||
"//third_party/f2fs-tools",
|
||||
"//third_party/f2fs-tools/include",
|
||||
]
|
||||
}
|
||||
|
||||
ohos_shared_library("libf2fs") {
|
||||
sources = [
|
||||
"libf2fs.c",
|
||||
"libf2fs_io.c",
|
||||
"libf2fs_zoned.c",
|
||||
"libf2fs.c",
|
||||
"nls_utf8.c",
|
||||
]
|
||||
|
||||
include_dirs = [ "." ]
|
||||
|
||||
configs = [
|
||||
":e2fsprogs-defaults",
|
||||
":f2fs-defaults",
|
||||
":libf2fs-headers",
|
||||
]
|
||||
|
||||
defines = [ "HAVE_CONFIG_H" ]
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# published by the Free Software Foundation.
|
||||
|
||||
import("//build/ohos.gni")
|
||||
config("e2fsprogs-defaults") {
|
||||
config("f2fs-defaults") {
|
||||
cflags = [
|
||||
"-Wno-pointer-sign",
|
||||
"-Wno-unused-variable",
|
||||
@ -17,34 +17,30 @@ config("e2fsprogs-defaults") {
|
||||
###################################################
|
||||
##Build mkfs.f2fs
|
||||
ohos_executable("mkfs.f2fs") {
|
||||
configs = [ ":e2fsprogs-defaults" ]
|
||||
configs = [ ":f2fs-defaults" ]
|
||||
sources = [
|
||||
"f2fs_format.c",
|
||||
"f2fs_format_main.c",
|
||||
"f2fs_format_utils.c",
|
||||
"f2fs_format.c",
|
||||
]
|
||||
|
||||
include_dirs = [
|
||||
".",
|
||||
"//third_party/e2fsprogs/lib/uuid",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/include",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib",
|
||||
"//third_party/f2fs-tools",
|
||||
"//third_party/f2fs-tools/include",
|
||||
"//third_party/f2fs-tools/lib",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//third_party/e2fsprogs/lib/uuid:libext2_uuid",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib:libf2fs",
|
||||
"//third_party/f2fs-tools/lib:libf2fs",
|
||||
]
|
||||
|
||||
defines = [
|
||||
"HAVE_CONFIG_H",
|
||||
]
|
||||
defines = [ "HAVE_CONFIG_H" ]
|
||||
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# published by the Free Software Foundation.
|
||||
|
||||
import("//build/ohos.gni")
|
||||
config("e2fsprogs-defaults") {
|
||||
config("f2fs-defaults") {
|
||||
cflags = [
|
||||
"-std=gnu89",
|
||||
"-Wno-implicit-function-declaration",
|
||||
@ -16,72 +16,59 @@ config("e2fsprogs-defaults") {
|
||||
###################################################
|
||||
##Build f2fscrypt
|
||||
ohos_executable("f2fscrypt") {
|
||||
configs = [ ":e2fsprogs-defaults" ]
|
||||
configs = [ ":f2fs-defaults" ]
|
||||
sources = [
|
||||
"f2fscrypt.c",
|
||||
"sha512.c",
|
||||
]
|
||||
include_dirs = [
|
||||
".",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/include",
|
||||
"//third_party/f2fs-tools",
|
||||
"//third_party/f2fs-tools/include",
|
||||
"//third_party/e2fsprogs/lib/uuid",
|
||||
]
|
||||
cflags = [ "-Wno-error=format-extra-args" ]
|
||||
|
||||
deps = [
|
||||
"//third_party/e2fsprogs/lib/uuid:libext2_uuid",
|
||||
]
|
||||
deps = [ "//third_party/e2fsprogs/lib/uuid:libext2_uuid" ]
|
||||
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
###################################################
|
||||
##Build f2fstat
|
||||
ohos_executable("f2fstat") {
|
||||
configs = [ ":e2fsprogs-defaults" ]
|
||||
sources = [
|
||||
"f2fstat.c",
|
||||
]
|
||||
configs = [ ":f2fs-defaults" ]
|
||||
sources = [ "f2fstat.c" ]
|
||||
|
||||
include_dirs = [
|
||||
".",
|
||||
]
|
||||
include_dirs = [ "." ]
|
||||
cflags = [
|
||||
"-Wno-error=format",
|
||||
"-Wno-error=type-limits",
|
||||
"-Wno-format-extra-args",
|
||||
]
|
||||
|
||||
deps = [
|
||||
]
|
||||
deps = []
|
||||
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
###################################################
|
||||
##Build fibmap.f2fs
|
||||
ohos_executable("fibmap.f2fs") {
|
||||
configs = [ ":e2fsprogs-defaults" ]
|
||||
sources = [
|
||||
"fibmap.c",
|
||||
]
|
||||
configs = [ ":f2fs-defaults" ]
|
||||
sources = [ "fibmap.c" ]
|
||||
|
||||
include_dirs = [
|
||||
".",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/include",
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib",
|
||||
"//third_party/f2fs-tools",
|
||||
"//third_party/f2fs-tools/include",
|
||||
"//third_party/f2fs-tools/lib",
|
||||
]
|
||||
|
||||
cflags = [
|
||||
@ -90,18 +77,12 @@ ohos_executable("fibmap.f2fs") {
|
||||
"-Wno-format-extra-args",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//third_party/e2fsprogs/f2fs-tools-1.14.0/lib:libf2fs",
|
||||
]
|
||||
deps = [ "//third_party/f2fs-tools/lib:libf2fs" ]
|
||||
|
||||
defines = [
|
||||
"HAVE_CONFIG_H",
|
||||
]
|
||||
defines = [ "HAVE_CONFIG_H" ]
|
||||
|
||||
install_enable = true
|
||||
subsystem_name = "storage_manager"
|
||||
subsystem_name = "filemanagement"
|
||||
part_name = "storage_standard"
|
||||
install_images = [
|
||||
"system",
|
||||
]
|
||||
install_images = [ "system" ]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user