From 6e45f8252579383ef4f69641da7a6062135538b8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 15 Mar 2018 23:10:39 +0530 Subject: [PATCH 1/6] transition package and others needed to replace android-tools-fsutils --- debian/control | 18 ++++++++++++++++++ debian/rules | 6 +++++- debian/simg2simg.docs | 1 + debian/simg2simg.install | 1 + debian/simg2simg.lintian-overrides | 12 ++++++++++++ debian/simg2simg.mk | 13 +++++++++++++ debian/simg_dump.install | 1 + 7 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 debian/simg2simg.docs create mode 100644 debian/simg2simg.install create mode 100644 debian/simg2simg.lintian-overrides create mode 100644 debian/simg2simg.mk create mode 100644 debian/simg_dump.install diff --git a/debian/control b/debian/control index a376dc2a..da8abc02 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,15 @@ Homepage: https://android.googlesource.com/platform/system/core Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-system-core.git Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-system-core +Package: android-tools-fsutils +Depends: simg2img,img2simg,mkuserimg-1.0,android-libext4-utils, ${misc:Depends} +Architecture: all +Priority: optional +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + + Package: android-liblog Section: libs Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el @@ -267,6 +276,15 @@ Replaces: android-tools-fsutils (<< 6.0~) Description: Android sparse image creation tool A command line tool to create sparse images for usage with Android devices. +Package: simg2simg +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: android-tools-fsutils (<< 6.0~) +Replaces: android-tools-fsutils (<< 6.0~) +Description: Android sparse image creation tool + A command line tool to create sparse images for usage with Android devices. + + Package: append2simg Architecture: amd64 i386 Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/rules b/debian/rules index 62c679af..fef588b5 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -fPIC STAGE1_COMPONENTS = adb \ simg2img \ img2simg \ + simg2simg \ append2simg \ libadb.so \ libbacktrace.so \ @@ -64,13 +65,16 @@ fastboot: debian/fastboot.mk libziparchive.so libsparse.so libbase.so libcutils. simg2img: debian/simg2img.mk libsparse.so make -f $< +simg2simg: debian/simg2simg.mk libsparse.so + make -f $< + img2simg: debian/img2simg.mk libsparse.so make -f $< append2simg: debian/append2simg.mk libsparse.so make -f $< -.PHONY: adb fastboot simg2img img2simg append2simg +.PHONY: adb fastboot simg2img img2simg simg2simg append2simg %: dh $@ --with bash-completion diff --git a/debian/simg2simg.docs b/debian/simg2simg.docs new file mode 100644 index 00000000..6d5ee1d0 --- /dev/null +++ b/debian/simg2simg.docs @@ -0,0 +1 @@ +NOTICE diff --git a/debian/simg2simg.install b/debian/simg2simg.install new file mode 100644 index 00000000..4625b3ce --- /dev/null +++ b/debian/simg2simg.install @@ -0,0 +1 @@ +libsparse/simg2simg usr/bin diff --git a/debian/simg2simg.lintian-overrides b/debian/simg2simg.lintian-overrides new file mode 100644 index 00000000..628475bd --- /dev/null +++ b/debian/simg2simg.lintian-overrides @@ -0,0 +1,12 @@ +# Executables from the Android SDK normally each staticly link in all +# of the libs. That means each executable includes a full copy of all +# the libs, which is not how Debian works. These libs need to be +# dynamically linlked in so that just the library can be updated when +# there is a security fix, instead of requiring all of the executables +# be recompiled. That said, these libraries do not have a stable +# interface and were never intended to be used by any other project, +# only with the internal, Android SDK executables. Therefore, the +# Android SDK executables use private libraries located in +# /usr/lib/android + +binary-or-shlib-defines-rpath diff --git a/debian/simg2simg.mk b/debian/simg2simg.mk new file mode 100644 index 00000000..6a5fa18e --- /dev/null +++ b/debian/simg2simg.mk @@ -0,0 +1,13 @@ +NAME = simg2simg +SOURCES = simg2simg.c sparse_crc32.c +SOURCES := $(foreach source, $(SOURCES), libsparse/$(source)) +CFLAGS += -Ilibsparse/include -fpermissive +LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ + -Wl,-rpath-link=. \ + -lz -L. -lsparse + +build: $(SOURCES) + $(CXX) $^ -o libsparse/$(NAME) $(CFLAGS) $(LDFLAGS) + +clean: + $(RM) libsparse/$(NAME) diff --git a/debian/simg_dump.install b/debian/simg_dump.install new file mode 100644 index 00000000..dbc70743 --- /dev/null +++ b/debian/simg_dump.install @@ -0,0 +1 @@ +libsparse/simg_dump.py usr/bin/ From 67364c3cf7ed484c3438d6decccccce3f21ab349 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 15 Mar 2018 23:48:19 +0530 Subject: [PATCH 2/6] Have packaged the transition package,simg2simg,simgdump --- debian/control | 25 ++++++++++++++++++------- debian/simgdump.install | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 debian/simgdump.install diff --git a/debian/control b/debian/control index da8abc02..a2970130 100644 --- a/debian/control +++ b/debian/control @@ -31,6 +31,23 @@ Description: transitional package This is a transitional package. It can safely be removed. +Package: simg2simg +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: android-tools-fsutils (<< 6.0~) +Replaces: android-tools-fsutils (<< 6.0~) +Description: Android sparse image creation tool + A command line tool to create sparse images for usage with Android devices. + +Package: simgdump +Architecture: amd64 i386 +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: android-tools-fsutils (<< 6.0~) +Replaces: android-tools-fsutils (<< 6.0~) +Description: Android sparse image dump tool + A command line tool to create sparse images for usage with Android devices. + + Package: android-liblog Section: libs Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el @@ -276,13 +293,7 @@ Replaces: android-tools-fsutils (<< 6.0~) Description: Android sparse image creation tool A command line tool to create sparse images for usage with Android devices. -Package: simg2simg -Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: android-tools-fsutils (<< 6.0~) -Replaces: android-tools-fsutils (<< 6.0~) -Description: Android sparse image creation tool - A command line tool to create sparse images for usage with Android devices. + Package: append2simg diff --git a/debian/simgdump.install b/debian/simgdump.install new file mode 100644 index 00000000..dbc70743 --- /dev/null +++ b/debian/simgdump.install @@ -0,0 +1 @@ +libsparse/simg_dump.py usr/bin/ From 93f2e9a050acec8bc7e0b2de96d49b6afac7909d Mon Sep 17 00:00:00 2001 From: Saif724U Date: Thu, 15 Mar 2018 23:52:56 +0530 Subject: [PATCH 3/6] not needed --- debian/simg_dump.install | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/simg_dump.install diff --git a/debian/simg_dump.install b/debian/simg_dump.install deleted file mode 100644 index dbc70743..00000000 --- a/debian/simg_dump.install +++ /dev/null @@ -1 +0,0 @@ -libsparse/simg_dump.py usr/bin/ From f4342c6f713f288d7c3e7b7087f69c5fcb089c84 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 16 Mar 2018 00:01:06 +0530 Subject: [PATCH 4/6] fixed minor error --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a2970130..32305727 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-system-cor Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-system-core Package: android-tools-fsutils -Depends: simg2img,img2simg,mkuserimg-1.0,android-libext4-utils, ${misc:Depends} +Depends: ext2simg,ext4fixup,img2simg,mkext4fs,mkuserimg,simg2img,simg2simg,simgdump ${misc:Depends} Architecture: all Priority: optional Section: oldlibs From bf27f989509b841ccf0b1af2bba9194c1d2df975 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 7 Apr 2018 13:49:02 +0530 Subject: [PATCH 5/6] packaged android-sdk-libsparse-utils which has the tools simg_dump,img2simg and simg2simg and a transitional to replace android-tools-fsutils --- debian/android-sdk-libsparse-utils.install | 5 +++ ...oid-sdk-libsparse-utils.lintian-overrides} | 0 debian/control | 32 ++++--------------- debian/img2simg.docs | 1 - debian/img2simg.install | 1 - debian/simg2simg.docs | 1 - debian/simg2simg.install | 1 - debian/simg2simg.lintian-overrides | 12 ------- debian/simgdump.install | 1 - 9 files changed, 12 insertions(+), 42 deletions(-) create mode 100755 debian/android-sdk-libsparse-utils.install rename debian/{img2simg.lintian-overrides => android-sdk-libsparse-utils.lintian-overrides} (100%) delete mode 100644 debian/img2simg.docs delete mode 100644 debian/img2simg.install delete mode 100644 debian/simg2simg.docs delete mode 100644 debian/simg2simg.install delete mode 100644 debian/simg2simg.lintian-overrides delete mode 100644 debian/simgdump.install diff --git a/debian/android-sdk-libsparse-utils.install b/debian/android-sdk-libsparse-utils.install new file mode 100755 index 00000000..4052e8f5 --- /dev/null +++ b/debian/android-sdk-libsparse-utils.install @@ -0,0 +1,5 @@ +#!/usr/bin/dh-exec + +libsparse/simg_dump.py => usr/bin/simg_dump +libsparse/simg2simg usr/bin +libsparse/img2simg usr/bin diff --git a/debian/img2simg.lintian-overrides b/debian/android-sdk-libsparse-utils.lintian-overrides similarity index 100% rename from debian/img2simg.lintian-overrides rename to debian/android-sdk-libsparse-utils.lintian-overrides diff --git a/debian/control b/debian/control index 32305727..6e6b521f 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: android-libunwind-dev (>= 7.0.0+r1~) [amd64 i386 armel armhf arm6 bash-completion, debhelper (>= 10), dh-exec, + python, dpkg-dev (>= 1.17.14), libsafe-iop-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el], libssl-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el], @@ -23,30 +24,21 @@ Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-system-cor Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-system-core Package: android-tools-fsutils -Depends: ext2simg,ext4fixup,img2simg,mkext4fs,mkuserimg,simg2img,simg2simg,simgdump ${misc:Depends} +Depends: android-sdk-libsparse-utils, android-sdk-ext4-utils, simg2img, ${shlibs:Depends}, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. +Description: Transitional package + This is a transitional package. It can safely be removed. -Package: simg2simg +Package: android-sdk-libsparse-utils Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: python,${shlibs:Depends}, ${misc:Depends} Breaks: android-tools-fsutils (<< 6.0~) Replaces: android-tools-fsutils (<< 6.0~) Description: Android sparse image creation tool - A command line tool to create sparse images for usage with Android devices. - -Package: simgdump -Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: android-tools-fsutils (<< 6.0~) -Replaces: android-tools-fsutils (<< 6.0~) -Description: Android sparse image dump tool - A command line tool to create sparse images for usage with Android devices. - + Command line tools to create sparse images for usage with Android devices. Package: android-liblog Section: libs @@ -285,16 +277,6 @@ Description: Android sparse image conversion tool A command line tool to convert sparse images to raw images, which can then be manipulated with the standard tools. -Package: img2simg -Architecture: amd64 i386 -Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: android-tools-fsutils (<< 6.0~) -Replaces: android-tools-fsutils (<< 6.0~) -Description: Android sparse image creation tool - A command line tool to create sparse images for usage with Android devices. - - - Package: append2simg Architecture: amd64 i386 diff --git a/debian/img2simg.docs b/debian/img2simg.docs deleted file mode 100644 index 6d5ee1d0..00000000 --- a/debian/img2simg.docs +++ /dev/null @@ -1 +0,0 @@ -NOTICE diff --git a/debian/img2simg.install b/debian/img2simg.install deleted file mode 100644 index daedbaf0..00000000 --- a/debian/img2simg.install +++ /dev/null @@ -1 +0,0 @@ -libsparse/img2simg usr/bin diff --git a/debian/simg2simg.docs b/debian/simg2simg.docs deleted file mode 100644 index 6d5ee1d0..00000000 --- a/debian/simg2simg.docs +++ /dev/null @@ -1 +0,0 @@ -NOTICE diff --git a/debian/simg2simg.install b/debian/simg2simg.install deleted file mode 100644 index 4625b3ce..00000000 --- a/debian/simg2simg.install +++ /dev/null @@ -1 +0,0 @@ -libsparse/simg2simg usr/bin diff --git a/debian/simg2simg.lintian-overrides b/debian/simg2simg.lintian-overrides deleted file mode 100644 index 628475bd..00000000 --- a/debian/simg2simg.lintian-overrides +++ /dev/null @@ -1,12 +0,0 @@ -# Executables from the Android SDK normally each staticly link in all -# of the libs. That means each executable includes a full copy of all -# the libs, which is not how Debian works. These libs need to be -# dynamically linlked in so that just the library can be updated when -# there is a security fix, instead of requiring all of the executables -# be recompiled. That said, these libraries do not have a stable -# interface and were never intended to be used by any other project, -# only with the internal, Android SDK executables. Therefore, the -# Android SDK executables use private libraries located in -# /usr/lib/android - -binary-or-shlib-defines-rpath diff --git a/debian/simgdump.install b/debian/simgdump.install deleted file mode 100644 index dbc70743..00000000 --- a/debian/simgdump.install +++ /dev/null @@ -1 +0,0 @@ -libsparse/simg_dump.py usr/bin/ From 096bd18dab42d4cf415ffe80df85cc71f103019a Mon Sep 17 00:00:00 2001 From: Saif_Abdul_Cassim Date: Sun, 15 Apr 2018 20:03:21 +0530 Subject: [PATCH 6/6] packaged simg2simg, simg_dump and img2simg under android-sdk-libsparse-utils and made a transitional package android-tools-fsutils which will replace android-tools-fsutils --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 6e6b521f..59e58098 100644 --- a/debian/control +++ b/debian/control @@ -35,8 +35,8 @@ Description: Transitional package Package: android-sdk-libsparse-utils Architecture: amd64 i386 Depends: python,${shlibs:Depends}, ${misc:Depends} -Breaks: android-tools-fsutils (<< 6.0~) -Replaces: android-tools-fsutils (<< 6.0~) +Breaks: android-tools-fsutils (<< 5.1.1.r38-1.1~) +Replaces: android-tools-fsutils (<< 5.1.1.r38-1.1~) Description: Android sparse image creation tool Command line tools to create sparse images for usage with Android devices. @@ -271,8 +271,8 @@ Description: Android fastboot tool Package: simg2img Architecture: amd64 i386 Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: android-tools-fsutils (<< 6.0~) -Replaces: android-tools-fsutils (<< 6.0~) +Breaks: android-tools-fsutils (<< 5.1.1.r38-1.1~) +Replaces: android-tools-fsutils (<< 5.1.1.r38-1.1~) Description: Android sparse image conversion tool A command line tool to convert sparse images to raw images, which can then be manipulated with the standard tools.