Skip to content

Commit

Permalink
feat: add patch to fix undefined symbol of liberofsfuse
Browse files Browse the repository at this point in the history
upstream reject export liberofs due to liberofs is unstable and
plan to address this in the future (v1.9)

linglong really need this to support exporting uab,
so add this patch just for now, these patches will be removed
after upstream erofs-utils releaseing v1.9

mail Link: https://lore.kernel.org/all/[email protected]/T/#m262899d58613e1a2cdebd4f83b526a9d2dfdaece

Signed-off-by: ComixHe <[email protected]>
  • Loading branch information
ComixHe authored and Zeno-sole committed Jun 11, 2024
1 parent 431e082 commit 037bc37
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 0 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
erofs-utils (1.7.1-1deepin2) unstable; urgency=medium

* add patch to fix undefined symbol of liberofsfuse

-- ComixHe <[email protected]> Tue, 11 Jun 2024 11:56:29 +0800

erofs-utils (1.7.1-1deepin1) unstable; urgency=medium

* add patch to provide static library 'liberofsfuse.a'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From e4c10b5436d8fc415e0451ded70cf9d77b32a987 Mon Sep 17 00:00:00 2001
From: ComixHe <[email protected]>
Date: Tue, 11 Jun 2024 12:02:30 +0800
Subject: [PATCH] fix: undifined symbols duing linking liberofsfuse

Signed-off-by: ComixHe <[email protected]>
---
fuse/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 5d4d3b1..f4f3a7b 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -10,10 +10,10 @@ erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS}
${libselinux_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS}

if ENABLE_STATIC_FUSE
-lib_LIBRARIES = liberofsfuse.a
-liberofsfuse_a_SOURCES = main.c
-liberofsfuse_a_CFLAGS = -Wall -I$(top_srcdir)/include
-liberofsfuse_a_CFLAGS += -Dmain=erofsfuse_main -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS}
+lib_LTLIBRARIES = liberofsfuse.la
+liberofsfuse_la_SOURCES = main.c
+liberofsfuse_la_CFLAGS = -Wall -I$(top_srcdir)/include
+liberofsfuse_la_CFLAGS += -Dmain=erofsfuse_main -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS}
liberofsfuse_la_LIBADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} \
${libselinux_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libdeflate_LIBS}
endif
--
2.45.2

1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
0001-build-support-building-static-library-liberofsfuse.patch
0002-fix-undifined-symbols-duing-linking-liberofsfuse.patch
3 changes: 3 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ override_dh_auto_install:
dh_auto_install
/bin/bash ./libtool --finish $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/

rm -r $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liberofsfuse.la
rm -r $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liberofsfuse.so*

override_dh_missing:
dh_missing --fail-missing

0 comments on commit 037bc37

Please sign in to comment.