Automatic import for version 4.4.2_r2-1

This commit is contained in:
Rosa 2015-04-17 12:09:54 +04:00
commit 893e469eb7
10 changed files with 502 additions and 0 deletions

3
.abf.yml Normal file
View file

@ -0,0 +1,3 @@
sources:
"core-4.4.2_r2.tar.bz2": 114e02871e8ca1c2145497b367e39584a57f257e
"extras-4.4.2_r2.tar.bz2": 20f7548170dde17f7aa6427d8f1010903f207c07

141
51-android.rules Normal file
View file

@ -0,0 +1,141 @@
# http://developer.android.com/guide/developing/device.html
# adb/usb_vendors.c
# Acer
SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0660", GROUP="users"
# Dell
SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0660", GROUP="users"
# Foxconn
SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0660", GROUP="users"
# Garmin-Asus
SUBSYSTEM=="usb", ATTR{idVendor}=="091E", MODE="0660", GROUP="users"
# Google
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0660", GROUP="users"
# HTC
SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0660", GROUP="users"
# Huawei
SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0660", GROUP="users"
# Kyocera
SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0660", GROUP="users"
# LG
SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0660", GROUP="users"
# Motorola
SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0660", GROUP="users"
# Nvidia
SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0660", GROUP="users"
# Pantech
SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", MODE="0660", GROUP="users"
# Samsung
SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0660", GROUP="users"
# Sharp
SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0660", GROUP="users"
# Sony Ericsson
SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0660", GROUP="users"
# ZTE
SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0660", GROUP="users"
# Qualcomm
SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0660", GROUP="users"
# On-The-Go-Video
SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0660", GROUP="users"
# NEC
SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0660", GROUP="users"
# Panasonic
SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0660", GROUP="users"
# Toshiba
SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0660", GROUP="users"
# SK Telesys
SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0660", GROUP="users"
# KT Tech
SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0660", GROUP="users"
# ASUS
SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0660", GROUP="users"
# Philips
SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0660", GROUP="users"
# Texas Instruments
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", MODE="0660", GROUP="users"
# Funai
SUBSYSTEM=="usb", ATTR{idVendor}=="0f1c", MODE="0660", GROUP="users"
# Gigabyte
SUBSYSTEM=="usb", ATTR{idVendor}=="0414", MODE="0660", GROUP="users"
# IRiver
SUBSYSTEM=="usb", ATTR{idVendor}=="2420", MODE="0660", GROUP="users"
# Compal
SUBSYSTEM=="usb", ATTR{idVendor}=="1219", MODE="0660", GROUP="users"
# T & A Mobile Phones
SUBSYSTEM=="usb", ATTR{idVendor}=="1bbb", MODE="0660", GROUP="users"
# LenovoMobile
SUBSYSTEM=="usb", ATTR{idVendor}=="2006", MODE="0660", GROUP="users"
# Lenovo
SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0660", GROUP="users"
# Vizio
SUBSYSTEM=="usb", ATTR{idVendor}=="e040", MODE="0660", GROUP="users"
# K-Touch
SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0660", GROUP="users"
# Pegatron
SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", MODE="0660", GROUP="users"
# Archos
SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0660", GROUP="users"
# Positivo
SUBSYSTEM=="usb", ATTR{idVendor}=="1662", MODE="0660", GROUP="users"
# Intel
SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0660", GROUP="users"
# Quanta
SUBSYSTEM=="usb", ATTR{idVendor}=="0408", MODE="0660", GROUP="users"
# INQ Mobile
SUBSYSTEM=="usb", ATTR{idVendor}=="2314", MODE="0660", GROUP="users"
# Sony
SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0660", GROUP="users"
# Lab126
SUBSYSTEM=="usb", ATTR{idVendor}=="1949", MODE="0660", GROUP="users"
# Yulong Coolpad
SUBSYSTEM=="usb", ATTR{idVendor}=="1ebf", MODE="0660", GROUP="users"
# Kobo
SUBSYSTEM=="usb", ATTR{idVendor}=="2237", MODE="0660", GROUP="users"
# Teleepoch
SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0660", GROUP="users"

73
adb-Makefile Normal file
View file

