fixes to various things
parent
7d7dcfcba9
commit
234ad9d52a
13
Makefile
13
Makefile
|
@ -8,6 +8,7 @@ arch:=noarch
|
||||||
rpmname:=$(Appname)-$(arch).rpm
|
rpmname:=$(Appname)-$(arch).rpm
|
||||||
jolla_usb_ip:=192.168.2.15
|
jolla_usb_ip:=192.168.2.15
|
||||||
jolla_wifi_ip:=Jolla
|
jolla_wifi_ip:=Jolla
|
||||||
|
jolla_ip:=$(jolla_usb_ip)
|
||||||
|
|
||||||
|
|
||||||
all: clean build-tmp rpm-virt rpm-jolla
|
all: clean build-tmp rpm-virt rpm-jolla
|
||||||
|
@ -30,23 +31,23 @@ build-tmp:
|
||||||
install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
|
install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
|
||||||
|
|
||||||
rpm-virt:
|
rpm-virt:
|
||||||
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
|
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
|
||||||
|
|
||||||
rpm-jolla:
|
rpm-jolla:
|
||||||
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(CURDIR)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
|
cd $(temp);fpm -f -s dir -t rpm $(dependencies) -p $(temp)/$(rpmname) -n $(Appname) -a $(arch) --prefix / *
|
||||||
|
|
||||||
send-virt:
|
send-virt:
|
||||||
cat ./$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
cat $(temp)/$(rpmname) | ssh -p2223 -i $(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/root root@localhost cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
||||||
|
|
||||||
send-jolla-wifi:
|
send-jolla-wifi:
|
||||||
cat ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
cat $(temp)/$(rpmname) | ssh root@$(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 ./$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
cat $(temp)/$(rpmname) | ssh root@$(jolla_wifi_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
||||||
|
|
||||||
send-jolla:
|
send-jolla:
|
||||||
cat ./$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
cat $(temp)/$(rpmname) | ssh root@$(jolla_usb_ip) cat ">>" /tmp/$(rpmname) "&&" pkcon install-local -y /tmp/$(rpmname) "&&" rm /tmp/$(rpmname)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(temp)
|
rm -rf $(temp)
|
||||||
|
|
|
@ -17,7 +17,7 @@ use these make commands to build/install your app for testing:
|
||||||
|
|
||||||
builds your package, and installs it on your Sailfish Emulator on localhost:2223, considering your Sailfish-SDK is installed at ~/SailfishOS
|
builds your package, and installs it on your Sailfish Emulator on localhost:2223, considering your Sailfish-SDK is installed at ~/SailfishOS
|
||||||
|
|
||||||
`make make-jolla-wifi`
|
`make make-jolla-wifi [jolla_wifi_ip=jolla]`
|
||||||
|
|
||||||
builds your package, and installs it on your jolla phone, considering your development PC is authorized for root ssh login on the phone and it is found in your dns-space as "jolla"
|
builds your package, and installs it on your jolla phone, considering your development PC is authorized for root ssh login on the phone and it is found in your dns-space as "jolla"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
sailfish-qml sailfish-scanner
|
sailfish-qml sailfish-python
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ def replaceInFile(oldname,newname,filename):
|
||||||
makefile.write(re.sub(oldname,newname,maketxt))
|
makefile.write(re.sub(oldname,newname,maketxt))
|
||||||
makefile.close()
|
makefile.close()
|
||||||
|
|
||||||
for filename in ["./Makefile","./dat/"+newname+".desktop"]:
|
for filename in ["./Makefile","./dat/"+newname+".desktop","./dat/"+newname+".sh"]:
|
||||||
replaceInFile(oldname,newname,filename)
|
replaceInFile(oldname,newname,filename)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue