external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #848 from holta/calibre-revert-pr833+pr839

Browse source 
Calibre 3.26.0 permits revert of PR833 & PR839
This commit is contained in:
A Holt 2018-06-21 02:38:01 -04:00 committed by GitHub
commit edbeee465e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
roles/calibre/tasks/debs.yml
View file

@ -18,13 +18,17 @@
# If you want the latest Calibre, run the appropriate below script, standalone.
# HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!)
- name: Install packages that Raspbian .deb's had installed for Calibre 3.23 (rpi)
#command: scripts/calibre-install-latest-rpi.sh # FAILS with Calibre 3.24+ ("calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed") since June 2018.
command: scripts/calibre-install-packages.sh # BORROWED package list from /var/log/apt/history.log (that resulted from 2018-05-22 install of Calibre 3.23 using calibre-install-latest-rpi.sh).
when: is_rpi and internet_available
#- name: Install packages that Raspbian .deb's had installed for Calibre 3.23 (rpi)
# #command: scripts/calibre-install-latest-rpi.sh # FAILS with Calibre 3.24+ ("calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed") since June 2018.
# command: scripts/calibre-install-packages.sh # BORROWED package list from /var/log/apt/history.log (that resulted from 2018-05-22 install of Calibre 3.23 using calibre-install-latest-rpi.sh).
# when: is_rpi and internet_available
- name: Upgrade to latest Calibre using Debian's own .deb's from testing (rpi)
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!)
#- name: Upgrade to latest Calibre using Debian's own .deb's from testing (rpi)
# 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)
command: scripts/calibre-install-latest-rpi.sh # SEEMS TO ONCE AGAIN WORK since Calibre 3.26.0 (Calibre 3.24-3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in 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)

29
scripts/calibre-install-packages.sh
View file

@ -3,29 +3,36 @@
# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical
# breakthrough possible!
#
# Caveat: calibre-install-latest-rpi.sh worked up to Calibre 3.23 in May 2018,
# but fails to "apt install" Calibre 3.24+ in June 2018:
# CLARIF: this entire file (calibre-install-packages.sh) is hopefully no
# longer necessary after June 21, 2018.
#
# CONTEXT: calibre-install-latest-rpi.sh worked up to Calibre 3.23 in May 2018
# -- and once again began working when Calibre 3.26.0 .debs became available
# from http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ on June
# 20, 2018 -- but had failed (#831) to "apt install" Calibre 3.24.x and 3.25
# during early and mid-June 2018, with error message:
#
# The following packages have unmet dependencies:
# calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed
# E: Unable to correct problems, you have held broken packages.
# So the new recipe (2018-06-18) for RPi is:
# In the interim (June 18-21, 2018) the following 3-step recipe for RPi was
# briefly used: (to permit microSD's that were at least interoperable between
# RPi 3 / 3 B+ & Zero W, even if Calibre did not run in Zero W)
#
# 1. "apt install calibre calibre-bin" (2.75.1, part of Raspbian OS)
# 1. "apt install calibre calibre-bin" (both 2.75.1, part of Raspbian OS)
#
# 2. calibre-install-packages.sh installs those packages that
# calibre-install-latest-rpi.sh used to install for Calibre 3.23:
# calibre-install-latest-rpi.sh had used to install for Calibre 3.23:
#
# https://github.com/iiab/iiab/pull/839
# https://github.com/iiab/iiab/pull/839
#
# 3. calibre-install-latest.sh installs Debian's own calibre & calibre-bin etc:
#
# https://github.com/iiab/iiab/pull/833 # WORKED ON RPI 3 AND RPI 3 B+
# https://github.com/iiab/iiab/issues/835 # FAILED ON RPI ZERO W, DUE TO INSTALLING libc6 (IF ABOVE STEP 2 NOT RUN!)
# https://github.com/iiab/iiab/pull/833 # WORKED ON RPI 3 AND RPI 3 B+ BUT...
# https://github.com/iiab/iiab/issues/835 # FAILED ON RPI ZERO W, possibly due to libc6 (IF ABOVE STEP 2 NOT RUN!)
# FYI Calibre 3.25 (and early signs of 3.26) are the latest available from
# testing as of 2018-06-18:
# FYI Calibre 3.26.0 is the latest available from testing as of 2018-06-21:
#
# http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/
# http://archive.raspbian.org/raspbian/pool/main/c/calibre/
@ -38,7 +45,7 @@ export DEBIAN_FRONTEND=noninteractive
# Prepares to update to latest from testing
echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list
apt update
# Packages below cribbed from Calibre 3.23 installation as recorded in /var/log/apt/history.log*
# Packages below cribbed from Calibre 3.23 installation on 2018-05-22, as recorded in /var/log/apt/history.log*
apt -y install libegl1 libegl-mesa0 libqt5sensors5 libbrotli1 libwoff1 libpodofo0.9.5 libjs-coffeescript python-regex libhyphen0 libqt5webchannel5 python-msgpack python-html5-parser libqt5positioning5 libpcre2-16-0 libglvnd0 libdrm-common python-sip libqt5svg5 libnih-dbus1 qt5-gtk-platformtheme libc6-dbg libqt5help5 libc6-dev libqt5dbus5 libqt5sql5-sqlite libc6 libqt5widgets5 locales libegl1-mesa python-pyqt5.qtsvg python-lxml fontconfig-config libqt5xml5 libgbm1 libqt5printsupport5 libqt5qml5 libc-l10n libqt5gui5 libc-bin libnih1 libqt5webkit5 python-pyqt5.qtwebkit libdrm2 libqt5core5a libfontconfig1 libqt5opengl5 libc-dev-bin python-pyqt5 libqt5network5 libqt5designer5 libqt5quick5 libqt5sql5
# BUT DO NOT DO "apt -y install calibre calibre-bin" UNTIL calibre-install-latest.sh
# Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list