Update to upstream git commit 3ddc005
- Added more udev devices - Added ext4_utils from extras for fastboot - Updated makefiles - Resolves: rhbz 869624 start adb server by udev
This commit is contained in:
Ivan Afonichev
parent
42cec49fe4
commit
e6eb269177
5 changed files with 115 additions and 61 deletions
|
|
@ -2,131 +2,140 @@
|
|||
# adb/usb_vendors.c
|
||||
|
||||
# Acer
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0502", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0502", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Dell
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="413c", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="413c", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Foxconn
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0489", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0489", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Garmin-Asus
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="091E", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="091E", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Google
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# HTC
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Huawei
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Kyocera
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0482", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0482", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# LG
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1004", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1004", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Motorola
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Nvidia
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0955", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0955", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Pantech
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Samsung
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Sharp
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Sony Ericsson
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# ZTE
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Qualcomm
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# On-The-Go-Video
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2257", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2257", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# NEC
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0409", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0409", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Panasonic
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04da", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="04da", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Toshiba
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0930", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0930", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# SK Telesys
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# KT Tech
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2116", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2116", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# ASUS
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Philips
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0471", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0471", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Texas Instruments
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Funai
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0f1c", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0f1c", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Gigabyte
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0414", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0414", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# IRiver
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2420", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2420", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Compal
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1219", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1219", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# T & A Mobile Phones
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1bbb", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1bbb", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# LenovoMobile
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2006", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2006", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Lenovo
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Vizio
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="e040", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="e040", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# K-Touch
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Pegatron
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Archos
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Positivo
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1662", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1662", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Intel
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="8087", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="8087", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Quanta
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0408", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0408", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# INQ Mobile
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2314", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2314", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Sony
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="054c", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="054c", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Lab126
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1949", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1949", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Yulong Coolpad
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1ebf", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Kobo
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2237", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
# Teleepoch
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="2340", RUN+="/usr/bin/adb start-server"
|
||||
|
||||
|
|
|
|||
11
adb-Makefile
11
adb-Makefile
|
|
@ -1,5 +1,6 @@
|
|||
SRCS+= adb.c
|
||||
SRCS+= adb_client.c
|
||||
SRCS+= adb_auth_host.c
|
||||
SRCS+= commandline.c
|
||||
SRCS+= console.c
|
||||
SRCS+= file_sync_client.c
|
||||
|
|
@ -22,11 +23,19 @@ SRCS+= socket_local_server.c
|
|||
SRCS+= socket_loopback_client.c
|
||||
SRCS+= socket_loopback_server.c
|
||||
SRCS+= socket_network_client.c
|
||||
SRCS+= load_file.c
|
||||
SRCS+= list.c
|
||||
|
||||
VPATH+= ../libzipfile
|
||||
SRCS+= centraldir.c
|
||||
SRCS+= zipfile.c
|
||||
|
||||
VPATH+= ../libmincrypt
|
||||
SRCS+= rsa.c
|
||||
SRCS+= rsa_e_3.c
|
||||
SRCS+= rsa_e_f4.c
|
||||
SRCS+= sha.c
|
||||
|
||||
CPPFLAGS+= -DADB_HOST=1
|
||||
CPPFLAGS+= -DHAVE_FORKEXEC=1
|
||||
CPPFLAGS+= -DHAVE_SYMLINKS
|
||||
|
|
@ -37,7 +46,7 @@ CPPFLAGS+= -I.
|
|||
CPPFLAGS+= -I../include
|
||||
|
||||
CFLAGS+= $(RPM_OPT_FLAGS)
|
||||
LIBS= -lrt -lpthread -lz
|
||||
LIBS= -lrt -lpthread -lz -lcrypto
|
||||
|
||||
CC= $(TOOLCHAIN)gcc
|
||||
LD= $(TOOLCHAIN)gcc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
%global date 20120510
|
||||
%global git_commit d98c87c
|
||||
%global date 20121120
|
||||
%global git_commit 3ddc005
|
||||
%global packdname core-%{git_commit}
|
||||
#last extras ext4_utils commit without custom libselinux requirement
|
||||
%global extras_git_commit 4ff85ad
|
||||
%global extras_packdname extras-%{extras_git_commit}
|
||||
|
||||
|
||||
Name: android-tools
|
||||
Version: %{date}git%{git_commit}
|
||||
|
|
@ -13,17 +17,22 @@ License: ASL 2.0 and (ASL 2.0 and BSD)
|
|||
URL: http://developer.android.com/guide/developing/tools/
|
||||
|
||||
# using git archive since upstream hasn't created tarballs.
|
||||
# git archive --format=tar --prefix=%%{packdname}/ %%{git_commit} adb fastboot libzipfile libcutils mkbootimg include/cutils include/zipfile | xz > %%{packdname}.tar.xz
|
||||
# git archive --format=tar --prefix=%%{packdname}/ %%{git_commit} adb fastboot libzipfile libcutils libmincrypt mkbootimg include/cutils include/zipfile include/mincrypt | xz > %%{packdname}.tar.xz
|
||||
# https://android.googlesource.com/platform/system/core.git
|
||||
# git archive --format=tar --prefix=extras/ %%{extras_git_commit} ext4_utils | xz > %%{extras_packdname}.tar.xz
|
||||
# https://android.googlesource.com/platform/system/extras.git
|
||||
|
||||
Source0: %{packdname}.tar.xz
|
||||
Source1: core-Makefile
|
||||
Source2: adb-Makefile
|
||||
Source3: fastboot-Makefile
|
||||
Source4: 51-android.rules
|
||||
Source1: %{extras_packdname}.tar.xz
|
||||
Source2: core-Makefile
|
||||
Source3: adb-Makefile
|
||||
Source4: fastboot-Makefile
|
||||
Source5: 51-android.rules
|
||||
|
||||
Requires: udev
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: libselinux-devel
|
||||
|
||||
Provides: adb
|
||||
Provides: fastboot
|
||||
|
|
@ -49,12 +58,11 @@ to read and write the flash partitions. It needs the same USB device
|
|||
setup between the host and the target phone as adb.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{packdname}
|
||||
cp -p %{SOURCE1} Makefile
|
||||
cp -p %{SOURCE2} adb/Makefile
|
||||
cp -p %{SOURCE3} fastboot/Makefile
|
||||
|
||||
|
||||
%setup -q -b 1 -n extras
|
||||
%setup -q -b 0 -n %{packdname}
|
||||
cp -p %{SOURCE2} Makefile
|
||||
cp -p %{SOURCE3} adb/Makefile
|
||||
cp -p %{SOURCE4} fastboot/Makefile
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags}
|
||||
|
|
@ -62,7 +70,7 @@ make %{?_smp_mflags}
|
|||
%install
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
|
||||
install -d -m 0755 ${RPM_BUILD_ROOT}/lib/udev/rules.d
|
||||
install -D -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/lib/udev/rules.d/51-android.rules
|
||||
install -D -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}/lib/udev/rules.d/51-android.rules
|
||||
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir}
|
||||
|
||||
%files
|
||||
|
|
@ -75,6 +83,13 @@ make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 20 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20121120git3ddc005-1
|
||||
- Update to upstream git commit 3ddc005
|
||||
- Added more udev devices
|
||||
- Added ext4_utils from extras for fastboot
|
||||
- Updated makefiles
|
||||
- Resolves: rhbz 869624 start adb server by udev
|
||||
|
||||
* Thu May 10 2012 Ivan Afonichev <ivan.afonichev@gmail.com> - 20120510gitd98c87c-1
|
||||
- Update to upstream git commit d98c87c
|
||||
- Added more udev devices
|
||||
|
|
|
|||
|
|
@ -9,6 +9,25 @@ VPATH+= ../libzipfile
|
|||
SRCS+= centraldir.c
|
||||
SRCS+= zipfile.c
|
||||
|
||||
VPATH+= ../libsparse
|
||||
SRCS+= backed_block.c
|
||||
SRCS+= output_file.c
|
||||
SRCS+= sparse.c
|
||||
SRCS+= sparse_crc32.c
|
||||
SRCS+= sparse_err.c
|
||||
SRCS+= sparse_read.c
|
||||
|
||||
VPATH+= ../../extras/ext4_utils
|
||||
SRCS+= allocate.c
|
||||
SRCS+= contents.c
|
||||
SRCS+= ext4_utils.c
|
||||
SRCS+= extent.c
|
||||
SRCS+= indirect.c
|
||||
SRCS+= make_ext4fs.c
|
||||
SRCS+= sha1.c
|
||||
SRCS+= uuid.c
|
||||
SRCS+= wipe.c
|
||||
|
||||
CPPFLAGS+= -DADB_HOST=1
|
||||
CPPFLAGS+= -DHAVE_FORKEXEC=1
|
||||
CPPFLAGS+= -DHAVE_SYMLINKS
|
||||
|
|
@ -17,11 +36,12 @@ CPPFLAGS+= -D_GNU_SOURCE
|
|||
CPPFLAGS+= -D_XOPEN_SOURCE
|
||||
CPPFLAGS+= -I.
|
||||
CPPFLAGS+= -I../include
|
||||
CPPFLAGS+= -I../libsparse/include
|
||||
CPPFLAGS+= -I../mkbootimg
|
||||
|
||||
CPPFLAGS+= -I../../extras/ext4_utils
|
||||
|
||||
CFLAGS+= $(RPM_OPT_FLAGS)
|
||||
LIBS= -lrt -lpthread -lz
|
||||
LIBS= -lrt -lpthread -lz -lselinux
|
||||
|
||||
CC= $(TOOLCHAIN)gcc
|
||||
LD= $(TOOLCHAIN)gcc
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
83af4a47fc510011182c5c37f2e4031a core-d98c87c.tar.xz
|
||||
651906a658de90a24301ba7d09525641 core-3ddc005.tar.xz
|
||||
e6c0b8dd70952e97a068c3a61f812968 extras-4ff85ad.tar.xz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue