Skip to contentSkip to conversation

package/f2fs-tools: fix build without blkid

PATCH New Fabrice Fontaine 3 participants 4 messages Sep 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/f2fs-tools: fix build without blkid

Fixes:
- http://autobuild.buildroot.org/results/c126cb419709367479578b6f118ac9f0d6622689

---
 ...-Makefile.am-fix-build-without-blkid.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch new file +30 -0
new file mode 100644
index 0000000000..aac60e70b6
@@ -0,0 +1,30 @@
+From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 22 Sep 2019 10:06:35 +0200
+Subject: [PATCH] mkfs/Makefile.am: fix build without blkid
+
+Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in
+libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid
+option so use ${libblkid_LIBS} instead
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ mkfs/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
+index cae2f93..83e2389 100644
+--- a/mkfs/Makefile.am
++++ b/mkfs/Makefile.am
+@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la
+ libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
+ libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
+ libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
+-libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \
++libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \
+ 	-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
+ 
+ install-exec-hook:
+-- 
+2.23.0
+
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/f2fs-tools: fix build without blkid

Quoted 4 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/c126cb419709367479578b6f118ac9f0d6622689

Applied to master, thanks.

I assume you sent the patch upstream?

Regards,
Arnout

Quoted 42 lines
---
 ...-Makefile.am-fix-build-without-blkid.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch new file +30 -0
new file mode 100644
index 0000000000..aac60e70b6
@@ -0,0 +1,30 @@
+From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 22 Sep 2019 10:06:35 +0200
+Subject: [PATCH] mkfs/Makefile.am: fix build without blkid
+
+Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in
+libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid
+option so use ${libblkid_LIBS} instead
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ mkfs/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
+index cae2f93..83e2389 100644
+--- a/mkfs/Makefile.am
++++ b/mkfs/Makefile.am
+@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la
+ libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
+ libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
+ libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
+-libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \
++libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \
+ 	-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
+ 
+ install-exec-hook:
+-- 
+2.23.0
+
#2 lore raw

PATCH 1/1 package/f2fs-tools: fix build without blkid

Dear Arnout,

Le dim. 22 sept. 2019 ? 20:17, Arnout Vandecappelle <[email protected]> a ?crit :

Quoted 12 lines · Fabrice Fontaine
Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/c126cb419709367479578b6f118ac9f0d6622689

Applied to master, thanks.

I assume you sent the patch upstream?

Nope, I didn't find where to sent it.

Quoted 38 lines

Regards,
Arnout

Quoted 34 lines
---
 ...-Makefile.am-fix-build-without-blkid.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch
package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch new file +23 -0
new file mode 100644
index 0000000000..aac60e70b6
@@ -0,0 +1,30 @@
+From 7727b6fe0897849d4fc8f75a48326e902f0ab8b2 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 22 Sep 2019 10:06:35 +0200
+Subject: [PATCH] mkfs/Makefile.am: fix build without blkid
+
+Commit d56232bc1640e2a3ffc412faff42cd8e77dbb8dd hardcoded -lblkid in
+libf2fs_format_la_LDFLAGS which breaks the build with --without-blkid
+option so use ${libblkid_LIBS} instead
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ mkfs/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
+index cae2f93..83e2389 100644
+--- a/mkfs/Makefile.am
++++ b/mkfs/Makefile.am
+@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libf2fs_format.la
+ libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
+ libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
+ libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
+-libf2fs_format_la_LDFLAGS = -lblkid -luuid -L$(top_builddir)/lib -lf2fs \
Quoted 8 lines

package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch line 30

Quoted 8 lines
package/f2fs-tools/0001-mkfs-Makefile.am-fix-build-without-blkid.patch new file +7 -0
++libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} -luuid -L$(top_builddir)/lib -lf2fs \
+     -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
+
+ install-exec-hook:
+--
+2.23.0
+

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/f2fs-tools: fix build without blkid

Hi Fabrice,

Quoted 6 lines · Fabrice Fontaine

Le dim. 22 sept. 2019 ? 20:17, Arnout Vandecappelle <[email protected]> a ?crit :

Quoted 5 lines · Fabrice Fontaine
Quoted 3 lines

Fixes:
- http://autobuild.buildroot.org/results/c126cb419709367479578b6f118ac9f0d6622689

Quoted 6 lines
Quoted 5 lines
Quoted 1 line

Applied to master, thanks.

I assume you sent the patch upstream?

Nope, I didn't find where to sent it.

Last year I sent a patch to the addresses listed in the F2FS entry of the kernel's MAINTAINERS:

To: Jaegeuk Kim <[email protected]>,
Chao Yu <[email protected]>
Cc: linux-f2fs-devel at lists.sourceforge.net

It was accepted as:

https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=eefe225a566be9a4d9a176672c40df6585267d5f

baruch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -