Commit ced8e8ed authored by rgaudin's avatar rgaudin
Browse files

Fixed #233: rebranded as Kiwix Hotspot

parent 8930d4ea
......@@ -7,8 +7,8 @@ launch.sh
.cache
.pytest_cache
$HOME
pibox-installer-vexpress-boot.zip
pibox-installer-vexpress-boot
vexpress-boot.zip
vexpress-boot
pygi-aio-setup.exe
pygi-aio-setup
qemu-*
......
......@@ -19,8 +19,8 @@ build-pibox-image:
LANG: 'en_US.UTF-8'
script:
# download custom kernel
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
- wget http://download.kiwix.org/dev/vexpress-boot.zip
- unzip vexpress-boot.zip
# download a static qemu
- wget http://download.kiwix.org/dev/qemu-2.12.0-linux-x86_64.tar.gz
......@@ -32,12 +32,12 @@ build-pibox-image:
# Install and run pyinstaller
- pip3 install https://github.com/thiolliere/pyinstaller/archive/develop.zip
- pyinstaller --log-level=DEBUG pibox-installer-linux.spec
- cat build/pibox-installer-linux/warnpibox-installer-linux.txt
- pyinstaller --log-level=DEBUG kiwix-hotspot-linux.spec
- cat build/kiwix-hotspot-linux/warnkiwix-hotspot-linux.txt
# start image builder
- eval "export OUT_IMG=plug-master_$(date +"%Y-%m-%d").img"
- dist/kiwix-plug_installer image --ram 8G --root 7 --size 8 --out ${OUT_IMG}
- eval "export OUT_IMG=hotspot-master_$(date +"%Y-%m-%d").img"
- dist/kiwix-hotspot image --ram 8G --root 7 --size 8 --out ${OUT_IMG}
- zip -9 ${OUT_IMG}.zip ${OUT_IMG}
- scp ${OUT_IMG}.zip upload@download.kiwix.org:/var/www/download.kiwix.org/plug/base/
only:
......
......@@ -40,16 +40,16 @@ matrix:
- python3 -m pip install -r requirements-macos.txt
- python3 -m pip install https://github.com/pyinstaller/pyinstaller/archive/93eec04eb2fbfc714d2c3453e04fd126e6a86f52.zip
# Download pibox-installer-vexpress-boot
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
# Download vexpress-boot
- wget http://download.kiwix.org/dev/vexpress-boot.zip
- unzip vexpress-boot.zip
# Bundle QEMU
- wget http://download.kiwix.org/dev/qemu-2.12.0_macOS.tar
- tar xf qemu-2.12.0_macOS.tar
# Run PyInstaller
- pyinstaller --log-level=DEBUG pibox-installer-macos.spec
- pyinstaller --log-level=DEBUG kiwix-hotspot-macos.spec
# Sign application
- security create-keychain -p mysecretpassword build.keychain
......@@ -58,19 +58,19 @@ matrix:
- security import pibox-installer.p12 -k build.keychain -P $MACOS_CERTIFICATE_PASSWORD -A
- "security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain"
- security find-identity -v
- "codesign -s \"Developer ID Application: Wikimedia CH (L7HWM3SP3L)\" dist/kiwix-plug_installer.app --deep"
- "codesign -s \"Developer ID Application: Wikimedia CH (L7HWM3SP3L)\" dist/kiwix-hotspot.app --deep"
# Install and run create-dmg
- npm install --global create-dmg@2.0.0 --python=python2.7
- create-dmg dist/kiwix-plug_installer.app || true
- mv kiwix-plug_installer-*.dmg kiwix-plug_installer-macos.dmg
- create-dmg dist/kiwix-hotspot.app || true
- mv kiwix-hotspot-*.dmg kiwix-hotspot-macos.dmg
# CI build
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-macos.dmg nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/kiwix-plug_installer-macos-$BRANCH.dmg; fi
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-hotspot-macos.dmg nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/kiwix-hotspot-macos-$BRANCH.dmg; fi
# nightly build (cron master)
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then SRCDIR=nightly/$(date +'%Y-%m-%d'); mkdir -p $SRCDIR; cp kiwix-plug_installer-macos.dmg $SRCDIR/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa $SRCDIR nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/; fi
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then SRCDIR=nightly/$(date +'%Y-%m-%d'); mkdir -p $SRCDIR; cp kiwix-hotspot-macos.dmg $SRCDIR/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa $SRCDIR nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/; fi
# release build (tagged)
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp kiwix-plug_installer-macos.dmg releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp kiwix-hotspot-macos.dmg releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-hotspot/; fi
- os: linux
language: python
......@@ -112,9 +112,9 @@ matrix:
- sudo ldconfig
- cd ..
# Download pibox-installer-vexpress-boot
- wget http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
- unzip pibox-installer-vexpress-boot.zip
# Download vexpress-boot
- wget http://download.kiwix.org/dev/vexpress-boot.zip
- unzip vexpress-boot.zip
# get static QEMU
- wget http://download.kiwix.org/dev/qemu-2.12.0-linux-x86_64.tar.gz
......@@ -126,17 +126,17 @@ matrix:
# Install and run pyinstaller
# note: we temporary use a fork that resolves pygobject issues
- pip3 install https://github.com/thiolliere/pyinstaller/archive/develop.zip
- pyinstaller --log-level=DEBUG pibox-installer-linux.spec
- cat build/pibox-installer-linux/warnpibox-installer-linux.txt
- pyinstaller --log-level=DEBUG kiwix-hotspot-linux.spec
- cat build/kiwix-hotspot-linux/warnkiwix-hotspot-linux.txt
# Archive
- cd dist
- tar czvf kiwix-plug_installer-linux.tar.gz kiwix-plug_installer
- tar czvf kiwix-hotspot-linux.tar.gz kiwix-hotspot
- cd ..
# CI build
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa dist/kiwix-plug_installer-linux.tar.gz nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/kiwix-plug_installer-linux-$BRANCH.tar.gz; fi
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa dist/kiwix-hotspot-linux.tar.gz nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/kiwix-hotspot-linux-$BRANCH.tar.gz; fi
# nightly build (cron master)
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then SRCDIR=nightly/$(date +'%Y-%m-%d'); mkdir -p $SRCDIR; cp dist/kiwix-plug_installer-linux.tar.gz $SRCDIR/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa $SRCDIR nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/; fi
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] && [ "a$PIBOX_RELEASE" = "a" ]; then SRCDIR=nightly/$(date +'%Y-%m-%d'); mkdir -p $SRCDIR; cp dist/kiwix-hotspot-linux.tar.gz $SRCDIR/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa $SRCDIR nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/; fi
# release build (tagged)
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp dist/kiwix-plug_installer-linux.tar.gz releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ] && [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp dist/kiwix-hotspot-linux.tar.gz releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-hotspot/; fi
# Authors and contributors
Kiwix-plug installer (formerly pibox installer) is owned and maintained by Guillaume Thiolliere
Kiwix Hotspot (formerly pibox installer) is owned and maintained by Guillaume Thiolliere
and published under the terms of GPLv3 license or (at your option) any later version
(see [LICENSE](https://framagit.org/ideascube/pibox-installer/blob/master/LICENSE)).
......
2.0-rc11
* Fixed an unmount issue on Linux
* File size entry is now a selection list of standard SD cards sizes
* Rebranded as Kiwix-hotspot
2.0-rc10
* Fixed wikifundi config regression
......
# Kiwix-plug installer
# Kiwix Hotspot
This installer install [Ideascube](https://framagit.org/ideascube/ideascube) on an SD card for raspberrypi 2 or raspberrypi 3.
Ideascube is a solution to serve offline content from the web such as Wikipedia, the Gutenberg library, TED talks.
Kiwix-plug installer configure the RaspberryPi into a hotspot WiFi with Ideascube server and offline contents.
Kiwix Hotspot configure the RaspberryPi into a hotspot WiFi with Ideascube server and offline contents.
## Download
......@@ -22,15 +22,15 @@ presentation of the projet at Potsdam [Slides](http://wiki.kiwix.org/w/images/4/
## CLI usage
run cli mode: `pibox-installer cli`
run cli mode: `kiwix-hotspot cli`
show help: `pibox-installer cli -h`
show help: `kiwix-hotspot cli -h`
show catalog: `pibox-installer cli --catalog`
show catalog: `kiwix-hotspot cli --catalog`
## Run pibox-installer from source
## Run kiwix-hotspot from source
you can read package pibox-installer to get help setting the environment
you can read package kiwix-hotspot to get help setting the environment
install dependencies:
......@@ -38,22 +38,22 @@ install dependencies:
* [qemu](http://www.qemu.org/download/): version >= 2.8, qemu-img and qemu-system-arm must be present in the directory (symlink or install there)
* [pygobject](https://pygobject.readthedocs.io/en/latest/getting_started.html):
on Windows you can also install it using [pygi-aio](https://sourceforge.net/projects/pygobjectwin32/)
* [pibox-installer-vexpress-boot](http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip): unzip in the directory
* [vexpress-boot](http://download.kiwix.org/dev/vexpress-boot.zip): unzip in the directory
create a virtual a virtual environment that includes pygobject: `python3 -m venv --system-site-packages my_venv`
activate the environment
install pip dependencies: `pip3 install -r requirements-PLATFORM.txt`
(note: on linux you may need some distribution packges, see package pibox-installer for more information)
(note: on linux you may need some distribution packges, see package kiwix-hotspot for more information)
run GUI application: `python3 pibox-installer`
run CLI application: `python3 pibox-installer cli`
## Build pibox-installer-vexpress-boot
## Build vexpress-boot
pibox-installer use a linux kernel for the QEMU emulation of vexpress machine.
kiwix-hotspot use a linux kernel for the QEMU emulation of vexpress machine.
This vexpress boot can be compiled on linux using make-vexpress-boot python3 script.
requirements: `gcc-arm-linux-gnueabihf`, `bc` and `zip`
......@@ -62,7 +62,7 @@ run: `python3 make-vexpress-boot`
## Build pibox base image
pibox-installer uses a custom base image based off raspbian-lite with the following modifications (not exhaustive):
kiwix-hotspot uses a custom base image based off raspbian-lite with the following modifications (not exhaustive):
* `2018-04-19-raspbian-jessie-lite`
* SSH enabled
......@@ -73,11 +73,11 @@ pibox-installer uses a custom base image based off raspbian-lite with the follow
Should you want to build the base image:
``` sh
pibox-installer image --root 7 --size 8 --out my-base.img
kiwix-hotspot image --root 7 --size 8 --out my-base.img
```
## Package pibox-installer
## Package kiwix-hotspot
see [appveyor.yml](appveyor.yml) for windows and [.travis.yml](.travis.yml) for mac and linux
......@@ -87,13 +87,13 @@ presentation of the projet at Potsdam [Slides](http://wiki.kiwix.org/w/images/4/
some notes about how the project is structured:
pibox-installer is a python3 (tested on 3.4 and 3.5) application that use PyGobject for GUI and QEMU for emulating ARM machine.
kiwix-hotspot is a python3 (tested on 3.4 and 3.5) application that use PyGobject for GUI and QEMU for emulating ARM machine.
how it works:
* ask user for configuration
* download raspbian-lite and a Linux kernel compiled with make-vexpress-boot
* resize the raspbian-lite image
* emulate vexpress ARM machine with pibox-installer-vexpress-boot and raspbian-lite image
* emulate vexpress ARM machine with vexpress-boot and raspbian-lite image
* run ansiblecube inside the emulation
* write output to SD card
......
# AnsibleCube
This is a **very distant** fork of [ideascube/ansiblecube](https://github.com/ideascube/ansiblecube/) dedicated to [pibox-installer](https://framagit.org/ideascube/pibox-installer)'s use case.
This is a **very distant** fork of [ideascube/ansiblecube](https://github.com/ideascube/ansiblecube/) dedicated to [kiwix-hotspot](https://framagit.org/ideascube/pibox-installer)'s use case.
## Goal
......@@ -43,7 +43,7 @@ This is achieved by using a three steps scenario:
This playbook is not meant to be run standalone on any system.
Please check [make-base-image](https://framagit.org/ideascube/pibox-installer/tree/master/make-vexpress-boot) and more generally [pibox-installer](https://framagit.org/ideascube/pibox-installer) to see it in action.
Please check [make-base-image](https://framagit.org/ideascube/pibox-installer/tree/master/make-vexpress-boot) and more generally [kiwix-hotspot](https://framagit.org/ideascube/pibox-installer) to see it in action.
## Tests
......
version: 1.0.{build}
clone_folder: c:\projects\pibox-installer
clone_folder: c:\projects\kiwix-hotspot
image: Visual Studio 2015
......@@ -46,9 +46,9 @@ install:
- secure-file\tools\secure-file -decrypt pibox_installer_ci_rsa.appveyor_enc -secret %certificate_secret% -out pibox_installer_ci_rsa
- ResourceHacker.CommandLineTool\tools\ResourceHacker.exe -help
# Download pibox-installer-vexpress-boot
- appveyor DownloadFile "http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip"
- 7z.exe x pibox-installer-vexpress-boot.zip
# Download vexpress-boot
- appveyor DownloadFile "http://download.kiwix.org/dev/vexpress-boot.zip"
- 7z.exe x vexpress-boot.zip
# Install pygobject
# pygi-aio provides a way to install from cmd even if it is not documented
......@@ -80,7 +80,7 @@ install:
- if %platform%==x64 set PATH=%PATH%;C:\msys64\mingw64\bin
# Install pyinstaller and requirements
- cd C:\projects\pibox-installer
- cd C:\projects\kiwix-hotspot
- if %platform%==x86 C:\Python34\python.exe -m pip install pypiwin32==219 pyinstaller==3.2.1 -r requirements-windows.txt
- if %platform%==x64 C:\Python34-x64\python.exe -m pip install pypiwin32==219 pyinstaller==3.2.1 -r requirements-windows.txt
......@@ -114,35 +114,35 @@ install:
- dir "C:\Program Files\imdiskinst"
# Run pyinstaller and show warning
- cd C:\projects\pibox-installer
- if %platform%==x86 C:\Python34\python.exe C:\Python34\Scripts\pyinstaller-script.py --log-level=DEBUG pibox-installer-win32.spec
- if %platform%==x64 C:\Python34-x64\python.exe C:\Python34-x64\Scripts\pyinstaller-script.py --log-level=DEBUG pibox-installer-win64.spec
- if %platform%==x86 type build\pibox-installer-win32\warnpibox-installer-win32.txt
- if %platform%==x64 type build\pibox-installer-win64\warnpibox-installer-win64.txt
- cd C:\projects\kiwix-hotspot
- if %platform%==x86 C:\Python34\python.exe C:\Python34\Scripts\pyinstaller-script.py --log-level=DEBUG kiwix-hotspot-win32.spec
- if %platform%==x64 C:\Python34-x64\python.exe C:\Python34-x64\Scripts\pyinstaller-script.py --log-level=DEBUG kiwix-hotspot-win64.spec
- if %platform%==x86 type build\kiwix-hotspot-win32\warnkiwix-hotspot-win32.txt
- if %platform%==x64 type build\kiwix-hotspot-win64\warnkiwix-hotspot-win64.txt
# Deploy
- cd C:\projects\pibox-installer\dist\kiwix-plug_installer
- 7z.exe a -m0=Copy C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.7z *
- cd C:\projects\kiwix-hotspot\dist\kiwix-hotspot
- 7z.exe a -m0=Copy C:\projects\kiwix-hotspot\windows_bundle\kiwix-hotspot.7z *
# download tools
- cd C:\projects\pibox-installer\windows_bundle\
- cd C:\projects\kiwix-hotspot\windows_bundle\
- appveyor DownloadFile "http://download.kiwix.org/dev/GoRC.exe" -FileName "GoRC.exe"
# create SFX exe from 7z archive
- copy /b "C:\Program Files\7zextra\7zS.sfx" + sfxconfig.txt + kiwix-plug_installer.7z kiwix-plug_installer.exe
- copy /b "C:\Program Files\7zextra\7zS.sfx" + sfxconfig.txt + kiwix-hotspot.7z kiwix-hotspot.exe
# change icon and add version info to exe
- GoRC.exe /fo resources.res resources.rc
- copy ..\kiwix-plug_installer-logo.ico icon.ico
- c:\projects\pibox-installer\ResourceHacker.CommandLineTool\tools\ResourceHacker.exe -script reshack.txt
- cd C:\projects\pibox-installer\dist\kiwix-plug_installer
- copy ..\kiwix-hotspot-logo.ico icon.ico
- c:\projects\kiwix-hotspot\ResourceHacker.CommandLineTool\tools\ResourceHacker.exe -script reshack.txt
- cd C:\projects\kiwix-hotspot\dist\kiwix-hotspot
# sign the build
- signtool.exe sign /f C:\projects\pibox-installer\kiwix.pfx /p %win_certificate_password% /t http://timestamp.verisign.com/scripts/timstamp.dll /d "Kiwix-plug installer" C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe
- signtool.exe sign /f C:\projects\kiwix-hotspot\kiwix.pfx /p %win_certificate_password% /t http://timestamp.verisign.com/scripts/timstamp.dll /d "Kiwix Hotspot" C:\projects\kiwix-hotspot\windows_bundle\kiwix-hotspot.exe
- if %platform%==x86 move C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe C:\msys64\home\appveyor\kiwix-plug_installer-win32.exe
- if %platform%==x64 move C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe C:\msys64\home\appveyor\kiwix-plug_installer-win64.exe
- move C:\projects\pibox-installer\pibox_installer_ci_rsa C:\msys64\home\appveyor\
- if %platform%==x86 move C:\projects\kiwix-hotspot\windows_bundle\kiwix-hotspot.exe C:\msys64\home\appveyor\kiwix-hotspot-win32.exe
- if %platform%==x64 move C:\projects\kiwix-hotspot\windows_bundle\kiwix-hotspot.exe C:\msys64\home\appveyor\kiwix-hotspot-win64.exe
- move C:\projects\kiwix-hotspot\pibox_installer_ci_rsa C:\msys64\home\appveyor\
- if %platform%==x86 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-win32.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-win32-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x64 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-win64.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-win64-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x86 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-hotspot-win32.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-hotspot-win32-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x64 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-hotspot-win64.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-hotspot-win64-$(cat branch.txt | sed 's/ //g').exe"
- C:\msys64\usr\bin\bash --login -c "PIBOX_RELEASE=$(cat tag.txt | sed 's/ //g' | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true; if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE/; cp kiwix-plug_installer-win*.exe releases/$PIBOX_RELEASE/; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi"
- C:\msys64\usr\bin\bash --login -c "PIBOX_RELEASE=$(cat tag.txt | sed 's/ //g' | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true; if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE/; cp kiwix-hotspot-win*.exe releases/$PIBOX_RELEASE/; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-hotspot/; fi"
......@@ -9,9 +9,9 @@ a = Analysis(['pibox-installer/__main__.py'],
datas=[('ui.glade', '.'),
('contents.json', '.'),
('etcher.gif', '.'),
('kiwix-plug_installer-logo.png', '.'),
('kiwix-hotspot-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
('vexpress-boot', 'vexpress-boot')],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
......@@ -26,7 +26,7 @@ exe = EXE(pyz,
a.binaries,
a.zipfiles,
a.datas,
name='kiwix-plug_installer',
name='kiwix-hotspot',
debug=False,
strip=False,
upx=True,
......
......@@ -16,9 +16,9 @@ a = Analysis(['pibox-installer/__main__.py'],
datas=[('ui.glade', '.'),
('contents.json', '.'),
('etcher.gif', '.'),
('kiwix-plug_installer-logo.png', '.'),
('kiwix-hotspot-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot')],
('vexpress-boot', 'vexpress-boot')],
hiddenimports=['gui', 'cli', 'image'],
hookspath=['additional-hooks'],
runtime_hooks=[],
......@@ -31,7 +31,7 @@ pyz = PYZ(a.pure, a.zipped_data,
exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
name='kiwix-plug_installer',
name='kiwix-hotspot',
debug=False,
strip=False,
upx=True,
......@@ -42,13 +42,13 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='kiwix-plug_installer')
name='kiwix-hotspot')
app = BUNDLE(coll,
name='kiwix-plug_installer.app',
icon='kiwix-plug_installer-logo.icns',
name='kiwix-hotspot.app',
icon='kiwix-hotspot-logo.icns',
bundle_identifier='org.kiwix.plug',
info_plist={
'CFBundleDisplayName': 'Kiwix-plug installer',
'CFBundleDisplayName': 'Kiwix Hotspot',
'CFBundleShortVersionString': get_version_str(),
'CFBundleVersion': get_short_version_str(),
'NSHumanReadableCopyright': 'Kiwix'
......
......@@ -24,9 +24,9 @@ a = Analysis(['pibox-installer/__main__.py'],
('contents.json', '.'),
('imdisk.png', '.'),
('etcher.gif', '.'),
('kiwix-plug_installer-logo.png', '.'),
('kiwix-hotspot-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot'),
('vexpress-boot', 'vexpress-boot'),
('C:\Program Files\qemu', 'qemu'),
('C:\Program Files\imdiskinst', 'imdiskinst'),
('C:\Program Files\\7zextra\\7za.dll', '.'),
......@@ -49,7 +49,7 @@ exe = EXE(pyz,
strip=False,
upx=True,
console=False,
icon='kiwix-plug_installer-logo.ico',
icon='kiwix-hotspot-logo.ico',
uac_admin=True)
coll = COLLECT(exe,
a.binaries,
......@@ -57,4 +57,4 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='kiwix-plug_installer')
name='kiwix-hotspot')
......@@ -24,9 +24,9 @@ a = Analysis(['pibox-installer/__main__.py'],
('contents.json', '.'),
('imdisk.png', '.'),
('etcher.gif', '.'),
('kiwix-plug_installer-logo.png', '.'),
('kiwix-hotspot-logo.png', '.'),
('ansiblecube', 'ansiblecube'),
('pibox-installer-vexpress-boot', 'pibox-installer-vexpress-boot'),
('vexpress-boot', 'vexpress-boot'),
('C:\Program Files\qemu', 'qemu'),
('C:\Program Files\imdiskinst', 'imdiskinst'),
('C:\Program Files\\7zextra\\x64\\7za.dll', '.'),
......@@ -49,7 +49,7 @@ exe = EXE(pyz,
strip=False,
upx=True,
console=False,
icon='kiwix-plug_installer-logo.ico',
icon='kiwix-hotspot-logo.ico',
uac_admin=True)
coll = COLLECT(exe,
a.binaries,
......@@ -57,4 +57,4 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='kiwix-plug_installer')
name='kiwix-hotspot')
......@@ -11,7 +11,7 @@ from zipfile import ZipFile
os.makedirs("build", exist_ok=True)
os.chdir("build")
boot_dir = "pibox-installer-vexpress-boot"
boot_dir = "vexpress-boot"
boot_zip = boot_dir + ".zip"
linux_version = "4.10"
......@@ -101,7 +101,7 @@ subprocess.check_call("cp .config arch/arm/boot/zImage arch/arm/boot/dts/vexpres
subprocess.check_call("cp .config arch/arm/boot/zImage arch/arm/boot/dts/vexpress-v2p-ca9.dtb ../{}".format(boot_dir), shell=True)
os.chdir("..")
with open("{}/README.txt".format(boot_dir), "w+") as readme:
readme.write("""This is the kernel used by pibox-installer to boot the vexpress machine in QEMU
readme.write("""This is the kernel used by kiwix-hotspot to boot the vexpress machine in QEMU
It has been generated by make-vexpress-boot script at https://framagit.org/ideascube/pibox-installer""")
readme.flush()
......
......@@ -31,10 +31,10 @@ fi
if [ ! -f ~/zImage ] ; then
echo "kernel files not present, downloading"
wget -O ~/boot.zip http://download.kiwix.org/dev/pibox-installer-vexpress-boot.zip
wget -O ~/boot.zip http://download.kiwix.org/dev/vexpress-boot.zip
unzip boot.zip
mv ~/pibox-installer-vexpress-boot/* ~/.
rmdir ~/pibox-installer-vexpress-boot
mv ~/vexpress-boot/* ~/.
rmdir ~/vexpress-boot
fi
# max ram to use by QEMU guest (format: XM or XG)
......
......@@ -237,7 +237,7 @@ class _RunningInstance:
break
self._logger.err(str(buf_states))
self._logger.err("internal error: please report this log to pibox-installer")
self._logger.err("internal error: please report this log")
if tries > 3:
raise QemuException("wait signal timeout: %s" % signal)
os.write(stdin_writer, b"pi\n")
......
......@@ -241,7 +241,7 @@ if args.sdcard and not os.path.exists(args.sdcard):
sys.exit(1)
# display configuration and offer time to cancel
print("Kiwix-plug installer configuration:")
print("Kiwix Hotspot configuration:")
keys = args.__dict__.keys()
longest = max([len(key) for key in keys])
for name in keys:
......
......@@ -9,11 +9,11 @@ else:
data_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
ui_glade = os.path.join(data_dir, "ui.glade")
_vexpress_boot_dir = "pibox-installer-vexpress-boot"
_vexpress_boot_dir = "vexpress-boot"
vexpress_boot_kernel = os.path.join(data_dir, _vexpress_boot_dir, "zImage")
vexpress_boot_dtb = os.path.join(data_dir, _vexpress_boot_dir, "vexpress-v2p-ca15_a7.dtb")
pibox_logo = os.path.join(data_dir, "kiwix-plug_installer-logo.png")
pibox_logo = os.path.join(data_dir, "kiwix-hotspot-logo.png")
cache_folder_name = "cache"
content_file = os.path.join(data_dir, 'contents.json')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment