Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #60262 from kierdavis/ckb-next-0.4.0
ckb-next: 0.3.2 -> 0.4.2
- Loading branch information
Showing
4 changed files
with
31 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,13 @@ | ||
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt | ||
index 09056a7..1bb4595 100644 | ||
index 2fc10a8..22dbd14 100644 | ||
--- a/src/daemon/CMakeLists.txt | ||
+++ b/src/daemon/CMakeLists.txt | ||
@@ -456,7 +456,7 @@ endif () | ||
if (LINUX) | ||
install( | ||
FILES "${CMAKE_SOURCE_DIR}/linux/udev/99-ckb-daemon.rules" | ||
- DESTINATION "/etc/udev/rules.d" | ||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" | ||
PERMISSIONS | ||
OWNER_READ OWNER_WRITE | ||
GROUP_READ | ||
diff --git a/src/libs/ckb-next/CMakeLists.txt b/src/libs/ckb-next/CMakeLists.txt | ||
index ecc591c..35de563 100644 | ||
--- a/src/libs/ckb-next/CMakeLists.txt | ||
+++ b/src/libs/ckb-next/CMakeLists.txt | ||
@@ -75,12 +75,12 @@ if(NOT MACOS) | ||
NAMESPACE | ||
${CMAKE_PROJECT_NAME}:: | ||
DESTINATION | ||
- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") | ||
+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") | ||
|
||
@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") | ||
elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") | ||
install( | ||
FILES | ||
"cmake/${PROJECT_NAME}Config.cmake" | ||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" | ||
DESTINATION | ||
- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") | ||
+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") | ||
endif() | ||
FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" | ||
- DESTINATION "/usr/lib/systemd/system" | ||
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" | ||
PERMISSIONS | ||
OWNER_READ OWNER_WRITE | ||
GROUP_READ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,26 @@ | ||
diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c | ||
index 1cedb07..8e0b24b 100644 | ||
index 8489f5b..b851419 100644 | ||
--- a/src/daemon/input_linux.c | ||
+++ b/src/daemon/input_linux.c | ||
@@ -58,7 +58,7 @@ int os_inputopen(usbdevice* kb){ | ||
/// First check whether the uinput module is loaded by the kernel. | ||
/// | ||
// Load the uinput module (if it's not loaded already) | ||
- if(system("modprobe uinput") != 0) { | ||
+ if(system("@kmod@/bin/modprobe uinput") != 0) { | ||
ckb_fatal("Failed to load uinput module\n"); | ||
return 1; | ||
} | ||
@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){ | ||
|
||
// If not available, load the module | ||
if(fd < 0){ | ||
- if(system("modprobe uinput") != 0) { | ||
+ if(system("@kmod@/bin/modprobe uinput") != 0) { | ||
ckb_fatal("Failed to load uinput module\n"); | ||
return 1; | ||
} | ||
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp | ||
index 3601146..3f2f78f 100644 | ||
index 1eb95bd..f7d38ba 100644 | ||
--- a/src/gui/mainwindow.cpp | ||
+++ b/src/gui/mainwindow.cpp | ||
@@ -251,7 +251,7 @@ void MainWindow::updateVersion(){ | ||
daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices.")); | ||
@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){ | ||
#elif defined(Q_OS_LINUX) | ||
QProcess modprobe; | ||
- modprobe.start("modprobe", QStringList("uinput")); | ||
+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); | ||
if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){ | ||
QProcess modprobe; | ||
- modprobe.start("modprobe", QStringList("uinput")); | ||
+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); | ||
|
||
if(!modprobe.waitForFinished()) | ||
qDebug() << "Modprobe error"; | ||
if(!modprobe.waitForFinished()) | ||
qDebug() << "Modprobe error"; |
This file was deleted.
Oops, something went wrong.