|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/Sailfish-On-Vince/droid-config-vince.git</param>
<param name="branch">master</param>
- <param name="revision">e95949c91979335e992f2f8fcd16ca2c1e880654</param>
+ <param name="revision">e2991c46ceb9dcd376c54703cac81f7ee05d53b3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.2.26.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd-prepare.service
^
|
| @@ -1,17 +0,0 @@
-# Copyright (C) 2013 Jolla Oy
-#
-# Prepare functionfs for adbd
-
-[Unit]
-Description=functionfs setup for adbd
-
-[Service]
-Type=notify
-RemainAfterExit=yes
-ExecStart=/usr/sbin/adbd-functionfs.sh
-ExecStopPost=/bin/umount adb
-ExecStopPost=/bin/umount adb
-
-[Install]
-WantedBy=graphical.target
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.2.26.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
| @@ -1,10 +0,0 @@
-[Unit]
-Description=Android Debug Bridge Daemon
-Requires=adbd-prepare.service
-After=adbd-prepare.service
-PartOf=adbd-prepare.service
-
-[Service]
-Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-ExecStart=/sbin/adbd
-Restart=always
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.2.26.tar.bz2/droid-configs-device/sparse/usr/sbin/adbd-functionfs.sh
^
|
| @@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-mkdir -p /dev/usb-ffs
-chmod 0770 /dev/usb-ffs
-chown shell:shell /dev/usb-ffs
-mkdir -p /dev/usb-ffs/adb
-chmod 0770 /dev/usb-ffs/adb
-chown shell:shell /dev/usb-ffs/adb
-/bin/mount -t functionfs adb /dev/usb-ffs/adb -o uid=shell,gid=shell
-exit 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.2.27.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -78,6 +78,8 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+BuildRequires: sed
+Requires: sed
Requires: droid-hal
%if 0%{?community_adaptation:1}
# because it provides one ssu feature, do:
@@ -510,8 +512,8 @@
%endif
%endif
-# build rnd kickstarts on devel level, release kickstarts on all other levels
-%if 0%{?qa_stage_devel:1}
+# build rnd kickstarts on devel and branch_devel level, release kickstarts on all other levels
+%if 0%{?qa_stage_devel:1} || 0%{?qa_stage_branch_devel:1}
KS_LEVELS=true
%else
KS_LEVELS=false
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.2.27.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -32,10 +32,11 @@
# 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
+# Kill all processes that are in this same cgroup.
+# Deducing the name of the service's cgroup based on the shutdown script's
+# cgroup name.
+CGROUP=$(cat /proc/self/cgroup | sed -r '/1:name=systemd:/!d;s|||;s|/control||')
+[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $CGROUP" && exit 1
get_pids() {
# Get list of running pids in this cgroup
|
