|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/piggz/droid-config-mido.git</param>
<param name="branch">master</param>
- <param name="revision">1d75899392dfc829c5f6bccccef88bcfe5e0b25d</param>
+ <param name="revision">5a7ec5fa14e0de8fb705f37aaa5a765a27ced500</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mido-0.4.3.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-mido-0.4.3.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-mido-0.4.3.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-mido-0.5.0.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
@@ -562,8 +564,8 @@
################################################################
%post
# Force an update of ssu repositories
-touch %{board_mapping_dir}/* || :
-touch %{_datadir}/ssu/features.d/* || :
+touch %{board_mapping_dir}/* &> /dev/null || :
+touch %{_datadir}/ssu/features.d/* &> /dev/null || :
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.5.0.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -48,19 +48,8 @@
# This is needed for notification LEDs
- mce-plugin-libhybris
-## USB mode controller
-# Enables mode selector upon plugging USB cable:
+# USB mode controller
- usb-moded
-- usb-moded-defaults-android
-- usb-moded-developer-mode-android
-
-# Extra useful modes not officially supported:
-# might need some configuration to get working
-#- usb-moded-mass-storage-android-config
-# working but careful with roaming!
-- usb-moded-connection-sharing-android-config
-# android diag mode only usable for certain android tools
-#- usb-moded-diag-mode-android
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
@@ -68,6 +57,9 @@
# enable device lock and allow to select untrusted software
- jolla-devicelock-daemon-encsfa
+# Enable home encryption
+#- sailfish-device-encryption
+
# For GPS
- geoclue-provider-hybris
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.5.0.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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.5.0.tar.bz2/sparse/lib/systemd/system/wlan-module-load.service
^
|
| @@ -6,7 +6,8 @@
Type=simple
RemainAfterExit=yes
ExecStartPre=/bin/touch /dev/wcnss_wlan
-ExecStart=/sbin/modprobe wlan
+ExecStart=/bin/sleep 5
+ExecStartPost=/sbin/modprobe wlan
ExecStop=/sbin/modprobe -r wlan
Restart=on-failure
RestartSec=2
|
