M cmake/modules/Assets.cmake => cmake/modules/Assets.cmake +4 -4
@@ 15,21 15,21 @@ function(add_assets_target)
# Copy user assets
COMMAND mkdir -p ${_ASSETS_USER_DEST_DIR}
- COMMAND rsync -qravu
+ COMMAND rsync -qau
${_ASSETS_SOURCE_DIR}/user/
${_ASSETS_USER_DEST_DIR}
COMMAND find ${_ASSETS_USER_DEST_DIR} -name "*-devel*" | sed "\"s,\\(.*\\)-devel\\(.*\\),& \\1\\2,\"" | xargs --no-run-if-empty -L1 mv
# Copy system assets
COMMAND mkdir -p ${_ASSETS_SYSTEM_DEST_DIR}
- COMMAND rsync -qravu
+ COMMAND rsync -qau
${_ASSETS_SOURCE_DIR}/system_a/data
${_ASSETS_SOURCE_DIR}/system_a/db
${_ASSETS_SYSTEM_DEST_DIR}
# Create 'golden copy' of DBs
- COMMAND rsync -qravu
- ${_ASSETS_SYSTEM_DEST_DIR}/db/
+ COMMAND rsync -qlptgoDu
+ ${_ASSETS_SYSTEM_DEST_DIR}/db/*
${_ASSETS_SYSTEM_DEST_DIR}/db/factory
COMMENT "Copying assets... add_assets_target (${_ASSETS_TARGET}) <- ${_ASSETS_DEPENDS}"
D config/products/BellHybrid/emmc_partition_table.dump => config/products/BellHybrid/emmc_partition_table.dump +0 -8
@@ 1,8 0,0 @@
-label: dos
-label-id: 0x09650eb4
-device: /dev/sda
-unit: sectors
-
-/dev/sda1 : start= 2048, size= 524288, type=b, bootable
-/dev/sda2 : start= 526336, size= 524288, type=9e
-/dev/sda3 : start= 1050624, size= 6354944, type=9e
M config/products/BellHybrid/image_partitions.map => config/products/BellHybrid/image_partitions.map +1 -1
@@ 1,2 1,2 @@
-DEVICE_BLK_COUNT=6963200
+DEVICE_BLK_COUNT=7634944
PART1_SIZE=524288
D config/products/PurePhone/emmc_partition_table.dump => config/products/PurePhone/emmc_partition_table.dump +0 -7
@@ 1,7 0,0 @@
-label: dos
-label-id: 0x09650eb4
-device: /dev/sda
-unit: sectors
-
-/dev/sda1 : start= 2048, size= 28522496, type=b, bootable
-/dev/sda2 : start= 28524544, size= 2097152, type=9e
M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +1 -1
@@ 149,7 149,7 @@ download_asset_release_json(json-community-target
)
download_asset_json(json-rt1051-target
${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_rt1051.json
- ${CMAKE_BINARY_DIR}/sysroot/system_a/
+ ${CMAKE_BINARY_DIR}/sysroot/system_a/assets
MuditaOSAssets
${MUDITA_CACHE_DIR}
)
M products/BellHybrid/assets/assets_rt1051.json => products/BellHybrid/assets/assets_rt1051.json +1 -1
@@ 4,7 4,7 @@
{
"name": "image/Luts.bin.tgz",
"tarfile": "Luts.bin",
- "output": "Luts.bin",
+ "output": "luts.bin",
"unpack": true
}
]
M tools/generate_image.sh => tools/generate_image.sh +3 -3
@@ 38,7 38,7 @@ source ${IMAGE_PARTITIONS}
DEVICE_BLK_SIZE=512
# Partition sizes in sector 512 units
-PART1_START=2048
+PART1_START=1
PART2_START=$(($PART1_START + $PART1_SIZE))
PART2_SIZE=$PART1_SIZE
PART3_START=$(($PART2_START + $PART2_SIZE))
@@ 93,7 93,7 @@ mke2fs \
-d 'system_a' \
-t ext4 \
"$IMAGE_NAME" \
- $((($PART1_SIZE*$DEVICE_BLK_SIZE)/1024)) > /dev/null
+ $((($PART1_SIZE*$DEVICE_BLK_SIZE)/1024)) > /dev/null
# Format ext4 system_b partition
echo "Formatting system_b partition as ext4..."
@@ 109,7 109,7 @@ mke2fs \
-r 1 \
-t ext4 \
"$IMAGE_NAME" \
- $((($PART2_SIZE*$DEVICE_BLK_SIZE)/1024)) > /dev/null
+ $((($PART2_SIZE*$DEVICE_BLK_SIZE)/1024)) > /dev/null
# Format ext4 user partition
echo "Formatting user partition as ext4..."