Update koreader; emulate ntpd with ntpdate

This commit is contained in:
Cosmin Gorgovan 2017-04-02 14:29:50 +01:00
parent 5fe9774ed7
commit a9bf918e1e
5 changed files with 9 additions and 11 deletions

View File

@ -139,10 +139,10 @@ compile_koreader() {
chmod +x koreader/restore-wifi-async.sh chmod +x koreader/restore-wifi-async.sh
cp ../../../files/defaults.persistent.lua koreader/ cp ../../../files/defaults.persistent.lua koreader/
# Patch lj-wpaclient to prevent excessive scanning latency
sed "s/if ev.lvl == 'INFO' and ev.msg == 'CTRL-EVENT-SCAN-RESULTS'/if ev.msg == 'CTRL-EVENT-SCAN-RESULTS'/" \ mkdir koreader/bin
./koreader/common/lj-wpaclient/wpaclient.lua > ./koreader/common/lj-wpaclient/wpaclient_patched.lua echo "ntpdate pool.ntp.org" > koreader/bin/ntpd
mv ./koreader/common/lj-wpaclient/wpaclient_patched.lua ./koreader/common/lj-wpaclient/wpaclient.lua chmod +x koreader/bin/ntpd
cd ../../ cd ../../
dpkg-deb -b koreader-pkg . dpkg-deb -b koreader-pkg .

View File

@ -87,7 +87,7 @@ config_rootfs() {
install_packages() { install_packages() {
cp src/linux-okreader-modules_2.6.35.3-1_armhf.deb rootfs/ cp src/linux-okreader-modules_2.6.35.3-1_armhf.deb rootfs/
cp src/firmware-okreader_1.0-2_armhf.deb rootfs/ cp src/firmware-okreader_1.0-2_armhf.deb rootfs/
cp src/koreader_2017.04-2_armhf.deb rootfs/ cp src/koreader_2017.04-3_armhf.deb rootfs/
cp src/kobo_hwconfig/kobo-hwconfig_1.0-1_armhf.deb rootfs/ cp src/kobo_hwconfig/kobo-hwconfig_1.0-1_armhf.deb rootfs/
chroot rootfs/ bash -c "dpkg -i /*.deb" chroot rootfs/ bash -c "dpkg -i /*.deb"
@ -108,15 +108,12 @@ clean_up_rootfs() {
rm -R ./rootfs/usr/share/doc/* rm -R ./rootfs/usr/share/doc/*
rm -R ./rootfs/var/log/* rm -R ./rootfs/var/log/*
# Disable the NTP daemon
chroot rootfs/ bash -c "update-rc.d ntp disable"
echo "Cleanup done." echo "Cleanup done."
} }
build_rootfs() { build_rootfs() {
debootstrap --arch=armhf --variant=minbase \ debootstrap --arch=armhf --variant=minbase \
--include=net-tools,wireless-tools,wpasupplicant,kmod,udev,openssh-server,iputils-ping,ifupdown,vim-tiny,dhcpcd,ntp \ --include=net-tools,wireless-tools,wpasupplicant,kmod,udev,openssh-server,iputils-ping,ifupdown,vim-tiny,dhcpcd,ntpdate \
wheezy ./rootfs http://http.debian.net/debian/ wheezy ./rootfs http://http.debian.net/debian/
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then

View File

@ -4,6 +4,7 @@ echo 0 > /sys/class/leds/pmic_ledsg/brightness
export WIFI_MODULE=brcmfmac export WIFI_MODULE=brcmfmac
PATH=/opt/koreader/bin:$PATH
cd /opt/koreader cd /opt/koreader
while true; do while true; do
./luajit ./reader.lua /mnt ./luajit ./reader.lua /mnt

@ -1 +1 @@
Subproject commit 7cb47d86f5c4a501bc92bd731c8943119ddedfb7 Subproject commit c73a1c1fcf2c83bf44edfad3d06d48199f61f1ff

View File

@ -1,5 +1,5 @@
Package: koreader Package: koreader
Version: 2017.04-2 Version: 2017.04-3
Maintainer: Cosmin Gorgovan <okreader@linux-geek.org> Maintainer: Cosmin Gorgovan <okreader@linux-geek.org>
Architecture: armhf Architecture: armhf
Description: An ebook viewer application. Description: An ebook viewer application.