Skip to content

Commit cc43ea3

Browse files
JamiKettunenJamiKettunen
committedDec 5, 2019
patterns: meta: Deprecate patterns in favor of meta-packages
·
1.5.41.1.0.3
1 parent 4c6d62d commit cc43ea3

10 files changed

+187
-128
lines changed
 

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "droid-configs-device"]
22
path = droid-configs-device
3-
url = https://github.com/mer-hybris/droid-hal-configs
3+
url = https://github.com/sailfishos-oneplus5/droid-hal-configs

‎droid-configs-device

‎patterns/jolla-configuration-cheeseburger.yaml

+3-34
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,5 @@
1-
Description: Pattern with packages for cheeseburger configurations
1+
Description: Dummy pattern to keep scripts happy
22
Name: jolla-configuration-cheeseburger
33
Requires:
4-
- pattern:jolla-hw-adaptation-cheeseburger
5-
6-
- patterns-sailfish-applications
7-
- patterns-sailfish-ui
8-
- patterns-sailfish-cellular-apps
9-
# Early stages of porting benefit from these:
10-
- pattern:sailfish-porter-tools
11-
12-
- sailfish-content-graphics-z@ICON_RES@
13-
14-
# For multi-SIM devices
15-
- jolla-settings-networking-multisim
16-
17-
# Introduced starting Sailfish OS 2.0.4.x:
18-
# 3rd party accounts like Twitter, VK, cloud services, etc
19-
- jolla-settings-accounts-extensions-3rd-party-all
20-
21-
# Introduced starting Sailfish OS 2.1.1.26
22-
# Required for Jolla Store Access
23-
- patterns-sailfish-consumer-generic
24-
25-
# For Mozilla location services (online)
26-
- geoclue-provider-mlsdb
27-
28-
# Sailfish OS CSD tool for hardware testing
29-
# needs some configuration to get all features working
30-
- csd
31-
32-
# Devices with 2G or more memory should also include this booster
33-
# to improve camera startup times and the like
34-
- mapplauncherd-booster-silica-qt5-media
35-
36-
Summary: Jolla Configuration cheeseburger
4+
- dummy-package
5+
Summary: Jolla Dummy Configuration cheeseburger

‎patterns/jolla-hw-adaptation-cheeseburger.yaml

+3-90
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,5 @@
1-
Description: Pattern with packages for cheeseburger HW Adaptation
1+
Description: Dummy pattern to keep scripts happy
22
Name: jolla-hw-adaptation-cheeseburger
33
Requires:
4-
- droid-hal-cheeseburger
5-
- droid-hal-cheeseburger-detritus
6-
- droid-hal-cheeseburger-img-boot
7-
- droid-hal-cheeseburger-kernel-modules
8-
- droid-config-cheeseburger-sailfish
9-
- droid-config-cheeseburger-pulseaudio-settings
10-
- droid-config-cheeseburger-policy-settings
11-
- droid-config-cheeseburger-preinit-plugin
12-
- droid-config-cheeseburger-flashing
13-
- droid-config-cheeseburger-bluez5
14-
- droid-hal-version-cheeseburger
15-
16-
# Hybris packages
17-
- libhybris-libEGL
18-
- libhybris-libGLESv2
19-
- libhybris-libwayland-egl
20-
21-
# Telephony
22-
- ofono-ril-binder-plugin
23-
24-
# Bluetooth
25-
- bluebinder
26-
27-
# NFC
28-
- nfcd-binder-plugin
29-
- jolla-settings-system-nfc
30-
31-
# Flashlight
32-
- jolla-settings-system-flashlight
33-
34-
# Sensors
35-
- hybris-libsensorfw-qt5
36-
37-
# Vibra
38-
- ngfd-plugin-native-vibrator
39-
- qt5-feedback-haptics-native-vibrator
40-
41-
# Needed for /dev/touchscreen symlink
42-
- qt5-plugin-generic-evdev
43-
44-
# Audio
45-
- pulseaudio-modules-droid
46-
- pulseaudio-modules-droid-hidl
47-
- pulseaudio-modules-droid-glue
48-
# for audio recording to work:
49-
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
50-
51-
# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
52-
- qt5-qtwayland-wayland_egl
53-
- qt5-qpa-hwcomposer-plugin
54-
- qtscenegraph-adaptation
55-
56-
# Add GStreamer v1.0 as standard
57-
- gstreamer1.0
58-
- gstreamer1.0-droid
59-
- gstreamer1.0-libav
60-
- gstreamer1.0-plugins-good
61-
- gstreamer1.0-plugins-base
62-
- gstreamer1.0-plugins-bad
63-
- nemo-gstreamer1.0-interfaces
64-
65-
# This is needed for notification LEDs
66-
- mce-plugin-libhybris
67-
68-
## USB mode controller
69-
# Enables mode selector upon plugging USB cable:
70-
- usb-moded
71-
72-
# hammerhead, grouper, and maguro use this in scripts, so include for all
73-
- rfkill
74-
75-
# enable device lock and allow to select untrusted software
76-
- jolla-devicelock-daemon-encsfa
77-
78-
# For GPS
79-
- geoclue-provider-hybris
80-
81-
# OnePlus 5 specific packages
82-
- triambienced
83-
- onyx-triambience-settings-plugin
84-
- gestured
85-
- onyx-gesture-settings-plugin
86-
87-
# Other packages
88-
- mce-tools
89-
- nano
90-
- htop
91-
92-
Summary: Jolla HW Adaptation cheeseburger
4+
- dummy-package
5+
Summary: Jolla Dummy HW Adaptation cheeseburger

