v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

builder/data/usr/bin/hdmioff

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo /opt/vc/bin/tvservice -o
+sudo /usr/bin/tvservice -o

builder/data/usr/bin/hdmion

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-sudo /opt/vc/bin/tvservice -p
+sudo /usr/bin/tvservice -p

builder/orangepi.yml

@@ -261,20 +261,6 @@
         force: true
       ignore_errors: true
 
-    - name: change hdmioff
-      lineinfile:
-        dest: /usr/bin/hdmioff
-        regexp: '^/opt/vc/'
-        line: "/usr/"
-        state: present
-
-    - name: change hdmion
-      lineinfile:
-        dest: /usr/bin/hdmion
-        regexp: '^/opt/vc/'
-        line: "/usr/"
-        state: present
-
     - name: add HDMI powersave to rc.local
       blockinfile:
         path: /etc/rc.local

builder/raspberrypi32.yml

@@ -230,8 +230,8 @@
     - name: disable sap plugin for bluetooth.service
       lineinfile:
         dest: /lib/systemd/system/bluetooth.service
-        regexp: '^ExecStart=/usr/lib(exec)?/bluetooth/bluetoothd$'
-        line: 'ExecStart=/usr/lib/bluetooth/bluetoothd --noplugin=sap'
+        regexp: '^ExecStart=/usr/libexec/bluetooth/bluetoothd$'
+        line: 'ExecStart=/usr/libexec/bluetooth/bluetoothd --noplugin=sap'
         state: present
 
     - name: configure dphys-swapfile