@ -0,0 +1,73 @@
# Makefile for adb
# modified and adapted for Mageia by daviddavid
PREFIX=/usr
BINDIR=$(PREFIX)/bin
SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib
DATADIR=$(PREFIX)/share
LOCALEDIR=$(PREFIX)
SRCS+= adb.c
SRCS+= adb_client.c
SRCS+= adb_auth_host.c
SRCS+= commandline.c
SRCS+= console.c
SRCS+= file_sync_client.c
SRCS+= fdevent.c
SRCS+= get_my_path_linux.c
SRCS+= services.c
SRCS+= sockets.c
SRCS+= transport.c
SRCS+= transport_local.c
SRCS+= transport_usb.c
SRCS+= usb_linux.c
SRCS+= usb_vendors.c
VPATH+= ../libcutils
SRCS+= socket_inaddr_any_server.c
SRCS+= socket_local_client.c
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+= sha.c
SRCS+= sha256.c
CPPFLAGS+= -DADB_HOST=1
CPPFLAGS+= -DHAVE_FORKEXEC=1
CPPFLAGS+= -DHAVE_SYMLINKS
CPPFLAGS+= -DHAVE_TERMIO_H
CPPFLAGS+= -D_GNU_SOURCE
CPPFLAGS+= -D_XOPEN_SOURCE
CPPFLAGS+= -I.
CPPFLAGS+= -I../include
CFLAGS+= $(RPM_OPT_FLAGS)
LIBS= -lrt -lpthread -lz -lcrypto
CC= $(TOOLCHAIN)gcc
LD= $(TOOLCHAIN)gcc
OBJS= $(SRCS:.c=.o)
all: adb
adb: $(OBJS)
$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
install: adb
mkdir -p $(DESTDIR)$(BINDIR)
install -m 755 adb $(DESTDIR)$(BINDIR)
clean:
rm -rf $(OBJS) adb

13
adb.service Normal file
View file

@ -0,0 +1,13 @@
# Systemd unit file for adb
[Unit]
Description=Android Debug Bridge (adb) service
[Service]
Type=forking
ExecStart=/usr/bin/adb start-server
ExecStop=/usr/bin/adb kill-server
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -0,0 +1,19 @@
diff -Naur extras/ext4_utils/contents.c extras_new/ext4_utils/contents.c
--- extras/ext4_utils/contents.c 2013-08-01 00:23:25.000000000 +0200
+++ extras_new/ext4_utils/contents.c 2014-02-15 22:38:48.868107115 +0100
@@ -18,11 +18,11 @@
#include <string.h>
#include <stdio.h>
-#ifdef HAVE_ANDROID_OS
+//#ifdef HAVE_ANDROID_OS
#include <linux/capability.h>
-#else
-#include <private/android_filesystem_capability.h>
-#endif
+//#else
+//#include <private/android_filesystem_capability.h>
+//#endif
#define XATTR_SELINUX_SUFFIX "selinux"
#define XATTR_CAPS_SUFFIX "capability"

View file

@ -0,0 +1,24 @@
diff -Naur extras/ext4_utils/make_ext4fs.c extras_new/ext4_utils/make_ext4fs.c
--- extras/ext4_utils/make_ext4fs.c 2013-08-01 00:23:25.000000000 +0200
+++ extras_new/ext4_utils/make_ext4fs.c 2014-02-15 21:34:03.790227581 +0100
@@ -61,7 +61,7 @@
#include <selinux/selinux.h>
#include <selinux/label.h>
-#include <selinux/android.h>
+//#include <selinux/android.h>
#define O_BINARY 0
diff -Naur extras/ext4_utils/make_ext4fs_main.c extras_new/ext4_utils/make_ext4fs_main.c
--- extras/ext4_utils/make_ext4fs_main.c 2013-08-01 00:23:25.000000000 +0200
+++ extras_new/ext4_utils/make_ext4fs_main.c 2014-02-15 21:34:11.649360025 +0100
@@ -32,7 +32,7 @@
#ifndef USE_MINGW
#include <selinux/selinux.h>
#include <selinux/label.h>
-#include <selinux/android.h>
+//#include <selinux/android.h>
#else
struct selabel_handle;
#endif

98
android-tools.spec Normal file
View file

