diff --git a/hybris/lxc-android/lxcconfig.patch b/hybris/lxc-android/0001-lxcconfig.patch similarity index 100% rename from hybris/lxc-android/lxcconfig.patch rename to hybris/lxc-android/0001-lxcconfig.patch diff --git a/hybris/lxc-android/0002-fix-android-rules.patch b/hybris/lxc-android/0002-fix-android-rules.patch new file mode 100644 index 000000000..67e464211 --- /dev/null +++ b/hybris/lxc-android/0002-fix-android-rules.patch @@ -0,0 +1,25 @@ +diff --git a/lib/udev/rules.d/65-android.rules b/lib/udev/rules.d/65-android.rules +index b3233aa..99fac2f 100644 +--- a/lib/udev/rules.d/65-android.rules ++++ b/lib/udev/rules.d/65-android.rules +@@ -12,15 +12,15 @@ ACTION=="add", KERNEL=="binder", MODE="0666" + SUBSYSTEM=="graphics", KERNEL=="*", SYMLINK+="graphics/%k" + + # input devices +-ACTION=="add", KERNEL=="event[0-9]*", GROUP="android_input", MODE="0660" ++ACTION=="add", KERNEL=="event[0-9]*", GROUP="aid_input", MODE="0660" + + # misc devices +-ACTION=="add", KERNEL=="alarm", OWNER="system", GROUP="phablet", MODE="0660" +-ACTION=="add", KERNEL=="uhid", OWNER="system", GROUP="system", MODE="0660" ++ACTION=="add", KERNEL=="alarm", OWNER="aid_system", GROUP="plugdev", MODE="0660" ++ACTION=="add", KERNEL=="uhid", OWNER="aid_system", GROUP="aid_system", MODE="0660" + ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="plugdev", MODE="0660" + + # memory +-ACTION=="add", KERNEL=="ashmem", OWNER="system", GROUP="system", MODE="0666" ++ACTION=="add", KERNEL=="ashmem", OWNER="aid_system", GROUP="aid_system", MODE="0666" + + # rfkill +-ACTION=="add", KERNEL=="rfkill", GROUP="android_input", MODE="0660" ++ACTION=="add", KERNEL=="rfkill", GROUP="aid_input", MODE="0660" diff --git a/hybris/lxc-android/APKBUILD b/hybris/lxc-android/APKBUILD index 39fa88762..a66c3141f 100644 --- a/hybris/lxc-android/APKBUILD +++ b/hybris/lxc-android/APKBUILD @@ -12,7 +12,8 @@ source="$pkgname-$_commit.tar.gz::https://github.com/Halium/$pkgname/archive/$_c add_android_groups.sh logcat pre-start.sh - lxcconfig.patch + 0001-lxcconfig.patch + 0002-fix-android-rules.patch lxc-android.init" pkgdesc="Configuration for starting Halium build of Android inside LXC container" options="!check" @@ -50,5 +51,6 @@ sha512sums="348650f24464abb7a5d2b3e86e762efbdf770bf5f91d4fb12eb62290e3e29b94bcb9 5917947c88e47e7ce982822b8d286073da6b8104a0c3df335b1358908cff0e3d819573a341392958aafb533503847ed2b188cb0e88086a8be16244383a577862 add_android_groups.sh 7c5931671a78ab8222f1c99b9720be328883c8961b7966daf71fd8a7093365d1a2b8785196399534c323585b1c70d723df7c1b52a94d533c62c4942e0eb267f0 logcat ef7081ea55a1acd5a6c5a973b4a7fc79bad4d5fdc721bc481e4ed92962a8ba9b70634e2a0a8f0afd28c14bd1fd4e1956914f68239c3dc34e41e167254252b1df pre-start.sh -7e8981ba9c779bf893dfddbe495dcaacfa43154748e21dd14fed2696d50b55807585d7168b79d73769d1381bb9974d7661479a303bacef883da0e0cf07dd0ad7 lxcconfig.patch +7e8981ba9c779bf893dfddbe495dcaacfa43154748e21dd14fed2696d50b55807585d7168b79d73769d1381bb9974d7661479a303bacef883da0e0cf07dd0ad7 0001-lxcconfig.patch +d5772e4776464acc016854cec8a7348e4226696c343eae3bf5e08fb5ad23155d883c23ed5d00e7ff3876907f516e66dd4438c7894c8441dd9b00d1f8f9f22620 0002-fix-android-rules.patch ad373e26fb4850f887ca0be76a4c5f19115e214dcbdc315cf24e41eabfd03eebf8f19085a49c97661861b16e8005355c7fd10e86acdb4593d43250e3fed998fb lxc-android.init"