diff -Nru android-tools-4.2.2+git20130218/debian/README.source android-tools-4.2.2+git20130218/debian/README.source --- android-tools-4.2.2+git20130218/debian/README.source 2012-11-05 16:46:10.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/README.source 2013-02-18 14:56:28.000000000 +0000 @@ -1,26 +1,12 @@ android-tools for Debian ------------------------ -To update package you need to clone core/ of Android source code: +The upstream tarball is based of these upstream Android git repos: + git clone https://android.googlesource.com/platform/system/core + git clone https://android.googlesource.com/platform/system/extras -git clone https://android.googlesource.com/platform/system/core -git clone https://android.googlesource.com/platform/system/extras +with unneeded files removed. -Then update directories present in this source package with newer code. - -Following directories and files were dropped: - -core/fastboot/engineering_key.p12 -core/fastboot/*.sh -core/include/android -core/include/corkscrew -core/include/ctest -core/include/diskconfig -core/include/ion -core/include/mincrypt -core/include/netutils -core/include/pixelflinger -core/include/private -core/include/sync -core/include/system -core/include/usbhost +The debian/create-snapshot script may be used to generate an +android-tools.tar.xz from the latest upstream; see this script for a list of +files to copy from upstream into the tarball. diff -Nru android-tools-4.2.2+git20130218/debian/changelog android-tools-4.2.2+git20130218/debian/changelog --- android-tools-4.2.2+git20130218/debian/changelog 2013-02-18 15:13:19.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/changelog 2013-02-18 16:05:10.000000000 +0000 @@ -1,10 +1,26 @@ -android-tools (4.2.2+git20130218-0ubuntu1+1~precise) precise; urgency=medium +android-tools (4.2.2+git20130218-0ubuntu2+1~webupd8~precise) precise; urgency=medium * Backport from Raring: - re-added android-tools-adb.android-rules.udev and "dh_installudev --name=android-rules --priority=51" in rules -- Alin Andrei Mon, 18 Feb 2013 13:40:22 +0100 +android-tools (4.2.2+git20130218-0ubuntu2) raring; urgency=low + + * Update README.source to mention debian/create-snapshot. + * Move added makefiles to debian/makefiles instead of painfully maintaining + these as patches. + * Add some metadata to debian/create-snapshot. + * Use $(MAKE) and $(INSTALL_PROGRAM) instead of plain "make" and "install" + in rules. + * Drop useless DH_OPTIONS export. + * Set CC to gcc by default instead of using "cc"; this is more consistent + with the cross-compiling case. + * export CC instead of passing it in all make calls. + * Add header with author and description to Android selinux patch. + + -- Loïc Minier Mon, 18 Feb 2013 15:56:29 +0100 + android-tools (4.2.2+git20130218-0ubuntu1) raring; urgency=low [ Sergio Schvezov ] diff -Nru android-tools-4.2.2+git20130218/debian/create-snapshot android-tools-4.2.2+git20130218/debian/create-snapshot --- android-tools-4.2.2+git20130218/debian/create-snapshot 2013-02-18 14:48:53.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/create-snapshot 2013-02-18 15:04:56.000000000 +0000 @@ -19,6 +19,9 @@ # License along with this package; if not, write to the Free # Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA +# +# depends: git, xz-utils (xz) +# author: Loïc Minier ANDROID_MIRROR="https://android.googlesource.com/" CORE_REPO="$ANDROID_MIRROR/platform/system/core" diff -Nru android-tools-4.2.2+git20130218/debian/makefiles/adb.mk android-tools-4.2.2+git20130218/debian/makefiles/adb.mk --- android-tools-4.2.2+git20130218/debian/makefiles/adb.mk 1970-01-01 00:00:00.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/makefiles/adb.mk 2013-02-18 14:58:25.000000000 +0000 @@ -0,0 +1,54 @@ +# Makefile for adb; from https://heiher.info/2227.html + +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 +SRCS+= utils.c + +VPATH+= ../libcutils +SRCS+= abort_socket.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 +SRCS+= list.c +SRCS+= load_file.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+= -I. +CPPFLAGS+= -I../include +CPPFLAGS+= -I../../../external/zlib + +LIBS+= -lc -lpthread -lz -lcrypto + +OBJS= $(SRCS:.c=.o) + +all: adb + +adb: $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + +clean: + rm -rf $(OBJS) adb diff -Nru android-tools-4.2.2+git20130218/debian/makefiles/ext4_utils.mk android-tools-4.2.2+git20130218/debian/makefiles/ext4_utils.mk --- android-tools-4.2.2+git20130218/debian/makefiles/ext4_utils.mk 1970-01-01 00:00:00.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/makefiles/ext4_utils.mk 2013-02-18 14:59:31.000000000 +0000 @@ -0,0 +1,53 @@ +# Makefile for ext4_utils; based on https://heiher.info/2227.html +# Author: Dmitrijs Ledkovs + +SRCS+=make_ext4fs.c +SRCS+=ext4fixup.c +SRCS+=ext4_utils.c +SRCS+=allocate.c +SRCS+=contents.c +SRCS+=extent.c +SRCS+=indirect.c +SRCS+=uuid.c +SRCS+=sha1.c +SRCS+=wipe.c +SRCS+=crc16.c + +VPATH+=../../core/libsparse +SRCS+= backed_block.c +SRCS+= sparse_crc32.c +SRCS+= sparse.c +SRCS+= sparse_read.c +SRCS+= sparse_err.c +SRCS+= output_file.c + +OBJS_SHARED:= $(SRCS:.c=.o) + +SRCS+=make_ext4fs_main.c +SRCS+=ext4fixup_main.c +SRCS+=setup_fs.c +SRCS+=ext2simg.c +SRCS+=img2simg.c +SRCS+=simg2img.c +SRCS+=simg2simg.c + +CPPFLAGS+= -I. +CPPFLAGS+= -I/usr/include +CPPFLAGS+= -I../../core/include +CPPFLAGS+= -I../../core/libsparse/include/ + +LIBS+= -lz -lselinux + +OBJS= $(SRCS:.c=.o) + +all: make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg + +make_ext4fs ext4fixup: $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS_SHARED) $@_main.o $(LIBS) + +ext2simg img2simg simg2img simg2simg: $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS_SHARED) $@.o $(LIBS) + +clean: + rm -rf $(OBJS) ext2simg ext4fixup make_ext4fs img2simg simg2img simg2simg + diff -Nru android-tools-4.2.2+git20130218/debian/makefiles/fastboot.mk android-tools-4.2.2+git20130218/debian/makefiles/fastboot.mk --- android-tools-4.2.2+git20130218/debian/makefiles/fastboot.mk 1970-01-01 00:00:00.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/makefiles/fastboot.mk 2013-02-18 14:58:47.000000000 +0000 @@ -0,0 +1,50 @@ +# Makefile for fastboot; from https://heiher.info/2227.html + +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+= sparse_crc32.c +SRCS+= sparse.c +SRCS+= sparse_read.c +SRCS+= sparse_err.c +SRCS+= output_file.c + +VPATH+= ../../extras/ext4_utils/ +SRCS+= make_ext4fs.c +SRCS+= crc16.c +SRCS+= ext4_utils.c +SRCS+= indirect.c +SRCS+= allocate.c +SRCS+= contents.c +SRCS+= uuid.c +SRCS+= extent.c +SRCS+= wipe.c +SRCS+= sha1.c + +CPPFLAGS+= -I. +CPPFLAGS+= -I../include +CPPFLAGS+= -I../mkbootimg +CPPFLAGS+= -I../../extras/ext4_utils/ +CPPFLAGS+= -I../libsparse/include/ + +LIBS+= -lz -lselinux + +OBJS= $(SRCS:.c=.o) + +all: fastboot + +fastboot: $(OBJS) + $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) + +clean: + rm -rf $(OBJS) fastboot diff -Nru android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-adb.patch android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-adb.patch --- android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-adb.patch 2013-02-18 14:31:35.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-adb.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -Subject: Add makefile to build adb without using Android build system -Origin: https://heiher.info/2227.html - ---- - core/adb/makefile | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) - ---- /dev/null -+++ android-tools/core/adb/makefile -@@ -0,0 +1,54 @@ -+# Makefile for adb -+ -+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 -+SRCS+= utils.c -+ -+VPATH+= ../libcutils -+SRCS+= abort_socket.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 -+SRCS+= list.c -+SRCS+= load_file.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+= -I. -+CPPFLAGS+= -I../include -+CPPFLAGS+= -I../../../external/zlib -+ -+LIBS+= -lc -lpthread -lz -lcrypto -+ -+OBJS= $(SRCS:.c=.o) -+ -+all: adb -+ -+adb: $(OBJS) -+ $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -+ -+clean: -+ rm -rf $(OBJS) adb diff -Nru android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-fastboot.patch android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-fastboot.patch --- android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-fastboot.patch 2013-02-18 14:30:54.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-fastboot.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -Subject: Add makefile to build fastboot without using Android build system -Origin: https://heiher.info/2227.html - ---- - core/fastboot/makefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 47 insertions(+) - ---- /dev/null -+++ android-tools/core/fastboot/makefile -@@ -0,0 +1,48 @@ -+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+= sparse_crc32.c -+SRCS+= sparse.c -+SRCS+= sparse_read.c -+SRCS+= sparse_err.c -+SRCS+= output_file.c -+ -+VPATH+= ../../extras/ext4_utils/ -+SRCS+= make_ext4fs.c -+SRCS+= crc16.c -+SRCS+= ext4_utils.c -+SRCS+= indirect.c -+SRCS+= allocate.c -+SRCS+= contents.c -+SRCS+= uuid.c -+SRCS+= extent.c -+SRCS+= wipe.c -+SRCS+= sha1.c -+ -+CPPFLAGS+= -I. -+CPPFLAGS+= -I../include -+CPPFLAGS+= -I../mkbootimg -+CPPFLAGS+= -I../../extras/ext4_utils/ -+CPPFLAGS+= -I../libsparse/include/ -+ -+LIBS+= -lz -lselinux -+ -+OBJS= $(SRCS:.c=.o) -+ -+all: fastboot -+ -+fastboot: $(OBJS) -+ $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) -+ -+clean: -+ rm -rf $(OBJS) fastboot diff -Nru android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-mkfs.patch android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-mkfs.patch --- android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-mkfs.patch 2013-02-18 14:40:55.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/patches/add-makefile-for-mkfs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -Subject: Add makefile to build ext4_utils without using Android build system -Author: Dmitrijs Ledkovs -Origin: https://heiher.info/2227.html - ---- /dev/null -+++ b/extras/ext4_utils/makefile -@@ -0,0 +1,50 @@ -+SRCS+=make_ext4fs.c -+SRCS+=ext4fixup.c -+SRCS+=ext4_utils.c -+SRCS+=allocate.c -+SRCS+=contents.c -+SRCS+=extent.c -+SRCS+=indirect.c -+SRCS+=uuid.c -+SRCS+=sha1.c -+SRCS+=wipe.c -+SRCS+=crc16.c -+ -+VPATH+=../../core/libsparse -+SRCS+= backed_block.c -+SRCS+= sparse_crc32.c -+SRCS+= sparse.c -+SRCS+= sparse_read.c -+SRCS+= sparse_err.c -+SRCS+= output_file.c -+ -+OBJS_SHARED:= $(SRCS:.c=.o) -+ -+SRCS+=make_ext4fs_main.c -+SRCS+=ext4fixup_main.c -+SRCS+=setup_fs.c -+SRCS+=ext2simg.c -+SRCS+=img2simg.c -+SRCS+=simg2img.c -+SRCS+=simg2simg.c -+ -+CPPFLAGS+= -I. -+CPPFLAGS+= -I/usr/include -+CPPFLAGS+= -I../../core/include -+CPPFLAGS+= -I../../core/libsparse/include/ -+ -+LIBS+= -lz -lselinux -+ -+OBJS= $(SRCS:.c=.o) -+ -+all: make_ext4fs ext4fixup ext2simg img2simg simg2img simg2simg -+ -+make_ext4fs ext4fixup: $(OBJS) -+ $(CC) -o $@ $(LDFLAGS) $(OBJS_SHARED) $@_main.o $(LIBS) -+ -+ext2simg img2simg simg2img simg2simg: $(OBJS) -+ $(CC) -o $@ $(LDFLAGS) $(OBJS_SHARED) $@.o $(LIBS) -+ -+clean: -+ rm -rf $(OBJS) ext2simg ext4fixup make_ext4fs img2simg simg2img simg2simg -+ diff -Nru android-tools-4.2.2+git20130218/debian/patches/remove-selinux-android.patch android-tools-4.2.2+git20130218/debian/patches/remove-selinux-android.patch --- android-tools-4.2.2+git20130218/debian/patches/remove-selinux-android.patch 2013-02-18 14:33:58.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/patches/remove-selinux-android.patch 2013-02-18 15:17:33.000000000 +0000 @@ -1,3 +1,6 @@ +Subject: drop useless includes of Android SELINUX extensions; avoids having to clone another module; this should be sent upstream +Author: Sergio Schvezov + --- a/extras/ext4_utils/make_ext4fs.c +++ b/extras/ext4_utils/make_ext4fs.c @@ -61,7 +61,6 @@ diff -Nru android-tools-4.2.2+git20130218/debian/patches/series android-tools-4.2.2+git20130218/debian/patches/series --- android-tools-4.2.2+git20130218/debian/patches/series 2013-02-18 14:33:08.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/patches/series 2013-02-18 14:57:51.000000000 +0000 @@ -1,4 +1 @@ -add-makefile-for-fastboot.patch -add-makefile-for-adb.patch -add-makefile-for-mkfs.patch remove-selinux-android.patch diff -Nru android-tools-4.2.2+git20130218/debian/rules android-tools-4.2.2+git20130218/debian/rules --- android-tools-4.2.2+git20130218/debian/rules 2013-02-18 15:11:32.000000000 +0000 +++ android-tools-4.2.2+git20130218/debian/rules 2013-02-18 16:04:34.000000000 +0000 @@ -4,33 +4,38 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - CC = $(DEB_HOST_GNU_TYPE)-gcc +export CC := $(DEB_HOST_GNU_TYPE)-gcc +else +export CC := gcc endif +M := $(CURDIR)/debian/makefiles + +INSTALL := install +INSTALL_PROGRAM = $(INSTALL) + %: dh $@ --with python2 override_dh_clean: dh_clean - make -C core/adb CC=$(CC) clean - make -C core/fastboot CC=$(CC) clean - make -C extras/ext4_utils CC=$(CC) clean + $(MAKE) -f $(M)/adb.mk -C core/adb clean + $(MAKE) -f $(M)/fastboot.mk -C core/fastboot clean + $(MAKE) -f $(M)/ext4_utils.mk -C extras/ext4_utils clean override_dh_auto_build: - make -C core/adb CC=$(CC) - make -C core/fastboot CC=$(CC) - make -C extras/ext4_utils CC=$(CC) + $(MAKE) -f $(M)/adb.mk -C core/adb + $(MAKE) -f $(M)/fastboot.mk -C core/fastboot + $(MAKE) -f $(M)/ext4_utils.mk -C extras/ext4_utils override_dh_install: dh_install --sourcedir=. - install core/libsparse/simg_dump.py debian/android-tools-fsutils/usr/bin/simg_dump - install extras/ext4_utils/mkuserimg.sh debian/android-tools-fsutils/usr/bin/mkuserimg + $(INSTALL_PROGRAM) core/libsparse/simg_dump.py debian/android-tools-fsutils/usr/bin/simg_dump + $(INSTALL_PROGRAM) extras/ext4_utils/mkuserimg.sh debian/android-tools-fsutils/usr/bin/mkuserimg override_dh_installudev: dh_installudev --priority=70