sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (2557d1b2f6fac17fd46624a15d10bc9b557c72c8)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2557d1b2f6fac17fd46624a15d10bc9b557c72c8)
- Date: Sun, 22 Jun 2014 07:13:23 -0500
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
devel/android-tools/HISTORY | 2 ++
devel/android-tools/PRE_BUILD | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 2557d1b2f6fac17fd46624a15d10bc9b557c72c8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/android-tools: set device permissions in udev rule file if systemd
is not installed
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index e06d0f4..a0e21ae 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,5 @@
2014-06-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, init.d/adb, DEPENDS, INSTALL, PRE_BUILD: spell created
+ * PRE_BUILD: if systemd is not installed, explicitly set permissions
+ in udev rules file
diff --git a/devel/android-tools/PRE_BUILD b/devel/android-tools/PRE_BUILD
index 94944ce..99041b6 100755
--- a/devel/android-tools/PRE_BUILD
+++ b/devel/android-tools/PRE_BUILD
@@ -16,5 +16,9 @@ sed -e 's: -lselinux::' -i fastboot/Makefile &&
sed -e '/#include <selinux\/selinux.h>/d' \
-e 's:#include <selinux/label.h>:struct selabel_handle;:' \
-i ../extras/ext4_utils/make_ext4fs.h &&
-sed -e '160,174d;434,455d' -i ../extras/ext4_utils/make_ext4fs.c
+sed -e '160,174d;434,455d' -i ../extras/ext4_utils/make_ext4fs.c &&
+
+if ! spell_ok systemd; then
+ sedit 's:, TAG+="systemd", ENV{SYSTEMD_WANTS}="adb.service":, MODE="0664",
GROUP="plugdev":' ${SOURCE_DIRECTORY}/51-android.rules
+fi
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2557d1b2f6fac17fd46624a15d10bc9b557c72c8), Florian Franzmann, 06/22/2014
Archive powered by MHonArc 2.6.24.