diff --git a/README.md b/README.md index dad31dcb34..2655fa337c 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ Helpful resources: * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference) * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages) -* [postmarketOS package search](https://pkgs.postmarketos.org/packages) \ No newline at end of file +* [postmarketOS package search](https://pkgs.postmarketos.org/packages) diff --git a/cross/grub-x86/APKBUILD b/cross/grub-x86/APKBUILD index e9bdcfbd27..8c9b7bc785 100644 --- a/cross/grub-x86/APKBUILD +++ b/cross/grub-x86/APKBUILD @@ -1,6 +1,6 @@ pkgname=grub-x86 pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="GRUB i386-efi image" url="https://www.gnu.org/software/grub/" license="GPL-3.0-or-later" @@ -10,13 +10,13 @@ options="pmb:strict" source="grub_early.cfg" package() { - mkdir -p "$pkgdir/boot/EFI/Boot" - grub_mod="all_video disk part_gpt part_msdos linux normal configfile search search_label efi_gop fat iso9660 cat echo ls test true help gzio" - grub-mkimage --config="$srcdir/grub_early.cfg" \ - --prefix="" \ - --output="$pkgdir/boot/EFI/Boot/bootia32.efi" \ - --format="i386-efi" --compression="xz" \ - $grub_mod + mkdir -p "$pkgdir/boot/EFI/Boot" + grub_mod="all_video disk part_gpt part_msdos linux normal configfile search search_label efi_gop fat iso9660 cat echo ls test true help gzio" + grub-mkimage --config="$srcdir/grub_early.cfg" \ + --prefix="" \ + --output="$pkgdir/boot/EFI/Boot/bootia32.efi" \ + --format="i386-efi" --compression="xz" \ + $grub_mod } sha512sums="0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd grub_early.cfg" diff --git a/device/community/device-nokia-n900/APKBUILD b/device/community/device-nokia-n900/APKBUILD index 3a405608e3..4d3415344d 100644 --- a/device/community/device-nokia-n900/APKBUILD +++ b/device/community/device-nokia-n900/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Danct12 pkgname=device-nokia-n900 pkgver=8.2 -pkgrel=0 +pkgrel=1 pkgdesc="Nokia N900" url="https://postmarketos.org" arch="armv7" @@ -162,34 +162,34 @@ nonfree_firmware() { } sha512sums=" -a4e9196f8ca31fea6f74af078c1e1df1e7be89b63b5d0d292d7f198cfae5f30247dd002536f0f9251ed96518a54aa2b4783870046283e6cd30093115f60cce8e deviceinfo -3ae550b50f963695be30eb0e03c31fe7a92aad73174873efe5b73d446b74da5763b6fe9495b91bbdbe307723f6510ebc6639437904815e9251a094ce9bec5b11 uboot-script.cmd -3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a backlight-enable.sh -c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527 90-touchscreen-dev.rules -9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762 10-nokia-modem.rules -cd5ff582e935c4d28ba359944b197b5486645451790f59e96d9faa4136bf9010c425bfd3c8e46d4b490b4f36fd3336c1d49dd18bc0e2c5738b81520f356adf20 acpi_handler.sh -b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7 acpi.map -e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba rx51_us.map -dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058edc6f87cc2877da2ecafd2f627d9b465d4fd24475fc21fdc71 rx51_ch.map -082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1 rx51_it.map -0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28 rx51_fise.map -181187db6d88b872233f594759373f32fd08065ee340b60f0c3ff06396d99f4b1250192d70a054fcc9e51e067f6cc063c62b7d8dfff3427b292f1d0c766db206 40-xkb.conf -143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal -67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c asound.state.speakers -5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32 asound.state.headset -2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26 battery-bq27200 -82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac ofono -d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d calendar -9791ea5f3f0d1ad4f74e2bc18af2ceccb4b8df6262f1566c67f1fd292928bfc75504d0deed32d24495a0d58ca52a52a97ae5ecd2efc34688631af04b131867ad wifi -16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c conky.conf -7e8a92b828a3cb823b8df0c67ff3cb72d220f2fdc4557a613ad051baaf7e6e3d0865cdfb5eadff7f4b04302ac650bc485863e26f4d54485d5a1c2389ac0793e3 i3wm.conf -826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f i3blocks.conf -0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8 protip_shell.sh -a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2 xorg.conf -38ecdf876b5aa9df2e5ea61c7ebb6f9ca871bdf433029808d028d563dfd740232b3dc21dba098a7622453212af1272e2e782be861b4a96a49fd475a618442d45 10-noroot-suspend 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21 10-initfs-keymap.files 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910 10-initfs-keymap.sh +38ecdf876b5aa9df2e5ea61c7ebb6f9ca871bdf433029808d028d563dfd740232b3dc21dba098a7622453212af1272e2e782be861b4a96a49fd475a618442d45 10-noroot-suspend +b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7 acpi.map +ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb acpi_handler.sh +5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32 asound.state.headset +67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c asound.state.speakers +3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a backlight-enable.sh e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef device-nokia-n900.start -654f2e1b8b7b64fc8c82a5f3c2b76b9d88f56d8dda520c1ce162648d65031bf62702e3bd43e135ab040b927c403f9970d6efae53f957bf1e55954125b358b313 x11-keymap +a4e9196f8ca31fea6f74af078c1e1df1e7be89b63b5d0d292d7f198cfae5f30247dd002536f0f9251ed96518a54aa2b4783870046283e6cd30093115f60cce8e deviceinfo +16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c conky.conf +826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f i3blocks.conf +7e8a92b828a3cb823b8df0c67ff3cb72d220f2fdc4557a613ad051baaf7e6e3d0865cdfb5eadff7f4b04302ac650bc485863e26f4d54485d5a1c2389ac0793e3 i3wm.conf +0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8 protip_shell.sh +2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26 battery-bq27200 +d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d calendar +82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac ofono +9791ea5f3f0d1ad4f74e2bc18af2ceccb4b8df6262f1566c67f1fd292928bfc75504d0deed32d24495a0d58ca52a52a97ae5ecd2efc34688631af04b131867ad wifi +181187db6d88b872233f594759373f32fd08065ee340b60f0c3ff06396d99f4b1250192d70a054fcc9e51e067f6cc063c62b7d8dfff3427b292f1d0c766db206 40-xkb.conf +dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058edc6f87cc2877da2ecafd2f627d9b465d4fd24475fc21fdc71 rx51_ch.map +0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28 rx51_fise.map +082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1 rx51_it.map +e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba rx51_us.map b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66 n900-wlan-data.initd +143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff pointercal +3ae550b50f963695be30eb0e03c31fe7a92aad73174873efe5b73d446b74da5763b6fe9495b91bbdbe307723f6510ebc6639437904815e9251a094ce9bec5b11 uboot-script.cmd +9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762 10-nokia-modem.rules +c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527 90-touchscreen-dev.rules +654f2e1b8b7b64fc8c82a5f3c2b76b9d88f56d8dda520c1ce162648d65031bf62702e3bd43e135ab040b927c403f9970d6efae53f957bf1e55954125b358b313 x11-keymap +a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2 xorg.conf " diff --git a/device/community/device-nokia-n900/acpi_handler.sh b/device/community/device-nokia-n900/acpi_handler.sh index cf5b088981..3fcb3c366a 100644 --- a/device/community/device-nokia-n900/acpi_handler.sh +++ b/device/community/device-nokia-n900/acpi_handler.sh @@ -4,13 +4,13 @@ cmd=$( echo $0 | awk '{i=split($0,a,"/"); print a[i]}' ) function adjust_keypad_bl { for i in $(seq 1 6); do - echo $1 > /sys/class/leds/lp5523\:kb$i/brightness + echo $1 > /sys/class/leds/lp5523\:kb$i/brightness done } case $cmd in KP_SLIDE_OPEN) - adjust_keypad_bl 255 + adjust_keypad_bl 255 ;; KP_SLIDE_CLOSE) adjust_keypad_bl 0 @@ -51,36 +51,36 @@ case $cmd in SCRNLCK_UP) echo "Not implemented yet" ;; - HEADPHONE_INSERT) - alsactl restore -f /var/lib/alsa/asound.state.headset - ;; - HEADPHONE_REMOVE) - alsactl restore -f /var/lib/alsa/asound.state.speakers - ;; - MICROPHONE_INSERT) - echo "Not implemented yet" - ;; - MICROPHONE_REMOVE) - echo "Not implemented yet" - ;; - PWR_BTN_DWN) - echo "Not implemented yet" - ;; - PWR_BTN_UP) - echo "Not implemented yet" - ;; - VIDEOOUT_INSERT) - echo "Not implemented yet" - ;; - VIDEOOUT_REMOVE) - echo "Not implemented yet" - ;; - VOL_DWN) - echo "Not implemented yet" - ;; - VOL_UP) - echo "Not implemented yet" - ;; + HEADPHONE_INSERT) + alsactl restore -f /var/lib/alsa/asound.state.headset + ;; + HEADPHONE_REMOVE) + alsactl restore -f /var/lib/alsa/asound.state.speakers + ;; + MICROPHONE_INSERT) + echo "Not implemented yet" + ;; + MICROPHONE_REMOVE) + echo "Not implemented yet" + ;; + PWR_BTN_DWN) + echo "Not implemented yet" + ;; + PWR_BTN_UP) + echo "Not implemented yet" + ;; + VIDEOOUT_INSERT) + echo "Not implemented yet" + ;; + VIDEOOUT_REMOVE) + echo "Not implemented yet" + ;; + VOL_DWN) + echo "Not implemented yet" + ;; + VOL_UP) + echo "Not implemented yet" + ;; *) echo "Unknown event" exit 1 diff --git a/device/community/device-odroid-hc2/APKBUILD b/device/community/device-odroid-hc2/APKBUILD index 330c8a860c..0cc6b465a3 100644 --- a/device/community/device-odroid-hc2/APKBUILD +++ b/device/community/device-odroid-hc2/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-odroid-hc2 pkgdesc="ODROID HC2" pkgver=0.7 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -56,5 +56,5 @@ tools() { sha512sums=" 69b4fa44985adc3b2de5a516fa54448024973633d53130eee6d5055b1ccf9aa4b83fe0cf3ee30c69c5defcbe20e776995b8b4682e0503c76e0189a63cd582950 deviceinfo f3e7a39d53c072f4ae68fcca241f88b05939052ff1c9bd8d45b47d2b336f3c239689857051ff3c7a96caefd5c10d2e34d9b921c62f993f80faca2999eb7beab8 uboot-script.cmd -669a0561251f287f072c9c1fc37d89b49a47fc4a4e5134c9e6681750ae960e5827043166136b7d5b9ad52c931b060bdcb6d0b5335c2e9fdb4eefd82f131ded93 install-rootfs-hdd.sh +09a2191dce5b5c8fdf80c4473d9773a51f2c633db51477f2f64983dd030d7800fd80999a228ec7efe3f9feafeba35902bff68cf95e6ae59048dc64424f402b63 install-rootfs-hdd.sh " diff --git a/device/community/device-odroid-hc2/install-rootfs-hdd.sh b/device/community/device-odroid-hc2/install-rootfs-hdd.sh index a3c9cf952e..c9a678da71 100644 --- a/device/community/device-odroid-hc2/install-rootfs-hdd.sh +++ b/device/community/device-odroid-hc2/install-rootfs-hdd.sh @@ -12,8 +12,8 @@ read -n 1 ANSWER echo "" if [ "$ANSWER" != "y" ]; then - echo "Operation aborted" - exit 1 + echo "Operation aborted" + exit 1 fi echo "Which partition should be used as rootfs?:" @@ -32,17 +32,17 @@ mount $HDD_ROOT_PARTITION $MOUNT_POINT # Copy rootfs echo "Copying rootfs... This can take a while." rsync \ - -aAXx \ - --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} \ - / \ - $MOUNT_POINT + -aAXx \ + --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} \ + / \ + $MOUNT_POINT # Verify all files are copied rsync \ - -aAXx \ - --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} \ - / \ - $MOUNT_POINT + -aAXx \ + --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found"} \ + / \ + $MOUNT_POINT sync echo "Rootfs successfully copied!" diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index 59c1f74224..4dd0e9d3df 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -5,7 +5,7 @@ # Co-Maintainer: Dylan Van Assche pkgname=device-pine64-pinephone pkgver=0.43 -pkgrel=1 +pkgrel=2 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -216,7 +216,7 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8 9cb52e3c5d63dde68296f4c1f9b691629182f82181a7f0877a72aad6870698ea9e7d628309970afbcce01041274054d304de1ee3faf8c1d101f7f8e988a43098 90-modem-eg25.rules ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4 UPower.conf 4a3e607a8e8249668195c472ba181149add65be515360b4d0f465b9c798e7bf8b2f2e431eb3e95cd8620c2a580779c665762f0386239b2fb2a64352e46702edb deviceinfo -ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648 gpsd_device-hook.sh +348a1c4b82ffb8d2535b9a659f20d1ebd9a34a6eb8ead1016012c680de6cca401e1883319b2c0206063eb316f0dec274877fb66ee28869592ebea1f10b7b11da gpsd_device-hook.sh 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd gpsd_pinephone.initd 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030 hwtest.ini 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf kirigami-lowpower.sh diff --git a/device/main/device-pine64-pinephone/gpsd_device-hook.sh b/device/main/device-pine64-pinephone/gpsd_device-hook.sh index 226424b256..a248aade99 100644 --- a/device/main/device-pine64-pinephone/gpsd_device-hook.sh +++ b/device/main/device-pine64-pinephone/gpsd_device-hook.sh @@ -1,10 +1,10 @@ #!/bin/sh if [ "$2" == "ACTIVATE" ]; then - echo "AT+QGPS=1" | atinout - /dev/EG25.AT - + echo "AT+QGPS=1" | atinout - /dev/EG25.AT - elif [ "$2" == "DEACTIVATE" ]; then - echo "AT+QGPSEND" | atinout - /dev/EG25.AT - + echo "AT+QGPSEND" | atinout - /dev/EG25.AT - else - echo "Unhandled argument: $2" - exit 1 + echo "Unhandled argument: $2" + exit 1 fi diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index 4225f735e2..5419a70f68 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-amd64 pkgver=3 -pkgrel=2 +pkgrel=3 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" arch="x86_64" @@ -73,5 +73,5 @@ kernel_edge() { sha512sums=" 0c9b4b50073dc6bf6bfecb07370254f0dd8a277acbc1d90a605c7891e7d00c1c211545b296b7a1a7a6e00bce05a4197102fcfa449f113f2b500d8879ad29c6bf deviceinfo 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad mce-display-blanking.conf -47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142 weston.ini +de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25 weston.ini " diff --git a/device/main/device-qemu-amd64/weston.ini b/device/main/device-qemu-amd64/weston.ini index 2c3fa6f1eb..72039ae301 100644 --- a/device/main/device-qemu-amd64/weston.ini +++ b/device/main/device-qemu-amd64/weston.ini @@ -2,4 +2,4 @@ xwayland=true backend=drm-backend.so [shell] -background-image=/usr/share/wallpapers/postmarketos.jpg \ No newline at end of file +background-image=/usr/share/wallpapers/postmarketos.jpg diff --git a/device/testing/device-htc-vivo/APKBUILD b/device/testing/device-htc-vivo/APKBUILD index e019ccfe87..3af2b7f23f 100644 --- a/device/testing/device-htc-vivo/APKBUILD +++ b/device/testing/device-htc-vivo/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-htc-vivo pkgdesc="Incredible S" pkgver=1 -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -20,5 +20,5 @@ package() { } sha512sums=" d32ce8a022277443aaf2da3dc834369a3f3669cceb78be46b9d1c841f884f43aa721374353e95a3b99b705f9aedf87336c1529c97407a1ee4b1651a8cc420462 deviceinfo -2d02a02649ee3dc28041045086ffe11c9077067393954295343efb80727432902494da4c3b68f992880f3c0f01a9d164c2517f51519c92445e3ed88872a71e2f initfs-hook.sh +765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb initfs-hook.sh " diff --git a/device/testing/device-htc-vivo/initfs-hook.sh b/device/testing/device-htc-vivo/initfs-hook.sh index 8fb5391003..79f65b414d 100644 --- a/device/testing/device-htc-vivo/initfs-hook.sh +++ b/device/testing/device-htc-vivo/initfs-hook.sh @@ -1,4 +1,4 @@ #!/bin/sh # set usb properties -echo 4 > /sys/devices/platform/android_usb/usb_function_switch \ No newline at end of file +echo 4 > /sys/devices/platform/android_usb/usb_function_switch diff --git a/device/testing/device-lenovo-karate/90-android-touch-dev.rules b/device/testing/device-lenovo-karate/90-android-touch-dev.rules index b2ccd04a73..db50926984 100644 --- a/device/testing/device-lenovo-karate/90-android-touch-dev.rules +++ b/device/testing/device-lenovo-karate/90-android-touch-dev.rules @@ -1,4 +1,4 @@ # use 'weston-calibrator' to calibrate the touchscreen! SUBSYSTEM=="input", ATTRS{name}=="fts_ts", \ ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1", \ -ENV{LIBINPUT_CALIBRATION_MATRIX}="0.975358 0.020484 -20.695250 0.031747 1.034592 -60.641296" \ No newline at end of file +ENV{LIBINPUT_CALIBRATION_MATRIX}="0.975358 0.020484 -20.695250 0.031747 1.034592 -60.641296" diff --git a/device/testing/device-lenovo-karate/APKBUILD b/device/testing/device-lenovo-karate/APKBUILD index 15ef0d5ffa..39239134d0 100644 --- a/device/testing/device-lenovo-karate/APKBUILD +++ b/device/testing/device-lenovo-karate/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-lenovo-karate pkgdesc="Lenovo K6 Power" pkgver=0.1 -pkgrel=16 +pkgrel=17 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -30,5 +30,5 @@ nonfree_firmware() { sha512sums=" b51f3fa7782afc75363675841e1c7160b924082a2446bb1d9dbeb23adc164b98c56c1e496a78e07e7b404b446e801428605b174498d99538d6b4142d99d0de25 deviceinfo -25086c95c67c27151112efac1dcf7792589c990cc0a93ee910654445a3f9cc66c4a5ab656b3256224b39c49fe104540757cc36abf9de19f47c28c4fa82c4f552 90-android-touch-dev.rules +c6a76928d81a36d54734a6061f73f41ce0a6108cf151eb0ef19c96ac5c108e05996d9bb8b57055037e8e0cb8ea0fb0e7dc3d1f047e1d974f7ea1375754ed0962 90-android-touch-dev.rules " diff --git a/device/testing/device-lg-d285/APKBUILD b/device/testing/device-lg-d285/APKBUILD index 7698bd9aaa..639070f6e5 100644 --- a/device/testing/device-lg-d285/APKBUILD +++ b/device/testing/device-lg-d285/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-lg-d285 pkgver=1 -pkgrel=17 +pkgrel=18 pkgdesc="LG L65" url="https://postmarketos.org" arch="armhf" @@ -27,6 +27,6 @@ package() { sha512sums=" c8d8f897372d81864464f148f3965869230f9c147f8c2aef21b6dc857a554e06f5842a89d324bc71501f10ae6605e5c668a9a026e0f7d157a1c52148a61d1cb5 deviceinfo -78224ef3078dd8ee6b15de7a72cc3fe05ec4cb8eb503e11aa06e83009da8a8c104562463ac747d00ac9854c18b16fa557df01f377f4f9af5d98429906fdd016f initfs-hook.sh +f53bd829fc747c50116c948f45a2227cded050dc649a874e8e2af80d2d4632311694d8ad4b967658ac99150ae7857c849bdc3705cd56b422803bed25205f4365 initfs-hook.sh 568d407c3e96b45d740af8617f0e389d36a7091dceccae8f77288fdc45fb7a5ed418c28f31d7fe5a51d92337a40b2dd741b1b18ad02e3fbae91f9a2035d62c95 90-android-touch-dev.rules " diff --git a/device/testing/device-lg-d285/initfs-hook.sh b/device/testing/device-lg-d285/initfs-hook.sh index bc3c1d14b4..6a0c5d1355 100644 --- a/device/testing/device-lg-d285/initfs-hook.sh +++ b/device/testing/device-lg-d285/initfs-hook.sh @@ -1,4 +1,4 @@ #!/bin/sh # set framebuffer resolution -echo 1 > /sys/devices/fd900000.qcom,mdss_mdp/qcom,mdss_fb_primary.134/leds/lcd-backlight/brightness \ No newline at end of file +echo 1 > /sys/devices/fd900000.qcom,mdss_mdp/qcom,mdss_fb_primary.134/leds/lcd-backlight/brightness diff --git a/device/testing/device-lg-lenok/APKBUILD b/device/testing/device-lg-lenok/APKBUILD index 86a78a0e0f..e6dcedd775 100644 --- a/device/testing/device-lg-lenok/APKBUILD +++ b/device/testing/device-lg-lenok/APKBUILD @@ -1,7 +1,7 @@ # Reference: pkgname=device-lg-lenok pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="LG G Watch R" url="https://postmarketos.org" arch="armv7" @@ -44,7 +44,7 @@ asteroid() { sha512sums=" a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f 90-android-touch-dev.rules 470c765fee8ed7d81fa4177b682d0c4f6c138c8d472809b6a484fbd252b5ccb2911e4f21b915241b45e0757f42f8a15250cbe9ac87f7d3dc3ca8aa56d056da1d deviceinfo -1e72e40935d21f194cf3183fad33e8f5baeacf1458568af61f8ef7cc54c3370e63072de3d414e2ba8feddeee8f012a0d9a40ce23bbb5a47173fd92b9794846c8 fb_fix.sh +1fc5a7609d8f79f74f29d55ce492dc6b77bb247da1b79abc1361e5e9072b5283816cef02c4cc283300031d708733c5fdbed94f539ae1c16b1dca96bf4d512234 fb_fix.sh d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22 initfs-hook.sh 81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d machine.conf " diff --git a/device/testing/device-lg-lenok/fb_fix.sh b/device/testing/device-lg-lenok/fb_fix.sh index 33896d268b..7598e4c444 100644 --- a/device/testing/device-lg-lenok/fb_fix.sh +++ b/device/testing/device-lg-lenok/fb_fix.sh @@ -1,15 +1,15 @@ main() { - # Wait until graphical environment is running - sleep 5 - # Workaround for buggy graphics driver - while [ ! ]; - do - echo '0,0' > /sys/class/graphics/fb0/pan; - done + # Wait until graphical environment is running + sleep 5 + # Workaround for buggy graphics driver + while [ ! ]; + do + echo '0,0' > /sys/class/graphics/fb0/pan; + done } # tty1 autologin if [ $(tty) = "/dev/tty1" ]; then - # Run in background, to make /etc/profile not wait for it to finish - main & + # Run in background, to make /etc/profile not wait for it to finish + main & fi diff --git a/device/testing/device-motorola-cedric/APKBUILD b/device/testing/device-motorola-cedric/APKBUILD index 28213b31d8..10a0e4171e 100644 --- a/device/testing/device-motorola-cedric/APKBUILD +++ b/device/testing/device-motorola-cedric/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-motorola-cedric pkgdesc="Motorola Moto G5" pkgver=0.1 -pkgrel=9 +pkgrel=10 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -28,5 +28,5 @@ nonfree_firmware() { sha512sums=" 7e932688c61dbd79ae9efd5fb7ddab58b77d7760358a08e96d5998f30bb4f7740bf52df83ab2faffbf4e809197286c00ce7be8a94d870c8513cecb6072898716 deviceinfo -371dd1df5fa3b81031c9277b45e1b6dc158c2a71ef519c374aac8fd23792004ed7bd8dcba7c3097e08a571d15313acb732e3716ef57ddc6c11f8cb88b8c91670 initfs-hook.sh +b1eed94a800e7adca79fa716cfa4cc0da550b807a8b58d150900713073e289848002a6346dd2b89e939f0660e24bc982b95c5eafbd778373714f4d78e97e856c initfs-hook.sh " diff --git a/device/testing/device-motorola-cedric/initfs-hook.sh b/device/testing/device-motorola-cedric/initfs-hook.sh index 7df89a0562..25d9b33740 100644 --- a/device/testing/device-motorola-cedric/initfs-hook.sh +++ b/device/testing/device-motorola-cedric/initfs-hook.sh @@ -1,2 +1 @@ -echo 1 > /sys/devices/soc/78b7000.i2c/i2c-3/3-0020/drv_irq - +echo 1 > /sys/devices/soc/78b7000.i2c/i2c-3/3-0020/drv_irq diff --git a/device/testing/device-samsung-a20/APKBUILD b/device/testing/device-samsung-a20/APKBUILD index 8b9d2b5f12..3f1531f302 100644 --- a/device/testing/device-samsung-a20/APKBUILD +++ b/device/testing/device-samsung-a20/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-a20 pkgdesc="Samsung Galaxy A20" pkgver=0.1 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -28,5 +28,5 @@ nonfree_firmware() { sha512sums=" ee7e75c5007a52e27e0422b628cd2dcb816aecd931ea2c0a9f17ad56eea7b0a9a8aab5a330b6a974ad28eb05cbb7372b75ef56bde6e74ea39a60d6e8afceff9e deviceinfo -d5c8f7ed89a842da83109e899ba55802cf07518bea057c8f0a70d942e4a17ce87bb470741a99369bc095c0005c529047437a1833294ba903a93eb4f6822a4611 initfs-hook.sh +04445194a5245d08fcf1b425bff1d8dd6a8fdacafdc151223634299a35f1eb20fbd733979b58bcfd854e16fde02629c28453f840d6c9dc34fc15d4fcc8aa4302 initfs-hook.sh " diff --git a/device/testing/device-samsung-a20/initfs-hook.sh b/device/testing/device-samsung-a20/initfs-hook.sh index 923be58b84..f949aabff1 100644 --- a/device/testing/device-samsung-a20/initfs-hook.sh +++ b/device/testing/device-samsung-a20/initfs-hook.sh @@ -25,4 +25,4 @@ ln -s $CONFIGFS/g1/functions/rndis.usb0 $CONFIGFS/g1/configs/c.1 \ echo "0" >"$SYS/enable" echo "$(ls /sys/class/udc)" > $CONFIGFS/g1/UDC || echo " Couldn't write UDC" echo "rndis" >"$SYS/functions" -echo "1" >"$SYS/enable" \ No newline at end of file +echo "1" >"$SYS/enable" diff --git a/device/testing/device-samsung-gts210vewifi/90-sec_touchscreen.rules b/device/testing/device-samsung-gts210vewifi/90-sec_touchscreen.rules index 16ba9ce006..0a5e65ba5c 100644 --- a/device/testing/device-samsung-gts210vewifi/90-sec_touchscreen.rules +++ b/device/testing/device-samsung-gts210vewifi/90-sec_touchscreen.rules @@ -1,9 +1,9 @@ # * need ATTRS{name}=="sec_touchscreen" else device not detected as touchscreen # * give size hint (in mm) otherwise too small size is assumed -# * to avoid palm detection, need LIBINPUT_ATTR_PALM_PRESSURE_THRESHOLD=256 +# * to avoid palm detection, need LIBINPUT_ATTR_PALM_PRESSURE_THRESHOLD=256 # and libinput>1.10 # * set calibration matrix for 270 degree clockwise rotation, see [1] -# * remove TOUCHPAD, add TOUCHSCREEN to ensure that device is seen as +# * remove TOUCHPAD, add TOUCHSCREEN to ensure that device is seen as # touchscreen only, see [2] # # [1] https://wayland.freedesktop.org/libinput/doc/latest/udev_config.html diff --git a/device/testing/device-samsung-gts210vewifi/APKBUILD b/device/testing/device-samsung-gts210vewifi/APKBUILD index 31b9dbf81b..f058ebf176 100644 --- a/device/testing/device-samsung-gts210vewifi/APKBUILD +++ b/device/testing/device-samsung-gts210vewifi/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-gts210vewifi pkgdesc="Galaxy Tab S2 9.7 WiFi (SM-T813)" pkgver=0.1 -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -24,5 +24,5 @@ package() { sha512sums=" cbd2b59bc371d1298d09fcd33235b3e929c576107fd945f3ec48c99aee35f9b769cb84ea3f8eabef14c3e77857a625a5423b3f71b01a22d6998ab66278590d19 deviceinfo -7ff1ca9e9afe4ffa62ed1ce54c9988d761c29af54c9a22f68b1b7d805a5ae280fcfc1833fb657bb1137de649c876a1d4f4592af6b323e883042e0f1aa3a554cc 90-sec_touchscreen.rules +0d23fae6de9b04a36f395068278b8a9054c33e435b24de943da1e55a0ee2d88ee932a3fd2f660596377b14474483edecb8357684f9b7bc2c53979c7f863fae52 90-sec_touchscreen.rules " diff --git a/device/testing/device-samsung-j8y18lte/APKBUILD b/device/testing/device-samsung-j8y18lte/APKBUILD index b72397f349..1c0e3feff3 100644 --- a/device/testing/device-samsung-j8y18lte/APKBUILD +++ b/device/testing/device-samsung-j8y18lte/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-j8y18lte pkgdesc="Samsung Galaxy J8 (2018)" pkgver=1 -pkgrel=2 +pkgrel=3 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -39,7 +39,7 @@ nonfree_firmware() { sha512sums=" b82b37ae056eb53434e6b98dc31fbab86deafa439b6a1ca69eae953acd4814b99e453d657a22922318b82b3c08893bf7b08fe3d7d5d5f9dd4a72f9984ec42cb7 deviceinfo -a6d2541ae1a1bf1c74ddbe40d821e450ab1c02b3dd8c5228491616a92a73c181207460e4657473e0e5272472513a2cd92382147355c9ce150b223cdb1f21d396 initfs-hook.sh +c11610ccfbb2a46a4b721d64f8a2dbc4315768dbae52f1b675fce0ad0ab3b24d8685f944d914f6c37acc480e01b16ae8a2d280655f028f2ac577a68dee7aef7d initfs-hook.sh 3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515 directfbrc 070eb0e3716d1a13517667d6cc6db720cc865f56f7619b1d4d864157567656128523cfa935236fff30a211a011b5c53b66d0cc28c256ba115a86aac82f4dffe9 fb.modes 302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74 30-gpu-firmware.files diff --git a/device/testing/device-samsung-j8y18lte/initfs-hook.sh b/device/testing/device-samsung-j8y18lte/initfs-hook.sh index 5fad8d4819..bf4db4bb5b 100644 --- a/device/testing/device-samsung-j8y18lte/initfs-hook.sh +++ b/device/testing/device-samsung-j8y18lte/initfs-hook.sh @@ -7,4 +7,4 @@ echo 1 > /sys/devices/soc/78b7000.i2c/i2c-3/3-0020/drv_irq echo 0 0 > /sys/class/graphics/fb0/pan # Start Panel -startx \ No newline at end of file +startx diff --git a/device/testing/device-samsung-n5110/APKBUILD b/device/testing/device-samsung-n5110/APKBUILD index f9a3d8bea7..7d568bbd6d 100644 --- a/device/testing/device-samsung-n5110/APKBUILD +++ b/device/testing/device-samsung-n5110/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-n5110 pkgdesc="Samsung Galaxy Note 8.0 (Wi-Fi)" pkgver=0.1 -pkgrel=11 +pkgrel=12 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -27,7 +27,7 @@ package() { "$pkgdir"/usr/share/alsa/ucm/Kona_WM1811/hifi.conf install -D -m644 "$srcdir"/lp.conf \ - "$pkgdir"/usr/share/alsa/ucm/Kona_WM1811/lp.conf + "$pkgdir"/usr/share/alsa/ucm/Kona_WM1811/lp.conf } sha512sums=" diff --git a/device/testing/device-samsung-p4wifi/90-device-samsung-p4wifi-audio.rules b/device/testing/device-samsung-p4wifi/90-device-samsung-p4wifi-audio.rules index ccb81c9334..c57cf02fd8 100644 --- a/device/testing/device-samsung-p4wifi/90-device-samsung-p4wifi-audio.rules +++ b/device/testing/device-samsung-p4wifi/90-device-samsung-p4wifi-audio.rules @@ -1 +1 @@ -ATTRS{id}=="wm8994aif1", RUN+="/usr/bin/alsaucm -c wm8994aif1 set _verb HiFi set _enadev Headset" \ No newline at end of file +ATTRS{id}=="wm8994aif1", RUN+="/usr/bin/alsaucm -c wm8994aif1 set _verb HiFi set _enadev Headset" diff --git a/device/testing/device-samsung-p4wifi/APKBUILD b/device/testing/device-samsung-p4wifi/APKBUILD index a19c1e8d49..43fdf4caae 100644 --- a/device/testing/device-samsung-p4wifi/APKBUILD +++ b/device/testing/device-samsung-p4wifi/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-p4wifi pkgdesc="Galaxy Tab 10.1" pkgver=0.5 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -55,7 +55,7 @@ sha512sums=" 15f60b34b81efb9e53ae652ee93c0f884079ae4a28d6eb11c720af14fb7f1f63ee4c351280e8da97eb4bb25950a8ebadc929a4b3701bafe9a99200072eaf1458 deviceinfo e457d1095b4c5da105d83a3951ca8d4c5074384a1280dcc95f8a8c24aff64c32a807968ad449d335fbafba528050436c283036869fc979aced6e613892e46fca modules-load.conf 56b865bab0714aed53bd6535ebefd2f3629ec78786e8f87dcae4637cfacb5912d28dc39d1fe0287d34bb36b4a8371481f54647e1b25190afbcd23ed30fe7edac modprobe.conf -9c5c332e26b7eedb6eaa1631d133a9e430ee9322f62c80d4709b4d11b73566ae85b818e510bf1762bc8a1cc8cb617e400ddcf2583db11106b272ae65faf355cb 90-device-samsung-p4wifi-audio.rules +f5df6715d460eff0b6017d11eeb6135a225791ec1700eaea2cc2747e3bbe3d0cce5dba5aad87abf562a0b7a6d8c2bce3d6cb7fe69689bc786d697ed2f4b86514 90-device-samsung-p4wifi-audio.rules 03022552bdfc5c66acf0fd69f3a913cd24c5bdedb1a7f6db5ddee295eef27e27dabee727798cdb0000851f42d242474421d3a56a4405f8b2046080eba93fce06 90-device-samsung-p4wifi-jack.rules b973ed600914140006616f7205e66a2efff67002069dfd0fb731da254954d5f193d02cc687a41dd2e5ee698692b9cdd7cf1c3c4b3f3dd846372bbdced11acd39 HiFi e801765eedfb5b88e191811bcb98915559cb11c500ababced3abed3afe3b46a3cdfe393eb0265c2756a0e9d13b5067ae2208e02d91621cbd6834cf12f3f07ba6 wm8994aif1.conf diff --git a/device/testing/device-samsung-starqltechn/APKBUILD b/device/testing/device-samsung-starqltechn/APKBUILD index 050c054d1a..ef3991303c 100644 --- a/device/testing/device-samsung-starqltechn/APKBUILD +++ b/device/testing/device-samsung-starqltechn/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-samsung-starqltechn pkgdesc="Samsung Galaxy S9 SM-G9600" pkgver=0.2 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -34,5 +34,5 @@ sha512sums=" 1a51b1a75a7ab23b0011d2952e716b6d98a3a395578a99e278d8eda4c921ce015ce1f0e386a88b89e9f657edc867f00fffd11e550a91ec9ede2769d8cbfd1718 deviceinfo 8ecd6621738b14fecfb8bb32f06fa86053649f46d6ef7e50cdc6dd44175d459a8b5f185e0b1d6168d23d6b8474ea31ae9aaf306385eb106df6489e6838b4fbe1 boot_image.its ba782c324c14cf0947c752b51a607ae1b08def885b0cf0afe89d1fcade3491ab2f547551eb08bd8074f608dac46bdcdf75c5c633bd7a15e6eb63a10f30994c82 payload_mock.dts -d7c5c52cb3b747d814680411cc2381e6158714f89aa7ffbeb639193cb10346f6f5b4b8897d2e1c0ce3889178e845599686e8e525a369be35503c2018f152fdb1 bootscript.sh +fc9a353946a061b964b8d85ba40a55aabd5dc51ad079ce9013473fb2031f2bea7f987dc437f3e7b515e7f1eccc16c7ba0c616926f59f98382b1193e6875b50f3 bootscript.sh " diff --git a/device/testing/device-samsung-starqltechn/bootscript.sh b/device/testing/device-samsung-starqltechn/bootscript.sh index 5177c5daa0..1c50c62be9 100644 --- a/device/testing/device-samsung-starqltechn/bootscript.sh +++ b/device/testing/device-samsung-starqltechn/bootscript.sh @@ -1,3 +1,3 @@ setenv bootargs 'console=tty1 loglevel=15 clk_ignore_unused' -bootm $prevbl_initrd_start_addr \ No newline at end of file +bootm $prevbl_initrd_start_addr diff --git a/device/testing/device-xiaomi-armani/APKBUILD b/device/testing/device-xiaomi-armani/APKBUILD index 35224463b4..d53aa74704 100644 --- a/device/testing/device-xiaomi-armani/APKBUILD +++ b/device/testing/device-xiaomi-armani/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-xiaomi-armani pkgdesc="Redmi 1S" pkgver=0.1 -pkgrel=15 +pkgrel=16 url="https://postmarketos.org" license="MIT" arch="armhf" @@ -43,7 +43,7 @@ sha512sums=" c215c71f60d9d83da085daf4dae4e56fb65575438c7a01e8bdc64be62b34b9a090645d39403a58460d454fa86891d30596eaa49890c932c420434cb359d3ef9e deviceinfo abf694ebe949025268630457ad14ae69f6a33c151236c1a193da32c27f836591e932517f011f6eb7ce750ab74d2f1e9a70724fed7150210d4da1b80a6e86a801 90-touchscreen.rules 862f9a8d81af74c0a1c99c6255d4ec9d4bdd7828636ee29fbaf4b3ceef53f236fd2b2078e3150baf0f1d78a3da87d7b3a5b975fef33014238eb7658428642571 100-charging.rules -cf82b3bf37c4975668d7bb6f0e573fa5b44ed596d80a7ac2cdfa78dd619b7dc58c085fe1a0703953a143a46a4d917abf94f658e268578fe1c40664fa639959d3 armani_battery_charging.sh +8d06a86877c3b6f12e98d7509e634014e790c1356b6b0dd6e86859365588d899f6d94652abc9b749a4ae648abffb4cd39778c27535812d86b589f7f71e2cfdf7 armani_battery_charging.sh c2ae3887712a209a8c8dc60ee87ff1ec8944246cc1a69d1f6f9f2725434e05b6c8388c0b3756423d5cec6a6e0ffc7272c30ccc20b77f0dac0813bb25476d4997 armani_battery_discharging.sh 22339e8b1c854e740034fe305d8447a88f7be98f8f2ef86b7e9ea6e373a30643993d95865c820df6c3598605d3390eb93a859c7a423f04de54a3b06a69adcb55 wlanarmani cf2b75e766f6ed5b7372179dfe160ecf1fa24a1c4f054abacc98e69794db90ca2c7f686325f7ce806b102c8eb93a345da3c016b17f280eda47f5891322162362 fb.modes diff --git a/device/testing/device-xiaomi-armani/armani_battery_charging.sh b/device/testing/device-xiaomi-armani/armani_battery_charging.sh index 408aa0ef87..69b7416ff4 100644 --- a/device/testing/device-xiaomi-armani/armani_battery_charging.sh +++ b/device/testing/device-xiaomi-armani/armani_battery_charging.sh @@ -1,4 +1,4 @@ #!/bin/sh -logger "Battery is in charging state" +logger "Battery is in charging state" echo 0 > /sys/class/leds/red/brightness echo 100 > /sys/class/leds/green/brightness diff --git a/device/testing/device-xiaomi-vince/APKBUILD b/device/testing/device-xiaomi-vince/APKBUILD index e513a44ebb..0a76402255 100644 --- a/device/testing/device-xiaomi-vince/APKBUILD +++ b/device/testing/device-xiaomi-vince/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-xiaomi-vince pkgdesc="Xiaomi Redmi 5 Plus" pkgver=4 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -102,8 +102,8 @@ sha512sums=" 9b888f3a4ef3ed3c0b2e9c6a6e8a6c686909c530c3d95be797b47b4eb9deb55d64190b7a3736e44139630bfff5e295625a855052923369fdd37889060a3220ca fb.modes b6951e2f8d2e21aa58f15b600a67289900d645b9dcff9992d0864dea383528539fc8b0140bff6af4eba4bb729db79a3d5d88ba248fcf2b579dd8c3cd0e20ae4e 100-charging.rules 922519b787ab8d6886f3b2e0ace84de69d0e185208776aedd471828132d13bc6364393cd5c7f97634de014aaf3fb100c9fa4724c97d6d1220320d2e73e0f1947 buttons.conf -89195cfaa131eef1a34c882685ed53eb0e80d1520cf9924e775875bde1de883448f3d182775f8323b261afaf0f6a5e73aa31142f2e72acc3ac584a64de6e72a3 charging.sh -947fb09b7dce638d28afb367ce193437092bca956647486d67438a3fbb695c9354bc1174a68a5993644c3c619f9826cb8a84b8b9f49b513a484089a965b665c5 discharging.sh +ab320227a6f680b51139ee2943bab315651a50b1681ab161af4b555b41cf1b895e0b3fc0e66590dc51b6a3d914ea6c88a6c0dfefaa11fd0023e473ceffaafeb9 charging.sh +000bf443d48a32f9ab5279e4adaeaf8b16d32ac3a034d7003db1de240c7cff5eb7bdc75e0fdeb64a07584633aac322682945574ce5873a957ccdad2ad345f5da discharging.sh 24762c3f4b0d1e9a035495c05e53852a68d46699e1f41915bd6d68af3d2a22dad075c77209533d92a81693aa45c86018ce825a8b7e7a8c163b59d826d9e204d1 vince-audioctl.sh 4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975 pointercal a72522650df9ff6bda188aeca71b9e2dacf810e1efaa10d8c32eb65e445ffb69e49410f531bc110abab270126140baa047ca847c9ed7a84f231c9c678263fc0e HiFi.conf diff --git a/device/testing/device-xiaomi-vince/misc/charging.sh b/device/testing/device-xiaomi-vince/misc/charging.sh index fa0ab50d9c..a3737b2483 100644 --- a/device/testing/device-xiaomi-vince/misc/charging.sh +++ b/device/testing/device-xiaomi-vince/misc/charging.sh @@ -1,7 +1,7 @@ #!/bin/sh # We'll vibrate a bit here, then turn the led on. -echo 500 > /sys/class/leds/vibrator/duration +echo 500 > /sys/class/leds/vibrator/duration echo 100 > /sys/class/leds/vibrator/brightness echo 1 > /sys/class/leds/vibrator/activate echo 150 > /sys/class/leds/red/brightness diff --git a/device/testing/device-xiaomi-vince/misc/discharging.sh b/device/testing/device-xiaomi-vince/misc/discharging.sh index 080f5410c8..8bd39b039a 100644 --- a/device/testing/device-xiaomi-vince/misc/discharging.sh +++ b/device/testing/device-xiaomi-vince/misc/discharging.sh @@ -3,6 +3,6 @@ echo 0 > /sys/class/leds/red/brightness # We'll vibrate a bit here. -echo 500 > /sys/class/leds/vibrator/duration +echo 500 > /sys/class/leds/vibrator/duration echo 100 > /sys/class/leds/vibrator/brightness echo 1 > /sys/class/leds/vibrator/activate diff --git a/device/testing/firmware-hisense-m470bsa/APKBUILD b/device/testing/firmware-hisense-m470bsa/APKBUILD index 14400eb829..bc217405ce 100644 --- a/device/testing/firmware-hisense-m470bsa/APKBUILD +++ b/device/testing/firmware-hisense-m470bsa/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-hisense-m470bsa pkgver=1 -pkgrel=1 +pkgrel=2 _commit="42fbba77c06cf822021554ed1b0e4736dbce2e72" pkgdesc="Hisense Sero 7 Pro Firmware" url="https://github.com/dolorespark/android_vendor_hisense_m470bsa" @@ -20,7 +20,7 @@ package() { for _fw in BCM20791B4_002.005.010.0103.0000_Hisense_I2CGED_NCD_Signed_Test.ncd BCM20791B4_002.005.010.0103.0000_Hisense_PreI2C_NCD_Signed_Test.ncd tlv320aic3206_fw_v1.bin; do install -Dm644 prebuilt/vendor/firmware/"$_fw" \ "$pkgdir"/lib/firmware/postmarketos/"$_fw" - done + done install -Dm644 prebuilt/etc/nvram_4330.txt \ "$pkgdir"/lib/firmware/postmarketos/nvram_4330.txt diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD index af1b49afc6..79e67135fd 100644 --- a/main/devicepkg-dev/APKBUILD +++ b/main/devicepkg-dev/APKBUILD @@ -1,6 +1,6 @@ pkgname=devicepkg-dev pkgver=0.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="Provides default device package functions" url="https://postmarketos.org" arch="all" @@ -64,7 +64,7 @@ sha512sums=" d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h 77dcc7bc4f90bc11f99b7bb88be171f706f7d92921b694ce862d31ab858a4b8850c9e0bdb68299ffce9f934a3c8ab16eb307fd09534085e65f0101334bd68a9d devicepkg_build.sh 74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4 devicepkg_package.sh -53aa129da5bd52376271bbd37ed7205f2dac971d442c5085260ed1c4a9b014a656cbe28ea45d242be60a2d0f8851611f3b8352c880c017995cda6ae093e5d324 downstreamkernel_prepare.sh +f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6 downstreamkernel_prepare.sh 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8 devicepkg_subpackage_kernel.sh 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3 deviceinfo diff --git a/main/devicepkg-dev/downstreamkernel_prepare.sh b/main/devicepkg-dev/downstreamkernel_prepare.sh index 22d7e8c00e..74541e559e 100644 --- a/main/devicepkg-dev/downstreamkernel_prepare.sh +++ b/main/devicepkg-dev/downstreamkernel_prepare.sh @@ -45,7 +45,7 @@ makefiles="$(find "$builddir" -type f -name Makefile) $(find "$builddir" -type f -name Kbuild)" for i in $makefiles; do sed -i 's/-Werror-/-W/g' "$i" - sed -i 's/-Werror=/-W/g' "$i" + sed -i 's/-Werror=/-W/g' "$i" sed -i 's/-Werror//g' "$i" done diff --git a/main/osk-sdl/APKBUILD b/main/osk-sdl/APKBUILD index 533c6cd20b..18f091c460 100644 --- a/main/osk-sdl/APKBUILD +++ b/main/osk-sdl/APKBUILD @@ -5,7 +5,7 @@ # https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10712 pkgname=osk-sdl pkgver=0.67.1 -pkgrel=0 +pkgrel=1 pkgdesc="Onscreen keyboard for unlocking LUKS devices" url="https://gitlab.com/postmarketOS/osk-sdl" arch="all" @@ -60,6 +60,6 @@ package() { sha512sums=" d699069b7acc1af9ade87ba01b3c2e8e9556bf762ea95b8379ebc7309fcb14ce7972d1563b599dd72068d50ebac039304089fdeb3a2c7972c84c2abe94853098 osk-sdl-0.67.1.tar.gz e1017bc0667756b82527d88f47a77e2f5a44e0769b5ccdea0c6c1f86bd3d0a1df9d9f5bbb224888748cfef5edc3375036a25099eb02c963302f155c3b2e8fefd osk-sdl.files -5e2de0da40f3b409cb01c388ab61e8072db30789af6f8a7fec817699dcb928b8aec25288fb1e59403e99769dec032f1b446bcc5f761d9a6504e238fa205281fd unlock.sh +9d4e92ce0fa8a6bb3da20b55cda59b74c40efa4a93f1bf40b520ad071d74dbeac8165891acad933d943035e2bbc0fd2c1349b3c768139e3612835e58fdaba444 unlock.sh b4dfd5030603e35553dadb5617d27f4fbf1101daafee2cdc9ccff6e7570b5c853abee98c627fbd37927b2f6e10ebc1a5e0de20e8a61cd97b2c573a7a81447236 set-font.patch " diff --git a/main/osk-sdl/unlock.sh b/main/osk-sdl/unlock.sh index eac5446c55..6e9f813095 100644 --- a/main/osk-sdl/unlock.sh +++ b/main/osk-sdl/unlock.sh @@ -45,11 +45,11 @@ run_osk_sdl() { # shellcheck disable=SC2154 if [ -n "$deviceinfo_mesa_driver" ]; then - # try to run osk-sdl with kmsdrm driver, then fallback to - # directfb if that fails - if ! run_osk_sdl "kmsdrm"; then - run_osk_sdl "directfb" - fi + # try to run osk-sdl with kmsdrm driver, then fallback to + # directfb if that fails + if ! run_osk_sdl "kmsdrm"; then + run_osk_sdl "directfb" + fi else - run_osk_sdl "directfb" + run_osk_sdl "directfb" fi diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 4d9bc6e611..59dde1c81c 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base pkgver=23 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" @@ -132,5 +132,5 @@ de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b1 5fd6dd7f9941e975a6ce559924eb252606943276dc09455bbeb05ff718ecd28f20a08eee8e04ca580e5af71d4c944c256ec04f07b07286394f5dfedfa59273e7 rootfs-etc-init.d-deferred-initcalls f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 rootfs-etc-init.d-swapfile 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 rootfs-sbin-swapfile -38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af rootfs-usr-lib-firmwareload.sh +72c73bd67bfe2a659c469781e4def038a9b2482e014c0304150fbc25c5325fc7a36b288de76447837741bb9a828eb1db6df0d33b41cf67c7a25bb27b03777b1f rootfs-usr-lib-firmwareload.sh " diff --git a/main/postmarketos-base/rootfs-usr-lib-firmwareload.sh b/main/postmarketos-base/rootfs-usr-lib-firmwareload.sh index 95baccf311..e58917bca2 100644 --- a/main/postmarketos-base/rootfs-usr-lib-firmwareload.sh +++ b/main/postmarketos-base/rootfs-usr-lib-firmwareload.sh @@ -5,17 +5,17 @@ FIRMWARE_DIRS="/lib/firmware /lib/firmware/postmarketos" exec >>/var/log/firmwareload.log 2>&1 if [ ! -e "/sys/$DEVPATH/loading" ]; then - echo "firmware loader misses sysfs directory" - exit 1 + echo "firmware loader misses sysfs directory" + exit 1 fi for DIR in $FIRMWARE_DIRS; do - [ -e "$DIR/$FIRMWARE" ] || continue - echo "loading $DIR/$FIRMWARE" - echo 1 > "/sys/$DEVPATH/loading" - cat "$DIR/$FIRMWARE" > "/sys/$DEVPATH/data" - echo 0 > "/sys/$DEVPATH/loading" - exit 0 + [ -e "$DIR/$FIRMWARE" ] || continue + echo "loading $DIR/$FIRMWARE" + echo 1 > "/sys/$DEVPATH/loading" + cat "$DIR/$FIRMWARE" > "/sys/$DEVPATH/data" + echo 0 > "/sys/$DEVPATH/loading" + exit 0 done # shellcheck disable=SC2039 diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 731df1768e..bdebe61cbf 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Clayton Craft pkgname=postmarketos-mkinitfs pkgver=1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" depends=" @@ -68,5 +68,5 @@ sha512sums=" b5214a275b5bf553621a345400b74af6f24f620c706e23b8bbfe42d400e835268e846834480bb1b955fa91ba4357e4339fa0f05304ce3536bfd270d1f91633a2 postmarketos-mkinitfs-1.5.tar.gz 20f110337113e8de8999cf2a064a93fea36821d5c216bfa4ba46ec1f83825638262b92fd7be29eee0a85a54a108b7315a96cbe30da8ae4419f54c2ed53bb08c7 00-default.modules ccdceaa710d97d6f57d8d66bfcbec448486d08083341712303f62123039f729229b88528308e411a308a2b90b81b60de89fe91143a6facbb11cbc9b4055eeaec init.sh -9de283415732dacf2ed95432df0c41702a75b3fa36bff5aa115f66e4b8e1278eb7454f0ab1e10dfee2523f8a89ceb8ebcb5d4c3f221a7a983fe17589e720a127 init_functions.sh +2abdea96aa66fcc709092ab97bfe5a99ecd7a6c959e344e0619a1c93ce28de21530379c498012a4d8e938013e7b490d3a00d5782b6d75c0987220ac3e7d66c92 init_functions.sh " diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index d98b79558c..854cc5ec06 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -603,8 +603,8 @@ show_splash() { return fi # Disable splash - if grep -q PMOS_NOSPLASH /proc/cmdline; then - return + if grep -q PMOS_NOSPLASH /proc/cmdline; then + return fi echo "IMG_ALIGN=CM" >>/tmp/fbsplash.cfg gzip -c -d "$1" >/tmp/splash.ppm diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index 9fbd4830ce..3df6884e83 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Martijn Braam pkgname=postmarketos-ui-i3wm pkgver=0.3 -pkgrel=12 +pkgrel=13 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" @@ -39,5 +39,7 @@ package() { install -Dm644 "$srcdir"/65-lightdm-autologin.conf \ "$pkgdir"/usr/share/lightdm/lightdm.conf.d/65-autologin.conf } -sha512sums="2165141499a830beb33ee42e410ba39104f3e70cd61507f0607115d421846104659fa7e9d4193b3394f7384fc33c2233269bb61c99d5d8a2368aa83500e54b35 lock.sh -60f4e1f3314ce8de6b92a2eb642f199c5ed24a18981958d787f0e876fa629598340cf467ab991dda4e3927ed6b11011dc0357bdcf0e5f1baac444939b4647445 65-lightdm-autologin.conf" +sha512sums=" +caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f lock.sh +60f4e1f3314ce8de6b92a2eb642f199c5ed24a18981958d787f0e876fa629598340cf467ab991dda4e3927ed6b11011dc0357bdcf0e5f1baac444939b4647445 65-lightdm-autologin.conf +" diff --git a/main/postmarketos-ui-i3wm/lock.sh b/main/postmarketos-ui-i3wm/lock.sh index 0e23ecc123..5be2942542 100644 --- a/main/postmarketos-ui-i3wm/lock.sh +++ b/main/postmarketos-ui-i3wm/lock.sh @@ -2,13 +2,13 @@ FILE=~/.screenoff if [ -f $FILE ]; then - xinput set-prop 8 "Device Enabled" 1 - xset dpms force on - rm "$FILE" + xinput set-prop 8 "Device Enabled" 1 + xset dpms force on + rm "$FILE" else - xinput set-prop 8 "Device Enabled" 0 - # Turn screen off twice (sometimes it does not work on first run) - xset dpms force off - xset dpms force off - touch "$FILE" + xinput set-prop 8 "Device Enabled" 0 + # Turn screen off twice (sometimes it does not work on first run) + xset dpms force off + xset dpms force off + touch "$FILE" fi diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index c447c9f442..8255d38d78 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-kodi pkgver=2 -pkgrel=3 +pkgrel=4 pkgdesc="(GBM) 10-foot UI useful on TV's" url="https://kodi.tv" arch="x86 x86_64 aarch64" # flatbuffers missing on armhf and armv7 @@ -31,5 +31,5 @@ package() { "$pkgdir"/usr/lib/udev/rules.d/99-automount-media.rules } sha512sums=" -80de117c696854d45b5fca98a7ea975a103fedf483e1415c19060447673d15d3ee1fe7fcdb3f093821fdcb0fdb389af106638c7e6a39b33028dc4d176395f0e8 automount-media.rules +2f1d46ba553cfa129f343ac856d736532374a347329016e35235aa6173658c9db64b259363180207592e77bf1817011b7df6c966f002850c4b0b1ddea856ae27 automount-media.rules " diff --git a/main/postmarketos-ui-kodi/automount-media.rules b/main/postmarketos-ui-kodi/automount-media.rules index c252f9fc9e..7a87500afa 100644 --- a/main/postmarketos-ui-kodi/automount-media.rules +++ b/main/postmarketos-ui-kodi/automount-media.rules @@ -1,19 +1,19 @@ # Automount any media you plug into the device to make it accessible to Kodi # Thanks to https://www.axllent.org/docs/auto-mounting-usb-storage/ -KERNEL!="sd[a-z][0-9]", GOTO="media_by_label_auto_mount_end" -# Import FS infos -IMPORT{program}="/sbin/blkid -o udev -p %N" -# Get a label if present, otherwise specify one -ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}" -ENV{ID_FS_LABEL}=="", ENV{dir_name}="usbhd-%k" -# Global mount options -ACTION=="add", ENV{mount_options}="relatime" -# Filesystem-specific mount options -ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", ENV{mount_options}="$env{mount_options},utf8,gid=100,umask=002" -# Mount the device -ACTION=="add", RUN+="/bin/mkdir -p /media/%E{dir_name}", RUN+="/bin/mount -o $env{mount_options} /dev/%k /media/%E{dir_name}" -# Clean up after removal -ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l /media/%E{dir_name}", RUN+="/bin/rmdir /media/%E{dir_name}" -# Exit +KERNEL!="sd[a-z][0-9]", GOTO="media_by_label_auto_mount_end" +# Import FS infos +IMPORT{program}="/sbin/blkid -o udev -p %N" +# Get a label if present, otherwise specify one +ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}" +ENV{ID_FS_LABEL}=="", ENV{dir_name}="usbhd-%k" +# Global mount options +ACTION=="add", ENV{mount_options}="relatime" +# Filesystem-specific mount options +ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", ENV{mount_options}="$env{mount_options},utf8,gid=100,umask=002" +# Mount the device +ACTION=="add", RUN+="/bin/mkdir -p /media/%E{dir_name}", RUN+="/bin/mount -o $env{mount_options} /dev/%k /media/%E{dir_name}" +# Clean up after removal +ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l /media/%E{dir_name}", RUN+="/bin/rmdir /media/%E{dir_name}" +# Exit LABEL="media_by_label_auto_mount_end" diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 88c0ecad5d..4b35b9eeab 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=6 -pkgrel=4 +pkgrel=5 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" @@ -45,6 +45,6 @@ package() { "$pkgdir"/etc/xdg/weston/weston.ini.default } sha512sums=" -33fbf6a3b5558a6d7c3a5993e890e4cee10e868ebc70e8f602d5e07513a77a0bebf7fd343c90a2a72c4f4b30777d3cd7b48c66efb4112032f4421d2806ef3b9b start_weston.sh +6c9f4f6eeb179b067f1d08c84f35d6a705043432a92c3733491de3c240d48a85e95173e0b4e2f83b737761212a2aec365b1375c077c330735013c9cf36d4390e start_weston.sh 57d2dd91aa6bee6ab73122bf26906de183fceee9f6c28586ac803045344b10c4e3c7e9cd23cada86a585c42221505a2d23572e3d6d1fd757c1ed1c8e1b65644c weston.ini.default " diff --git a/main/postmarketos-ui-weston/start_weston.sh b/main/postmarketos-ui-weston/start_weston.sh index 7cc382319b..aaca6c533e 100644 --- a/main/postmarketos-ui-weston/start_weston.sh +++ b/main/postmarketos-ui-weston/start_weston.sh @@ -9,8 +9,8 @@ export DISPLAY=:0 XDG_RUNTIME_DIR=/tmp/$(id -u)-runtime-dir export XDG_RUNTIME_DIR if ! test -d "${XDG_RUNTIME_DIR}"; then - mkdir "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" fi # Find right weston.ini @@ -21,10 +21,10 @@ WESTON_OPTS="--config=$cfg" # #633: Weston doesn't support autostarting applications (yet), so # we try to run postmarketos-demos for 10 seconds, until it succeeds. ( - for _ in $(seq 0 19); do - sleep 0.5 - postmarketos-demos && break - done + for _ in $(seq 0 19); do + sleep 0.5 + postmarketos-demos && break + done ) & diff --git a/main/qtwebbrowser/APKBUILD b/main/qtwebbrowser/APKBUILD index cb470faff0..02235428d0 100644 --- a/main/qtwebbrowser/APKBUILD +++ b/main/qtwebbrowser/APKBUILD @@ -1,6 +1,6 @@ pkgname=qtwebbrowser pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Qt web browser" url="http://doc.qt.io/QtWebBrowser/" arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 @@ -27,8 +27,10 @@ package() { } -sha512sums="a385ef2c6459733606945bc3a6857bfbc725fa04224ee4309196220c3a9be177d52bbaf0bab57fac7a15b38920b8d19852db04451bdbdadb4f03a7f5803319ab qtwebbrowser-1.0.tar.gz +sha512sums=" +a385ef2c6459733606945bc3a6857bfbc725fa04224ee4309196220c3a9be177d52bbaf0bab57fac7a15b38920b8d19852db04451bdbdadb4f03a7f5803319ab qtwebbrowser-1.0.tar.gz 5e14de5c4c8aec79f3ab25947e1f4091fdbf9a38a894229d1f636dbbb17480970e3c9d7dfdf7cc57e42246a55058025ee3e200145115cfea507f0611aaa3dd77 qtwebbrowser.svg -a0a09a8d7942ae7ce5f5bd3be96fb96448babf05191d46582366db1a1c2db97d724b5767f34959cabe18bbce36b64b2c2dfdefae4e23391d9cdddb83afb22ae5 startup-qtwebbrowser.sh +008998972cb836327203a740e0fa2929a4028b70366597ed0f21640f1383ed93630c40f2e0eb4fea59a8b8367e825c321803c8b5f73b16def4dbe31f5d9fbc69 startup-qtwebbrowser.sh 681a1275f7d09991cdffe9a0f86aa9af22103807d02fd24e806a46e79c8eacb4eea907ef1a677d5eacc379e0666934b346662c99e76026e3dc7820df162a9fe6 qtwebbrowser.desktop -6802f908973d29dc73f87df831cc4303dfc2eaf11a082341d1ff4618bbbcb712e858cab20bf67ed6cc2ef5eacfb44f80ec04d3765890b49ce510040d01986880 0001-Patch-for-usability-on-postmarketOS.patch" +6802f908973d29dc73f87df831cc4303dfc2eaf11a082341d1ff4618bbbcb712e858cab20bf67ed6cc2ef5eacfb44f80ec04d3765890b49ce510040d01986880 0001-Patch-for-usability-on-postmarketOS.patch +" diff --git a/main/qtwebbrowser/startup-qtwebbrowser.sh b/main/qtwebbrowser/startup-qtwebbrowser.sh index f6e6a9de3f..d13fccb9aa 100644 --- a/main/qtwebbrowser/startup-qtwebbrowser.sh +++ b/main/qtwebbrowser/startup-qtwebbrowser.sh @@ -9,7 +9,7 @@ while [ "$need_to_start" -eq "1" ]; do START=$(date +%s) #Start the app with X11 and scale factor to 1.75 - QT_SCALE_FACTOR=1.75 QT_QPA_PLATFORM=xcb qtwebbrowser-bin >/tmp/qtwebbrowserlog 2>&1 + QT_SCALE_FACTOR=1.75 QT_QPA_PLATFORM=xcb qtwebbrowser-bin >/tmp/qtwebbrowserlog 2>&1 END=$(date +%s) EXEC_TIME=$(( $END - $START )) @@ -22,7 +22,7 @@ while [ "$need_to_start" -eq "1" ]; do #If the browser did not crash we do not need to restart it #It was closed intentionally by the user - #If it crashed 4 times in a row at startup don't try again + #If it crashed 4 times in a row at startup don't try again #in order to avoid loops cat /tmp/qtwebbrowserlog | grep "Received signal" if [ "$?" -ne "0" ] || [ "$crash_at_start" -ge "4" ]; then diff --git a/main/swclock-offset/APKBUILD b/main/swclock-offset/APKBUILD index 66e4fbf8e7..26bf908ad0 100644 --- a/main/swclock-offset/APKBUILD +++ b/main/swclock-offset/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakko pkgname=swclock-offset pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Keep system time at an offset to a non-writable RTC" url="https://gitlab.com/postmarketOS/pmaports" arch="noarch" @@ -26,6 +26,6 @@ openrc() { sha512sums=" 777dff161dcae742d1bfb7acbf413a319c9e623292a315ccd8cf5f3f0df9258d54d3e9891bdff741a6146ab285bc5a27c7921bc93902b4a2006104666a835ecd swclock-offset-boot.initd a834fe9f721a4797f5675361fe07b500f93a2082753ed0a0fd583ccfd49738acfe04fb526e2936f3ce270053d151c7080a6a5356246fb816638e72992c6f77db swclock-offset-shutdown.initd -288373bef5d7e5a64d118396491b424fb9cd38bfb3e7c422762c4c1441894617e59140035cd824846880c159fe3b9f6f8ceaddd552014e53b4e0ab05da7931dc swclock-offset-boot.sh -49f2ac3b4f41904097d1b5e903b810abd3da005972fffc14bd34d3c25aaa9b92d293a10bfa4348e160060670ed19d50e06ac6c9b8ebe663e56bf30e36c28edf9 swclock-offset-shutdown.sh +a3b7ea5963da066ddfec64dac56b4c15306de6e5dc0028a6d88e4fceef8b5229e0847c91fea556488476e281424883df7738a305ad9efb1a1531ec8eba493848 swclock-offset-boot.sh +36a6a1d8b9907e3b8e2342cb20b29fecd5904d4fb01c81e67e528242cb8b5f8e7745ecee69a1be797ee5ffae2156419e21e68118393394ccb1c808a5268490a3 swclock-offset-shutdown.sh " diff --git a/main/swclock-offset/swclock-offset-boot.sh b/main/swclock-offset/swclock-offset-boot.sh index 3c349e9d6f..dfdf96d085 100644 --- a/main/swclock-offset/swclock-offset-boot.sh +++ b/main/swclock-offset/swclock-offset-boot.sh @@ -15,12 +15,12 @@ offset_file="/var/cache/swclock-offset/offset-storage" # check presence of rtc sys node if [ ! -f $rtc_sys_node ]; then - exit 1 + exit 1 fi # check presence of offset file if [ ! -f $offset_file ]; then - exit 2 + exit 2 fi # calculate system time diff --git a/main/swclock-offset/swclock-offset-shutdown.sh b/main/swclock-offset/swclock-offset-shutdown.sh index 934f91cc14..5df465815e 100644 --- a/main/swclock-offset/swclock-offset-shutdown.sh +++ b/main/swclock-offset/swclock-offset-shutdown.sh @@ -13,12 +13,12 @@ offset_directory="/var/cache/swclock-offset" # check presence of rtc sys node if [ ! -f $rtc_sys_node ]; then - exit 1 + exit 1 fi # check presence of offset directory if [ ! -d $offset_directory ]; then - mkdir -p $offset_directory + mkdir -p $offset_directory fi # calculate offset