|
[-]
[+]
|
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">c681571200b857c04ea121ecb98320009b838191</param>
+ <param name="revision">4f564832e39d46fcf7c57534dbcb7d602bb717b4</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -1,76 +0,0 @@
-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
-- 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:
-#- audiosystem-passthrough-dummy-af
-
-# 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
-
-# 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@
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/sparse/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
| -(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/sparse/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 %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
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
| -(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-late-start.service
^
|
| -(symlink to ../droid-late-start.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/patterns/jolla-hw-adaptation-fp2-sibon.yaml
^
|
| @@ -1,83 +0,0 @@
-Description: Pattern with packages for fp2-sibon HW Adaptation
-Name: jolla-hw-adaptation-fp2-sibon
-Requires:
-- droid-hal-fp2-sibon
-- droid-hal-fp2-sibon-detritus
-- droid-hal-fp2-sibon-img-boot
-- droid-hal-fp2-sibon-kernel-modules
-- droid-config-fp2-sibon-sailfish
-- droid-config-fp2-sibon-pulseaudio-settings
-- droid-config-fp2-sibon-policy-settings
-- droid-config-fp2-sibon-preinit-plugin
-- droid-config-fp2-sibon-flashing
-- droid-config-fp2-sibon-bluez5
-- droid-hal-version-fp2-sibon
-
-# 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
-
-# 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
-# Enables mode selector upon plugging USB cable:
-- 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
-
-# enable device lock and allow to select untrusted software
-- jolla-devicelock-daemon-encsfa
-
-# For GPS
-- geoclue-provider-hybris
-
-# For FM radio
-- qt5-qtmultimedia-plugin-mediaservice-irisradio
-- jolla-mediaplayer-radio
-
-# for audio during calls
-- pulseaudio-modules-droid-glue
-
-# Flashlight
-- jolla-settings-system-flashlight
-
-# For camera module detection
-- droid-camres
-
-Summary: Jolla HW Adaptation fp2-sibon
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/lib/systemd/system/basic.target.wants/wlan-module-load.service
^
|
| -(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/droid-fm-up.service
^
|
| -(symlink to ../droid-fm-up.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
^
|
| -(symlink to ../droid-hcismd-up.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/lib/systemd/system/graphical.target.wants/droid-cameradetect.service
^
|
| -(symlink to ../droid-cameradetect.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/lib/systemd/system/graphical.target.wants/sensors-delay-hack.service
^
|
| -(symlink to ../sensors-delay-hack.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
| @@ -10,14 +10,17 @@
# Community HW adaptations need this
%define community_adaptation 1
-# 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.
+# 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.
# 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-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -16,16 +16,12 @@
# 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, 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.
+# pixel_ratio: UI scaling factor. Calc shown in droid-config-@DEVICE@.spec.template
# Ratio examples:
# Jolla1: 1.0
# Jolla Tablet: 1.5
# Nexus 5: 2.0
-# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0)
+# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -392,6 +388,8 @@
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,
@@ -419,6 +417,8 @@
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,6 +519,14 @@
>$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
@@ -679,3 +687,23 @@
%files bluez5 -f tmp/bluez5.files
%defattr(644,root,root,-)
%endif
+
+
+%package -n patterns-sailfish-device-configuration-common-%{rpm_device}
+Summary: Jolla Configuration common
+Requires: patterns-sailfish-applications
+Requires: patterns-sailfish-ui
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+Recommends: csd
+# All 3 requires above will be replaced with new meta-package
+# "patterns-sailfish-device-configuration-common" that will become available in
+# the next Sailfish OS release after 3.4.0
+
+%description -n patterns-sailfish-device-configuration-common-%{rpm_device}
+Pattern with packages for common HW configurations
+
+%files -n patterns-sailfish-device-configuration-common-%{rpm_device}
+
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
| @@ -0,0 +1,97 @@
+#!/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-dev-tools"
+ echo "- patterns-sailfish-rnd"
+ 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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -1,21 +1,6 @@
Description: Pattern with packages for common debugging tools used by porters
Name: sailfish-porter-tools
Requires:
-- 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
+- patterns-sailfish-device-porter-tools
Summary: Sailfish OS Porter Tools
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -1,38 +1,6 @@
Description: Pattern with packages for @DEVICE@ configurations
Name: jolla-configuration-@DEVICE@
Requires:
-- 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
+- patterns-sailfish-device-configuration-@DEVICE@
Summary: Jolla Configuration @DEVICE@
-
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
| @@ -0,0 +1,80 @@
+%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 devices with droidmedia and gst-droid built, see HADK pdf for more information
+Requires: gstreamer1.0-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@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
| @@ -0,0 +1,45 @@
+%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
+Requires: patterns-sailfish-dev-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@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -5,3 +5,4 @@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
requires:libhybris-libwayland-egl
+requires:patterns-sailfish-core-device
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.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}="bootdevice"
+IMPORT{cmdline}="androidboot.bootdevice"
# Unfortunately we cannot compare two variables, therefore use a workaround
# with a file.
-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"
+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"
# 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{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"
+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"
# 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-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
| +(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/sparse/usr/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
+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-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-late-start.service
^
|
| (renamed from droid-configs-device/sparse/lib/systemd/system/droid-late-start.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
| +(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.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-fp2-sibon-0.0.68.tar.bz2/patterns/jolla-configuration-fp2-sibon.yaml
^
|
| @@ -1,38 +1,7 @@
Description: Pattern with packages for fp2-sibon configurations
Name: jolla-configuration-fp2-sibon
Requires:
-- pattern:jolla-hw-adaptation-fp2-sibon
-
-- 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
+- patterns-sailfish-device-configuration-fp2-sibon
Summary: Jolla Configuration fp2-sibon
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/patterns/patterns-sailfish-device-adaptation-fp2-sibon.inc
^
|
| @@ -0,0 +1,85 @@
+%package -n patterns-sailfish-device-adaptation-fp2-sibon
+Summary: Jolla HW Adaptation fp2-sibon
+Requires: droid-hal-fp2-sibon
+Requires: droid-hal-fp2-sibon-detritus
+Requires: droid-hal-fp2-sibon-img-boot
+Requires: droid-hal-fp2-sibon-kernel-modules
+Requires: droid-config-fp2-sibon-sailfish
+Requires: droid-config-fp2-sibon-pulseaudio-settings
+Requires: droid-config-fp2-sibon-policy-settings
+Requires: droid-config-fp2-sibon-preinit-plugin
+Requires: droid-config-fp2-sibon-flashing
+Requires: droid-config-fp2-sibon-bluez5
+Requires: droid-hal-version-fp2-sibon
+
+# 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
+# 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 devices with droidmedia and gst-droid built, 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
+# Enables mode selector upon plugging USB cable:
+Requires: usb-moded
+Requires: usb-moded-defaults-android
+Requires: usb-moded-developer-mode-android
+
+# Extra useful modes not officially supported:
+# might need some configuration to get working
+#Requires: usb-moded-mass-storage-android-config
+# working but careful with roaming!
+Requires: usb-moded-connection-sharing-android-config
+# android diag mode only usable for certain android tools
+#Requires: usb-moded-diag-mode-android
+
+# 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
+
+# For GPS
+Requires: geoclue-provider-hybris
+
+# For FM radio
+Requires: qt5-qtmultimedia-plugin-mediaservice-irisradio
+Requires: jolla-mediaplayer-radio
+
+# for audio during calls
+Requires: pulseaudio-modules-droid-glue
+
+# Flashlight
+Requires: jolla-settings-system-flashlight
+
+# For camera module detection
+Requires: droid-camres
+
+%description -n patterns-sailfish-device-adaptation-fp2-sibon
+Pattern with packages for fp2-sibon HW Adaptation
+
+%files -n patterns-sailfish-device-adaptation-fp2-sibon
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/patterns/patterns-sailfish-device-configuration-fp2-sibon.inc
^
|
| @@ -0,0 +1,42 @@
+%package -n patterns-sailfish-device-configuration-fp2-sibon
+Summary: Jolla Configuration fp2-sibon
+Requires: patterns-sailfish-device-configuration-common-sibon
+Requires: patterns-sailfish-device-adaptation-fp2-sibon
+
+# 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-dev-tools
+Requires: patterns-sailfish-rnd
+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
+
+# 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
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+
+# 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-fp2-sibon
+Pattern with packages for fp2-sibon configurations
+
+%files -n patterns-sailfish-device-configuration-fp2-sibon
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/basic.target.wants/wlan-module-load.service
^
|
| +(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/bluetooth.service.wants/droid-fm-up.service
^
|
| +(symlink to ../droid-fm-up.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
^
|
| +(symlink to ../droid-hcismd-up.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/droid-cameradetect.service
^
|
| (renamed from sparse/lib/systemd/system/droid-cameradetect.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/droid-fm-up.service
^
|
| (renamed from sparse/lib/systemd/system/droid-fm-up.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/droid-hcismd-up.service
^
|
| (renamed from sparse/lib/systemd/system/droid-hcismd-up.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/graphical.target.wants/droid-cameradetect.service
^
|
| +(symlink to ../droid-cameradetect.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/graphical.target.wants/sensors-delay-hack.service
^
|
| +(symlink to ../sensors-delay-hack.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/sensors-delay-hack.service
^
|
| (renamed from sparse/lib/systemd/system/sensors-delay-hack.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.68.tar.bz2/sparse/usr/lib/systemd/system/wlan-module-load.service
^
|
| (renamed from sparse/lib/systemd/system/wlan-module-load.service)
|