‎rpm/droid-config-cheeseburger.spec

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Reference: ../droid-configs-device/droid-configs.inc
22

3-
%define vendor oneplus
4-
%define device cheeseburger
3+
%include rpm/header-cheeseburger.inc
54

65
%define vendor_pretty OnePlus
76
%define device_pretty OnePlus 5
87

98
%define community_adaptation 1
9+
%define use_meta_package 1
1010
%define pixel_ratio 1.8
1111

1212
# Device-specific usb-moded configuration
@@ -17,6 +17,9 @@ Obsoletes: usb-moded-defaults
1717
Provides: ofono-configs
1818
Obsoletes: ofono-configs-mer
1919

20+
# Obsolete unnecessary PA glue module (we still need audioflingerglue for camera)
21+
Obsoletes: pulseaudio-modules-droid-glue
22+
2023
%define ofono_enable_plugins bluez5,hfp_ag_bluez5
2124
%define ofono_disable_plugins bluez4,dun_gw_bluez4,hfp_ag_bluez4,hfp_bluez4,dun_gw_bluez5,hfp_bluez5
2225

‎rpm/header-cheeseburger.inc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
%define vendor oneplus
2+
%define device cheeseburger

‎rpm/jolla-configuration-cheeseburger.inc

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
Requires: jolla-hw-adaptation-%{device}
2+
3+
Requires: patterns-sailfish-applications
4+
Requires: patterns-sailfish-ui
5+
Requires: patterns-sailfish-cellular-apps
6+
7+
Requires: sailfish-content-graphics-z1.75
8+
9+
# Extended settings functionality
10+
Requires: jolla-settings-system-nfc
11+
Requires: jolla-settings-system-flashlight
12+
Requires: jolla-settings-networking-multisim
13+
Requires: jolla-settings-accounts-extensions-3rd-party-all
14+
15+
# Introduced starting Sailfish OS 2.1.1.26
16+
# Required for Jolla Store Access
17+
Requires: patterns-sailfish-consumer-generic
18+
19+
# For Mozilla location services (online)
20+
Requires: geoclue-provider-mlsdb
21+
22+
# Sailfish OS CSD tool for hardware testing
23+
# needs some configuration to get all features working
24+
Requires: csd
25+
26+
# Devices with 2G or more memory should also include this booster
27+
# to improve camera startup times and the like
28+
Requires: mapplauncherd-booster-silica-qt5-media
29+
30+
# Enable device lock and allow to select untrusted software
31+
Requires: jolla-devicelock-daemon-encsfa
32+
#Requires: jolla-devicelock-plugin-encsfa
33+
34+
# Enable /home encryption
35+
#Requires: sailfish-device-encryption
36+
37+
# SELinux
38+
#Requires: libselinux-utils
39+
#Requires: libselinux-utils-extra
40+
#Requires: setools
41+
#Requires: policycoreutils
42+
43+
# Early stages of porting benefit from these:
44+
# On the basis of sailfish-porter-tools
45+
Requires: jolla-developer-mode
46+
Requires: sailfishsilica-qt5-demos
47+
Requires: busybox-static
48+
Requires: net-tools
49+
Requires: openssh-clients
50+
Requires: openssh-server
51+
Requires: vim-enhanced
52+
Requires: zypper
53+
Requires: strace
54+
#Requires: jolla-rnd-device
55+
#Requires: libhybris-tests
56+
# End sailfish-porter-tools
57+
58+
# Miscellaneous packages
59+
Requires: htop
60+
#Requires: mce-tools
61+
#Requires: nano