@ -0,0 +1,98 @@
Summary: Android platform tools (adb, fastboot, mkbootimg)
Name: android-tools
Version: 4.4.2_r2
Release: 1
# The entire source code is Apache Software License except fastboot/ which is BSD
License: Apache Software License and BSD
Group: Development/Tools
Url: http://developer.android.com/tools/
#http://developer.android.com/guide/developing/tools/
# git clone https://android.googlesource.com/platform/system/core.git && cd core
# git archive android-%%{version} --prefix=core-%%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | bzip2 > ../core-%%{version}.tar.bz2
#
# git clone https://android.googlesource.com/platform/system/extras.git && cd extras
# git archive android-%%{version} --prefix=extras/ ext4_utils | bzip2 > ../extras-%%{version}.tar.bz2
Source0: core-%{version}.tar.bz2
Source1: extras-%{version}.tar.bz2
Source2: core-Makefile
Source3: adb-Makefile
Source4: fastboot-Makefile
Source5: mkbootimg-Makefile
Source6: 51-android.rules
Source7: adb.service
Patch0: android-tools-4.4.2-ignore-selinux-android.h.patch
Patch1: android-tools-4.4.2-ignore-android_filesystem_capability.h.patch
BuildRequires: selinux-devel
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
Requires(post,preun): rpm-helper
Provides: adb = %{EVRD}
Provides: fastboot = %{EVRD}
Provides: mkbootimg = %{EVRD}
%description
The Android Debug Bridge (ADB) is used to:
- keep track of all Android devices and emulators instances
connected to or running on a given host developer machine
- implement various control commands (e.g. "adb shell", "adb pull", etc.)
for the benefit of clients (command-line users, or helper programs like
DDMS). These commands are what is called a 'service' in ADB.
Fastboot is used to manipulate the flash partitions of the Android phone.
It can also boot the phone using a kernel image or root filesystem image
which reside on the host machine rather than in the phone flash.
In order to use it, it is important to understand the flash partition
layout for the phone.
The fastboot program works in conjunction with firmware on the phone
to read and write the flash partitions. It needs the same USB device
setup between the host and the target phone as adb.
For ROSA you must use the following commands :
- adb
- fastboot-android
- mkbootimg
%files
%doc adb/OVERVIEW.TXT adb/SERVICES.TXT adb/NOTICE adb/protocol.txt
%{_udevrulesdir}/51-android.rules
%{_unitdir}/adb.service
#Apache Software License
%{_bindir}/adb
%{_bindir}/mkbootimg
#Apache Software License and BSD.
%{_bindir}/fastboot-android
%post
%_post_service adb
%preun
%_preun_service adb
#----------------------------------------------------------------------------
%prep
%setup -q -b 1 -n extras
%apply_patches
%setup -q -b 0 -n core-%{version}
cp -pr %{SOURCE2} Makefile
cp -pr %{SOURCE3} adb/Makefile
cp -pr %{SOURCE4} fastboot/Makefile
cp -pr %{SOURCE5} mkbootimg/Makefile
%build
%make
%install
%makeinstall_std
# for 51-android.rules
mkdir -p %{buildroot}%{_udevrulesdir}
install -m 0644 %{SOURCE6} %{buildroot}%{_udevrulesdir}/51-android.rules
# for adb.service
mkdir -p %{buildroot}%{_unitdir}
install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/adb.service

17
core-Makefile Normal file
View file

@ -0,0 +1,17 @@
# Makefile for core
# modified and adapted for Mageia by daviddavid
all:
$(MAKE) -C adb all
$(MAKE) -C fastboot all
$(MAKE) -C mkbootimg all
install:
$(MAKE) -C adb install
$(MAKE) -C fastboot install
$(MAKE) -C mkbootimg install
clean:
$(MAKE) -C adb clean
$(MAKE) -C fastboot clean
$(MAKE) -C mkbootimg clean

74
fastboot-Makefile Normal file
View file

@ -0,0 +1,74 @@
# Makefile for fastboot (fastboot-android for Mageia)
# modified and adapted for Mageia by daviddavid
PREFIX=/usr
BINDIR=$(PREFIX)/bin
SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib
DATADIR=$(PREFIX)/share
LOCALEDIR=$(PREFIX)
SRCS+= bootimg.c
SRCS+= engine.c
SRCS+= fastboot.c
SRCS+= protocol.c
SRCS+= usb_linux.c
SRCS+= util_linux.c
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+= crc16.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
CPPFLAGS+= -DHAVE_TERMIO_H
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 -lselinux
LIBS+= -lz -lselinux
#CC= $(TOOLCHAIN)gcc
#LD= $(TOOLCHAIN)gcc
OBJS= $(SRCS:.c=.o)
all: fastboot
fastboot: $(OBJS)
#$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
install: fastboot
mkdir -p $(DESTDIR)$(BINDIR)
install -m 755 fastboot $(DESTDIR)$(BINDIR)/fastboot-android
clean:
rm -rf $(OBJS) fastboot

40
mkbootimg-Makefile Normal file
View file

@ -0,0 +1,40 @@
# Makefile for mkbootimg
# modified and adapted for Mageia by daviddavid
PREFIX=/usr
BINDIR=$(PREFIX)/bin
SBINDIR=$(PREFIX)/sbin
LIBDIR=$(PREFIX)/lib
DATADIR=$(PREFIX)/share
LOCALEDIR=$(PREFIX)
SRCS+= mkbootimg.c
VPATH+= ../libmincrypt
#SRCS+= dsa_sig.c
#SRCS+= p256.c
#SRCS+= p256_ec.c
#SRCS+= p256_ecdsa.c
SRCS+= rsa.c
SRCS+= sha.c
SRCS+= sha256.c
CPPFLAGS+= -I.
CPPFLAGS+= -I../include
#LIBS+=
OBJS=$(SRCS:.c=.o)
all: mkbootimg
mkbootimg: $(OBJS)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
install: mkbootimg
mkdir -p $(DESTDIR)$(BINDIR)
install -m 755 mkbootimg $(DESTDIR)$(BINDIR)
clean:
rm -rf $(OBJS) mkbootimg