[arch-commits] Commit in android-tools/trunk (4 files)
Anatol Pomozov
anatolik at archlinux.org
Mon May 18 05:01:57 UTC 2015
Date: Monday, May 18, 2015 @ 07:01:57
Author: anatolik
Revision: 133685
Add mkbootimg tool
Integrate custom makefiles into single one
Added:
android-tools/trunk/Makefile
Modified:
android-tools/trunk/PKGBUILD
Deleted:
android-tools/trunk/adbMakefile
android-tools/trunk/fastbootMakefile
------------------+
Makefile | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 13 ++----
adbMakefile | 44 -----------------------
fastbootMakefile | 67 -----------------------------------
4 files changed, 105 insertions(+), 120 deletions(-)
Added: Makefile
===================================================================
--- Makefile (rev 0)
+++ Makefile 2015-05-18 05:01:57 UTC (rev 133685)
@@ -0,0 +1,101 @@
+all: mkbootimg fastboot adb
+
+install:
+ install -m755 -d $(DESTDIR)/usr/bin
+ install -m755 -t $(DESTDIR)/usr/bin mkbootimg fastboot adb
+
+clean:
+ rm -f **/*.o
+
+.PHONY: clean
+
+
+
+
+MKBOOTIMG_SRCS += $(wildcard core/libmincrypt/*.c)
+MKBOOTIMG_SRCS += core/mkbootimg/mkbootimg.c
+
+MKBOOTIMG_CFLAGS += -Icore/include
+
+mkbootimg: $(MKBOOTIMG_OBJ)
+ $(CC) -o $@ $(CFLAGS) $(MKBOOTIMG_CFLAGS) $(LDFLAGS) $(MKBOOTIMG_LIBS) $(MKBOOTIMG_SRCS)
+
+
+
+
+ADB_SRCS += core/adb/adb.c
+ADB_SRCS += core/adb/adb_auth_host.c
+ADB_SRCS += core/adb/adb_client.c
+ADB_SRCS += core/adb/commandline.c
+ADB_SRCS += core/adb/console.c
+ADB_SRCS += core/adb/fdevent.c
+ADB_SRCS += core/adb/file_sync_client.c
+ADB_SRCS += core/adb/get_my_path_linux.c
+ADB_SRCS += core/adb/services.c
+ADB_SRCS += core/adb/sockets.c
+ADB_SRCS += core/adb/transport.c
+ADB_SRCS += core/adb/transport_local.c
+ADB_SRCS += core/adb/transport_usb.c
+ADB_SRCS += core/adb/usb_linux.c
+ADB_SRCS += core/adb/usb_vendors.c
+ADB_SRCS += core/libcutils/load_file.c
+ADB_SRCS += core/libcutils/socket_inaddr_any_server.c
+ADB_SRCS += core/libcutils/socket_local_client.c
+ADB_SRCS += core/libcutils/socket_local_server.c
+ADB_SRCS += core/libcutils/socket_loopback_client.c
+ADB_SRCS += core/libcutils/socket_loopback_server.c
+ADB_SRCS += core/libcutils/socket_network_client.c
+ADB_SRCS += core/libzipfile/centraldir.c
+ADB_SRCS += core/libzipfile/zipfile.c
+
+ADB_CFLAGS += -DADB_HOST=1 -DHAVE_FORKEXEC=1 -DHAVE_OFF64_T=1 -DHAVE_TERMIO_H -I core/include -I core/adb
+ADB_LIBS += -lcrypto -lpthread -lz
+
+adb: $(ADB_SRCS)
+ $(CC) -o $@ $(CFLAGS) $(ADB_CFLAGS) $(LDFLAGS) $(ADB_SRCS) $(ADB_LIBS)
+
+
+
+FASTBOOT_SRCS += core/fastboot/bootimg.c
+FASTBOOT_SRCS += core/fastboot/engine.c
+FASTBOOT_SRCS += core/fastboot/fastboot.c
+FASTBOOT_SRCS += core/fastboot/protocol.c
+FASTBOOT_SRCS += core/fastboot/usb_linux.c
+FASTBOOT_SRCS += core/fastboot/util_linux.c
+FASTBOOT_SRCS += core/fastboot/util.c
+FASTBOOT_SRCS += core/fastboot/fs.c
+FASTBOOT_SRCS += core/libsparse/backed_block.c
+FASTBOOT_SRCS += core/libsparse/output_file.c
+FASTBOOT_SRCS += core/libsparse/sparse.c
+FASTBOOT_SRCS += core/libsparse/sparse_crc32.c
+FASTBOOT_SRCS += core/libsparse/sparse_err.c
+FASTBOOT_SRCS += core/libsparse/sparse_read.c
+FASTBOOT_SRCS += core/libzipfile/centraldir.c
+FASTBOOT_SRCS += core/libzipfile/zipfile.c
+FASTBOOT_SRCS += extras/ext4_utils/allocate.c
+FASTBOOT_SRCS += extras/ext4_utils/contents.c
+FASTBOOT_SRCS += extras/ext4_utils/crc16.c
+FASTBOOT_SRCS += extras/ext4_utils/ext4_utils.c
+FASTBOOT_SRCS += extras/ext4_utils/ext4_sb.c
+FASTBOOT_SRCS += extras/ext4_utils/extent.c
+FASTBOOT_SRCS += extras/ext4_utils/indirect.c
+FASTBOOT_SRCS += extras/ext4_utils/make_ext4fs.c
+FASTBOOT_SRCS += extras/ext4_utils/sha1.c
+FASTBOOT_SRCS += extras/ext4_utils/uuid.c
+FASTBOOT_SRCS += extras/ext4_utils/wipe.c
+FASTBOOT_SRCS += extras/f2fs_utils/f2fs_utils.c
+FASTBOOT_SRCS += extras/f2fs_utils/f2fs_dlutils.c
+FASTBOOT_SRCS += extras/f2fs_utils/f2fs_ioutils.c
+FASTBOOT_SRCS += libselinux/src/callbacks.c
+FASTBOOT_SRCS += libselinux/src/check_context.c
+FASTBOOT_SRCS += libselinux/src/freecon.c
+FASTBOOT_SRCS += libselinux/src/init.c
+FASTBOOT_SRCS += libselinux/src/label.c
+FASTBOOT_SRCS += libselinux/src/label_android_property.c
+FASTBOOT_SRCS += libselinux/src/label_file.c
+
+FASTBOOT_CFLAGS += -DHAVE_OFF64_T=1 -std=gnu99 -I core/mkbootimg -I core/libsparse/include -I core/include -I extras/ext4_utils -I extras/f2fs_utils -I libselinux/include -I f2fs-tools/include -I f2fs-tools/mkfs
+FASTBOOT_LIBS += -lz -ldl -lpcre
+
+fastboot: $(FASTBOOT_OBJS)
+ $(CC) -o $@ $(CFLAGS) $(FASTBOOT_CFLAGS) $(LDFLAGS) $(FASTBOOT_SRCS) $(FASTBOOT_LIBS)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-18 03:05:44 UTC (rev 133684)
+++ PKGBUILD 2015-05-18 05:01:57 UTC (rev 133685)
@@ -16,18 +16,15 @@
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
+ Makefile
bash_completion) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
sha1sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '65fe33b2cb41c7125470b5c606cd2ca38193f6ad'
- '0bf0bdcabb78af81583c932cce198f918d9e4463'
+ '6ed0cbf14f55a6e90b3df3060b276c38a8f9b113'
'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
@@ -34,13 +31,11 @@
}
build() {
- make -C core/adb -f "$srcdir"/adbMakefile
- make -C core/fastboot -f "$srcdir"/fastbootMakefile
+ make
}
package(){
- install -Dm 755 core/adb/adb "$pkgdir"/usr/bin/adb
- install -Dm 755 core/fastboot/fastboot "$pkgdir"/usr/bin/fastboot
+ make DESTDIR="$pkgdir" install
install -Dm 644 bash_completion "$pkgdir"/etc/bash_completion.d/$pkgname
}
Deleted: adbMakefile
===================================================================
--- adbMakefile 2015-05-18 03:05:44 UTC (rev 133684)
+++ adbMakefile 2015-05-18 05:01:57 UTC (rev 133685)
@@ -1,44 +0,0 @@
-SRCS+= adb.c
-SRCS+= adb_auth_host.c
-SRCS+= adb_client.c
-SRCS+= commandline.c
-SRCS+= console.c
-SRCS+= fdevent.c
-SRCS+= file_sync_client.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+= load_file.c
-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
-
-VPATH+= ../libzipfile
-SRCS+= centraldir.c
-SRCS+= zipfile.c
-
-CPPFLAGS+= -DADB_HOST=1
-CPPFLAGS+= -DHAVE_FORKEXEC=1
-CPPFLAGS+= -DHAVE_OFF64_T=1
-CPPFLAGS+= -DHAVE_TERMIO_H
-CPPFLAGS+= -I.
-CPPFLAGS+= -I../include
-
-LIBS+= -lcrypto -lpthread -lz
-
-OBJS= $(SRCS:.c=.o)
-
-all: adb
-
-adb: $(OBJS)
- cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
Deleted: fastbootMakefile
===================================================================
--- fastbootMakefile 2015-05-18 03:05:44 UTC (rev 133684)
+++ fastbootMakefile 2015-05-18 05:01:57 UTC (rev 133685)
@@ -1,67 +0,0 @@
-SRCS+=bootimg.c
-SRCS+=engine.c
-SRCS+=fastboot.c
-SRCS+=protocol.c
-SRCS+=usb_linux.c
-SRCS+=util_linux.c
-SRCS+=util.c
-SRCS+=fs.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+= ext4_sb.c
-SRCS+= extent.c
-SRCS+= indirect.c
-SRCS+= make_ext4fs.c
-SRCS+= sha1.c
-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
-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../../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 -ldl -lpcre
-
-OBJS= $(SRCS:.c=.o)
-
-all: fastboot
-
-fastboot: $(OBJS)
- cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
More information about the arch-commits
mailing list