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

Add support to aarch64

master
kirbylife 2023-03-13 13:21:48 -06:00
parent 04185d3f75
commit b9d06abcce
3 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Makefile
View File

@ -1,25 +1,12 @@
Appname:=$(shell cat appname.txt) Appname:=$(shell cat appname.txt)
prefix:=/usr prefix:=/usr
temp:=/tmp/fpm-jolla temp:=/tmp/fpm-jolla
sdkpath:=$(HOME)/SailfishOS
sourcePath:=$(shell pwd) sourcePath:=$(shell pwd)
dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;) dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;)
arch:=armv7hl
version:=0.5.0 version:=0.5.0
iteration:=1 iteration:=9
rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
ssh_user:=defaultuser
jolla_usb_ip:=192.168.2.15
jolla_wifi_ip:=192.168.100.34
all: clean build-tmp rpm-i686 rpm-jolla rpm-aarch64
all: clean build-tmp rpm-virt rpm-jolla
make-jolla-usb: build-tmp rpm-jolla send-jolla-usb
make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi
make-jolla-ap: build-tmp rpm-jolla send-jolla-ap
make-virt: arch:=i686
make-virt: build-tmp rpm-virt send-virt
build-tmp: build-tmp:
mkdir -p $(temp)/usr/share/applications mkdir -p $(temp)/usr/share/applications
@ -32,9 +19,9 @@ build-tmp:
cp -ar ./dat/appicon.png $(temp)/usr/share/icons/hicolor/86x86/apps/$(Appname).png cp -ar ./dat/appicon.png $(temp)/usr/share/icons/hicolor/86x86/apps/$(Appname).png
install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname) install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
rpm-virt: arch:=i686 rpm-i686: arch:=i686
rpm-virt: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm rpm-i686: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
rpm-virt: build-tmp rpm-i686: build-tmp
cd $(temp);fpm -f -s dir -t rpm \ cd $(temp);fpm -f -s dir -t rpm \
--after-install $(sourcePath)/dat/upgradeScript.sh \ --after-install $(sourcePath)/dat/upgradeScript.sh \
--after-remove $(sourcePath)/dat/removeScript.sh \ --after-remove $(sourcePath)/dat/removeScript.sh \
@ -48,6 +35,8 @@ rpm-virt: build-tmp
-a $(arch) \ -a $(arch) \
--prefix / * --prefix / *
rpm-jolla: arch:=armv7hl
rpm-jolla: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
rpm-jolla: build-tmp rpm-jolla: build-tmp
cd $(temp);fpm -f -s dir -t rpm \ cd $(temp);fpm -f -s dir -t rpm \
--after-install $(sourcePath)/dat/upgradeScript.sh \ --after-install $(sourcePath)/dat/upgradeScript.sh \
@ -62,36 +51,23 @@ rpm-jolla: build-tmp
-a $(arch) \ -a $(arch) \
--prefix / * --prefix / *
send-virt: rpm-aarch64: arch:=aarch64
cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \ rpm-aarch64: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
cat ">" /tmp/$(rpmname) "&&" \ rpm-aarch64: build-tmp
pkcon install-local -y /tmp/$(rpmname) "&&" \ cd $(temp);fpm -f -s dir -t rpm \
rm /tmp/$(rpmname) --after-install $(sourcePath)/dat/upgradeScript.sh \
--after-remove $(sourcePath)/dat/removeScript.sh \
send-jolla-wifi: --rpm-changelog $(sourcePath)/changelog.txt \
cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) \ --directories "/usr/share/$(Appname)" \
cat ">" /tmp/$(rpmname) "&&" \ -v $(version) \
pkcon install-local -y /tmp/$(rpmname) "&&" \ --iteration $(iteration) \
rm /tmp/$(rpmname) $(dependencies) \
-p $(temp)/$(rpmname) \
send-jolla-ap: jolla_wifi_ip:=192.168.1.1 -n $(Appname) \
send-jolla-ap: -a $(arch) \
cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) \ --prefix / *
cat ">" /tmp/$(rpmname) "&&" \
pkcon install-local -y /tmp/$(rpmname) "&&" \
rm /tmp/$(rpmname)
send-jolla-usb:
cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_usb_ip) \
cat ">" /tmp/$(rpmname) "&&" \
pkcon install-local -y /tmp/$(rpmname) "&&" \
rm /tmp/$(rpmname)
send-only-virt:
cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \
cat ">" /tmp/$(rpmname)
clean: clean:
rm -rf $(temp) rm -rf $(temp)
rm -rf $(builddir) rm -rf $(builddir)
rm -rf ./$(rpmname) rm -rf ./$(Appname)-$(version)-$(iteration)*

6
README.md
View File

@ -9,6 +9,7 @@ Make your webapps icons in the app box look better with the rest of your native
## Build dependencies ## Build dependencies
- [fpm](https://github.com/jordansissel/fpm) - [fpm](https://github.com/jordansissel/fpm)
- [rpm-tools](http://rpm.org/)
## Build your own RPM package ## Build your own RPM package
1. Clone the repository: `git clone https://gitlab.com/kirbylife/harbour-muchkin` 1. Clone the repository: `git clone https://gitlab.com/kirbylife/harbour-muchkin`
@ -16,13 +17,14 @@ Make your webapps icons in the app box look better with the rest of your native
1. Build the package. 1. Build the package.
1. armv7hl: `make rpm-jolla` 1. armv7hl: `make rpm-jolla`
1. i686: `make rpm-virt` 1. i686: `make rpm-virt`
1. aarch64: `soon` 1. aarch64: `make rpm-aarch64`
1. the .rpm file will be on `/tmp/fpm-jolla/` 1. the .rpm file will be on `/tmp/fpm-jolla/`
## TO-DO ## TO-DO
- [ ] Make betters Make commands
- [x] Support to aarch64 arquitecture - [x] Support to aarch64 arquitecture
- [x] Choice non-transparent color to fill the empty spaces - [x] Choice non-transparent color to fill the empty spaces
- [x] Fix the issue with sailjail
- [ ] Make betters Make commands
- [ ] Add option to request favicon - [ ] Add option to request favicon
- [ ] Add option to restore the original icon - [ ] Add option to restore the original icon
- [ ] Make all icons in the main grid the same size - [ ] Make all icons in the main grid the same size

3
dat/upgradeScript.sh
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
#rm -rf /usr/share/harbour-muchkin #rm -rf /usr/share/harbour-muchkin
echo "Upgrading...." echo "Upgrading..."