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

Merge "Create systemtarball either with bz2 or gz"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-07-08 16:36:54 -07:00
committed by Android Code Review
parent 68f9303c90 69ef5ce4f0
commit f5f11eb01c
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

@@ -720,8 +720,12 @@ define build-systemtarball-target
$(INSTALLED_SYSTEMTARBALL_TARGET) $(INSTALLED_SYSTEMTARBALL_TARGET)
endef endef
ifndef SYSTEM_TARBALL_FORMAT
SYSTEM_TARBALL_FORMAT := bz2
endif
system_tar := $(PRODUCT_OUT)/system.tar 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): PRIVATE_SYSTEM_TAR := $(system_tar)
$(INSTALLED_SYSTEMTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_SYSTEMIMAGE_FILES) $(INSTALLED_SYSTEMTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_SYSTEMIMAGE_FILES)
$(build-systemtarball-target) $(build-systemtarball-target)

7
tools/mktarball.sh
View File

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