‎rpm/jolla-configuration-cheeseburger.spec

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Device variables including vendor & device (model)
2+
%include rpm/header-cheeseburger.inc
3+
4+
Name: jolla-configuration-%{device}
5+
Summary: Jolla Configuration %{device}
6+
Version: 1.1.1
7+
Release: 1
8+
License: BSD-3-Clause
9+
Source: %{name}-%{version}.tar.gz
10+
11+
# Include general Jolla & Sailfish OS configuration
12+
%inlcude rpm/jolla-configuration-cheeseburger.inc
13+
14+
%description
15+
Meta-package to install packages for %{device} configurations
16+
%files

‎rpm/jolla-hw-adaptation-cheeseburger.inc

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
Requires: droid-hal-%{device}
2+
Requires: droid-hal-%{device}-detritus
3+
Requires: droid-hal-%{device}-img-boot
4+
#Requires: droid-hal-%{device}-img-recovery
5+
Requires: droid-hal-%{device}-kernel-modules
6+
Requires: droid-hal-%{device}-tools
7+
Requires: droid-config-%{device}-sailfish
8+
Requires: droid-config-%{device}-pulseaudio-settings
9+
Requires: droid-config-%{device}-policy-settings
10+
Requires: droid-config-%{device}-preinit-plugin
11+
Requires: droid-config-%{device}-flashing
12+
Requires: droid-config-%{device}-bluez5
13+
Requires: droid-hal-version-%{device}
14+
15+
# Hybris packages
16+
Requires: libhybris-libEGL
17+
Requires: libhybris-libGLESv2
18+
Requires: libhybris-libwayland-egl
19+
20+
# Telephony
21+
Requires: ofono-ril-binder-plugin
22+
23+
# Bluetooth
24+
Requires: bluebinder
25+
26+
# NFC
27+
Requires: nfcd-binder-plugin
28+
29+
# Sensors
30+
Requires: hybris-libsensorfw-qt5
31+
32+
# Vibra
33+
Requires: ngfd-plugin-native-vibrator
34+
Requires: qt5-feedback-haptics-native-vibrator
35+
36+
# Needed for /dev/touchscreen symlink
37+
Requires: qt5-plugin-generic-evdev
38+
39+
# Audio
40+
Requires: pulseaudio-modules-droid
41+
Requires: pulseaudio-modules-droid-hidl
42+
# for audio recording to work:
43+
Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
44+
45+
# Camera
46+
Requires: audioflingerglue
47+
48+
# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
49+
Requires: qt5-qtwayland-wayland_egl
50+
Requires: qt5-qpa-hwcomposer-plugin
51+
Requires: qtscenegraph-adaptation
52+
53+
# Add GStreamer v1.0 as standard
54+
Requires: gstreamer1.0
55+
Requires: gstreamer1.0-droid
56+
Requires: gstreamer1.0-libav
57+
Requires: gstreamer1.0-plugins-good
58+
Requires: gstreamer1.0-plugins-base
59+
Requires: gstreamer1.0-plugins-bad
60+
Requires: nemo-gstreamer1.0-interfaces
61+
62+
# This is needed for notification LEDs
63+
Requires: mce-plugin-libhybris
64+
65+
## USB mode controller
66+
# Enables mode selector upon plugging USB cable:
67+
Requires: usb-moded
68+
69+
# hammerhead, grouper, and maguro use this in scripts, so include for all
70+
Requires: rfkill
71+
72+
# For GPS
73+
Requires: geoclue-provider-hybris
74+
75+
# OnePlus 5 specific packages
76+
Requires: triambienced
77+
Requires: onyx-triambience-settings-plugin
78+
Requires: gestured
79+
Requires: onyx-gesture-settings-plugin

‎rpm/jolla-hw-adaptation-cheeseburger.spec

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Device variables including vendor & device (model)
2+
%include rpm/header-cheeseburger.inc
3+
4+
Name: jolla-hw-adaptation-%{device}
5+
Summary: Jolla HW Adaptation %{device}
6+
Version: 1.1.1
7+
Release: 1
8+
License: BSD-3-Clause
9+
Source: %{name}-%{version}.tar.gz
10+
11+
# Include device specific HW adaptation configuration
12+
%inlcude rpm/jolla-hw-adaptation-cheeseburger.inc
13+
14+
%description
15+
Meta-package to install packages for %{device} HW Adaptation
16+
%files

0 commit comments

Comments
 (0)
Please sign in to comment.