Date: Thu, 18 Jun 2015 22:45:35 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390085 - in head/devel: . android-tools-fastboot android-tools-fastboot-devel android-tools-fastboot-devel/files Message-ID: <201506182245.t5IMjZ2h093638@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jun 18 22:45:34 2015 New Revision: 390085 URL: https://svnweb.freebsd.org/changeset/ports/390085 Log: devel/android-tools-fastboot-devel: add new slave port for git master A temporary port to facilitate testing and updating master. Changes: https://android.googlesource.com/platform/system/core/+log/53d504f/fastboot Added: head/devel/android-tools-fastboot-devel/ head/devel/android-tools-fastboot-devel/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/distinfo (contents, props changed) head/devel/android-tools-fastboot-devel/files/ head/devel/android-tools-fastboot-devel/files/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp (contents, props changed) head/devel/android-tools-fastboot-devel/files/patch-liblog_logd__write.c (contents, props changed) Modified: head/devel/Makefile (contents, props changed) head/devel/android-tools-fastboot/Makefile (contents, props changed) Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Jun 18 22:22:47 2015 (r390084) +++ head/devel/Makefile Thu Jun 18 22:45:34 2015 (r390085) @@ -58,6 +58,7 @@ SUBDIR += amd64-xtoolchain-gcc SUBDIR += android-tools-adb SUBDIR += android-tools-fastboot + SUBDIR += android-tools-fastboot-devel SUBDIR += anjuta SUBDIR += anjuta-extras SUBDIR += antlr Added: head/devel/android-tools-fastboot-devel/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot-devel/Makefile Thu Jun 18 22:45:34 2015 (r390085) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +DISTVERSION= m-preview-122 +DISTVERSIONSUFFIX= -g53d504f +PORTREVISION= 0 +PKGNAMESUFFIX= -devel + +GH_TAGNAME= m-preview-36-gb9408ad:extras \ + m-preview-1-g06d4551:libselinux + +CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* + +MASTERDIR= ${.CURDIR}/../android-tools-fastboot +DISTINFO_FILE= ${.CURDIR}/distinfo +MAKEFILE= ${.CURDIR}/files/Makefile +EXTRA_PATCHES+= ${.CURDIR}/files/patch-* + +USES= compiler:c++11-lib +CFLAGS+= -DFASTBOOT_REVISION='\"${DISTVERSIONFULL}\"' + +.include "${MASTERDIR}/Makefile" Added: head/devel/android-tools-fastboot-devel/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot-devel/distinfo Thu Jun 18 22:45:34 2015 (r390085) @@ -0,0 +1,10 @@ +SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1e5518cf066a04479f61e5ebf3761d4bc4 +SIZE (bash_completion.d/fastboot?id=2b8cfec) = 3051 +SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 +SIZE (fastboot.1?id=706e754) = 5906 +SHA256 (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 8d49065aff063fb02cc175c634384eb1dc9ed87b85d16e85f0c70bff01415948 +SIZE (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 1182976 +SHA256 (jbeich-platform_system_extras-m-preview-36-gb9408ad_GH0.tar.gz) = 012a17d90652e91d886a3b9e9770390264232e383e7c6278dd3082528f73f3dd +SIZE (jbeich-platform_system_extras-m-preview-36-gb9408ad_GH0.tar.gz) = 651518 +SHA256 (jbeich-platform_external_libselinux-m-preview-1-g06d4551_GH0.tar.gz) = 14a6193ee80f42752089232b766b3948f3ff0c321c770684163b845ed03b0a77 +SIZE (jbeich-platform_external_libselinux-m-preview-1-g06d4551_GH0.tar.gz) = 50973 Added: head/devel/android-tools-fastboot-devel/files/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot-devel/files/Makefile Thu Jun 18 22:45:34 2015 (r390085) @@ -0,0 +1,91 @@ +# $FreeBSD$ + +PROG_CXX=fastboot +BINDIR?=/usr/bin + +SRCS+= bootimg_utils.cpp +SRCS+= engine.c +SRCS+= fastboot.cpp +SRCS+= fs.c +SRCS+= protocol.c +SRCS+= util.c + +.PATH: ${FILESDIR} +SRCS+= usb_freebsd.c +SRCS+= util_freebsd.c + +# required by libziparchive +.PATH: ${.CURDIR}/../base +SRCS+= file.cpp + +# required by fastboot +.PATH: ${.CURDIR}/../ext4_utils +SRCS+= allocate.c +SRCS+= contents.c +SRCS+= crc16.c +SRCS+= ext4_sb.c +SRCS+= ext4_utils.c +SRCS+= ext4fixup.c +SRCS+= extent.c +SRCS+= indirect.c +SRCS+= make_ext4fs.c +SRCS+= sha1.c +SRCS+= wipe.c + +# required by base and libutils +.PATH: ${.CURDIR}/../liblog +SRCS+= fake_log_device.c +SRCS+= logd_write.c +CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 + +# required by ext4_utils +.PATH: ${.CURDIR}/../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 +CFLAGS.init.c+= -DDARWIN # statfs + +# required by fastboot and ext4_utils +.PATH: ${.CURDIR}/../libsparse +SRCS+= backed_block.c +SRCS+= output_file.c +SRCS+= sparse.c +SRCS+= sparse_crc32.c +SRCS+= sparse_err.c +SRCS+= sparse_read.c + +# required by libziparchive +.PATH: ${.CURDIR}/../libutils +SRCS+= FileMap.cpp + +# required by fastboot +.PATH: ${.CURDIR}/../libziparchive +SRCS+= zip_archive.cc + +CFLAGS+=-Doff64_t=off_t +CFLAGS+=-Dftruncate64=ftruncate +CFLAGS+=-Dlseek64=lseek +CFLAGS+=-Dmmap64=mmap +CFLAGS+=-Dpread64=pread +CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${.CURDIR}/../include +CFLAGS+=-I${.CURDIR}/../mkbootimg +CFLAGS+=-I${.CURDIR}/../base/include +CFLAGS+=-I${.CURDIR}/../ext4_utils +CFLAGS+=-I${.CURDIR}/../f2fs_utils +CFLAGS+=-I${.CURDIR}/../libselinux/include +CFLAGS+=-I${.CURDIR}/../libsparse/include +CFLAGS+=${CFLAGS.${.IMPSRC:T}} + +CXXFLAGS+=-D__STDC_LIMIT_MACROS # DragonFly +CXXFLAGS+=-std=gnu++11 +CXXFLAGS+=${CFLAGS:N-std*} + +LDADD+= -lpcre -lusb -lz +DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ} + +.include <bsd.prog.mk> Added: head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp Thu Jun 18 22:45:34 2015 (r390085) @@ -0,0 +1,10 @@ +--- base/file.cpp.orig 2015-05-27 20:24:08 UTC ++++ base/file.cpp +@@ -21,6 +21,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + ++#include <cstring> // strerror + #include <string> + + #include "base/macros.h" // For TEMP_FAILURE_RETRY on Darwin. Added: head/devel/android-tools-fastboot-devel/files/patch-liblog_logd__write.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-fastboot-devel/files/patch-liblog_logd__write.c Thu Jun 18 22:45:34 2015 (r390085) @@ -0,0 +1,12 @@ +--- liblog/logd_write.c.orig 2015-05-27 20:24:08 UTC ++++ liblog/logd_write.c +@@ -22,7 +22,9 @@ + #include <pthread.h> + #endif + #include <stdarg.h> ++#if (FAKE_LOG_DEVICE == 0) + #include <stdatomic.h> ++#endif + #include <stdio.h> + #include <stdlib.h> + #include <string.h> Modified: head/devel/android-tools-fastboot/Makefile ============================================================================== --- head/devel/android-tools-fastboot/Makefile Thu Jun 18 22:22:47 2015 (r390084) +++ head/devel/android-tools-fastboot/Makefile Thu Jun 18 22:45:34 2015 (r390085) @@ -2,8 +2,8 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- -DISTVERSION= 5.1.1_r4 -PORTREVISION= 5 +DISTVERSION?= 5.1.1_r4 +PORTREVISION?= 5 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage DISTFILES= bash_completion.d/fastboot?id=2b8cfec:bashcomp \ @@ -26,10 +26,12 @@ GH_ACCOUNT= android jbeich:extras,libsel GH_PROJECT= platform_system_core platform_system_extras:extras \ platform_external_libselinux:libselinux -USES= uidfix +CONFLICTS_INSTALL?= ${PORTNAME}-devel-* + +USES+= uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} -MAKEFILE= ${FILESDIR}/Makefile +MAKEFILE= ${.CURDIR}/files/Makefile # XXX ?= when bmake-only MAKE_ENV= FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin" \ MANDIR="${PREFIX}/man/man" \ LIBPCRE="${LOCALBASE}/lib/libpcre.a"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506182245.t5IMjZ2h093638>