Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change configuration to match changes made in kernel
Kernel sets 32bit framebuffer mode and display orientation to portrait:
filippz/kernel-adaptation-n950-n9@c81b181
[configs] change touchscreen rotation to match display orientation
[configs] remove unnecessary fbset-n9.service
[packaging] remove fbset-n9.service from packaging
[packaging] remove Requires to fbset from packaging
[packaging] add Requires to kernel version >= 3.5.3.20141025.1 in packaging

Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  • Loading branch information
filippz committed Oct 25, 2014
1 parent e94ca78 commit 1bff439
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 20 deletions.
1 change: 0 additions & 1 deletion Makefile
Expand Up @@ -3,6 +3,5 @@ all:
install:
install -D -m 644 conf/60-n9-n950-ui.conf $(DESTDIR)/var/lib/environment/compositor/60-n9-n950-ui.conf
install -D -m 644 conf/61-nemo-mobile-hw-wayland.conf $(DESTDIR)/var/lib/environment/nemo/61-nemo-mobile-hw-wayland.conf
install -D -m 644 fbset-n9.service $(DESTDIR)/lib/systemd/system/fbset-n9.service
install -D -m 644 conf/powervr.ini $(DESTDIR)/etc/powervr.ini
install -D -m 644 prjconf/n950-n9-prjconf.xml $(DESTDIR)/usr/share/prjconf/n950-n9-prjconf.xml
4 changes: 2 additions & 2 deletions conf/60-n9-n950-ui.conf
Expand Up @@ -4,5 +4,5 @@ QT_QPA_EGLFS_DEPTH=32
QT_QPA_EGLFS_HIDECURSOR=1
M_FORCE_LOCAL_THEME=1
LIPSTICK_OPTIONS=
QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=
PRE_USER_SESSION_DISPLAY_OPTIONS=-displayX 187 -displayY -187 -displayRotation -90
QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS="rotate=90"
PRE_USER_SESSION_DISPLAY_OPTIONS=
13 changes: 0 additions & 13 deletions fbset-n9.service

This file was deleted.

5 changes: 1 addition & 4 deletions rpm/nemo-configs-n950-n9.spec
Expand Up @@ -33,7 +33,7 @@ Summary: Configuration files for n950/n9 wayland env
Obsoletes: ti-omap3-sgx-configs-default <= 1.4.268.5
Provides: ti-omap3-sgx-configs-default > 1.4.268.5
Provides: ti-omap3-sgx-configs
Requires: fbset
Requires: kernel-adaptation-n950 >= 3.5.3.20141025.1

%description wayland
%{summary}.
Expand All @@ -48,7 +48,6 @@ make
rm -rf %{buildroot}
make DESTDIR=%{buildroot} ONESHOTDIR=%{_oneshotdir} install
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants/
ln -s ../fbset-n9.service $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants/fbset-n9.service
/usr/bin/repomd-pattern-builder.py --patternxml -p ./patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}

%files
Expand All @@ -66,5 +65,3 @@ ln -s ../fbset-n9.service $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants/
%{_sysconfdir}/powervr.ini
/var/lib/environment/compositor/60-n9-n950-ui.conf
/var/lib/environment/nemo/61-nemo-mobile-hw-wayland.conf
/lib/systemd/system/basic.target.wants/fbset-n9.service
/lib/systemd/system/fbset-n9.service

0 comments on commit 1bff439

Please sign in to comment.