From 1882c0248f6fc6305fc4a590c9fac812c6dd6025 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Fri, 9 Aug 2019 12:42:49 +0200
Subject: [PATCH] Update debian scripts
---
CMakeLists.txt | 2 +-
scripts/debian/postinst | 10 +++++-----
scripts/debian/prerm | 12 ++++++------
scripts/{load_pcspkr.sh => load_pcspkr} | 0
scripts/unbind_ftdi_udev.sh | 5 +++--
scripts/{undo_load_pcspkr.sh => undo_load_pcspkr} | 0
src/CMakeLists.txt | 4 +---
7 files changed, 16 insertions(+), 17 deletions(-)
rename scripts/{load_pcspkr.sh => load_pcspkr} (100%)
rename scripts/{undo_load_pcspkr.sh => undo_load_pcspkr} (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0212a38..3959af1 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ IF (UNIX)
# Uncomment to add the necessary mantainer scripts
# SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/preinst;${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm;${CMAKE_SOURCE_DIR}/scripts/debian/postrm")
-SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/preinst;${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm;${CMAKE_SOURCE_DIR}/scripts/debian/postrm")
+SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/preinst;${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm;${CMAKE_SOURCE_DIR}/scripts/debian/postrm;${CMAKE_SOURCE_DIR}/scripts/load_pcspkr;${CMAKE_SOURCE_DIR}/scripts/undo_load_pcspkr.sh")
# Uncomment to add dependencies comma separated
# SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-<package_name>-dev (>= 1.0~${DISTRIB})")
diff --git a/scripts/debian/postinst b/scripts/debian/postinst
index 921a467..6c7c6f8 100644
--- a/scripts/debian/postinst
+++ b/scripts/debian/postinst
@@ -2,7 +2,7 @@
set -e
case "$1" in
configure)
- echo "Running postinst script"
+ #echo "Running postinst script"
# TEST
# echo "pkg name $DPKG_MAINTSCRIPT_PACKAGE"
@@ -10,13 +10,13 @@ case "$1" in
# dpkg -L $DPKG_MAINTSCRIPT_PACKAGE
# TEST
- /usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A600eB1Y
- /usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A600eByq
- /usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A900WSG1
+ #/usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A600eB1Y
+ #/usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A600eByq
+ #/usr/share/iri/battery_monitor/scripts/unbind_ftdi_udev.sh -s A900WSG1
# SERIAL DABO: A600eB1Y
# SERIAL TIBI: A600eByq
# SERIAL TEO: A900WSG1
- /usr/share/iri/battery_monitor/scripts/load_pcspkr.sh
+ /var/lib/dpkg/info/iri-battery-monitor-dev.load_pcspkr
;;
abort-upgrade)
diff --git a/scripts/debian/prerm b/scripts/debian/prerm
index 4c61293..4163bc1 100644
--- a/scripts/debian/prerm
+++ b/scripts/debian/prerm
@@ -2,21 +2,21 @@
set -e
case "$1" in
remove)
- echo "Running prerm script"
+ #echo "Running prerm script"
# TEST
# echo "pkg name $DPKG_MAINTSCRIPT_PACKAGE"
# echo "pkg files: dpkg -L <pkg_name>"
# dpkg -L $DPKG_MAINTSCRIPT_PACKAGE
# TEST
- /usr/share/iri/battery_monitor/scripts/undo_unbind_ftdi_udev.sh -s A600eB1Y
- /usr/share/iri/battery_monitor/scripts/undo_unbind_ftdi_udev.sh -s A600eByq
- /usr/share/iri/battery_monitor/scripts/undo_unbind_ftdi_udev.sh -s A900WSG1
+ #/usr/share/iri/undo_unbind_ftdi_udev.sh -s A600eB1Y
+ #/usr/share/iri/undo_unbind_ftdi_udev.sh -s A600eByq
+ #/usr/share/iri/undo_unbind_ftdi_udev.sh -s A900WSG1
# SERIAL DABO: A600eB1Y
# SERIAL TIBI: A600eByq
# SERIAL TEO: A900WSG1
- echo "battery_monitor postrm script: You may want to remove pcspkr from /etc/modules. You can do it by running ./scripts/undo_load_pcspkr.sh"
- #/usr/share/iri/battery_monitor/scripts/undo_load_pcspkr.sh
+ echo "You may want to remove pcspkr from /etc/modules, which was added when this package was installed."
+ #/var/lib/dpkg/info/iri-battery-monitor-dev.load_pcspkr
;;
upgrade)
diff --git a/scripts/load_pcspkr.sh b/scripts/load_pcspkr
similarity index 100%
rename from scripts/load_pcspkr.sh
rename to scripts/load_pcspkr
diff --git a/scripts/unbind_ftdi_udev.sh b/scripts/unbind_ftdi_udev.sh
index a3d6012..fbaaf65 100755
--- a/scripts/unbind_ftdi_udev.sh
+++ b/scripts/unbind_ftdi_udev.sh
@@ -10,7 +10,7 @@ echo "--- unbind_ftdi_udev.sh ---"
VENDOR="0403"
PRODUCT="6001"
SERIAL="A600eB1Y"
-FILE="99-ftdi.rules"
+FILE="99-ftdi-unbind-by-serial.rules"
# SERIAL DABO: A600eB1Y
# SERIAL TIBI: A600eByq
@@ -21,7 +21,7 @@ usage() {
echo " -v specify vendor id. Default 0403"
echo " -p specify product id. Default 6001"
echo " -s specify serial number. Default A600eB1Y"
- echo " -f specify udev file. Default 99-ftdi.rules"
+ echo " -f specify udev file. Default 99-ftdi-unbind-by-serial.rules"
exit 1
}
@@ -38,6 +38,7 @@ done
shift $((OPTIND-1))
+FILE=/etc/udev/rules.d/$FILE
FILE=/etc/udev/rules.d/$FILE
echo " Add udev rule so VENDOR:PRODUCT:SERIAL=${VENDOR}:${PRODUCT}:${SERIAL} devices do not load ftdi_sio driver."
diff --git a/scripts/undo_load_pcspkr.sh b/scripts/undo_load_pcspkr
similarity index 100%
rename from scripts/undo_load_pcspkr.sh
rename to scripts/undo_load_pcspkr
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc4ef31..61386a8 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,10 +29,8 @@ INSTALL(TARGETS battery_monitor
INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
INSTALL(FILES ../Findbattery_monitor.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
INSTALL(FILES ../scripts/unbind_ftdi_udev.sh
- ../scripts/load_pcspkr.sh
../scripts/undo_unbind_ftdi_udev.sh
- ../scripts/undo_load_pcspkr.sh
- DESTINATION share/iri/${PROJECT_NAME}/scripts
+ DESTINATION share/iri
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
ADD_SUBDIRECTORY(examples)
--
GitLab