Commit 6b531a6c authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge tag 'v32' into pureos/byzantium

librem5-base v32
parents 55ea7366 8daa7784
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
stages:
- package
- test-package
- package
- test-package
variables:
WORKING_DIR: $CI_PROJECT_DIR/debian/output
package:deb-debian-buster:
extends: .l5-build-debian-package
build-debian-package:
image: debian:buster
tags:
- librem5
stage: package
before_script:
- export DEBIAN_FRONTEND=noninteractive
- apt-get -y update
- apt-get -y install build-essential wget ca-certificates gnupg
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
- wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
- apt-get -y update
- apt-get -y build-dep .
script:
- dpkg-buildpackage -b -uc -us
- rm -rf "${WORKING_DIR}"; mkdir -p "${WORKING_DIR}"
- cp -l ../*.deb ../*.changes "${WORKING_DIR}/"
artifacts:
paths:
- "${WORKING_DIR}"
autopkgtest-debian-buster-package:
dependencies:
- package:deb-debian-buster
extends: .l5-autopkgtest-debian-package
autopkgtest-debian-package:
image: debian:buster
tags:
- librem5
stage: test-package
lintian-debian-buster-package:
dependencies:
- build-debian-package
before_script:
- export DEBIAN_FRONTEND=noninteractive
- apt-get -y update
- apt-get -y install wget ca-certificates gnupg autopkgtest
- echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
- wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
script:
- ls "${WORKING_DIR}"
- RET=0;
autopkgtest -U ${WORKING_DIR}/*.changes -- autopkgtest-virt-null || RET=$?;
echo "Autopkgtest exited with ${RET}";
[ "${RET}" -eq 8 ] && exit 0 || exit "${RET}"
- package:deb-debian-buster
extends: .l5-lintian-debian-package
librem5-base (32) amber-phone; urgency=medium
* defaults: Lower priority for src:webkit for non-amber phone.
Debian thankfully ships security updates for webkit but they don't
use WPE so break epiphany. Hence lower the priority of packages from
amber, amber-security, amber-updates and amber-proposed-updates
but leave amber-phone, amber-phone-staging at default priority.
This still allows to use
apt install <pkg>/amber-security
while prefering amber-phone{,-staging} by default.
We add a lintian override since this is better than breaking
installations. This will go away automatically when we switch
to byzantium.
* Use phosh-mobile-tweaks.
Use the shell specific package for things related
to the shell. We'll use mobile-tweaks and meta-phosh
to unclutter librem5-base further in the future.
-- Guido Günther <agx@sigxcpu.org> Wed, 23 Dec 2020 15:14:32 +0100
librem5-base (31) amber-phone; urgency=medium
[ Sebastian Krzyszkowiak ]
* gnome-base: Add gstreamer1.0-libav.
Patched glibc is already in amber-phone-staging, we can install
`gstreamer1.0-libav` by default now for better media support in
Epiphany.
Fixes OS-issues#79
[ Guido Günther ]
* schema override: Tweak nautilus a bit.
Use single click and smaller symbols
* gnome-notfit: Add nautilus.
Needed to display new mounts
-- Guido Günther <agx@sigxcpu.org> Fri, 11 Dec 2020 13:05:05 +0100
librem5-base (30) amber-phone; urgency=medium
* gnome-base: Add gvfs-backends.
Needed for phosh's volume automounting
* gnome-base: Add fonts-noto-cjk.
Otherwise there's lots of TOFU chracers e.g. in gnome-software's
package descriptions.
-- Guido Günther <agx@sigxcpu.org> Mon, 30 Nov 2020 09:05:33 +0100
librem5-base (29) amber-phone; urgency=high
* hidden-apps: Hide Yelp's launcher
* gnome-all: Add geary
-- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> Sat, 14 Nov 2020 18:16:57 +0100
librem5-base (28) amber-phone; urgency=high
[ Guido Günther ]
* schema override: Drop apps that aren't adaptive in amber-phone
[ Sebastian Krzyszkowiak ]
* gnome-all: Add gnome-weather
[ Martin Kepplinger ]
* Put battery in shipmode when powering off while not charging
-- Martin Kepplinger <martin.kepplinger@puri.sm> Mon, 09 Nov 2020 15:53:26 +0100
librem5-base (27) amber-phone; urgency=medium
[ Guido Günther ]
* Whitelist adaptive apps
[ Sebastian Krzyszkowiak ]
* librem5.pa: Cork streams also based on input stream trigger
[ Arnaud Ferraris ]
* ucm: wm8962: improve ucm profile
* pulse: librem5: use new profile name for default settings
[ Sebastian Krzyszkowiak ]
* librem5.pa: Add default parameters for echo cancellation module
* ucm: wm8962: Tweak microphone capture volume
[ Guido Günther ]
* gschema-overrides: Drop button-layout
[ Sebastian Krzyszkowiak ]
* Add librem5-non-gnome metapackage
* non-gnome-all: Add firefox-esr-mobile-config
* overriden-apps: Drop firefox-esr desktop file override
-- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> Wed, 04 Nov 2020 16:41:00 +0100
librem5-base (26) amber-phone; urgency=medium
[ Sebastian Krzyszkowiak ]
* Mark the modem's ALSA card as a modem.
This makes PulseAudio ignore it by default, so we add it to librem5.pa
as well to make it stay available.
* librem5.pa: Cork/mute audio streams when on a phone call
* librem5.pa: Duck volume of audio streams when notification or
accessibility sounds are played
* librem5.pa: Automatically switch default source/sink to a new device (Bluetooth, USB)
* librem5.pa: prevent automatic switch to HSP profile.
To be reverted once HSP works with Redpine module (linux-next#228)
[ Guido Günther ]
* gitlab-ci: Use the prebuilt pipelines.
This eases maintenance and makes sure we can ci packages apart
by version number. (Closes: #36)
* dev-tools: Follow librem5-devkit-check -> librem5-check name change.
This will help librem5-devkit-tools migrate.
[ Alexander Mikhaylenko ]
* librem5.gschema.override: Enable phone mode in GTK.
See https://source.puri.sm/Librem5/gtk/-/merge_requests/18
* librem5.gschema.override: Force enable hardware acceleration in Epiphany.
Now that it works in 2.30.1, we want it to be actually used.
* d/control: Depend on new WebKit.
AC mode is broken in older WebKit versions.
[ Adrien Plazas ]
* gnome-base-all: Replace GNOME Software by PureOS Store
-- Guido Günther <agx@sigxcpu.org> Fri, 30 Oct 2020 16:51:47 +0100
librem5-base (25.0pureos0.1) byzantium; urgency=high
* Forward port to byzantium
......
......@@ -79,6 +79,19 @@ Description: GNOME notfit metapackage for the Librem5
This package contains GNOME apps that aren't fully working
on phones like e.g. requiring the use of landscape mode.
Package: librem5-non-gnome
Architecture: all
Depends:
${germinate:Depends},
${misc:Depends},
Recommends:
${germinate:Recommends}
Description: Non-GNOME metapackage for the Librem5
This package contains non-GNOME packages for Librem5
that don't really fit into base metapackage.
.
It should be installed on every librem5.
Package: librem5-dev-tools
Architecture: all
Depends:
......@@ -130,6 +143,7 @@ Depends:
Breaks:
haegtesse (<< 0.1.1),
librem5-theme-default (<= 1),
libwebkit2gtk-4.0-37 (<< 2.30.1),
squeekboard (<< 1.4.0),
wys (<< 0.1.1),
Replaces:
......
......@@ -17,9 +17,6 @@ default/profile.d/*.sh etc/profile.d/
# Applications to hide form the menu
default/hidden-apps/*.desktop usr/share/librem5/applications/
# Other desktop file overrides
default/overriden-apps/*.desktop usr/share/librem5/applications/
# pam password policies
default/pam-librem5 usr/share/pam-configs
......@@ -34,3 +31,9 @@ default/90-nm-gadget-managed.rules /usr/lib/udev/rules.d/
default/gpsd/librem5-gpsd /etc/default/
default/gpsd/gpsd.service.d /lib/systemd/system/
default/gpsd/99-gnss.rules lib/udev/rules.d/
# battery shipmode on poweroff
default/shipmode/l5-poweroff-shipmode /usr/lib/systemd/system-shutdown/
# Apt pinning since amber-phone is not a full suite
default/apt-preferences.d/* /etc/apt/preferences.d/
# mark the modem's ALSA card as a modem
SUBSYSTEM=="sound", ACTION=="change", KERNEL=="card*", ATTR{id}=="MODEM", ENV{SOUND_CLASS}="modem"
librem5-base-defaults: package-installs-apt-preferences etc/apt/preferences.d/webkit-amber-phone
......@@ -6,6 +6,7 @@
override_dh_installudev:
dh_installudev --name=librem5-devkit-sgtl5000 --priority=85
dh_installudev --name=librem5-pm --priority=85
dh_installudev --name=librem5-modem --priority=85
override_dh_auto_test:
desktop-file-validate default/hidden-apps/*.desktop default/overriden-apps/*.desktop
desktop-file-validate default/hidden-apps/*.desktop
[org.gnome.desktop.a11y.applications]
screen-keyboard-enabled=true
[org.gnome.desktop.background]
picture-uri='file:///usr/share/librem5/default-theme/adwaita-phone.jpg'
[org.gnome.desktop.interface]
clock-show-date=false
clock-show-weekday=false
[org.gnome.desktop.sound]
theme-name='librem5'
[org.gnome.desktop.wm.preferences]
button-layout='appmenu:'
[org.gnome.Epiphany]
search-engines=[('Search the Web', 'https://duckduckgo.com/?q=%s&t=epiphany', ''), ('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), ('Qwant', 'https://www.qwant.com/?q=%s', '!q')]
[org.gnome.Epiphany.web]
hardware-acceleration-policy='never'
hardware-acceleration-policy='always'
user-agent='Mozilla/5.0 (Librem 5, like iPhone; Linux aarch64) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Chrome/64 Mobile/15E148 Safari/605.1.15'
[org.gnome.desktop.session]
......@@ -36,3 +26,15 @@ sleep-inactive-battery-type='nothing'
[org.gnome.settings-daemon.plugins.wwan]
unlock-sim=true
[org.gnome.nautilus.preferences]
click-policy='single'
[org.gnome.nautilus.icon-view]
default-zoom-level='standard'
[org.gtk.Settings.Purism]
is-phone=true
[sm.puri.phosh]
force-adaptive=['chromium.desktop', 'com.github.johnfactotum.Foliate.desktop', 'firefox-esr.desktop', 'gnome-control-center.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.Evince.desktop', 'org.gnome.gedit.desktop', 'org.gnome.Lollypop.desktop', 'org.gnome.PasswordSafe.desktop', 'org.gnome.Podcasts.desktop', 'org.gnome.Software.desktop', 'org.gnome.TwentyFortyEight.desktop', 'org.gnome.Usage.desktop', 'org.gnome.zbrown.KingsCross.desktop', 'sm.puri.Calls.desktop', 'sm.puri.Store.desktop', 'supertuxkart.desktop', 'yelp.desktop']
# Lower the priority of all suites except amber-phone*
# for webkit2gtk packages
#
# Can't use src:webkit on buster/amber so this gets rather long:
# amber-security
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-javascriptcoregtk-4.0
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-webkit2-4.0
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-18
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-bin
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-dev
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37-gtk2
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-dev
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-doc
Pin: release n=amber-security
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: webkit2gtk-driver
Pin: release n=amber-security
Pin-Priority: 90
# amber-updates
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-javascriptcoregtk-4.0
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-webkit2-4.0
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-18
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-bin
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-dev
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37-gtk2
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-dev
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-doc
Pin: release n=amber-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: webkit2gtk-driver
Pin: release n=amber-updates
Pin-Priority: 90
# amber
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-javascriptcoregtk-4.0
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-webkit2-4.0
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-18
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-bin
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-dev
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37-gtk2
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-dev
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-doc
Pin: release n=amber
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: webkit2gtk-driver
Pin: release n=amber
Pin-Priority: 90
# amber-proposed-updates
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-javascriptcoregtk-4.0
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: gir1.2-webkit2-4.0
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-18
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-bin
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libjavascriptcoregtk-4.0-dev
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-37-gtk2
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-dev
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: libwebkit2gtk-4.0-doc
Pin: release n=amber-proposed-updates
Pin-Priority: 90
Explanation: Debian ships webkit versions that don't work for us
Package: webkit2gtk-driver
Pin: release n=amber-proposed-updates
Pin-Priority: 90
......@@ -4,11 +4,32 @@
.ifexists /sys/devices/platform/sound/308b0000.sai-sgtl5000
set-default-sink alsa_output.platform-sound.VoiceCall__hw_CARD_sgtl5000__sink
set-default-source alsa_input.platform-sound.VoiceCall__hw_CARD_sgtl5000__source
update-source-proplist alsa_input.platform-sound.VoiceCall__hw_CARD_sgtl5000__source filter.apply.echo-cancel.parameters="aec_args=\"analog_gain_control=0\" use_master_format=yes channels=1"
.endif
# phone
.ifexists /sys/devices/platform/sound-wwan/30030000.sai-bm818
load-module module-alsa-card device_id="MODEM" name="platform-sound-wwan" card_properties="device.description=Modem"
.endif
.ifexists /sys/devices/platform/sound/308b0000.sai-wm8962
set-card-profile alsa_card.platform-sound Audio
set-default-sink alsa_output.platform-sound.Audio__hw_CARD_wm8962__sink
set-default-source alsa_input.platform-sound.Audio__hw_CARD_wm8962__source
set-card-profile alsa_card.platform-sound HiFi
set-default-sink alsa_output.platform-sound.HiFi__hw_CARD_wm8962__sink
set-default-source alsa_input.platform-sound.HiFi__hw_CARD_wm8962__source
update-source-proplist alsa_input.platform-sound.HiFi__hw_CARD_wm8962__source filter.apply.echo-cancel.parameters="aec_args=\"analog_gain_control=0\" use_master_format=yes channels=1"
.endif
# cork/mute audio streams when on a phone call
unload-module module-role-cork
load-module module-role-cork trigger_roles=phone cork_roles=no_role,music,video,game global=true use_source_trigger=true
# duck volume of audio streams when notification or accessibility sounds are played
load-module module-role-ducking trigger_roles=event,a11y ducking_roles=no_role,music,video,game global=true
# automatically switch default source/sink to a new device (Bluetooth, USB)
load-module module-switch-on-connect
# prevent automatic switch to HSP profile until HSP works with Redpine module
.ifexists module-bluetooth-policy.so
unload-module module-bluetooth-policy
.endif
SectionVerb {
EnableSequence [
]
DisableSequence [
]
Value {
TQ "Audio"
}
}
SectionDevice."Handset".0 {
Comment "Handset"
ConflictingDevice [
"Headset"
"SpeakerPhone"
]
EnableSequence [
cdev "hw:wm8962"
cset "name='Speaker Switch' off,on"
cset "name='Headphone Switch' off,off"
cset "name='Speaker Volume' 121,121"
cset "name='Speaker Boost Volume' 2"
cset "name='Digital Playback Volume' 100,100"
cset "name='Digital Capture Volume' 100,100"
cset "name='DAC L/R Swap Switch' on"
cset "name='SPKOUTL PGA' Mixer"
cset "name='SPKOUTR PGA' DAC"
cset "name='DAC Monomix Switch' on"
cset "name='ADC L/R Swap Switch' off"
]
DisableSequence [
cdev "wm8962"
cset "name='Speaker Switch' off,off"
cset "name='Digital Capture Volume' 0,0"
cset "name='DAC L/R Swap Switch' off"
cset "name='DAC Monomix Switch' off"
]
Value {
PlaybackChannels "2"
PlaybackPriority "1000"
PlaybackPCM "hw:CARD=wm8962"
PlaybackVolume "name='Speaker Volume'"
PlaybackSwitch "name='Speaker Switch'"
CaptureChannels "2"
CapturePriority "1000"
CaptureVolume "name='Digital Capture Volume'"
CapturePCM "hw:CARD=wm8962"
}
}
SectionDevice."SpeakerPhone".0 {
Comment "Speaker Phone"
ConflictingDevice [
"Handset"
"Headset"
]
EnableSequence [
cdev "hw:wm8962"
cset "name='Speaker Switch' on,off"
cset "name='Headphone Switch' off,off"
cset "name='Speaker Volume' 121,121"
cset "name='Speaker Boost Volume' 6"
cset "name='Digital Playback Volume' 100,100"
cset "name='Digital Capture Volume' 100,100"
cset "name='DAC L/R Swap Switch' off"
cset "name='SPKOUTL PGA' DAC"
cset "name='SPKOUTR PGA' Mixer"
cset "name='DAC Monomix Switch' on"
cset "name='ADC L/R Swap Switch' on"
]
DisableSequence [
cset "name='Speaker Switch' off,off"
cset "name='Digital Capture Volume' 0,0"
cset "name='DAC Monomix Switch' off"
cset "name='ADC L/R Swap Switch' off"
]
Value {
PlaybackChannels "2"
PlaybackPriority "800"
PlaybackPCM "hw:CARD=wm8962"
PlaybackVolume "name='Speaker Volume'"