StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 39a6a644: merge from open-source master

Browse Source 
Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'

* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
  Create systemtarball either with bz2 or gz
This commit is contained in:
The Android Open Source Project
2010-07-09 15:00:57 -07:00
committed by Android Git Automerger
parent c608c44c1f 39a6a64471
commit 2a582caba1
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -748,8 +748,12 @@ define build-systemtarball-target
$(INSTALLED_SYSTEMTARBALL_TARGET)
endef
ifndef SYSTEM_TARBALL_FORMAT
SYSTEM_TARBALL_FORMAT := bz2
endif
system_tar := $(PRODUCT_OUT)/system.tar
INSTALLED_SYSTEMTARBALL_TARGET := $(system_tar).bz2
INSTALLED_SYSTEMTARBALL_TARGET := $(system_tar).$(SYSTEM_TARBALL_FORMAT)
$(INSTALLED_SYSTEMTARBALL_TARGET): PRIVATE_SYSTEM_TAR := $(system_tar)
$(INSTALLED_SYSTEMTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_SYSTEMIMAGE_FILES)
$(build-systemtarball-target)

9
tools/mktarball.sh
View File

@@ -39,7 +39,14 @@ for f in ${subdirs} ${files} ; do
done
if [ $? -eq 0 ] ; then
bzip2 -c ${target_tar} > ${target_tarball}
case "${target_tarball}" in
*.bz2 )
bzip2 -c ${target_tar} > ${target_tarball}
;;
*.gz )
gzip -c ${target_tar} > ${target_tarball}
;;
esac
success=$?
[ $success -eq 0 ] || rm -f ${target_tarball}
rm -f ${target_tar}