kirbylife
/
harbour-muchkin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed ssh_user from root to nemo

master
TobSim 2015-04-07 01:18:17 +02:00
parent 702e07c861
commit fee0b6b5d9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -6,13 +6,14 @@ dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};do
arch:=armv7hl arch:=armv7hl
version:=0.0.1 version:=0.0.1
rpmname:=$(Appname)-$(version).$(arch).rpm rpmname:=$(Appname)-$(version).$(arch).rpm
ssh_user:=nemo
jolla_usb_ip:=192.168.2.15 jolla_usb_ip:=192.168.2.15
jolla_wifi_ip:=Jolla jolla_wifi_ip:=Jolla
all: clean build-tmp rpm-virt rpm-jolla all: clean build-tmp rpm-virt rpm-jolla
make-jolla-usb: build-tmp rpm-jolla send-jolla make-jolla-usb: build-tmp rpm-jolla send-jolla-usb
make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi
make-jolla-ap: build-tmp rpm-jolla send-jolla-ap make-jolla-ap: build-tmp rpm-jolla send-jolla-ap
make-virt: arch:=i686 make-virt: arch:=i686
@ -37,17 +38,17 @@ rpm-jolla: build-tmp
cd $(temp);fpm -f -s dir -t rpm -v $(version) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / * cd $(temp);fpm -f -s dir -t rpm -v $(version) $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
send-virt: send-virt:
cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' -p2223 root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root' -p2223 $(ssh_user)@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla-wifi: send-jolla-wifi:
cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla-ap: jolla_wifi_ip:=192.168.1.1 send-jolla-ap: jolla_wifi_ip:=192.168.1.1
send-jolla-ap: send-jolla-ap:
cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
send-jolla: send-jolla-usb:
cat $(temp)/$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname) cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
clean: clean:

2
qml/sailfish-python.qml
View File

@ -13,7 +13,7 @@ ApplicationWindow {
if (py.evaluate("os.uname().machine") == "armv7l"){ if (py.evaluate("os.uname().machine") == "armv7l"){
py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-armv7hl')); py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-armv7hl'));
} else { } else {
py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-x86')); py.addImportPath(Qt.resolvedUrl('../src/pyPackages/pillow-i686'));
} }
py.importModule('main',function(){ py.importModule('main',function(){
py.call("helloworld",[]) py.call("helloworld",[])

0
renamep.py 100755 → 100644
View File