update to 4.4.4_r1 [release 4.4.4_r1-1mamba;Sat Jul 12 2014]
This commit is contained in:
parent
337861e6bf
commit
12c350a27e
@ -1,11 +1,10 @@
|
||||
BINDIR:=/usr/bin
|
||||
|
||||
SRCS+= adb.c
|
||||
SRCS+= adb_auth_host.c
|
||||
SRCS+= adb_client.c
|
||||
SRCS+= commandline.c
|
||||
SRCS+= console.c
|
||||
SRCS+= file_sync_client.c
|
||||
SRCS+= fdevent.c
|
||||
SRCS+= file_sync_client.c
|
||||
SRCS+= get_my_path_linux.c
|
||||
SRCS+= services.c
|
||||
SRCS+= sockets.c
|
||||
@ -14,10 +13,10 @@ SRCS+= transport_local.c
|
||||
SRCS+= transport_usb.c
|
||||
SRCS+= usb_linux.c
|
||||
SRCS+= usb_vendors.c
|
||||
SRCS+= utils.c
|
||||
|
||||
VPATH+= ../libcutils
|
||||
SRCS+= abort_socket.c
|
||||
SRCS+= list.c
|
||||
SRCS+= load_file.c
|
||||
SRCS+= socket_inaddr_any_server.c
|
||||
SRCS+= socket_local_client.c
|
||||
SRCS+= socket_local_server.c
|
||||
@ -31,28 +30,14 @@ SRCS+= zipfile.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
|
||||
|
||||
CC= $(TOOLCHAIN)gcc
|
||||
LD= $(TOOLCHAIN)gcc
|
||||
LIBS+= -lcrypto -lpthread -lz
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
|
||||
all: adb
|
||||
|
||||
adb: $(OBJS)
|
||||
$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
|
||||
|
||||
install: adb
|
||||
install -D -m0755 adb $(DESTDIR)$(BINDIR)/adb
|
||||
|
||||
clean:
|
||||
rm -rf $(OBJS)
|
||||
cc -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
|
54
android-tools-Makefile-fastboot
Normal file
54
android-tools-Makefile-fastboot
Normal file
@ -0,0 +1,54 @@
|
||||
SRCS+=bootimg.c
|
||||
SRCS+=engine.c
|
||||
SRCS+=fastboot.c
|
||||
SRCS+=protocol.c
|
||||
SRCS+=usb_linux.c
|
||||
SRCS+=util_linux.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+= ../libzipfile
|
||||
SRCS+= centraldir.c
|
||||
SRCS+= zipfile.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
|
||||
|
||||
VPATH+= ../../libselinux/src
|
||||
SRCS+= callbacks.c
|
||||
SRCS+= check_context.c
|
||||
SRCS+= freecon.c
|
||||
SRCS+= init.c
|
||||
SRCS+= label.c
|
||||
SRCS+= label_android_property.c
|
||||
SRCS+= label_file.c
|
||||
|
||||
CPPFLAGS+= -I../include
|
||||
CPPFLAGS+= -I../libsparse/include
|
||||
CPPFLAGS+= -I../mkbootimg
|
||||
CPPFLAGS+= -I../../extras/ext4_utils
|
||||
CPPFLAGS+= -I../../libselinux/include
|
||||
|
||||
LIBS+= -lz
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
|
||||
all: fastboot
|
||||
|
||||
fastboot: $(OBJS)
|
||||
cc -o $@ $(OBJS) $(LIBS)
|
13
android-tools-autoupdate
Normal file
13
android-tools-autoupdate
Normal file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
VERSION=$1
|
||||
git clone https://android.googlesource.com/platform/system/core -b android-$VERSION --depth=1 android-tools-$VERSION
|
||||
tar cJf android-tools-$VERSION.tar.xz android-tools-$VERSION
|
||||
rm -rf android-tools-$VERSION
|
||||
#
|
||||
git clone https://android.googlesource.com/platform/system/extras -b android-$VERSION --depth=1 android-tools-extras-$VERSION
|
||||
tar cJf android-tools-extras-$VERSION.tar.xz android-tools-extras-$VERSION
|
||||
rm -rf android-tools-extras-$VERSION
|
||||
#
|
||||
git clone https://android.googlesource.com/platform/external/libselinux -b android-$VERSION --depth=1 android-tools-external-libselinux-$VERSION
|
||||
tar cJf android-tools-external-libselinux-$VERSION.tar.xz android-tools-external-libselinux-$VERSION
|
||||
rm -rf android-tools-external-libselinux-$VERSION
|
@ -1,32 +1,25 @@
|
||||
Name: android-tools
|
||||
Version: 4.0.3_r1
|
||||
Release: 3mamba
|
||||
Version: 4.4.4_r1
|
||||
Release: 1mamba
|
||||
Summary: Android platform tools
|
||||
Group: System/Tools
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://source.android.com
|
||||
# git clone https://android.googlesource.com/platform/system/core
|
||||
# cd core
|
||||
# git archive --format=tar --prefix=android-tools-$(git tag -l | grep tools | sed "s,android-sdk-\([^-]*\)-tools\(.*\),\1\2,")/ \
|
||||
# $(git tag -l | grep tools) \
|
||||
# adb cpio fastboot include/cutils include/mincrypt include/private include/zipfile libcutils libmincrypt libzipfile mkbootimg | \
|
||||
# xz > $(rpm --eval %_sourcedir)/android-tools-$(git tag -l | grep tools | sed "s,android-sdk-\([^-]*\)-tools\(.*\),\1\2,").tar.xz
|
||||
Source: android-tools-%{version}.tar.xz
|
||||
# Source created with (very big download):
|
||||
# mkdir android-src-system; cd android-src-system
|
||||
# repo init -u https://android.googlesource.com/platform/manifest -b android-4.0.3_r1
|
||||
# repo sync
|
||||
# (only /system directory is archivced)
|
||||
Source6: android-tools-extras-%{version}.tar.xz
|
||||
Source7: android-tools-external-libselinux-%{version}.tar.xz
|
||||
#Source: android-src-system-%{version}.tar.xz
|
||||
Source1: 51-android.rules
|
||||
Source2: core-Makefile
|
||||
Source3: adb-Makefile
|
||||
Source4: fastboot-Makefile
|
||||
Source3: %{name}-Makefile-adb
|
||||
Source4: %{name}-Makefile-fastboot
|
||||
Source5: %{name}-autoupdate
|
||||
License: Apache License 2.0, BSD
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libz-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
@ -53,13 +46,18 @@ mkbootims is a command line tool useful for creating kernel bootable images for
|
||||
This package also includes mkbootfs.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -c -a6 -a7
|
||||
mv android-tools-%{version} core
|
||||
mv android-tools-extras-%{version} extras
|
||||
mv android-tools-external-libselinux-%{version} libselinux
|
||||
cd core
|
||||
cp -p %{S:2} Makefile
|
||||
cp -p %{S:3} adb/Makefile
|
||||
cp -p %{S:4} fastboot/Makefile
|
||||
|
||||
%build
|
||||
%make
|
||||
cd core
|
||||
%make TOOLCHAIN=%{target_platform}
|
||||
|
||||
(cd libmincrypt
|
||||
%{_host}-gcc -c *.c -I../include
|
||||
@ -73,16 +71,19 @@ cp -p %{S:4} fastboot/Makefile
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall
|
||||
|
||||
install -D -m0644 %{S:1} \
|
||||
%{buildroot}%{_sysconfdir}/udev/rules.d/51-android.rules
|
||||
|
||||
cd core
|
||||
install -D -m0755 adb/adb \
|
||||
%{buildroot}%{_bindir}/adb
|
||||
install -D -m0755 fastboot/fastboot \
|
||||
%{buildroot}%{_bindir}/fastboot
|
||||
install -D -m0755 mkbootimg/mkbootimg \
|
||||
%{buildroot}%{_bindir}/mkbootimg
|
||||
install -D -m0755 cpio/mkbootfs \
|
||||
%{buildroot}%{_bindir}/mkbootfs
|
||||
|
||||
install -D -m0644 %{S:1} \
|
||||
%{buildroot}%{_sysconfdir}/udev/rules.d/51-android.rules
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
@ -91,7 +92,7 @@ install -D -m0755 cpio/mkbootfs \
|
||||
%{_bindir}/adb
|
||||
%{_bindir}/fastboot
|
||||
%{_sysconfdir}/udev/rules.d/51-android.rules
|
||||
%doc adb/*.TXT adb/NOTICE adb/*.txt
|
||||
%doc core/adb/*.TXT core/adb/NOTICE core/adb/*.txt
|
||||
|
||||
%files -n mkbootimg
|
||||
%defattr(-,root,root)
|
||||
@ -99,6 +100,9 @@ install -D -m0755 cpio/mkbootfs \
|
||||
%{_bindir}/mkbootfs
|
||||
|
||||
%changelog
|
||||
* Sat Jul 12 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 4.4.4_r1-1mamba
|
||||
- update to 4.4.4_r1
|
||||
|
||||
* Fri Jun 01 2012 Stefano Cotta Ramusino <stefano.cotta@openmamba.org> 4.0.3_r1-3mamba
|
||||
- fixed android udev rules
|
||||
|
||||
|
@ -1,42 +0,0 @@
|
||||
BINDIR:=/usr/bin
|
||||
|
||||
SRCS+= protocol.c
|
||||
SRCS+= engine.c
|
||||
SRCS+= bootimg.c
|
||||
SRCS+= fastboot.c
|
||||
SRCS+= usb_linux.c
|
||||
SRCS+= util_linux.c
|
||||
|
||||
VPATH+= ../libzipfile
|
||||
SRCS+= centraldir.c
|
||||
SRCS+= zipfile.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../mkbootimg
|
||||
|
||||
|
||||
CFLAGS+= $(RPM_OPT_FLAGS)
|
||||
LIBS= -lrt -lpthread -lz
|
||||
|
||||
CC= $(TOOLCHAIN)gcc
|
||||
LD= $(TOOLCHAIN)gcc
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
|
||||
all: fastboot
|
||||
|
||||
fastboot: $(OBJS)
|
||||
$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
|
||||
|
||||
install: fastboot
|
||||
install -D -m0755 fastboot $(DESTDIR)$(BINDIR)/fastboot
|
||||
|
||||
clean:
|
||||
rm -rf $(OBJS)
|
Loading…
Reference in New Issue
Block a user