Merge pull request #115 from EmixamPP/systemd

Fix systemd hanging in some case

Author: EmixamPP

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
         id: setup
         run: |
           meson setup build --pkg-config-path opencv-4.7.0/lib64/pkgconfig
+          meson configure build -Dlibdir=lib64 
       
       - name: Compile
         run: |

.github/workflows/pr-comment.yml

@@ -20,43 +20,28 @@ jobs:
           OWNER: ${{ github.repository_owner }}
           REPO: ${{ github.event.repository.name }}
         run: |
-          PREVIOUS_JOB_ID=$(jq -r '.id' <<< "$WORKFLOW_RUN_EVENT_OBJ")
-          echo "Previous Job ID: $PREVIOUS_JOB_ID"
-          echo "PREVIOUS_JOB_ID=$PREVIOUS_JOB_ID" >> "$GITHUB_ENV"
+          PR_NUMBER=$(jq -r '.pull_requests[0].number' <<< "$WORKFLOW_RUN_EVENT_OBJ")         
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
           
+          HEAD_SHA=$(jq -r '.pull_requests[0].head.sha' <<< "$WORKFLOW_RUN_EVENT_OBJ")        
+          echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_ENV"
+
           SUITE_ID=$(jq -r '.check_suite_id' <<< "$WORKFLOW_RUN_EVENT_OBJ")
-          echo "Previous Suite ID: $SUITE_ID"
           echo "SUITE_ID=$SUITE_ID" >> "$GITHUB_ENV"
-          
-          ARTIFACT_ID=$(gh api "/repos/$OWNER/$REPO/actions/artifacts" \
+
+          PREVIOUS_JOB_ID=$(jq -r '.id' <<< "$WORKFLOW_RUN_EVENT_OBJ")
+          echo "PREVIOUS_JOB_ID=$PREVIOUS_JOB_ID" >> "$GITHUB_ENV"
+
+          ARTIFACT=$(gh api "/repos/$OWNER/$REPO/actions/artifacts" \
             --jq ".artifacts.[] |
             select(.workflow_run.id==${PREVIOUS_JOB_ID}) |
-            select(.expired==false) |
-            .id")
-          
-          echo "Artifact ID: $ARTIFACT_ID"
+            select(.expired==false)")
+
+          ARTIFACT_ID=$(jq -r '.id' <<< ${ARTIFACT})
           echo "ARTIFACT_ID=$ARTIFACT_ID" >> "$GITHUB_ENV"
           
-          ARTIFACT_EXPIRE_DATE=$(gh api "/repos/$OWNER/$REPO/actions/artifacts" \
-            --jq ".artifacts.[] |
-            select(.workflow_run.id==${PREVIOUS_JOB_ID}) |
-            select(.expired==false) |
-            .expires_at")
-          
-          echo "Artifact Expire Date: $ARTIFACT_EXPIRE_DATE"
+          ARTIFACT_EXPIRE_DATE=$(jq -r '.expires_at' <<< ${ARTIFACT})
           echo "ARTIFACT_EXPIRE_DATE=$ARTIFACT_EXPIRE_DATE" >> "$GITHUB_ENV"
-          
-          PR_NUMBER=$(jq -r '.pull_requests[0].number' \
-            <<< "$WORKFLOW_RUN_EVENT_OBJ")
-          
-          echo "Pull request Number: $PR_NUMBER"
-          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
-          
-          HEAD_SHA=$(jq -r '.pull_requests[0].head.sha' \
-            <<< "$WORKFLOW_RUN_EVENT_OBJ")
-          
-          echo "Head SHA: $HEAD_SHA"
-          echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_ENV"
 
       - name: Find comment
         uses: peter-evans/find-comment@v2

README.md

@@ -18,7 +18,7 @@ It can be uninstalled by executing:
 ```
 sudo rm -rf /usr/lib64/linux-enable-ir-emitter \
 /etc/linux-enable-ir-emitter \
-/usr/bin/liblinux-enable-ir-emitter \
+/usr/libexec/linux-enable-ir-emitter \
 /usr/bin/linux-enable-ir-emitter \
 /usr/lib/systemd/system/linux-enable-ir-emitter.service \
 /etc/udev/rules.d/99-linux-enable-ir-emitter.rules \

meson.build

@@ -16,7 +16,7 @@ opencv_dep = dependency('opencv4', static: true)
 ################
 # Lib executable
 ################
-lib_bin_dir = get_option('bindir')  / 'lib' + meson.project_name()
+lib_exec_dir = get_option('libexecdir')  / meson.project_name()
 
 executable(
     'driver-generator', 
@@ -27,7 +27,7 @@ executable(
     'sources/driver/finder.cpp',
     dependencies: opencv_dep,
     install: true,
-    install_dir: lib_bin_dir,
+    install_dir: lib_exec_dir,
 )
 
 executable(
@@ -38,7 +38,7 @@ executable(
     'sources/driver/driver.cpp',
     dependencies: opencv_dep,
     install: true,
-    install_dir: lib_bin_dir,
+    install_dir: lib_exec_dir,
 )
 
 #####
@@ -60,8 +60,8 @@ boot_service = get_option('boot_service')
 
 configure_paths_data = configuration_data({
     'SAVE_DRIVER_FOLDER_PATH': get_option('sysconfdir') / meson.project_name(),
-    'BIN_EXECUTE_DRIVER_PATH': '/usr' / lib_bin_dir / 'execute-driver',
-    'BIN_DRIVER_GENERATOR_PATH': '/usr' / lib_bin_dir / 'driver-generator',
+    'BIN_EXECUTE_DRIVER_PATH': '/usr' / lib_exec_dir / 'execute-driver',
+    'BIN_DRIVER_GENERATOR_PATH': '/usr' / lib_exec_dir / 'driver-generator',
     'UDEV_RULE_PATH': '/etc/udev/rules.d/99-linux-enable-ir-emitter.rules',
     'BOOT_SERVICE_MANAGER': boot_service,
 })

sources/boot_service/systemd/linux-enable-ir-emitter.service

@@ -1,11 +1,11 @@
 [Unit]
 Description = enable the infrared emitter
-After = multi-user.target suspend.target hybrid-sleep.target hibernate.target suspend-then-hibernate.target
+After = suspend.target sleep.target hybrid-sleep.target hibernate.target suspend-then-hibernate.target
 
 [Service]
 Type = oneshot
 ExecStartPre = /sbin/modprobe uvcvideo
 ExecStart = /usr/bin/linux-enable-ir-emitter run
 
 [Install]
-WantedBy = multi-user.target suspend.target hybrid-sleep.target hibernate.target suspend-then-hibernate.target
+WantedBy = multi-user.target suspend.target sleep.target hybrid-sleep.target hibernate.target suspend-then-hibernate.target