Skip to content

Commit b51500d

Browse files
authored
Only build static library (#6)
Signed-off-by: Jeff Olivier <jeffolivier@google.com>
1 parent 1afbef2 commit b51500d

7 files changed

Lines changed: 22 additions & 24 deletions

File tree

debian/changelog

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
fused (1.0.0-1) unstable; urgency=medium
1+
fused (1.0.0-2) unstable; urgency=medium
2+
[ Jeff Olivier ]
3+
* Change to static only
4+
5+
-- Jeff Olivier <jeffolivier@google.com> Sat, 11 Jan 2025 08:09:00 +0000
26

7+
8+
fused (1.0.0-1) unstable; urgency=medium
39
[ Jeff Olivier ]
410
* Initial version
511

debian/control

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,8 @@ Homepage: https://daos.io
1010
Vcs-Browser: https://github.com/daos-stack/fused.git
1111
Vcs-Git: https://github.com/daos-stack/fused.git
1212

13-
Package: libfused
14-
Section: libdevel
15-
Architecture: any
16-
Multi-Arch: same
17-
Description: Runtime binaries for DAOS FUSE library
18-
1913
Package: libfused-dev
2014
Section: libdevel
2115
Architecture: any
2216
Multi-Arch: same
23-
Description: Development binaries and headers for DAOS FUSE library
24-
Depends: libfused
17+
Description: Headers and static library for DAOS FUSE library

debian/libfused-dev.install

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
usr/include
2-
usr/lib/*/pkgconfig
3-
usr/lib/*/*.so
2+
usr/lib

debian/libfused.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ override_dh_auto_clean:
1616
dh_auto_clean
1717

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

2222
override_dh_missing:
@@ -26,4 +26,4 @@ override_dh_missing:
2626
dh ${@} --buildsystem=meson
2727

2828
.PHONY: override_dh_auto_clean override_dh_auto_configure \
29-
override_dh_missing override_dh_auto_test
29+
override_dh_missing override_dh_auto_test override_dh_install

fused.rpmlintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This line is mandatory to access the configuration functions
22
from Config import *
33

4-
addFilter('fused.x86_64: W: no-documentation')
4+
addFilter('fused-devel.x86_64: E: static-library-without-debuginfo /usr/lib64/libfused.a')
55
addFilter('fused-devel.x86_64: W: no-documentation')
66
# https://github.com/rpm-software-management/rpmlint/issues/856
77
addFilter('W: incoherent-version-in-changelog')

fused.spec

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: fused
22
Version: 1.0.0
3-
Release: 1%{?relval}%{?dist}
3+
Release: 2%{?relval}%{?dist}
44
Summary: DAOS File System in Userspace Library
55

66
License: LGPLv2+
@@ -17,37 +17,38 @@ This package builds on FUSE but implements a completely custom file
1717
system intended for use with the DAOS file system.
1818

1919
%package devel
20-
Summary: DAOS File System in Userspace based on (FUSE) v3 libraries and headers
20+
Summary: DAOS file system development files
2121
Group: System Environment/Libraries
2222
License: LGPLv2+
2323
Conflicts: filesystem < 3
2424
Requires: %{name}%{?_isa} = %{version}-%{release}
2525

26-
%description devel
27-
Provides a user space library and headers for DAOS specific FUSE filesystem
2826

2927
%global debug_package %{nil}
3028

29+
%description devel
30+
Static library, pkgconfig, and headers for DAOS FUSE library
31+
3132
%prep
3233
%autosetup
3334

3435
%build
35-
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library shared
36+
%meson --strip -Ddisable-mtab=True -Dutils=False --default-library static
3637
%meson_build
3738

3839
%install
3940
export MESON_INSTALL_DESTDIR_PREFIX=%{buildroot}/usr %meson_install
4041
find %{buildroot} .
4142
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
4243

43-
%files
44-
%{_libdir}/libfused.so.*
45-
4644
%files devel
47-
%{_libdir}/libfused.so
45+
%{_libdir}/libfused.a
4846
%{_includedir}/fused/
4947
%{_libdir}/pkgconfig
5048

5149
%changelog
50+
* Sat Jan 11 2025 Jeff Olivier <jeffolivier@google.com> - 1.0.0-2.0
51+
- Only build static lib
52+
5253
* Mon Feb 12 2024 Jeff Olivier <jeffolivier@google.com> - 1.0.0-1.0
5354
- Initial packaging for fused, a DAOS file system adaptation of libfused

0 commit comments

Comments
 (0)