From 450eabf93934739322e5efe42dd258c68188eb38 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 14:27:50 +0000 Subject: [PATCH 01/17] freeze calibre at 3.30 --- roles/calibre/defaults/main.yml | 2 ++ roles/calibre/tasks/debs.yml | 3 ++- roles/calibre/tasks/main.yml | 15 ++++++++++++++- scripts/calibre-install-3.30-rpi.sh | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 scripts/calibre-install-3.30-rpi.sh diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index a89171f8b..5c4d713d2 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,6 +19,8 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" +calibre_deb_url: http://download.iiab.io/packages/ + # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True # Enable unstable .deb's, not just testing .deb's: (moved to /etc/iiab/local_vars.yml & /opt/iiab/iiab/vars/default_vars.yml) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 23504f511..dc5134c4b 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -30,7 +30,8 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) + #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) + command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index ec8b8e62a..85ac51f0d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -12,7 +12,20 @@ with_items: - calibre - calibre-bin - when: internet_available and (not calib_executable.stat.exists) + when: internet_available and not is_rpi and (not calib_executable.stat.exists) + +- name: Download Calibre 3.30 (RPi) + get_url: + url: "{{ calibre_deb_url }}/{{ item }}.deb" + dest: "{{ downloads_dir }}/{{ item }}.deb" + mode: 0755 + force: no + backup: no + timeout: "{{ download_timeout }}" + with_items: + - calibre + - calibre-bin + when: internet_available and is_rpi - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml diff --git a/scripts/calibre-install-3.30-rpi.sh b/scripts/calibre-install-3.30-rpi.sh new file mode 100755 index 000000000..b4387401d --- /dev/null +++ b/scripts/calibre-install-3.30-rpi.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# Might break future updates; you have been warned. +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh + +export DEBIAN_FRONTEND=noninteractive +# Prepares to update to latest from raspbian testing +echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list +apt update +apt -y install /opt/iiab/downloads/calibre*.deb +#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line +rm /etc/apt/sources.list.d/rpi-testing.list +# Clears the cache of rpi/testing +apt update From 0343d3bb0c296fd3166356adcea58b084d95044f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 14:51:49 +0000 Subject: [PATCH 02/17] use full calibre package names --- roles/calibre/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 85ac51f0d..4bcc8939a 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -23,8 +23,8 @@ backup: no timeout: "{{ download_timeout }}" with_items: - - calibre - - calibre-bin + - calibre_3.30.0+dfsg-1_all + - calibre-bin_3.30.0+dfsg-1_armhf when: internet_available and is_rpi - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) From 25cb17584b50aef304df3b801e13c3f47237d83d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 15:05:03 +0000 Subject: [PATCH 03/17] use deb.yml even if calibre exists on RPi --- roles/calibre/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 4bcc8939a..f7cb27caa 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -27,9 +27,13 @@ - calibre-bin_3.30.0+dfsg-1_armhf when: internet_available and is_rpi +- name: Install Calibre 3.30 .debs on RPi + include_tasks: debs.yml + when: calibre_via_debs and is_rpi + - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: calibre_via_debs and (not calib_executable.stat.exists) + when: calibre_via_debs and not is_rpi and (not calib_executable.stat.exists) - name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) include_tasks: py-installer.yml From 975f8e787fa8d7170ab6520a5d55cf8423ab8848 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:04:31 +0000 Subject: [PATCH 04/17] softcode calibre version --- roles/calibre/defaults/main.yml | 3 +++ roles/calibre/tasks/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 5c4d713d2..3c67e310d 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -20,6 +20,9 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" calibre_deb_url: http://download.iiab.io/packages/ +#calibre_3.30.0+dfsg-1_all +#calibre-bin_3.30.0+dfsg-1_armhf +calibre_deb_version: _3.30.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index f7cb27caa..9be822a0e 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -23,8 +23,8 @@ backup: no timeout: "{{ download_timeout }}" with_items: - - calibre_3.30.0+dfsg-1_all - - calibre-bin_3.30.0+dfsg-1_armhf + - calibre{{ calibre_deb_version }}_all + - calibre-bin{{ calibre_deb_version }}_armhf when: internet_available and is_rpi - name: Install Calibre 3.30 .debs on RPi From 86ba6631aa2583868111f0753d9ecbf5c1a0328a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:13:31 +0000 Subject: [PATCH 05/17] update task name --- roles/calibre/tasks/debs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index dc5134c4b..1744c2e21 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -27,10 +27,13 @@ # command: scripts/calibre-install-latest.sh # NECESSARY since Calibre 3.24 (BEWARE installing libc6 will prevent boot in RPi Zero W, i.e. if calibre-install-packages.sh isn't run above!) # when: is_rpi and internet_available -- name: Upgrade to latest Calibre using .deb's from testing (rpi) +#- name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) +# when: is_rpi and internet_available + +- name: Upgrade to Calibre 3.30 while using addional .deb's from testing (rpi) command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available From 58ba19c772431d889e3f39233211d4d7f0e91242 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:20:32 +0000 Subject: [PATCH 06/17] use calibre_deb_version in task name --- roles/calibre/tasks/debs.yml | 2 +- roles/calibre/tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 1744c2e21..b6ea1010b 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to Calibre 3.30 while using addional .deb's from testing (rpi) +- name: Upgrade to Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 9be822a0e..764e87643 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,7 +14,7 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download Calibre 3.30 (RPi) +- name: Download Calibre {{ calibre_deb_version }} (RPi) get_url: url: "{{ calibre_deb_url }}/{{ item }}.deb" dest: "{{ downloads_dir }}/{{ item }}.deb" @@ -27,7 +27,7 @@ - calibre-bin{{ calibre_deb_version }}_armhf when: internet_available and is_rpi -- name: Install Calibre 3.30 .debs on RPi +- name: Install Calibre .debs on RPi include_tasks: debs.yml when: calibre_via_debs and is_rpi From a012b099f0f12d16f23f1777db55dcd6e8d5cf79 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:42:41 +0000 Subject: [PATCH 07/17] use pinned --- roles/calibre/tasks/debs.yml | 4 ++-- roles/calibre/tasks/main.yml | 2 +- ...ibre-install-3.30-rpi.sh => calibre-install-pinned-rpi.sh} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{calibre-install-3.30-rpi.sh => calibre-install-pinned-rpi.sh} (100%) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index b6ea1010b..1f7e844f1 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,8 +33,8 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) - command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 +- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) + command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 764e87643..8b5c97b2a 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,7 +14,7 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download Calibre {{ calibre_deb_version }} (RPi) +- name: Download pinned Calibre {{ calibre_deb_version }} (RPi) get_url: url: "{{ calibre_deb_url }}/{{ item }}.deb" dest: "{{ downloads_dir }}/{{ item }}.deb" diff --git a/scripts/calibre-install-3.30-rpi.sh b/scripts/calibre-install-pinned-rpi.sh similarity index 100% rename from scripts/calibre-install-3.30-rpi.sh rename to scripts/calibre-install-pinned-rpi.sh From 23dd0fccb29202647ac4dec7255dd0dd52d7c066 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:58:37 +0000 Subject: [PATCH 08/17] it typo --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 1f7e844f1..d32674072 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) +- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available From ee9338cdba334136696ec52de36d71214a8589a1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:24:08 -0400 Subject: [PATCH 09/17] Update calibre-install-pinned-rpi.sh --- scripts/calibre-install-pinned-rpi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/calibre-install-pinned-rpi.sh b/scripts/calibre-install-pinned-rpi.sh index b4387401d..c0dc408a5 100755 --- a/scripts/calibre-install-pinned-rpi.sh +++ b/scripts/calibre-install-pinned-rpi.sh @@ -10,6 +10,7 @@ export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from raspbian testing echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update +# @jvonau explains that stale .deb's should be avoided as: "apt will pick the highest version to install after churning a bit..." apt -y install /opt/iiab/downloads/calibre*.deb #sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line rm /etc/apt/sources.list.d/rpi-testing.list From c0526a74e0e9edce327c220a337c30a489abae8d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:26:19 -0400 Subject: [PATCH 10/17] Update debs.yml --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index d32674072..2d9b3a0e5 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -34,7 +34,7 @@ # when: is_rpi and internet_available - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) - command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 + command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) From 10dfd0021e5576db47ecbd40c7ec570dd3de48cc Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:27:45 -0400 Subject: [PATCH 11/17] Update debs.yml --- roles/calibre/tasks/debs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 2d9b3a0e5..98dbebbc6 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -28,9 +28,9 @@ # when: is_rpi and internet_available #- name: Upgrade to latest Calibre using .deb's from testing (rpi) - #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh - #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) +# #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh +# #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x +# command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) From 3248ab0bfa07facedec99b62729d2072c3190647 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:30:07 -0400 Subject: [PATCH 12/17] Update main.yml --- roles/calibre/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 3c67e310d..6a068d101 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -22,7 +22,7 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages/ #calibre_3.30.0+dfsg-1_all #calibre-bin_3.30.0+dfsg-1_armhf -calibre_deb_version: _3.30.0+dfsg-1 +calibre_deb_version: 3.30.0 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 74310e73f2295a98e1cb7bd99c8dfcc70429124c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:14:15 -0400 Subject: [PATCH 13/17] Update main.yml --- roles/calibre/tasks/main.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 8b5c97b2a..f2adfef0d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,26 +14,9 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download pinned Calibre {{ calibre_deb_version }} (RPi) - get_url: - url: "{{ calibre_deb_url }}/{{ item }}.deb" - dest: "{{ downloads_dir }}/{{ item }}.deb" - mode: 0755 - force: no - backup: no - timeout: "{{ download_timeout }}" - with_items: - - calibre{{ calibre_deb_version }}_all - - calibre-bin{{ calibre_deb_version }}_armhf - when: internet_available and is_rpi - -- name: Install Calibre .debs on RPi +- name: Install Calibre .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: calibre_via_debs and is_rpi - -- name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) - include_tasks: debs.yml - when: calibre_via_debs and not is_rpi and (not calib_executable.stat.exists) + when: calibre_via_debs and (not calib_executable.stat.exists) - name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) include_tasks: py-installer.yml From f09ed0c0ecc2b38a7ddcced23b135f974a5f5cbe Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:16:46 -0400 Subject: [PATCH 14/17] Update debs.yml --- roles/calibre/tasks/debs.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 98dbebbc6..4bc895b84 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,6 +33,19 @@ # command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available +- name: Download PINNED version {{ calibre_deb_version }} of calibre & calibre-bin (rpi) + get_url: + url: "{{ calibre_deb_url }}/{{ item }}" + dest: "{{ downloads_dir }}/{{ item }}" + mode: 0644 + #force: no + #backup: no + timeout: "{{ download_timeout }}" + with_items: + - calibre_{{ calibre_deb_version }}+dfsg-1_all.deb + - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb + when: is_rpi and internet_available + - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available From 4126ad71724be12b2d0b305f2896bd570bef3d3b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:52:24 -0400 Subject: [PATCH 15/17] Update debs.yml --- roles/calibre/tasks/debs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 4bc895b84..ed55c4c7a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -46,14 +46,14 @@ - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb when: is_rpi and internet_available -- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) +- name: Install/Upgrade both, to PINNED version {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available -- name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) +- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) command: scripts/calibre-install-latest.sh when: not is_rpi and not is_ubuntu_18 and internet_available -- name: Upgrade to Calibre unstable .deb's IF calibre_unstable_debs +- name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs command: scripts/calibre-install-unstable.sh when: calibre_unstable_debs and internet_available From f8d422e0680beb6ad41ed14adf0403b627bc330a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:03:37 -0400 Subject: [PATCH 16/17] Update main.yml --- roles/calibre/defaults/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 6a068d101..effe32dc4 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,10 +19,11 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" -calibre_deb_url: http://download.iiab.io/packages/ -#calibre_3.30.0+dfsg-1_all -#calibre-bin_3.30.0+dfsg-1_armhf -calibre_deb_version: 3.30.0 +calibre_deb_url: http://download.iiab.io/packages +# Must contain both packages for the pinned version, formatted as follows: +# calibre_3.30.0+dfsg-1_all (25M, 2018-08-24) +# calibre-bin_3.30.0+dfsg-1_armhf (742K, 2018-08-30) +calibre_deb_pin_version: 3.30.0 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 9ca970041be5f0bef4a075ec6c45854f70cf7e8e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:04:35 -0400 Subject: [PATCH 17/17] Update debs.yml --- roles/calibre/tasks/debs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index ed55c4c7a..612404a2a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ # command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Download PINNED version {{ calibre_deb_version }} of calibre & calibre-bin (rpi) +- name: Download PINNED version {{ calibre_deb_pin_version }} of calibre & calibre-bin (rpi) get_url: url: "{{ calibre_deb_url }}/{{ item }}" dest: "{{ downloads_dir }}/{{ item }}" @@ -42,11 +42,11 @@ #backup: no timeout: "{{ download_timeout }}" with_items: - - calibre_{{ calibre_deb_version }}+dfsg-1_all.deb - - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb + - calibre_{{ calibre_deb_pin_version }}+dfsg-1_all.deb + - calibre-bin_{{ calibre_deb_pin_version }}+dfsg-1_armhf.deb when: is_rpi and internet_available -- name: Install/Upgrade both, to PINNED version {{ calibre_deb_version }} while using additional .deb's from testing (rpi) +- name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available