Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reinstall libtcmu API and header files #444

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Reinstall libtcmu API and header files #444

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8b26c4
Revert "build: drop versionless libtcmu.so symlink"
Jul 14, 2018
d5fec27
Revert "libtcmu: do not install headers and drop libtcmu stable API"
Jul 14, 2018
b1db372
libtcmu: explicitly include tcmu-runner.h where necessary
Jul 14, 2018
1f925d0
libtcmu_priv.h: drop unnecessary header files
Jul 14, 2018
96d0625
CMakeList.txt: install more header files for dependence of libtcmu
Jul 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ target_link_libraries(tcmu
${LIBNL_GENL_LIB}
${GLIB_LIBRARIES}
)
install(TARGETS tcmu LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP)
install(TARGETS tcmu LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

# Stuff for building the static library
add_library(tcmu_static
Expand Down Expand Up @@ -272,6 +272,8 @@ configure_file (
)
install(SCRIPT tcmu.conf_install.cmake)

install(FILES libtcmu.h libtcmu_common.h tcmu-runner.h
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't the final new lib have a new header name so it does not conflict with users of the old libtcmu?

Also wether the final lib needs something like tcmu-runner.h is still up in the air.

DESTINATION include)
install(FILES org.kernel.TCMUService1.service
DESTINATION /usr/share/dbus-1/system-services)
install(FILES tcmu-runner.conf DESTINATION /etc/dbus-1/system.d)
Expand Down
1 change: 1 addition & 0 deletions alua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "libtcmu_log.h"
#include "libtcmu_common.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch seems ok.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

#include "libtcmu_priv.h"
#include "tcmu-runner.h"
#include "tcmur_device.h"
#include "target.h"
#include "alua.h"
Expand Down
1 change: 1 addition & 0 deletions api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "libtcmu_log.h"
#include "libtcmu_common.h"
#include "libtcmu_priv.h"
#include "tcmu-runner.h"
#include "target.h"
#include "alua.h"
#include "be_byteshift.h"
Expand Down
1 change: 1 addition & 0 deletions libtcmu_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "libtcmu_config.h"
#include "libtcmu_time.h"
#include "libtcmu_priv.h"
#include "tcmu-runner.h"
#include "string_priv.h"

/* tcmu ring buffer for log */
Expand Down
4 changes: 0 additions & 4 deletions libtcmu_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
#include <gio/gio.h>
#include <pthread.h>

#include "scsi_defs.h"
#include "darray.h"
#include "ccan/list/list.h"
#include "tcmur_aio.h"
#include "tcmu-runner.h"

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch is fine.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

#define KERN_IFACE_VER 2

Expand Down