From 91f04d446c089073692ab7269e58f16fd762d9ff Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:06:07 -0400 Subject: [PATCH 1/6] Update main.yml --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index ac64a8165..e7b1de7eb 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,9 +21,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all.deb (25M, 2018-09-07) -# calibre-bin_3.31.0+dfsg-1_armhf.deb (747K, 2018-09-12) -calibre_deb_pin_version: 3.31.0+dfsg-1 +# calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) ...SEE ALSO 706K calibre-bin_3.32.0+dfsg-1+b1_armhf.deb ? +calibre_deb_pin_version: 3.32.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 From 63cae9565dcfb6c160e6694bc54fcd9546ea1d41 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:14:04 -0400 Subject: [PATCH 2/6] Update main.yml --- roles/calibre/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index e7b1de7eb..852a22b88 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -22,8 +22,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) -# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) ...SEE ALSO 706K calibre-bin_3.32.0+dfsg-1+b1_armhf.deb ? +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? calibre_deb_pin_version: 3.32.0+dfsg-1 +calibre-bin_deb_pin_version: 3.32.0+dfsg-1+b1 # 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 a6f5d5876332f1940cde9a476ecc80943c172029 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:14:35 -0400 Subject: [PATCH 3/6] 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 e00b46e0b..a37278f79 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -43,7 +43,7 @@ timeout: "{{ download_timeout }}" with_items: - calibre_{{ calibre_deb_pin_version }}_all.deb - - calibre-bin_{{ calibre_deb_pin_version }}_armhf.deb + - calibre-bin_{{ calibre-bin_deb_pin_version }}_armhf.deb when: is_rpi and internet_available - name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) From c3153e06cc1de66ce0ae9574c3c6db84fddcf55c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:22:42 -0400 Subject: [PATCH 4/6] 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 852a22b88..4035f1860 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -24,7 +24,7 @@ calibre_deb_url: http://download.iiab.io/packages # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) # calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? calibre_deb_pin_version: 3.32.0+dfsg-1 -calibre-bin_deb_pin_version: 3.32.0+dfsg-1+b1 +calibre_bin_deb_pin_version: 3.32.0+dfsg-1+b1 # 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 6b786dcfdb618d2fefb46d29f69c81e7f1acae62 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:23:00 -0400 Subject: [PATCH 5/6] 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 a37278f79..6638bd29a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -43,7 +43,7 @@ timeout: "{{ download_timeout }}" with_items: - calibre_{{ calibre_deb_pin_version }}_all.deb - - calibre-bin_{{ calibre-bin_deb_pin_version }}_armhf.deb + - calibre-bin_{{ calibre_bin_deb_pin_version }}_armhf.deb when: is_rpi and internet_available - name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) From 06e7fcfdccdf7317db86a75efb8ae6ccc3416827 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 8 Oct 2018 20:48:40 -0400 Subject: [PATCH 6/6] Update main.yml --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 4035f1860..7207cf670 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -20,11 +20,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 -# Must contain both packages for the pinned version, formatted as follows: +# Must contain both packages, corresponding with variable value(s) below, for scripts/calibre-install-pinned-rpi.sh to run: # calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) -# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) -> calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) ? +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) WORKS DESPITE BEING 11H EARLIER? FAILS: calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) calibre_deb_pin_version: 3.32.0+dfsg-1 -calibre_bin_deb_pin_version: 3.32.0+dfsg-1+b1 +calibre_bin_deb_pin_version: 3.32.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