diff options
author | Danct12 | 2022-02-14 11:47:09 +0700 |
---|---|---|
committer | Danct12 | 2022-02-14 11:47:09 +0700 |
commit | aad9dcb307cc0ee98f36d7acba4f0034ca49c1f8 (patch) | |
tree | 693156855fc9b7afe21e50fb13cdef708ed0dbb3 | |
parent | 8a4b43c41d5a5829210edf6f4c858151ec3d234b (diff) | |
download | aur-aad9dcb307cc0ee98f36d7acba4f0034ca49c1f8.tar.gz |
fix bad eol on proc dt values
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-fix-bad-eol-of-proc-dt-values.patch | 22 | ||||
-rw-r--r-- | PKGBUILD | 13 |
3 files changed, 35 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = waydroid pkgdesc = A container-based approach to boot a full Android system on a regular Linux system pkgver = 1.2.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/waydroid arch = any license = GPL @@ -16,7 +16,9 @@ pkgbase = waydroid optdepends = python-pyclip: share clipboard with container source = waydroid::git+https://github.com/waydroid/waydroid.git#commit=9a87b10bbfd9cc04c8259207233fadad9acbf5d3 source = gbinder.conf + source = 0001-fix-bad-eol-of-proc-dt-values.patch sha256sums = SKIP sha256sums = 87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd + sha256sums = a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8 pkgname = waydroid diff --git a/0001-fix-bad-eol-of-proc-dt-values.patch b/0001-fix-bad-eol-of-proc-dt-values.patch new file mode 100644 index 000000000000..80093c748650 --- /dev/null +++ b/0001-fix-bad-eol-of-proc-dt-values.patch @@ -0,0 +1,22 @@ +From 71f9249c9e08e9abbd08f6ce95d2906c23cfe433 Mon Sep 17 00:00:00 2001 +From: Erfan Abdi <erfangplus@gmail.com> +Date: Mon, 25 Oct 2021 12:18:02 +0330 +Subject: [PATCH] lxc: Fix bad eol of proc dt values + +--- + tools/helpers/lxc.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py +index 1319442..d57e63c 100644 +--- a/tools/helpers/lxc.py ++++ b/tools/helpers/lxc.py +@@ -231,7 +231,7 @@ def find_hal(hardware): + else: + if os.path.isfile("/proc/device-tree/" + product): + with open("/proc/device-tree/" + product) as f: +- f_value = f.read().strip() ++ f_value = f.read().strip().rstrip('\x00') + if f_value != "": + props.append("ro.product.waydroid." + + product + "=" + f_value) @@ -3,7 +3,7 @@ pkgname=waydroid pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A container-based approach to boot a full Android system on a regular Linux system" arch=('any') url='https://github.com/waydroid' @@ -14,13 +14,19 @@ optdepends=('waydroid-image: Android image for use with waydroid' 'python-pyclip: share clipboard with container') _commit="9a87b10bbfd9cc04c8259207233fadad9acbf5d3" # tags/1.2.0 source=("waydroid::git+https://github.com/waydroid/waydroid.git#commit=$_commit" - gbinder.conf) + gbinder.conf + 0001-fix-bad-eol-of-proc-dt-values.patch) pkgver() { cd "$pkgname" git describe --tags | sed 's/^v//;s/-/+/g' } +prepare() { + cd waydroid + patch -p1 < ../0001-fix-bad-eol-of-proc-dt-values.patch +} + package() { cd waydroid install -dm755 "$pkgdir/usr/lib/waydroid" @@ -37,4 +43,5 @@ package() { } sha256sums=('SKIP' - '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd') + '87a21d401281735ea026d715ea79b36e01f9af084198de2761b32d5b58a343dd' + 'a0f2f5fe6c3e5af6afee144ad6deec067679d39a9544dfaa2d10e8dac7013bf8') |