|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/mlehtima/droid-config-fp2-sibon.git</param>
<param name="branch">master</param>
- <param name="revision">01c9a3be11bde1337cd9ea19df0317a0390d4000</param>
+ <param name="revision">d066ae8a9596e479db7812c12cfa57c3089bfd00</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.34.tar.bz2/droid-configs-device/sparse/usr/bin/droid/kill-cgroup.sh
^
|
| @@ -1,74 +0,0 @@
-#!/bin/sh
-# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
-#
-# Copyright (c) 2013, Jolla Ltd.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# Kill all processes that are in this same cgroup ($1)
-[ -z "$1" ] && echo "Need cgroup path" && exit 1
-CGROUP=$1
-[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
-
-get_pids() {
- # Get list of running pids in this cgroup
- # return list $PIDS and $NUM_PIDS
- PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs)
- NUM_PIDS=$(echo $PIDS | wc -w)
-}
-
-kill_pids() {
- # Kill pids using signal $1
- for pid in $PIDS; do
- [ -d /proc/$pid ] && kill -$1 $pid
- done
-}
-
-# ============== main() ===============
-
-get_pids
-PREV_NUM_PIDS=$NUM_PIDS
-kill_pids TERM
-sleep 1
-WAIT=1
-get_pids
-MAX_WAIT=5
-while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do
- if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
- # Number of running processes is getting smaller
- # Wait a little bit more
- sleep 1
- else
- # Number of pids is not gettting smaller
- break
- fi
- let WAIT=$WAIT+1
- PREV_NUM_PIDS=$NUM_PIDS
- get_pids
-done
-# If anyone left, hard kill them all
-[ $NUM_PIDS -gt 0 ] && kill_pids KILL
-exit 0
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -203,7 +203,7 @@
Provides: droid-config-flashing
Group: System
# Sparse image flashing support for flash-partition
-Requires: droid-hal-%{rpm_device}-tools
+Requires: droid-hal-tools
Summary: On device flashing files for %{rpm_device} hw
%description flashing
@@ -429,6 +429,8 @@
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/usr/share/package-groups/*
+sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
mkdir -p $RPM_BUILD_ROOT/%{board_mapping_dir}
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -0,0 +1,6 @@
+requires:droid-hal-@DEVICE@
+requires:droid-config-@DEVICE@
+requires:droid-hal-version-@DEVICE@
+requires:libhybris-libEGL
+requires:libhybris-libGLESv2
+requires:libhybris-libwayland-egl
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
| @@ -7,3 +7,4 @@
[Service]
Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
ExecStart=/sbin/adbd
+Restart=always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -13,7 +13,7 @@
Type=notify
NotifyAccess=all
ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-ExecStop=/usr/bin/droid/kill-cgroup.sh %c
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh
Restart=always
# Lets make sure we don't block minutes in case of errors.
TimeoutSec=15
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -11,3 +11,5 @@
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.35.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -0,0 +1,81 @@
+#!/bin/sh
+# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
+#
+# Copyright (c) 2013, Jolla Ltd.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of the <organization> nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The following should be in /init.rc, so init will shut everything down:
+# on property:hybris.shutdown=*
+# class_stop late_start
+# class_stop main
+# class_stop core
+
+# Kill all processes that are in this same cgroup ($1)
+[ -z "$1" ] && echo "Need cgroup path" && exit 1
+CGROUP=$1
+[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
+
+get_pids() {
+ # Get list of running pids in this cgroup
+ # return list $PIDS and $NUM_PIDS
+ PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs)
+ NUM_PIDS=$(echo $PIDS | wc -w)
+ echo Android service PIDs remaining: $NUM_PIDS
+}
+
+# ============== main() ===============
+
+get_pids
+PREV_NUM_PIDS=$NUM_PIDS
+# This android property is supposed to ensure a shutdown if system-server crashes
+# We don't use it, but some init scripts watch for it as a signal to shut other things down
+/usr/bin/setprop sys.shutdown.requested 1
+
+echo Shutting down droid-hal-init services
+/usr/bin/setprop hybris.shutdown 1
+
+sleep 1
+WAIT=1
+get_pids
+MAX_WAIT=5
+while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do
+ if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
+ # Number of running processes is getting smaller
+ # Wait a little bit more
+ sleep 1
+ else
+ # Number of pids is not gettting smaller
+ break
+ fi
+ let WAIT=$WAIT+1
+ PREV_NUM_PIDS=$NUM_PIDS
+ get_pids
+done
+
+echo All done. Killing droid-hal-init
+killall droid-hal-init
+
+exit 0
+
|
