From 0d51d94889b5b23f564d6c1df804de1354cee10b Mon Sep 17 00:00:00 2001
From: Alopez <alopez@iri.upc.edu>
Date: Tue, 3 Nov 2020 15:59:12 +0100
Subject: [PATCH] Adapted to Ubuntu 18.04 package generation
---
.gitlab-ci.yml | 9 ++++-----
scripts/debian/postinst | 3 +++
scripts/debian/prerm | 3 +++
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4a83ae..bff7881 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: docker.io/labrobotica/labrobotica
+image: docker.io/labrobotica/labrobotica:latest
stages:
- build
@@ -8,10 +8,9 @@ stages:
build-package:
stage: build
script:
+ - apt update || apt -y install ca-certificates && apt update
# Uncomment to install dependencies
-# - apt update
-# - apt -y iri-<package_name>-dev
- - apt update
+# - apt -y install iri-<package_name>-dev
- apt -y install iri-iriutils-dev
- mkdir -pv build
- cd build
@@ -29,7 +28,7 @@ update_repo:
script:
- cd build
- "scp -i /root/.ssh/iriLabKeyNopwd -r *comm*.deb irilabo@labrepo.iri.upc.edu:packages/"
- - "ssh irilabo@labrepo.iri.upc.edu -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh comm"
+ - "ssh irilabo@labrepo.iri.upc.edu -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh comm $(lsb_release -cs)"
only:
- tags
diff --git a/scripts/debian/postinst b/scripts/debian/postinst
index 193597e..d1b8187 100755
--- a/scripts/debian/postinst
+++ b/scripts/debian/postinst
@@ -34,6 +34,9 @@ case "$1" in
sudo echo " export PATH=\$PATH:\${iri_script_path}" >> $FILE
sudo echo "fi" >> $FILE
echo " Done. It's necessary a log out for changes to take effect."
+
+ echo " Trying to add library to ldconfig..."
+ /usr/share/iri/add_lib_to_ld_config.sh -l comm -p && echo " Done." || echo " /usr/share/iri/add_lib_to_ld_config.sh doesn't exists. Download it from iriutils and execute it."
;;
abort-upgrade)
diff --git a/scripts/debian/prerm b/scripts/debian/prerm
index 0ad26db..b826b88 100644
--- a/scripts/debian/prerm
+++ b/scripts/debian/prerm
@@ -12,6 +12,9 @@ case "$1" in
sudo service udev restart
echo " Done. Need to unplug-plug devices for changes to take effect"
+ echo " Trying to remove library from ldconfig..."
+ /usr/share/iri/remove_lib_from_ld_config.sh -l comm -p && echo " Done." || echo " /usr/share/iri/remove_lib_from_ld_config.sh doesn't exists. Download it from iriutils and execute it."
+
;;
upgrade)
--
GitLab