rm2fb: Rename package to rm2display

timower · Nov 26, 2023 · e915fcb · e915fcb
1 parent a383c22
commit e915fcb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/cmake/CPackOptions.cmake.in b/cmake/CPackOptions.cmake.in
@@ -17,10 +17,11 @@ set(CPACK_DEBIAN_ARCHIVE_TYPE "gnutar")
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "rmall")
 
 # rm2fb stuff
-set(CPACK_DEBIAN_RM2FB_PACKAGE_DEPENDS "xochitl")
-set(CPACK_DEBIAN_RM2FB_PACKAGE_PROVIDES "display, rm2fb-client")
-set(CPACK_DEBIAN_RM2FB_PACKAGE_CONFLICTS "display, rm2fb-client, rm2fb")
-set(CPACK_DEBIAN_RM2FB_PACKAGE_REPLACES "display, rm2fb-client, rm2fb")
+# TODO: Xochitl fails to install on 3.5 :(
+# set(CPACK_DEBIAN_RM2DISPLAY_PACKAGE_DEPENDS "xochitl")
+set(CPACK_DEBIAN_RM2DISPLAY_PACKAGE_PROVIDES "display, rm2fb-client")
+set(CPACK_DEBIAN_RM2DISPLAY_PACKAGE_CONFLICTS "display, rm2fb-client, rm2fb")
+set(CPACK_DEBIAN_RM2DISPLAY_PACKAGE_REPLACES "display, rm2fb-client, rm2fb")
 
 # yaft2 and yaft term files conflict.
 set(CPACK_DEBIAN_YAFT2_PACKAGE_REPLACES "yaft")

diff --git a/libs/rm2fb/CMakeLists.txt b/libs/rm2fb/CMakeLists.txt
@@ -56,10 +56,18 @@ set_target_properties(rm2fb_client PROPERTIES
 add_custom_target(rm2fb DEPENDS rm2fb_client rm2fb_server)
 
 install(TARGETS rm2fb_client rm2fb_server
-  COMPONENT rm2fb
+  COMPONENT rm2display
   DESTINATION opt/lib)
+
+# Make a symlink in /usr/lib to librm2fb_client.so.1
+execute_process(
+  COMMAND ln -s /opt/lib/librm2fb_client.so.1 "${CMAKE_BINARY_DIR}/librm2fb_client.so.1")
+install(FILES "${CMAKE_BINARY_DIR}/librm2fb_client.so.1"
+  DESTINATION usr/lib
+  COMPONENT rm2display)
+
 install(FILES rm2fb.service
-  COMPONENT rm2fb
+  COMPONENT rm2display
   DESTINATION lib/systemd/system)
 
 add_deploy(rm2fb_client)

diff --git a/test/integration/test.sh b/test/integration/test.sh
@@ -61,8 +61,10 @@ scp -P 2222 "$IPKS_PATH"/*.ipk root@localhost:
 do_ssh systemctl restart systemd-timesyncd
 do_ssh opkg update
 
-# Xochitl fails to install on 3.5 :(
-do_ssh opkg install ./*.ipk || true
+do_ssh opkg install ./*.ipk
+
+do_ssh opkg install xochitl || true # TODO: xochitl doesn't configure for 3.5+
+
 do_ssh systemctl daemon-reload
 
 do_ssh systemctl start rm2fb