[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-sony-tama/droid-config-sony-tama-pie.git</param>
<param name="branch">master</param>
- <param name="revision">60c44169d14b8e106f74b89c6f20bc36b818cda7</param>
+ <param name="revision">8db886b421ca1f4a89c40caa7cf3c62f446c8405</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-METAPKG_DIR=patterns
-PATTERNS_DIR=patterns
-SPEC_DIR=rpm
-
-function migrate {
- pattern=$1
- pattername=$(basename "$pattern" .yaml)
- remove_prefix="jolla-"
- meta=${pattername#"$remove_prefix"}
- meta=patterns-sailfish-device-${meta#"hw-"}
- metaspec=$meta.inc
- device=${meta##*-}
-
- if [ -f $METAPKG_DIR/"$metaspec" ]; then
- echo "Already migrated: $PATTERNS_DIR/$pattern -> $metaspec"
- return
- fi
-
- {
- echo "%package -n $meta"
- sed -n '/Summary:/p' $PATTERNS_DIR/"$pattern"
- awk '/Requires:/{flag=1;next}/Summary:/{flag=0}flag' $PATTERNS_DIR/"$pattern"
- } >> $METAPKG_DIR/"$metaspec"
-
- sed -i 's/- /Requires: /g' $METAPKG_DIR/"$metaspec"
- sed -i 's/pattern://g' $METAPKG_DIR/"$metaspec"
- sed -i 's/Requires: jolla-hw-adaptation-/Requires: patterns-sailfish-device-adaptation-/g' $METAPKG_DIR/"$metaspec"
- sed -i "/^Requires: patterns-sailfish-device-adaptation-/i Requires: patterns-sailfish-device-configuration-common-$device" $METAPKG_DIR/"$metaspec"
- sed -i '/^Requires: patterns-sailfish-applications/d' $METAPKG_DIR/"$metaspec"
- sed -i '/^Requires: patterns-sailfish-ui/d' $METAPKG_DIR/"$metaspec"
- sed -i '/^Requires: csd/d' $METAPKG_DIR/"$metaspec"
- sed -i 's/Requires: jolla-configuration-/Requires: patterns-sailfish-device-configuration-/g' $METAPKG_DIR/"$metaspec"
- sed -i "s/@ICON_RES@/%{icon_res}/" $METAPKG_DIR/"$metaspec"
-
- {
- echo "%description -n $meta"
- sed -n -e 's/^Description: //p' $PATTERNS_DIR/"$pattern"
- echo
- echo "%files -n $meta"
- } >> $METAPKG_DIR/"$metaspec"
-
- # scan all .spec files, some of them might have differing rpm_device and device vars
- grep -l "device\s*$device\s*$" $SPEC_DIR/droid-config-*.spec | while IFS= read -r f; do
- if ! grep -q "%include $METAPKG_DIR\/$metaspec" "$f"; then
- # include meta-packages to the .spec
- sed -i "/^%include droid-configs-device\/droid-configs.inc/a %include $METAPKG_DIR\/$metaspec" "$f"
- fi
- done
-
- if [[ $meta == patterns-sailfish-device-adaptation-* ]]; then
- rm $PATTERNS_DIR/"$pattern"
- sed -i "/$pattername.xml$/d" delete_pattern_*.list 2>/dev/null
- elif [[ $meta == patterns-sailfish-device-*configuration-* ]]; then
- # Replace pattern contents with the main meta-package
- tmpmeta=$(mktemp)
- awk -v name=$meta '
- BEGIN {p=1}
- /^Requires:/ {print;system("echo - "name"; echo");p=0}
- /^Summary:/ {p=1}
- p' $PATTERNS_DIR/"$pattern" > $tmpmeta
- mv $tmpmeta $PATTERNS_DIR/"$pattern"
- fi
-
- echo "Migrated successfully: $PATTERNS_DIR/$pattern -> $metaspec"
-}
-
-if [ ! -d droid-configs-device/helpers ]; then
- echo "$0: launch this script from the \$ANDROID_ROOT/hybris/droid-configs directory"
- exit 1
-fi
-
-for pattern in "$PATTERNS_DIR"/*.yaml; do
- while IFS= read -r f; do
- if (echo "$f" | grep -q "^- pattern:\s*sailfish-porter-tools"); then
- echo "Please replace '- pattern:sailfish-porter-tools' with:"
- echo "- patterns-sailfish-rnd"
- echo "# dev-tools pattern will be fixed in the next release"
- echo "# for now we'll use its 'exploded' version:"
- echo "#- patterns-sailfish-dev-tools"
- echo "- jolla-developer-mode"
- echo "- strace"
- echo "- gdb"
- echo "- gdb-gdbserver"
- echo "- vim-enhanced"
- echo "- less"
- echo "- valgrind"
- echo "- lipstick-qt5-tools"
- echo "- libhybris-tests"
- echo "- busybox-static"
- echo "- openssh-server"
- echo "- zypper"
- echo
- echo "and re-run this script"
- exit 1
- fi
- if ! (echo "$f" | grep -q "^- pattern:\s*jolla-hw-adaptation-"); then
- echo "File $pattern contains patterns that cannot be migrated automatically. Aborting."
- exit 1
- fi
- done < <(grep "^- pattern:" "$pattern")
-done
-
-for pattern in "$PATTERNS_DIR"/*.yaml; do
- migrate "${pattern##*/}"
-done
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
@@ -1,81 +0,0 @@
-%package -n patterns-sailfish-device-adaptation-@DEVICE@
-Summary: Jolla HW Adaptation @DEVICE@
-Requires: droid-hal-@DEVICE@
-Requires: droid-hal-@DEVICE@-img-boot
-Requires: droid-hal-@DEVICE@-kernel-modules
-Requires: droid-config-@DEVICE@-sailfish
-Requires: droid-config-@DEVICE@-pulseaudio-settings
-Requires: droid-config-@DEVICE@-policy-settings
-Requires: droid-config-@DEVICE@-preinit-plugin
-Requires: droid-config-@DEVICE@-flashing
-Requires: droid-config-@DEVICE@-bluez5
-Requires: droid-hal-version-@DEVICE@
-
-# Hybris packages
-Requires: libhybris-libEGL
-Requires: libhybris-libGLESv2
-Requires: libhybris-libwayland-egl
-
-# Sensors
-Requires: hybris-libsensorfw-qt5
-
-# Vibra
-Requires: ngfd-plugin-native-vibrator
-Requires: qt5-feedback-haptics-native-vibrator
-
-# Needed for /dev/touchscreen symlink
-Requires: qt5-plugin-generic-evdev
-
-Requires: pulseaudio-modules-droid
-Requires: pulseaudio-modules-droid-hidl
-
-# The -dummy-af is needed for newer devices that run the main
-# audiosystem-passthrough in qti mode (e.g. >=Android 9 Qualcomm),
-# to fix non-responding Camera app and/or voice during a phone call:
-#Requires: audiosystem-passthrough-dummy-af
-
-# for audio recording to work:
-Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
-
-# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
-Requires: qt5-qtwayland-wayland_egl
-Requires: qt5-qpa-hwcomposer-plugin
-Requires: qtscenegraph-adaptation
-
-# For hybris devices with droidmedia, see HADK pdf for more information
-Requires: gstreamer1.0-droid
-Requires: gmp-droid
-
-# This is needed for notification LEDs
-Requires: mce-plugin-libhybris
-
-# USB mode controller
-Requires: usb-moded
-
-# hammerhead, grouper, and maguro use this in scripts, so include for all
-Requires: rfkill
-
-# enable device lock and allow to select untrusted software
-Requires: jolla-devicelock-daemon-encsfa
-
-# Enable home encryption
-#Requires: sailfish-device-encryption
-
-# For GPS
-Requires: geoclue-provider-hybris
-
-# For FM radio on some QCOM devices
-#Requires: qt5-qtmultimedia-plugin-mediaservice-irisradio
-#Requires: jolla-mediaplayer-radio
-
-# NFC support
-# 1. binder plugin requires Android 8 or a newer base
-# 2. pn54x plugin talks directly to pn54x driver
-# These plugins are mutually exclusive, you need to pick one:
-#Requires: nfcd-binder-plugin
-#Requires: nfcd-pn54x-plugin
-
-%description -n patterns-sailfish-device-adaptation-@DEVICE@
-Pattern with packages for @DEVICE@ HW Adaptation
-
-%files -n patterns-sailfish-device-adaptation-@DEVICE@
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
@@ -1,55 +0,0 @@
-%package -n patterns-sailfish-device-configuration-@DEVICE@
-Summary: Jolla Configuration @DEVICE@
-Requires: patterns-sailfish-device-configuration-common-@DEVICE@
-Requires: patterns-sailfish-device-adaptation-@DEVICE@
-
-# For devices with cellular modem. Those without one, please comment out:
-Requires: patterns-sailfish-cellular-apps
-
-# Early stages of porting benefit from these:
-Requires: patterns-sailfish-rnd
-# dev-tools pattern will be fixed in the next release
-# for now we'll use its 'exploded' version:
-#Requires: patterns-sailfish-dev-tools
-Requires: jolla-developer-mode
-Requires: strace
-Requires: gdb
-Requires: gdb-gdbserver
-Requires: vim-enhanced
-Requires: less
-Requires: valgrind
-Requires: lipstick-qt5-tools
-Requires: libhybris-tests
-Requires: busybox-static
-Requires: openssh-server
-Requires: zypper
-
-Requires: sailfish-content-graphics-z%{icon_res}
-
-# For multi-SIM devices
-#Requires: jolla-settings-networking-multisim
-
-# For devices which support NFC
-#Requires: jolla-settings-system-nfc
-#Requires: nfcd-dbuslog-plugin
-#Requires: nfcd-mce-plugin
-
-# Introduced starting Sailfish OS 2.0.4.x:
-# 3rd party accounts like Twitter, VK, cloud services, etc
-Requires: jolla-settings-accounts-extensions-3rd-party-all
-
-# Introduced starting Sailfish OS 2.1.1.26
-# Required for Jolla Store Access
-Requires: patterns-sailfish-consumer-generic
-
-# For Mozilla location services (online)
-Requires: geoclue-provider-mlsdb
-
-# Devices with 2G or more memory should also include this booster
-# to improve camera startup times and the like
-#Requires: mapplauncherd-booster-silica-qt5-media
-
-%description -n patterns-sailfish-device-configuration-@DEVICE@
-Pattern with packages for @DEVICE@ configurations
-
-%files -n patterns-sailfish-device-configuration-@DEVICE@
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
-(symlink to ../droid-hal-init.service)
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-hal-init.service
^
|
@@ -1,28 +0,0 @@
-[Unit]
-Description=droid-hal-init
-Wants=systemd-udev-settle.service
-After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
-Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
-DefaultDependencies=no
-Conflicts=shutdown.target
-# Lets not do Requires= here as that means that this service will restart which leads automatically
-# to broken state as android init can be only started once per boot. If something goes wrong
-# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
-
-[Service]
-Type=notify
-NotifyAccess=all
-ProtectSystem=full
-ProtectHome=true
-PrivateTmp=true
-ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
-ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-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
-StartLimitInterval=60
-StartLimitBurst=2
-
-[Install]
-WantedBy=graphical.target
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
-(symlink to ../droid-hal-init.service)
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-h8324-0.3.8+master.20201128120434.1.g60c4416.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/graphical.target.wants/droid-late-start.service
^
|
-(symlink to ../droid-late-start.service)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
@@ -10,17 +10,14 @@
# Community HW adaptations need this
%define community_adaptation 1
-# Sailfish OS is considered to-scale, if in the App Grid you get 4-in-a-row icons,
-# and 2-in-a-row or 3-in-a-row app covers in the Home Screen, depending on
-# how many apps are open.
+# Sailfish OS is considered to-scale, if in app grid you get 4-in-a-row icons
+# and 2x2 or 3x3 covers when up-to-4 or 5-or-more apps are open respectively.
# For 4-5.5" device screen sizes of 16:9 ratio, use this formula (hold portrait):
# pixel_ratio = 4.5/DiagonalDisplaySizeInches * HorizontalDisplayResolution/540
# Other screen sizes and ratios will require more trial-and-error.
%define pixel_ratio 1.0
%include droid-configs-device/droid-configs.inc
-%include patterns/patterns-sailfish-device-adaptation-@DEVICE@.inc
-%include patterns/patterns-sailfish-device-configuration-@DEVICE@.inc
# IMPORTANT if you want to comment out any macros in your .spec, delete the %
# sign, otherwise they will remain defined! E.g.:
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -3,6 +3,9 @@
#
# community_adaptation: needs to be defined for community HW adaptations
#
+# use_meta_package: define to use meta package jolla-configuration-%{rpm_device} with
+# all dependencies instead of patterns
+#
# Device information:
# device: should be the CM codename or the AOSP TARGET_PRODUCT
# vendor: determine the droid-side directory used for ./device/<vendor>/<device>
@@ -16,12 +19,16 @@
# Device capabilities:
# remove_modem: set this if your device has no modem (e.g. a WiFi-only tablet)
# remove_bluetooth: set this if your device does not have a Bluetooth chip
-# pixel_ratio: UI scaling factor. Calc shown in droid-config-@DEVICE@.spec.template
+# pixel_ratio: UI scaling factor, choose from 1.0, 1.5, 2.0. Any other value will
+# default the icon pack to 1.0 resolution (it is a bug)!
+# Read more on ways to do-it-together: https://bugs.nemomobile.org/show_bug.cgi?id=814
+# WARNING: pixel_ratio is experimental, and not yet ready for proper UI scalability
+# tests! Please do not test/port your apps to other form factors for the time being.
# Ratio examples:
# Jolla1: 1.0
# Jolla Tablet: 1.5
# Nexus 5: 2.0
-# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
+# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0)
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -66,12 +73,8 @@
Provides: droid-config
Summary: Config packages for Droid HAL adaptations
Version: 1
-%if 0%{?_obs_build_project:1}
Release: 1
-%else
-%define rel_date %(date +'%%Y%%m%%d%%H%%M')
-Release: %{rel_date}
-%endif
+Group: Configs
License: GPLv2
Source0: %{name}-%{version}.tar.bz2
BuildRequires: ssu-kickstart-configuration
@@ -190,6 +193,7 @@
%package sailfish
Provides: droid-config-sailfish
Provides: theme-configs
+Group: System
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: oneshot
@@ -203,6 +207,7 @@
%package flashing
Provides: droid-config-flashing
+Group: System
# Sparse image flashing support for flash-partition
Requires: droid-hal-tools
Summary: On device flashing files for %{rpm_device} hw
@@ -215,6 +220,7 @@
%if 0%{?out_of_image_files:1}
%package out-of-image-files
+Group: System
BuildArch: noarch
Summary: Files that are used for flashing and are not needed on device.
@@ -230,6 +236,8 @@
%package bluez4
Summary: %{rpm_device} packages for BlueZ 4
Conflicts: droid-config-%{rpm_device}-bluez5
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
Provides: %{rpm_device}-bluez-configs
Requires: bluez
@@ -258,29 +266,25 @@
%package bluez5
Summary: %{rpm_device} packages for BlueZ 5
Conflicts: droid-config-%{rpm_device}-bluez4
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
Provides: %{rpm_device}-bluez-configs
Requires: bluez5
Conflicts: bluez
-Obsoletes: bluez
Requires: bluez5-libs
Conflicts: bluez-libs
-Obsoletes: bluez-libs
Requires: bluez5-obexd
Conflicts: obexd
-Obsoletes: obexd
Requires: kf5bluezqt-bluez5
Conflicts: kf5bluezqt-bluez4
-Obsoletes: kf5bluezqt-bluez4
-Obsoletes: kf5bluezqt-bluez4-declarative
Provides: bluez5-configs
Conflicts: bluez-configs
Obsoletes: bluez-configs-sailfish
-Obsoletes: bluez-configs-mer
%description bluez5
%{summary}.
@@ -304,49 +308,13 @@
mkdir -p tmp/
echo "%defattr(-,root,root,-)" > tmp/droid-config.files
-# On 64-bit ARM certain subdirs should not be moved to lib64 but kept under lib.
-# Algorithm below autodetects cases under sparse/ so adaptations do not have to
-# make any changes to their trees when going from armv7hl to aarch64.
-do_not_move_to_lib64=(
- "firmware"
- "modules"
- "startup"
- "systemd/system"
- "systemd/user"
- "tmpfiles.d"
- "udev"
- )
+# Prefer files from sparse/ in the HA specific
+# area over sparse/ in the dcd area
copy_files_from() {
config_dir=$1
if [ -d $config_dir ]; then
- olddir=$PWD
- cd $config_dir
- for f in $(find . \( -type f -o -type l \) -print); do
- dst=$(echo $f | sed 's/^.//')
- if echo $dst | grep -qE "^/usr/lib/|^/lib/"; then
- move_to_lib64=true
- for stay_in_lib in "${do_not_move_to_lib64[@]}"; do
- if echo $dst | grep -qE "^/usr/lib/$stay_in_lib/|^/lib/$stay_in_lib/"; then
- move_to_lib64=false
- break
- fi
- done
- if [ "$move_to_lib64" = true ]; then
- if echo $dst | grep -q "^/usr/lib/"; then
- dst=$(echo $dst | sed 's /usr/lib/ %{_libdir}/ ')
- else
- dst=$(echo $dst | sed 's /lib/ /%{_lib}/ ')
- fi
- fi
- fi
- dstdir=$RPM_BUILD_ROOT$(dirname $dst)
- if [ ! -d $dstdir ]; then
- mkdir -p $dstdir
- fi
- cp -Pv $f $dstdir
- echo $dst >> $olddir/tmp/droid-config.files
- done
- cd - >/dev/null
+ (cd $config_dir; find . \( -type f -o -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
+ cp -Rf $config_dir/* $RPM_BUILD_ROOT/
fi
}
@@ -388,8 +356,6 @@
OFONONOPLUGIN=$RPM_BUILD_ROOT/var/lib/environment/ofono/noplugin.conf
-if [ -e $OFONONOPLUGIN ]; then
-
%if 0%{?have_modem:1}
# DO NOT MODIFY THE "OFONO_MODEM_DEFAULT_PLUGINS" SET! If you do, you will break
# modems on other devices! If you need to introduce or remove a plugin,
@@ -417,8 +383,6 @@
done)
%endif
-fi
-
# Delete files from droid-config.files which are packaged in main spec file
if [ -e packaged-in-main-spec.files ]; then
delete_files tmp/droid-config.files packaged-in-main-spec.files 0
@@ -519,14 +483,6 @@
>$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
%endif
-%if 0%{!?lvm_root_size:1}
-%define lvm_root_size 2500
-%endif
-
-if [ -f %{dcd_path}/kickstart/part/%{rpm_device} ]; then
- sed --in-place 's|@LVM_ROOT_PART_SIZE@|%{lvm_root_size}|' %{dcd_path}/kickstart/part/%{rpm_device}
-fi
-
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}
DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris
@@ -559,20 +515,12 @@
%endif
%endif
-%if 0%{?_obs_build_project:1}
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
@@ -1,6 +1,21 @@
Description: Pattern with packages for common debugging tools used by porters
Name: sailfish-porter-tools
Requires:
-- patterns-sailfish-device-porter-tools
+- jolla-developer-mode
+- sailfishsilica-qt5-demos
+- libhybris-tests
+
+- busybox-static
+- net-tools
+- openssh-clients
+- openssh-server
+- vim-enhanced
+- zypper
+- strace
+
+# jolla-rnd-device will enable usb-moded even when UI is not yet
+# brought up (useful during development, available since update10)
+- jolla-rnd-device
Summary: Sailfish OS Porter Tools
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
@@ -1,6 +1,38 @@
Description: Pattern with packages for @DEVICE@ configurations
Name: jolla-configuration-@DEVICE@
Requires:
-- patterns-sailfish-device-configuration-@DEVICE@
+- pattern:jolla-hw-adaptation-@DEVICE@
+
+- patterns-sailfish-applications
+- patterns-sailfish-ui
+# For devices with cellular modem. Those without one, please comment out:
+- patterns-sailfish-cellular-apps
+# Early stages of porting benefit from these:
+- pattern:sailfish-porter-tools
+
+- sailfish-content-graphics-z@ICON_RES@
+
+# For multi-SIM devices
+#- jolla-settings-networking-multisim
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
+
+# For Mozilla location services (online)
+- geoclue-provider-mlsdb
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+- csd
+
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#- mapplauncherd-booster-silica-qt5-media
Summary: Jolla Configuration @DEVICE@
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
@@ -0,0 +1,75 @@
+Description: Pattern with packages for @DEVICE@ HW Adaptation
+Name: jolla-hw-adaptation-@DEVICE@
+Requires:
+- droid-hal-@DEVICE@
+- droid-hal-@DEVICE@-img-boot
+- droid-hal-@DEVICE@-kernel-modules
+- droid-config-@DEVICE@-sailfish
+- droid-config-@DEVICE@-pulseaudio-settings
+- droid-config-@DEVICE@-policy-settings
+- droid-config-@DEVICE@-preinit-plugin
+- droid-config-@DEVICE@-flashing
+- droid-config-@DEVICE@-bluez5
+- droid-hal-version-@DEVICE@
+
+# Hybris packages
+- libhybris-libEGL
+- libhybris-libGLESv2
+- libhybris-libwayland-egl
+
+# Sensors
+- hybris-libsensorfw-qt5
+
+# Vibra
+- ngfd-plugin-native-vibrator
+- qt5-feedback-haptics-native-vibrator
+
+# Needed for /dev/touchscreen symlink
+- qt5-plugin-generic-evdev
+
+- pulseaudio-modules-droid
+# for audio recording to work:
+- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
+
+# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
+- qt5-qtwayland-wayland_egl
+- qt5-qpa-hwcomposer-plugin
+- qtscenegraph-adaptation
+
+# Add GStreamer v1.0 as standard
+- gstreamer1.0
+- gstreamer1.0-plugins-good
+- gstreamer1.0-plugins-base
+- gstreamer1.0-plugins-bad
+- nemo-gstreamer1.0-interfaces
+# For devices with droidmedia and gst-droid built, see HADK pdf for more information
+#- gstreamer1.0-droid
+
+# This is needed for notification LEDs
+- mce-plugin-libhybris
+
+# USB mode controller
+- usb-moded
+
+# hammerhead, grouper, and maguro use this in scripts, so include for all
+- rfkill
+
+# enable device lock and allow to select untrusted software
+- jolla-devicelock-daemon-encsfa
+
+# Enable home encryption
+#- sailfish-device-encryption
+
+# For GPS
+- geoclue-provider-hybris
+
+# For FM radio on some QCOM devices
+#- qt5-qtmultimedia-plugin-mediaservice-irisradio
+#- jolla-mediaplayer-radio
+
+# NFC for devices using Android 8 or newer as base
+#- nfcd-binder-plugin
+#- jolla-settings-system-nfc
+
+Summary: Jolla HW Adaptation @DEVICE@
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/main.conf
^
|
@@ -14,16 +14,17 @@
# 0 = disable timer, i.e. stay discoverable forever
DiscoverableTimeout = 0
-# Always allow pairing even if there are no agent registered
-# Possible values: true, false
-# Default: false
-#AlwaysPairable = false
-
# How long to stay in pairable mode before going back to non-discoverable
# The value is in seconds. Default is 0.
# 0 = disable timer, i.e. stay pairable forever
PairableTimeout = 0
+# Automatic connection for bonded devices driven by platform/user events.
+# If a platform plugin uses this mechanism, automatic connections will be
+# enabled during the interval defined below. Initially, this feature
+# intends to be used to establish connections to ATT channels. Default is 60.
+AutoConnectTimeout = 60
+
# Use vendor id source (assigner), vendor, product and version information for
# DID profile support. The values are separated by ":" and assigner, VID, PID
# and version.
@@ -31,11 +32,9 @@
#DeviceID = bluetooth:1234:5678:abcd
# Do reverse service discovery for previously unknown devices that connect to
-# us. For BR/EDR this option is really only needed for qualification since the
-# BITE tester doesn't like us doing reverse SDP for some test cases, for LE
-# this disables the GATT client functionally so it can be used in system which
-# can only operate as peripheral.
-# Defaults to 'true'.
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to 'true'.
ReverseServiceDiscovery = true
# Enable name resolving after inquiry. Set it to 'false' if you don't need
@@ -73,11 +72,6 @@
# Defaults to "off"
# Privacy = off
-# Specify the policy to the JUST-WORKS repairing initiated by peer
-# Possible values: "never", "confirm", "always"
-# Defaults to "never"
-#JustWorksRepairing = never
-
[GATT]
# GATT attribute cache.
# Possible values:
@@ -90,21 +84,6 @@
# Default: always
#Cache = always
-# Minimum required Encryption Key Size for accessing secured characteristics.
-# Possible values: 0 and 7-16. 0 means don't care.
-# Defaults to 0
-#KeySize = 0
-
-# Exchange MTU size.
-# Possible values: 23-517
-# Defaults to 517
-#ExchangeMTU = 517
-
-# Number of ATT channels
-# Possible values: 1-5 (1 disables EATT)
-# Default to 3
-#Channels = 3
-
[Policy]
#
# The ReconnectUUIDs defines the set of remote services that should try
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
@@ -5,4 +5,3 @@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
requires:libhybris-libwayland-egl
-requires:patterns-sailfish-core-device
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
+(symlink to ../droid-hal-init.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
@@ -0,0 +1,28 @@
+[Unit]
+Description=droid-hal-init
+Wants=systemd-udev-settle.service
+After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
+Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+# Lets not do Requires= here as that means that this service will restart which leads automatically
+# to broken state as android init can be only started once per boot. If something goes wrong
+# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
+
+[Service]
+Type=notify
+NotifyAccess=all
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
+ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
+Restart=always
+# Lets make sure we don't block minutes in case of errors.
+TimeoutSec=15
+StartLimitInterval=60
+StartLimitBurst=2
+
+[Install]
+WantedBy=graphical.target
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-late-start.service
^
|
(renamed from droid-configs-device/sparse/usr/lib/systemd/system/droid-late-start.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
+(symlink to ../droid-hal-init.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-late-start.service
^
|
+(symlink to ../droid-late-start.service)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
@@ -34,21 +34,21 @@
# be). If android-init doesn't create the bootdevice symlink and there is no
# androidboot.bootdevice on the cmdline, then the bootdevice symlink is not
# required.
-IMPORT{cmdline}="androidboot.bootdevice"
+IMPORT{cmdline}="bootdevice"
# Unfortunately we cannot compare two variables, therefore use a workaround
# with a file.
-ENV{androidboot.bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{androidboot.bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice} /dev/block/bootdevice"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice} /dev/block/bootdevice"
+ENV{bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
# On certain devices the path is .../$PLATFORM_FOLDER/$PLATFORM_DEVICE/...,
# but on others there is no $PLATFORM_DEVICE subdirectory, or in other words,
# PLATFORM_FOLDER=platform device, PLATFORM_DEVICE=empty string. (1).
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{androidboot.bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{androidboot.bootdevice} /dev/block/bootdevice"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{androidboot.bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{androidboot.bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
# Create the partition symlinks.
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/usr/share/environment/nemo/hybris.conf
^
|
@@ -0,0 +1,2 @@
+# Ensure that we can find hybris libs from any hybris-enabled binary
+HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-h8324-0.3.8.tar.bz2/droid-configs-device/sparse/var/lib/environment/nemo/99-hybris.conf
^
|
@@ -0,0 +1,2 @@
+# Ensure that we can find hybris libs from any hybris-enabled binary
+HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|