diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64ec4aed..b0127721 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,11 @@ ## Reporting issues -* Consider joining the [chat](https://github.com/postmarketOS/pmbootstrap/wiki/Matrix-and-IRC) for instant help. -* Maybe your question is answered in the [wiki](https://github.com/postmarketOS/pmbootstrap/wiki) somewhere. [Search](https://github.com/postmarketOS/pmbootstrap/search?q=&type=Wikis&utf8=%E2%9C%93) first! +* Consider joining the [chat](https://wiki.postmarketos.org/wiki/Matrix_and_IRC) for instant help. +* Maybe your question is answered in the [wiki](https://wiki.postmarketos.org/) somewhere. [Search](https://wiki.postmarketos.org/index.php?search=&title=Special%3ASearch&go=Go) first! * Otherwise, just ask what you want to know. We're happy if we can help you and glad that you're using `pmbootstrap`! ## Development -See pmbootstrap's [Development Guide](https://github.com/postmarketOS/pmbootstrap/wiki/Development-guide). +See pmbootstrap's [Development Guide](https://wiki.postmarketos.org/wiki/Development_guide). ### Contributing code changes * [Fork](https://guides.github.com/activities/forking/) this repository, commit your changes and then make a [pull-request](https://guides.github.com/activities/forking/#making-a-pull-request) (PR). @@ -33,4 +33,3 @@ This is a reST style. **If you need any help, don't hesitate to open an [issue](https://github.com/postmarketOS/pmbootstrap/issues) and ask!** - diff --git a/README.md b/README.md index 1cd4e807..3f110c26 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # pmbootstrap -[**Introduction**](https://ollieparanoid.github.io/post/postmarketOS) | [**Security Warning**](https://ollieparanoid.github.io/post/security-warning/) | [**Supported Devices**](https://github.com/postmarketOS/pmbootstrap/wiki/Devices) | [![travis badge](https://api.travis-ci.org/postmarketOS/pmbootstrap.png?branch=master)](https://travis-ci.org/postmarketOS/pmbootstrap) +[**Introduction**](https://ollieparanoid.github.io/post/postmarketOS) | [**Security Warning**](https://ollieparanoid.github.io/post/security-warning/) | [**Supported Devices**](https://wiki.postmarketos.org/wiki/Supported_devices) | [![travis badge](https://api.travis-ci.org/postmarketOS/pmbootstrap.png?branch=master)](https://travis-ci.org/postmarketOS/pmbootstrap) Sophisticated chroot/build/flash tool to develop and install postmarketOS. @@ -14,7 +14,7 @@ For in-depth information please refer to the [postmarketOS wiki](https://github. ## Usage -Assuming you have a supported device, you can build and flash a postmarketOS image by running through the following steps. For new devices check the [porting guide](https://github.com/postmarketOS/pmbootstrap/wiki/Porting-to-a-new-device). +Assuming you have a supported device, you can build and flash a postmarketOS image by running through the following steps. For new devices check the [porting guide](https://wiki.postmarketos.org/wiki/Porting_to_a_new_device). First, clone the git repository and initialize your pmbootstrap environment: @@ -53,7 +53,7 @@ Trying 172.16.42.1... Connected to 172.16.42.1. Escape character is '^]'. -Enter passphrase for /dev/mapper/mmcblk0p25p2: +Enter passphrase for /dev/mapper/mmcblk0p25p2: Connection closed by foreign host. ``` @@ -72,4 +72,3 @@ Install `pytest` (via your package manager or pip) and run it inside the pmboots ## License [GPLv3](LICENSE) - diff --git a/aports/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch b/aports/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch index e9305038..d11e70cb 100644 --- a/aports/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch +++ b/aports/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch @@ -4,7 +4,7 @@ Date: Mon, 17 Jul 2017 19:55:45 +0200 Subject: [PATCH 2/3] compositor-fbdev: Add support for ABGR This is needed for Asus grouper (Google Nexus 7 2012) -https://github.com/postmarketOS/pmbootstrap/wiki/asus-grouper-%28Google-Nexus-7-2012%29 +https://wiki.postmarketos.org/wiki/Google_Nexus_7_2012_(asus-grouper) --- libweston/compositor-fbdev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) @@ -16,13 +16,13 @@ index b7d2c74..8158841 100644 @@ -223,8 +223,8 @@ calculate_pixman_format(struct fb_var_screeninfo *vinfo, vinfo->blue.length); } - + - /* Work out the format type from the offsets. We only support RGBA and - * ARGB at the moment. */ + /* Work out the format type from the offsets. We only support RGBA, + * ARGB and ABGR at the moment. */ type = PIXMAN_TYPE_OTHER; - + if ((vinfo->transp.offset >= vinfo->red.offset || @@ -236,6 +236,10 @@ calculate_pixman_format(struct fb_var_screeninfo *vinfo, vinfo->green.offset >= vinfo->blue.offset && @@ -32,9 +32,8 @@ index b7d2c74..8158841 100644 + vinfo->blue.offset >= vinfo->green.offset && + vinfo->green.offset >= vinfo->red.offset) + type = PIXMAN_TYPE_ABGR; - + if (type == PIXMAN_TYPE_OTHER) return 0; --- +-- 2.7.4 - diff --git a/aports/main/weston/APKBUILD b/aports/main/weston/APKBUILD index 57ebfa71..31b8078b 100644 --- a/aports/main/weston/APKBUILD +++ b/aports/main/weston/APKBUILD @@ -136,5 +136,5 @@ _sub() { sha512sums="085a0ba278932d41b50edd6e89db5df31cd6a1179c6cfe9a8ac5ac64e63b25cfc3da1ad8c587259273c3812593029b803867195e2d82b12b5cdd2588ac59acc6 weston-2.0.0.tar.xz 68d8485eed6a536924a8ebef7e0b45738330c38326fe659443c26d674f9538ec1c66033f83a7971914dcd72bc52333e3f55486c5a01e067e3f5fee8f5b489728 no_0hz_refresh_rate.patch 2daa68ee19f4e123d7f3148517c2afcd4df0f065815a0e28db38f301260cd833b7170060c46127e65a25021e2d814afb40fc0f2987cbb3ab5cd4f9dae778bc98 0001-compositor-fbdev-Added-parameter-pixman-type.patch -b4da8caa9373c2c23b9955c50b9d682de3ed17bb48974490d111fd366c7b2d0231a0a5b0e55fb6cb1b8d5fd9b435823f3d91ff625984ecfe3b779892f6ae8b08 0002-compositor-fbdev-Add-support-for-ABGR.patch +08db9a98c2099f3d379415cc5b74325add89648afe74fb8fb07864fb2e9e668d48ce7928c5592f7f72e6e6f31fdc3df4a1618aa6e0f6f2a2d6589226451e661e 0002-compositor-fbdev-Add-support-for-ABGR.patch b5eb741ea8b6fcbd9de95e773fe0bf4ae6588ef57564f97a65aefc6c7ec29f1a01de9764a25672fd7c76c8ff514b497743cbaf279818123041c161c7a1e62bb6 0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch"