From fff71bfadf21f6a09439749484b50f3ab8ada423 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 05:51:10 +0000 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9f2fs-tools=E7=9A=84fsck?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BE=9D=E8=B5=96=EF=BC=8C=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E8=93=9D=E5=8C=BAci=E7=9C=8B=E6=9D=BF=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- fsck/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index 9fed520..e260df7 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -53,10 +53,13 @@ ohos_executable("fsck.f2fs") { ] deps = [ - "//third_party/e2fsprogs:libdacconfig", "//third_party/f2fs-tools/lib:libf2fs", ] + external_deps = [ + "e2fsprogs:libdacconfig" + ] + defines = [ "HAVE_CONFIG_H" ] symlink_target_name = [ From ef11282bcab2534c83cfa3683d5676f69bfb9108 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 05:54:57 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9f2fs-tools=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E7=9A=84mkfs=E6=8E=A5=E5=8F=A3=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E9=99=A4=E8=93=9D=E5=8C=BAci=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- mkfs/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mkfs/BUILD.gn b/mkfs/BUILD.gn index 5cea424..e7549ae 100644 --- a/mkfs/BUILD.gn +++ b/mkfs/BUILD.gn @@ -34,10 +34,13 @@ ohos_executable("mkfs.f2fs") { ] deps = [ - "//third_party/e2fsprogs:libext2_uuid", "//third_party/f2fs-tools/lib:libf2fs", ] + external_deps = [ + "e2fsprogs:libext2_uuid", + ] + defines = [ "HAVE_CONFIG_H" ] install_enable = true From 36a5458a687038991b7a8b11b4ce13feccf24f84 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 06:17:37 +0000 Subject: [PATCH 3/9] =?UTF-8?q?update=20bundle.json=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E5=8E=BBheader=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bundle.json b/bundle.json index fc4204f..5506481 100644 --- a/bundle.json +++ b/bundle.json @@ -33,13 +33,7 @@ "sub_component": [], "inner_kits": [ { - "name": "//third_party/f2fs-tools/lib:libf2fs", - "header": { - "header_files": [ - "utf8data.h" - ], - "header_base": "//third_party/f2fs-tools/lib" - } + "name": "//third_party/f2fs-tools/lib:libf2fs" }, { "name": "//third_party/f2fs-tools/fsck:fsck.f2fs" From 377379d690338be67abea4b449f4a3a161de03ca Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 14:24:20 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96gn=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- fsck/BUILD.gn | 8 ++------ mkfs/BUILD.gn | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index e260df7..b7ea025 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -52,13 +52,9 @@ ohos_executable("fsck.f2fs") { "//third_party/e2fsprogs/e2fsprogs/contrib/android", ] - deps = [ - "//third_party/f2fs-tools/lib:libf2fs", - ] + deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - external_deps = [ - "e2fsprogs:libdacconfig" - ] + external_deps = [ "e2fsprogs:libdacconfig" ] defines = [ "HAVE_CONFIG_H" ] diff --git a/mkfs/BUILD.gn b/mkfs/BUILD.gn index e7549ae..90cc65b 100644 --- a/mkfs/BUILD.gn +++ b/mkfs/BUILD.gn @@ -33,13 +33,9 @@ ohos_executable("mkfs.f2fs") { "//third_party/f2fs-tools/lib", ] - deps = [ - "//third_party/f2fs-tools/lib:libf2fs", - ] + deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - external_deps = [ - "e2fsprogs:libext2_uuid", - ] + external_deps = [ "e2fsprogs:libext2_uuid" ] defines = [ "HAVE_CONFIG_H" ] From 58b79de074b7952a77fcd64c406ada8c65520310 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 07:48:11 +0000 Subject: [PATCH 5/9] update fsck/BUILD.gn. Signed-off-by: tongkai0808fh --- fsck/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index b7ea025..33c0aa3 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -54,7 +54,7 @@ ohos_executable("fsck.f2fs") { deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - external_deps = [ "e2fsprogs:libdacconfig" ] + public_external_deps = [ "e2fsprogs:libdacconfig" ] defines = [ "HAVE_CONFIG_H" ] From 960ed9ac7bbf88d79e87b6e96b68a9bc19fe0ecf Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Mon, 27 May 2024 11:23:15 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9mkfs/BUILD.gn=EF=BC=8C?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E9=83=A8=E4=BB=B6=E4=BE=9D=E8=B5=96external?= =?UTF-8?q?=5Fdeps=E6=94=B9=E6=88=90public=5Fexternal=5Fdeps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- mkfs/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkfs/BUILD.gn b/mkfs/BUILD.gn index 90cc65b..5fc588e 100644 --- a/mkfs/BUILD.gn +++ b/mkfs/BUILD.gn @@ -35,7 +35,7 @@ ohos_executable("mkfs.f2fs") { deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - external_deps = [ "e2fsprogs:libext2_uuid" ] + public_external_deps = [ "e2fsprogs:libext2_uuid" ] defines = [ "HAVE_CONFIG_H" ] From af1c3576a8c14e02119554b9715c21e25c73296b Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 28 May 2024 08:27:49 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9mkfs/BUILD.gn=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E8=93=9D=E5=8C=BAinclude=5Fdirs=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- mkfs/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/mkfs/BUILD.gn b/mkfs/BUILD.gn index 5fc588e..ff5a429 100644 --- a/mkfs/BUILD.gn +++ b/mkfs/BUILD.gn @@ -27,7 +27,6 @@ ohos_executable("mkfs.f2fs") { include_dirs = [ ".", - "//third_party/e2fsprogs/e2fsprogs/lib/uuid", "//third_party/f2fs-tools", "//third_party/f2fs-tools/include", "//third_party/f2fs-tools/lib", From a3fd557bd7b84c3c6d9ede4aae25a424dbe4faaa Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 28 May 2024 08:30:24 +0000 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9fsck/BUILD.gn=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E8=93=9D=E5=8C=BAinclude=5Fdirs=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- fsck/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index 33c0aa3..530cb49 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -49,12 +49,14 @@ ohos_executable("fsck.f2fs") { "//third_party/f2fs-tools", "//third_party/f2fs-tools/include", "//third_party/f2fs-tools/lib", - "//third_party/e2fsprogs/e2fsprogs/contrib/android", ] deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - public_external_deps = [ "e2fsprogs:libdacconfig" ] + public_external_deps = [ + "e2fsprogs:libdacconfig", + "e2fsprogs:e2fsdroid" + ] defines = [ "HAVE_CONFIG_H" ] From 7840acd16eac52fb7906aad74a16301254a48470 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 28 May 2024 20:34:11 +0800 Subject: [PATCH 9/9] =?UTF-8?q?gn=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- fsck/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fsck/BUILD.gn b/fsck/BUILD.gn index 530cb49..4b233f1 100644 --- a/fsck/BUILD.gn +++ b/fsck/BUILD.gn @@ -53,9 +53,9 @@ ohos_executable("fsck.f2fs") { deps = [ "//third_party/f2fs-tools/lib:libf2fs" ] - public_external_deps = [ - "e2fsprogs:libdacconfig", - "e2fsprogs:e2fsdroid" + public_external_deps = [ + "e2fsprogs:e2fsdroid", + "e2fsprogs:libdacconfig", ] defines = [ "HAVE_CONFIG_H" ]