Commit adf228b2 authored by spiiroin's avatar spiiroin

Merge branch 'upstream_sync' into 'master'

Upstream sync

[version] Merge changes from upstream 0.86.0 version. Fixes MER#1583

Cherry-pick commits from upstream repo that are missing from mer usb-moded.

Due to version conflicts created earlier, the mer versions (that are
higher than ones used by upstream) are retained in configure.ac and
rpm/usb-moded.spec -files.

See merge request !18
parents 96861475 e7d7bcc6
......@@ -23,6 +23,7 @@ test_gcc_flag() {
# We use gnu99 instead of c99 because many have interpreted the standard
# in a way that int64_t isn't defined on non-64 bit platforms.
CFLAGS="-Os -std=gnu99 -Wall -W -Wextra -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -finline-small-functions -Wno-unused-result -fstack-protector -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -fpie -pie"
LDFLAGS="-z relro -z now"
AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],[Enable debug @<:@default=false@:>@]),
[case "${enableval}" in
......
usb-moded (0.86.0) unstable; urgency=low
* [ssu] Get device manufacturer and product name from ssu. Fixes JB#35156
* [dbus] Handle missing mode setting gracefully. Fixes MER#1576
* Bump version to enable to sync up with mer changes and get mer to use
upstream derived version numbering.
-- Philippe De Swert <philippedeswert@gmail.com> Sun, 29 May 2016 15:19:26 +0300
usb-moded (0.85.5) unstable; urgency=low
* [network] Set max_leases in udhcpd configuration. Fixes JB#18566
......
......@@ -359,7 +359,9 @@ install -m 755 -D systemd/turn-usb-rescue-mode-off %{buildroot}/%{_bindir}/turn-
install -m 644 -D systemd/usb-rescue-mode-off.service %{buildroot}/lib/systemd/system/usb-rescue-mode-off.service
install -m 644 -D systemd/usb-rescue-mode-off.service %{buildroot}/lib/systemd/system/graphical.target.wants/usb-rescue-mode-off.service
install -m 644 -D systemd/usb-moded.conf %{buildroot}/%{_sysconfdir}/tmpfiles.d/usb-moded.conf
install -m 644 -D systemd/adbd-prepare.service %{buildroot}/lib/systemd/system/adbd-prepare.service
install -m 644 -D systemd/adbd-prepare.service %{buildroot}/lib/systemd/system/graphical.target.wants/adbd-prepare.service
install -m 744 -D systemd/adbd-functionfs.sh %{buildroot}/usr/sbin/adbd-functionfs.sh
%preun
systemctl daemon-reload || :
......@@ -435,6 +437,9 @@ systemctl daemon-reload || :
%{_sysconfdir}/usb-moded/run/adb-startserver.ini
%{_sysconfdir}/usb-moded/run/adb-prepare.ini
%{_sysconfdir}/usb-moded/run/udhcpd-adb-mode.ini
/lib/systemd/system/adbd-prepare.service
/lib/systemd/system/graphical.target.wants/adbd-prepare.service
/usr/sbin/adbd-functionfs.sh
%files mtp-mode-android
%defattr(-,root,root,-)
......
......@@ -624,9 +624,11 @@ static void usb_moded_init(void)
readlist(diag_mode);
/* make sure all services are down when starting */
appsync_stop(1);
modelist = read_mode_list(diag_mode);
#endif /* APP_SYNC */
/* always read dyn modes even if appsync is not used */
modelist = read_mode_list(diag_mode);
if(check_trigger())
trigger_init();
......
#!/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
# Copyright (C) 2013 Jolla Oy
#
# Prepare functionfs for adbd
[Unit]
Description=functionfs setup for adbd
Before=adbd.service
PartOf=adbd.service
[Service]
Type=notify
RemainAfterExit=yes
ExecStart=/usr/sbin/adbd-functionfs.sh
ExecStop=/bin/umount adb
[Install]
WantedBy=graphical.target
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment