Changes - SailfishOS Open Build Service

Changes of Revision 13

[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger.spec
@@ -1,94 +1,15 @@ # Device variables including vendor & device (model) %define vendor oneplus %define device cheeseburger - Name: jolla-hw-adaptation-%{device} Summary: Jolla HW Adaptation %{device} -Version: 1.2.2+master.20191226214657.2.ge355f52 +Version: 1.1.0.3 Release: 1 License: BSD-3-Clause Source: %{name}-%{version}.tar.gz # Include device specific HW adaptation configuration -Requires: droid-hal-%{device} -Requires: droid-hal-%{device}-detritus -Requires: droid-hal-%{device}-img-boot -#Requires: droid-hal-%{device}-img-recovery -Requires: droid-hal-%{device}-kernel-modules -Requires: droid-hal-%{device}-tools -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 - -# Telephony -Requires: ofono-ril-binder-plugin - -# Bluetooth -Requires: bluebinder - -# NFC -Requires: nfcd-binder-plugin - -# 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 - -# Audio -Requires: pulseaudio-modules-droid -Requires: pulseaudio-modules-droid-hidl -# for audio recording to work: -Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture - -# Camera -Requires: audioflingerglue - -# 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 - -# Add GStreamer v1.0 as standard -Requires: gstreamer1.0 -Requires: gstreamer1.0-droid -Requires: gstreamer1.0-libav -Requires: gstreamer1.0-plugins-good -Requires: gstreamer1.0-plugins-base -Requires: gstreamer1.0-plugins-bad -Requires: nemo-gstreamer1.0-interfaces - -# This is needed for notification LEDs -Requires: mce-plugin-libhybris - -## USB mode controller -# Enables mode selector upon plugging USB cable: -Requires: usb-moded - -# hammerhead, grouper, and maguro use this in scripts, so include for all -Requires: rfkill - -# For GPS -Requires: geoclue-provider-hybris - -# OnePlus 5 specific packages -Requires: triambienced -Requires: onyx-triambience-settings-plugin -Requires: gestured -Requires: onyx-gesture-settings-plugin +%inlcude rpm/jolla-hw-adaptation-cheeseburger.inc %description Meta-package to install packages for %{device} HW Adaptation
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-oneplus5/droid-config-cheeseburger.git</param> <param name="branch">master</param> - <param name="revision">e355f52baad81dc1a7693be4ca2fca031fbeec98</param> + <param name="revision">cc43ea373c6693975902dc35f0ec91bdbf1b0341</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:header-cheeseburger.inc ^
@@ -1,2 +1,2 @@ %define vendor oneplus -%define device cheeseburger +%define device cheeseburger \ No newline at end of file
[-] [+]	Changed	_service:tar_git:jolla-configuration-cheeseburger.inc ^
@@ -3,6 +3,7 @@ Requires: patterns-sailfish-applications Requires: patterns-sailfish-ui Requires: patterns-sailfish-cellular-apps + Requires: sailfish-content-graphics-z1.75 # Extended settings functionality @@ -39,12 +40,6 @@ #Requires: setools #Requires: policycoreutils -# Miscellaneous packages -Requires: less -Requires: htop -#Requires: mce-tools -#Requires: nano - # Early stages of porting benefit from these: # On the basis of sailfish-porter-tools Requires: jolla-developer-mode @@ -56,6 +51,11 @@ Requires: vim-enhanced Requires: zypper Requires: strace -Requires: jolla-rnd-device +#Requires: jolla-rnd-device #Requires: libhybris-tests # End sailfish-porter-tools + +# Miscellaneous packages +Requires: htop +#Requires: mce-tools +#Requires: nano
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/droid-configs-device/sparse/lib/systemd/system/adbd-prepare.service ^
@@ -0,0 +1,17 @@ +# 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 +
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/droid-configs-device/sparse/lib/systemd/system/adbd.service ^
@@ -0,0 +1,10 @@ +[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
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/droid-configs-device/sparse/usr/sbin/adbd-functionfs.sh ^
@@ -0,0 +1,10 @@ +#!/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:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/kickstart/pack_package-droid-updater ^
@@ -16,9 +16,6 @@ exit 1 fi -# Make sure we have 'bc' to estimate rootfs size -zypper --non-interactive in bc &> /dev/null - # Roughly estimate the final rootfs size when installed IMAGE_SIZE=`echo "scale=2; 2.25 * $(du -h $GEN_IMG_BASE.tar.bz2 \| cut -d'M' -f1)" \| bc` echo "[hybris-installer] Estimated rootfs size when installed: ${IMAGE_SIZE}M" @@ -27,11 +24,6 @@ DST_IMG=sfos-rootfs.tar.bz2 DST_PKG=$ID-$VERSION_ID-$DATE-$DEVICE$EXTRA_NAME # sailfishos-3.2.0.12-20191101-$DEVICE -# Clone hybris-installer if not preset (e.g. porters-ci build env) -if [ ! -d ../hybris/hybris-installer/ ]; then - git clone --depth 1 https://github.com/sailfishos-oneplus5/hybris-installer ../hybris/hybris-installer > /dev/null -fi - # Copy rootfs & hybris-installer scripts into updater .zip tree mkdir updater/ mv $GEN_IMG_BASE.tar.bz2 updater/$DST_IMG
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/patterns/jolla-configuration-cheeseburger.yaml ^
@@ -1,54 +1,5 @@ -Description: Pattern with packages for cheeseburger configurations +Description: Dummy pattern to keep scripts happy Name: jolla-configuration-cheeseburger Requires: -- pattern:jolla-hw-adaptation-cheeseburger - -- patterns-sailfish-applications -- patterns-sailfish-ui -- patterns-sailfish-cellular-apps -- sailfish-content-graphics-z@ICON_RES@ - -# Extended settings functionality -- jolla-settings-system-nfc -- jolla-settings-system-flashlight -- jolla-settings-networking-multisim -- 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 - -# Enable device lock and allow to select untrusted software -- jolla-devicelock-daemon-encsfa -#- jolla-devicelock-plugin-encsfa - -# Enable /home encryption -#- sailfish-device-encryption - -# SELinux -#- libselinux-utils -#- libselinux-utils-extra -#- setools -#- policycoreutils - -# Miscellaneous packages -- less -- htop -#- mce-tools -#- nano - -# Early stages of porting benefit from these: -- pattern:sailfish-porter-tools - -Summary: Jolla Configuration cheeseburger +- dummy-package +Summary: Jolla Dummy Configuration cheeseburger \ No newline at end of file
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/patterns/jolla-hw-adaptation-cheeseburger.yaml ^
@@ -1,83 +1,5 @@ -Description: Pattern with packages for cheeseburger HW Adaptation +Description: Dummy pattern to keep scripts happy Name: jolla-hw-adaptation-cheeseburger Requires: -- droid-hal-cheeseburger -- droid-hal-cheeseburger-detritus -- droid-hal-cheeseburger-img-boot -#droid-hal-cheeseburger-img-recovery -- droid-hal-cheeseburger-kernel-modules -- droid-config-cheeseburger-sailfish -- droid-config-cheeseburger-pulseaudio-settings -- droid-config-cheeseburger-policy-settings -- droid-config-cheeseburger-preinit-plugin -- droid-config-cheeseburger-flashing -- droid-config-cheeseburger-bluez5 -- droid-hal-version-cheeseburger - -# Hybris packages -- libhybris-libEGL -- libhybris-libGLESv2 -- libhybris-libwayland-egl - -# Telephony -- ofono-ril-binder-plugin - -# Bluetooth -- bluebinder - -# NFC -- nfcd-binder-plugin - -# Sensors -- hybris-libsensorfw-qt5 - -# Vibra -- ngfd-plugin-native-vibrator -- qt5-feedback-haptics-native-vibrator - -# Needed for /dev/touchscreen symlink -- qt5-plugin-generic-evdev - -# Audio -- pulseaudio-modules-droid -- pulseaudio-modules-droid-hidl -# for audio recording to work: -- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture - -# Camera -- audioflingerglue - -# 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-droid -- gstreamer1.0-libav -- gstreamer1.0-plugins-good -- gstreamer1.0-plugins-base -- gstreamer1.0-plugins-bad -- nemo-gstreamer1.0-interfaces - -# This is needed for notification LEDs -- mce-plugin-libhybris - -## USB mode controller -# Enables mode selector upon plugging USB cable: -- usb-moded - -# hammerhead, grouper, and maguro use this in scripts, so include for all -- rfkill - -# For GPS -- geoclue-provider-hybris - -# OnePlus 5 specific packages -- triambienced -- onyx-triambience-settings-plugin -- gestured -- onyx-gesture-settings-plugin - -Summary: Jolla HW Adaptation cheeseburger +- dummy-package +Summary: Jolla Dummy HW Adaptation cheeseburger \ No newline at end of file
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/dconf/db/vendor.d/lipstick-configs-cheeseburger.txt ^
@@ -0,0 +1,4 @@ +[lipstick/screen/primary] +physicalDotsPerInch=401 +width=1080 +height=1920
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/mce/90-display-gestures.conf ^
@@ -3,7 +3,7 @@ # # Double tap & swipe -/system/osso/dsm/powerkey/actions_gesture4=unblank +/system/osso/dsm/powerkey/actions_gesture4=vibrate,unblank /system/osso/dsm/powerkey/actions_gesture5=vibrate,dbus5 # Arrows (^, V, <, >)
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/ofono/ril_subscription.conf ^
@@ -1,55 +1,33 @@ -# -# Jolla RIL driver configuration for OnePlus 5 -# - ref: https://tinyurl.com/yxwlz7bx - -# +# Jolla RIL driver configuration file for OnePlus 5 +# ref: https://tinyurl.com/yxwlz7bx -# Global +# Global config [Settings] #EmptyConfig=false -#Identity=radio:radio +emptyPinQuery=true +radioPowerCycle=false +confirmRadioPowerOn=false +uiccWorkaround=false +allowDataReq=on +dataCallRetryDelay=333 +startTimeout=10000 +#dataCallFormat=11 +#useDataProfiles=false +#ecclistFile=/var/lib/ofono/ril.ecclist # Dual-SIM +SetRadioCapability=off #3GLTEHandover=true #ForceGsmForNonDataSlots=true -SetRadioCapability=off # SIM 1 [ril_0] transport=binder:name=slot1 -#sub=SUB1 name=slot1 -#slot=0 -#timeout=0 -#technologies=all -#uiccWorkaround=true -#ecclistFile=/var/lib/ofono/ril.ecclist -#allowDataReq=auto -#emptyPinQuery=true -#dataCallFormat=auto -#dataCallRetryLimit=4 -#dataCallRetryDelay=200 -#remoteHangupReasons=20 -#localHangupReasons=23 -#enableVoicecall=true -#enableCellBroadcast=true -#enableSimToolkit=true -#startTimeout=20000 -#legacyImeiQuery=false -#lteNetworkMode=9 -#networkModeTimeout=20000 -#radioPowerCycle=true -#confirmRadioPowerOn=true -#singleDataContext=false -#networkSelectionManual0=true -useDataProfiles=true -#mmsDataProfileId=2 -#deviceStateTracking=auto -#forceGsmWhenRadioOff=true +sub=SUB1 # SIM 2 [ril_1] transport=binder:name=slot2 -#sub=SUB2 name=slot2 -#slot=1 -useDataProfiles=true +sub=SUB2
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/pulse/arm_droid_card_custom.pa ^
@@ -0,0 +1 @@ +load-module module-droid-card rate=48000
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/systemd/system/mount-sd@sda2.service ^
+(symlink to /dev/null)
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/systemd/system/mount-sd@sda3.service ^
+(symlink to /dev/null)
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/systemd/system/mount-sd@sdf6.service ^
+(symlink to /dev/null)
[-] [+]	Added	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/etc/systemd/system/sys-fs-pstore.mount ^
+(symlink to /dev/null)
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/usr/bin/droid/startup-misc.sh ^
@@ -1,6 +1,9 @@ #!/bin/env bash # startup-misc - A miscellaneous preparation script to run on device startup. +# Enable backlight for physical buttons +echo 1 > /sys/class/leds/button-backlight/brightness + # We're done here if this isn't the first boot [ ! -f /var/tmp/make-droid-links ] && exit 0
[-] [+]	Changed	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.3.tar.gz/sparse/usr/share/csd/settings.d/hw-settings.ini ^
@@ -59,6 +59,3 @@ RecordBottomDevice=input-builtin_mic RecordTopDeviceChannel=left RecordBottomDeviceChannel=right - -[Keys] -Keys=0x01000072, 0x01000070, 0x010000dc, 0x01000090, 0x01000061
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/etc/dconf/db/vendor.d/custom-defaults.txt ^
@@ -1,11 +0,0 @@ -[desktop/jolla] -reboot_action_enabled=true - -[lipstick/weatherbanner] -expanded=true - -[meegotouch/i18n] -lc_timeformat24h='24' - -[sailfish/i18n] -lc_timeformat24h='24'
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/etc/profile.d/less-custom-setup.sh ^
@@ -1,13 +0,0 @@ -if [[ $- = i && -x `command -v less` ]]; then - # colors init - export LESS_TERMCAP_mb=$(printf '\e[01;31m') # enter blinking mode - red - export LESS_TERMCAP_md=$(printf '\e[01;35m') # enter double-bright mode - bold, magenta - export LESS_TERMCAP_me=$(printf '\e[0m') # turn off all appearance modes (mb, md, so, us) - export LESS_TERMCAP_se=$(printf '\e[0m') # leave standout mode - export LESS_TERMCAP_so=$(printf '\e[01;33m') # enter standout mode - yellow - export LESS_TERMCAP_ue=$(printf '\e[0m') # leave underline mode - export LESS_TERMCAP_us=$(printf '\e[04;36m') # enter underline mode - cyan - - # stop using 'more' :) - export PAGER=less -fi
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/etc/systemd/user/ngfd.service ^
@@ -1,13 +0,0 @@ -[Unit] -Description=Non-Graphic Feedback Daemon -Requires=dbus.socket -After=pre-user-session.target - -[Service] -EnvironmentFile=-/etc/sysconfig/ngfd -ExecStartPre=/bin/sleep 1 -ExecStart=/usr/bin/ngfd $NGFD_ARGS -Restart=always - -[Install] -WantedBy=user-session.target
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/etc/systemd/user/user-session.target.wants/ngfd.service ^
-(symlink to ../ngfd.service)
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/etc/udev/rules.d/80-udisks2.rules ^
@@ -1,180 +0,0 @@ -# This file contains udev rules for udisks 2.x -# -# Overrides system installed (/lib) rules to avoid processing internal /dev/sd[a-f] block devices as external -# - -# ------------------------------------------------------------------------ -# Probing -# ------------------------------------------------------------------------ - -# Skip probing if not a block device or if requested by other rules -# -SUBSYSTEM!="block", GOTO="udisks_probe_end" -ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="udisks_probe_end" -ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?", GOTO="udisks_probe_end" - -# MD-RAID (aka Linux Software RAID) members -# -# TODO: file bug against mdadm(8) to have --export-prefix option that can be used with e.g. UDISKS_MD_MEMBER -# -SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="raid", ENV{ID_FS_TYPE}=="linux_raid_member", ENV{UDISKS_MD_MEMBER_LEVEL}=="", IMPORT{program}="/bin/sh -c '/sbin/mdadm --examine --export $tempnode \| /bin/sed s/^MD_/UDISKS_MD_MEMBER_/g'" - -SUBSYSTEM=="block", KERNEL=="md", ENV{DEVTYPE}!="partition", IMPORT{program}="/bin/sh -c '/sbin/mdadm --detail --export $tempnode \| /bin/sed s/^MD_/UDISKS_MD_/g'" - -LABEL="udisks_probe_end" - -# ------------------------------------------------------------------------ -# Tag floppy drives since they need special care - -# PC floppy drives -# -KERNEL=="fd", ENV{ID_DRIVE_FLOPPY}="1" - -# USB floppy drives -# -SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", ENV{ID_DRIVE_FLOPPY}="1" - -# ATA Zip drives -# -ENV{ID_VENDOR}=="IOMEGA", ENV{ID_MODEL}=="ZIP", ENV{ID_DRIVE_FLOPPY_ZIP}="1" - -# TODO: figure out if the drive supports SD and SDHC and what the current -# kind of media is - right now we just assume SD -KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1" - -# Match sda1 to mmcblk1 both of DEVTYPE==disk and SUBSYSTEM=="block" -KERNEL=="mmcblk\|sd[g-z][0-9]", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1" -KERNEL=="mmcblk\|sd[g-z][0-9]", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem", ACTION=="add", MODE="0660", TAG+="systemd", ENV{SYSTEMD_WANTS}="mount-sd@%k.service" - -# ditto for memstick -KERNEL=="msblk[0-9]\|mspblk[0-9]", SUBSYSTEMS=="memstick", ENV{DEVTYPE}=="disk", ENV{ID_DRIVE_FLASH_MS}="1", ENV{ID_DRIVE_MEDIA_FLASH_MS}="1" - -# TODO: maybe automatically convert udisks1 properties to udisks2 ones? -# (e.g. UDISKS_PRESENTATION_HIDE -> UDISKS_IGNORE) - -# ------------------------------------------------------------------------ -# ------------------------------------------------------------------------ -# ------------------------------------------------------------------------ -# Whitelist for tagging drives with the property media type. -# TODO: figure out where to store this database - -SUBSYSTEMS=="usb", ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_MS}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SM}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0248", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_SD}="1" - -SUBSYSTEMS=="usb", ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SM}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SD}="1" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_MS}="1" - -# APPLE SD Card Reader (MacbookPro5,4) -# -SUBSYSTEMS=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="8403", ENV{ID_DRIVE_FLASH_SD}="1" - -# Realtek card readers -DRIVERS=="rts_pstor", ENV{ID_DRIVE_FLASH_SD}="1" -DRIVERS=="rts5229", ENV{ID_DRIVE_FLASH_SD}="1" - -# Lexar Dual Slot USB 3.0 Reader Professional -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SD}="1" - -# Transcend USB 3.0 Multi-Card Reader (TS-RDF8K) -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SD}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_MS}="1" - -# Common theme -# -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="ReaderSD", ENV{ID_DRIVE_FLASH_SD}="1" -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="CF_Reader", ENV{ID_DRIVE_FLASH_CF}="1" -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="SM_Reader", ENV{ID_DRIVE_FLASH_SM}="1" -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="MS_Reader", ENV{ID_DRIVE_FLASH_MS}="1" - -# USB stick / thumb drives -# -SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="Kingston", ENV{ID_MODEL}=="DataTraveler", ENV{ID_DRIVE_THUMB}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="SanDisk", ENV{ID_MODEL}=="Cruzer", ENV{ID_CDROM}!="1", ENV{ID_DRIVE_THUMB}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="HP", ENV{ID_MODEL}=="v125w", ENV{ID_DRIVE_THUMB}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="13fe", ENV{ID_MODEL}=="Patriot", ENV{ID_DRIVE_THUMB}="1" -SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="JetFlash", ENV{ID_MODEL}=="Transcend", ENV{ID_DRIVE_THUMB}="1" - -# SD-Card reader in Chromebook Pixel -SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05e3", ENV{ID_MODEL_ID}=="0727", ENV{ID_DRIVE_FLASH_SD}="1" - -# ------------------------------------------------------------------------ -# ------------------------------------------------------------------------ -# ------------------------------------------------------------------------ -# Devices which should not be display in the user interface -# -# (note that RAID/LVM members are not normally shown in an user -# interface so setting UDISKS_IGNORE at first does not seem to achieve -# anything. However it helps for RAID/LVM members that are encrypted -# using LUKS. See bug #51439.) - -# Apple Bootstrap partitions -ENV{ID_PART_ENTRY_SCHEME}=="mac", ENV{ID_PART_ENTRY_TYPE}=="Apple_Bootstrap", ENV{UDISKS_IGNORE}="1" - -# Apple Boot partitions -ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_TYPE}=="426f6f74-0000-11aa-aa11-00306543ecac", ENV{UDISKS_IGNORE}="1" - -# special DOS partition types (EFI, hidden, etc.) and RAID/LVM -# see http://www.win.tue.nl/~aeb/partitions/partition_types-1.html -ENV{ID_PART_ENTRY_SCHEME}=="dos", \ - ENV{ID_PART_ENTRY_TYPE}=="0x0\|0x11\|0x12\|0x14\|0x16\|0x17\|0x1b\|0x1c\|0x1e\|0x27\|0x3d\|0x84\|0x8d\|0x8e\|0x90\|0x91\|0x92\|0x93\|0x97\|0x98\|0x9a\|0x9b\|0xbb\|0xc2\|0xc3\|0xdd\|0xef\|0xfd", \ - ENV{UDISKS_IGNORE}="1" - -# special GUID-identified partition types (EFI System Partition, BIOS Boot partition, RAID/LVM) -# see http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs -ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ - ENV{ID_PART_ENTRY_TYPE}=="c12a7328-f81f-11d2-ba4b-00a0c93ec93b\|21686148-6449-6e6f-744e-656564454649\|a19d880f-05fc-4d3b-a006-743f0f84911e\|e6d6d379-f507-44c2-a23c-238f2a3df928\|e3c9e316-0b5c-4db8-817d-f92df00215ae\|de94bba4-06d1-4d40-a16a-bfd50179d6ac", \ - ENV{UDISKS_IGNORE}="1" - -# ZFS member partitions -ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ - ENV{ID_FS_TYPE}=="zfs_member", ENV{ID_PART_ENTRY_TYPE}=="6a898cc3-1dd2-11b2-99a6-080020736631", \ - ENV{UDISKS_IGNORE}="1" - -# MAC recovery/tool partitions/devices which are useless on Linux -ENV{ID_PART_ENTRY_SCHEME}=="mac", \ - ENV{ID_CDROM}=="?", ENV{ID_FS_TYPE}=="udf", ENV{ID_FS_LABEL}=="WDSmartWare", \ - ENV{UDISKS_IGNORE}="1" -ENV{ID_PART_TABLE_TYPE}=="mac", \ - ENV{ID_CDROM}=="?", ENV{ID_FS_TYPE}=="udf", ENV{ID_FS_LABEL}=="WDSmartWare", \ - ENV{UDISKS_IGNORE}="1" - -# recovery partitions -ENV{ID_FS_TYPE}=="ntfs\|vfat", \ - ENV{ID_FS_LABEL}=="Recovery\|RECOVERY\|Lenovo_Recovery\|HP_RECOVERY\|Recovery_Partition\|DellUtility\|DellRestore\|IBM_SERVICE\|SERVICEV001\|SERVICEV002\|SYSTEM_RESERVED\|System_Reserved\|WINRE_DRV\|DIAGS\|IntelRST", \ - ENV{UDISKS_IGNORE}="1" - -# read-only non-Linux software installer partitions -ENV{ID_VENDOR}=="Sony", ENV{ID_MODEL}=="PRSLauncher", ENV{UDISKS_IGNORE}="1" - -# non-Linux software -KERNEL=="sr", ENV{ID_VENDOR}=="SanDisk", ENV{ID_MODEL}=="Cruzer", ENV{ID_FS_LABEL}=="U3_System", ENV{UDISKS_IGNORE}="1" - -# Virtual Windows tools installation on Asus Zendisk (0b05:17b4) -KERNEL=="sr", ENV{ID_VENDOR}=="ASMT",ENV{ID_MODEL}=="VirtualCDROM", ENV{ID_FS_LABEL}=="ASUS_+Speed_ZENDISK", ENV{UDISKS_IGNORE}="1" - -# Virtual Windows tools installation CD on Nokia 7 Plus (2e04:c025) -KERNEL=="sr", ENV{ID_VENDOR}=="Linux", ENV{ID_MODEL}=="File-CD_Gadget", ENV{ID_FS_LABEL}=="CDROM", ATTRS{manufacturer}=="HMD Global", ENV{UDISKS_IGNORE}="1" - -# Content created using isohybrid (typically used on CDs and USB -# sticks for bootable media) is a bit special insofar that the -# interesting content is on a DOS partition with type 0x00 ... which -# is hidden above. So undo this. -# -# See http://mjg59.dreamwidth.org/11285.html for more details -# -# ) This is true only for 64bit images. For 32bit images the type is 0x17 -# (Hidden HPFS/NTFS/exFAT). This is most likely a bug but we still need to -# stop ignoring these. -ENV{ID_PART_TABLE_TYPE}=="dos", ENV{ID_PART_ENTRY_TYPE}=="0x0\|0x17", ENV{ID_PART_ENTRY_NUMBER}=="1", ENV{ID_FS_TYPE}=="iso9660\|udf", ENV{UDISKS_IGNORE}="0" - -# Zram devices setup -# KERNEL=="zram[0-9]", ENV{SYSTEMD_WANTS}="zram-setup@zram%n.service", TAG+="systemd" - -# Explicitly ignore ram block devices, they don't work with udev -KERNEL=="ram", ENV{UDISKS_IGNORE}="1"
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/lib/systemd/system/local-fs.target.wants/vendor-bin-netmgrd.mount ^
-(symlink to ../vendor-bin-netmgrd.mount)
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/lib/systemd/system/vendor-bin-netmgrd.mount ^
@@ -1,13 +0,0 @@ -[Unit] -Description=Droid mount for /vendor/bin/netmgrd -Before=local-fs.target - -[Mount] -What=/usr/libexec/droid-hybris/vendor/bin/netmgrd -Where=/vendor/bin/netmgrd -Type=none -Options=ro,bind -TimeoutSec=5 - -[Install] -WantedBy=local-fs.target
	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/usr/libexec/droid-hybris/vendor/bin/netmgrd ^
[-] [+]	Deleted	_service:tar_git:jolla-hw-adaptation-cheeseburger-1.2.2+master.20191226214657.2.ge355f52.tar.gz/sparse/var/lib/mce/builtin-gconf.values ^
@@ -1,4 +0,0 @@ -/system/osso/dsm/energymanagement/enable_power_saving=true -/system/osso/dsm/energymanagement/psm_threshold=15 -/system/osso/dsm/display/als_autobrightness=false -/system/osso/dsm/display/display_dim_timeout=120