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

Fix mkbootimg parameters for releasetools.

Browse Source 
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
This commit is contained in:
Ying Wang
2010-08-25 14:29:34 -07:00
parent 0962b71980
commit 4de6b5bfc8
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -618,6 +618,10 @@ endif
ifdef BOARD_KERNEL_BASE ifdef BOARD_KERNEL_BASE
INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE) INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)
endif endif
BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE))
ifdef BOARD_KERNEL_PAGESIZE
INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
endif
# Keys authorized to sign OTA packages this build will accept. The # Keys authorized to sign OTA packages this build will accept. The
# build always uses test-keys for this; release packaging tools will # build always uses test-keys for this; release packaging tools will
@@ -948,6 +952,9 @@ ifdef BOARD_KERNEL_CMDLINE
endif endif
ifdef BOARD_KERNEL_BASE ifdef BOARD_KERNEL_BASE
$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/RECOVERY/base $(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/RECOVERY/base
endif
ifdef BOARD_KERNEL_PAGESIZE
$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/RECOVERY/pagesize
endif endif
@# Components of the boot image @# Components of the boot image
$(hide) mkdir -p $(zip_root)/BOOT $(hide) mkdir -p $(zip_root)/BOOT
@@ -965,6 +972,9 @@ ifdef BOARD_KERNEL_CMDLINE
endif endif
ifdef BOARD_KERNEL_BASE ifdef BOARD_KERNEL_BASE
$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base $(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base
endif
ifdef BOARD_KERNEL_PAGESIZE
$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize
endif endif
$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\ $(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
mkdir -p $(zip_root)/RADIO; \ mkdir -p $(zip_root)/RADIO; \

5
tools/releasetools/common.py
View File

@@ -121,6 +121,11 @@ def BuildBootableImage(sourcedir):
cmd.append("--base") cmd.append("--base")
cmd.append(open(fn).read().rstrip("\n")) cmd.append(open(fn).read().rstrip("\n"))
fn = os.path.join(sourcedir, "pagesize")
if os.access(fn, os.F_OK):
cmd.append("--pagesize")
cmd.append(open(fn).read().rstrip("\n"))
cmd.extend(["--ramdisk", ramdisk_img.name, cmd.extend(["--ramdisk", ramdisk_img.name,
"--output", img.name]) "--output", img.name])