Skip to content

Commit

Permalink
Only build static library
Browse files Browse the repository at this point in the history
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
  • Loading branch information
jolivier23 committed Jan 11, 2025
1 parent 1afbef2 commit 53e990f
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 32 deletions.
8 changes: 7 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
fused (1.0.0-1) unstable; urgency=medium
fused (1.0.0-2) unstable; urgency=medium
[ Jeff Olivier ]
* Change to static only

-- Jeff Olivier <jeffolivier@google.com> Sat, 11 Jan 2025 08:09:00 +0000


fused (1.0.0-1) unstable; urgency=medium
[ Jeff Olivier ]
* Initial version

Expand Down
9 changes: 1 addition & 8 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,4 @@ Package: libfused
Section: libdevel
Architecture: any
Multi-Arch: same
Description: Runtime binaries for DAOS FUSE library

Package: libfused-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Description: Development binaries and headers for DAOS FUSE library
Depends: libfused
Description: Headers and static library for DAOS FUSE library
3 changes: 0 additions & 3 deletions debian/libfused-dev.install

This file was deleted.

4 changes: 3 additions & 1 deletion debian/libfused.install
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
usr/lib/*/*.so.*
usr/include
usr/lib/*/pkgconfig
usr/lib/*/libfused.a
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ override_dh_auto_clean:
dh_auto_clean

override_dh_auto_configure:
dh_auto_configure -- -Ddisable-mtab=True -Dutils=False --default-library shared \
dh_auto_configure -- -Ddisable-mtab=True -Dutils=False --default-library static \
--libdir=/usr/lib/${DEB_BUILD_MULTIARCH} --prefix=/usr

override_dh_missing:
Expand Down
26 changes: 8 additions & 18 deletions fused.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: fused
Version: 1.0.0
Release: 1%{?relval}%{?dist}
Release: 2%{?relval}%{?dist}
Summary: DAOS File System in Userspace Library

License: LGPLv2+
Expand All @@ -12,27 +12,17 @@ Conflicts: filesystem < 3
BuildRequires: libselinux-devel
BuildRequires: meson, gcc-c++, gcc

%global debug_package %{nil}

%description
This package builds on FUSE but implements a completely custom file
system intended for use with the DAOS file system.

%package devel
Summary: DAOS File System in Userspace based on (FUSE) v3 libraries and headers
Group: System Environment/Libraries
License: LGPLv2+
Conflicts: filesystem < 3
Requires: %{name}%{?_isa} = %{version}-%{release}

%description devel
Provides a user space library and headers for DAOS specific FUSE filesystem

%global debug_package %{nil}

%prep
%autosetup

%build
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library shared
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library static
%meson_build

%install
Expand All @@ -41,13 +31,13 @@ find %{buildroot} .
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'

%files
%{_libdir}/libfused.so.*

%files devel
%{_libdir}/libfused.so
%{_libdir}/libfused.a
%{_includedir}/fused/
%{_libdir}/pkgconfig

%changelog
* Sat Jan 11 2025 Jeff Olivier <jeffolivier@google.com> - 1.0.0-2.0
- Only build static lib

* Mon Feb 12 2024 Jeff Olivier <jeffolivier@google.com> - 1.0.0-1.0
- Initial packaging for fused, a DAOS file system adaptation of libfused

0 comments on commit 53e990f

Please sign in to comment.