Date: Saturday, November 8, 2014 @ 19:52:51 Author: anatolik Revision: 122267
upgpkg: android-tools 5.0.0_r2-1 Modified: android-tools/trunk/PKGBUILD android-tools/trunk/adbMakefile android-tools/trunk/fastbootMakefile ------------------+ PKGBUILD | 22 +++++++++++++++------- adbMakefile | 2 +- fastbootMakefile | 15 ++++++++++++++- 3 files changed, 30 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-08 18:24:03 UTC (rev 122266) +++ PKGBUILD 2014-11-08 18:52:51 UTC (rev 122267) @@ -4,7 +4,7 @@ # Contributor: Alucryd <alucryd at gmail dot com> pkgname=android-tools -pkgver=4.4.4_r2.0.1 +pkgver=5.0.0_r2 pkgrel=1 pkgdesc='Android platform tools' arch=(i686 x86_64) @@ -15,16 +15,24 @@ source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver git+https://android.googlesource.com/platform/external/libselinux#tag=android-$pkgver + git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver adbMakefile fastbootMakefile bash_completion) # Bash completion file was taken from https://github.com/mbrubeck/android-completion -md5sums=('SKIP' - 'SKIP' - 'SKIP' - '887d868e544330ef850334961685cab3' - 'cd1a1a9d16b523119245bfe17120d73b' - '421f8640d7b4ec156f1d37167f3e7a45') +sha1sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'cc3d5bbf7f38574bfe597555b39d983db87ec37f' + '5a66a188e35ec09393f5bd85d5b63fe7a7e38c0f' + 'd99991b208c7c2d8d0053e9937653cca22d09b6d') + +prepare() { + # another way to fix the compilation error is to add #include <stddef.h> + sed -e 's/f2fs_sparse_file = NULL/f2fs_sparse_file = 0/g' -i extras/f2fs_utils/f2fs_utils.c +} + build() { make -C core/adb -f "$srcdir"/adbMakefile make -C core/fastboot -f "$srcdir"/fastbootMakefile Modified: adbMakefile =================================================================== --- adbMakefile 2014-11-08 18:24:03 UTC (rev 122266) +++ adbMakefile 2014-11-08 18:52:51 UTC (rev 122267) @@ -15,7 +15,6 @@ SRCS+= usb_vendors.c VPATH+= ../libcutils -SRCS+= list.c SRCS+= load_file.c SRCS+= socket_inaddr_any_server.c SRCS+= socket_local_client.c @@ -30,6 +29,7 @@ CPPFLAGS+= -DADB_HOST=1 CPPFLAGS+= -DHAVE_FORKEXEC=1 +CPPFLAGS+= -DHAVE_OFF64_T=1 CPPFLAGS+= -I. CPPFLAGS+= -I../include Modified: fastbootMakefile =================================================================== --- fastbootMakefile 2014-11-08 18:24:03 UTC (rev 122266) +++ fastbootMakefile 2014-11-08 18:52:51 UTC (rev 122267) @@ -4,6 +4,8 @@ SRCS+=protocol.c SRCS+=usb_linux.c SRCS+=util_linux.c +SRCS+=util.c +SRCS+=fs.c VPATH+= ../libsparse SRCS+= backed_block.c @@ -22,6 +24,7 @@ SRCS+= contents.c SRCS+= crc16.c SRCS+= ext4_utils.c +SRCS+= ext4_sb.c SRCS+= extent.c SRCS+= indirect.c SRCS+= make_ext4fs.c @@ -29,6 +32,11 @@ SRCS+= uuid.c SRCS+= wipe.c +VPATH+= ../../extras/f2fs_utils +SRCS+= f2fs_utils.c +SRCS+= f2fs_dlutils.c +SRCS+= f2fs_ioutils.c + VPATH+= ../../libselinux/src SRCS+= callbacks.c SRCS+= check_context.c @@ -42,9 +50,14 @@ CPPFLAGS+= -I../libsparse/include CPPFLAGS+= -I../mkbootimg CPPFLAGS+= -I../../extras/ext4_utils +CPPFLAGS+= -I../../extras/f2fs_utils/ CPPFLAGS+= -I../../libselinux/include +CPPFLAGS+= -I../../f2fs-tools/include +CPPFLAGS+= -I../../f2fs-tools/mkfs +CPPFLAGS+= -DHAVE_OFF64_T=1 +CPPFLAGS+= -std=gnu99 -LIBS+= -lz +LIBS+= -lz -ldl OBJS= $(SRCS:.c=.o)
