Skip to content

Commit

Permalink
Definetelly fix file inclusion mess
Browse files Browse the repository at this point in the history
Close #33

Signed-off-by: p4u <p4u@dabax.net>
  • Loading branch information
p4u committed Dec 15, 2017
1 parent 8a8f3b3 commit f8afee9
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions cooker
Expand Up @@ -114,34 +114,37 @@ cook() {
echo "-> Cooking $target/$profile"
[ ! -d "$output_dir" ] && mkdir -p $output_dir

# handle community packages and files, and local files
local ib_files="${PWD}/$tmp_dir/files"
local myfiles="${PWD}/$files_dir"
rm -rf ${ib_files}
mkdir -p ${ib_files}
# handle community packages files, and local files
local ib_files_dir="${PWD}/$tmp_dir/files"
local local_files="${PWD}/$files_dir"
rm -rf ${ib_files_dir}; mkdir -p ${ib_files_dir}
[ -n "$community_files" ] && {
[ -f "${community_files}/PACKAGES" ] && {
echo "--> Adding community packages: "
join_packages $(cat "${community_files}/PACKAGES")
}
echo "--> Copying community files"
cp -rf ${community_files}/* $ib_files/ 2>/dev/null
[ -f ${ib_files}/PACKAGES ] && rm -f ${ib_files}/PACKAGES
cp -rf ${community_files}/* $ib_files_dir/ 2>/dev/null
[ -f ${ib_files_dir}/PACKAGES ] && rm -f ${ib_files_dir}/PACKAGES
}
cp -rf ${myfiles}/* ${ib_files}/ 2>/dev/null
cp -rf ${local_files}/* ${ib_files_dir}/ 2>/dev/null

# make binary using imagebuilder
local fw_extra_name="$flavor"
[ -n "$community" ] && fw_extra_name="$community-$community_profile"
find $myfiles/* 2>/dev/null && ib_files="FILES=$myfiles" # if files directory is empty, IB crashes
[ "$profile" == "Default" ] && profile="" # if profile is Default better leave it blank. some targets do not have any profile
# if profile is Default better leave it blank. some targets do not have any profile
[ "$profile" == "Default" ] && profile=""
[ -n "$profile" ] && profile="PROFILE=$profile"
[ -n "$no_update" ] && force_no_update="NO_UPDATE=1"
[ -f "files_remove" ] && files_remove="FILES_REMOVE=$(pwd)/files_remove"
echo "-> Cooking firmware image"
join_packages ${!flavor}
echo "--> Selected extra packages:$PKG"
make -C $ib image $profile PACKAGES="$PKG" EXTRA_IMAGE_NAME="$fw_extra_name" BIN_DIR="$output_dir" $ib_files $force_no_update $files_remove
make -C $ib image $profile PACKAGES="$PKG" \
EXTRA_IMAGE_NAME="$fw_extra_name" \
BIN_DIR="$output_dir" \
`ls $ib_files_dir/* 1>/dev/null 2>&1 && echo "FILES=$ib_files_dir"` \
$force_no_update $files_remove
ERROR=$?
if (($ERROR != 0)); then
echo -e "\n-> Firmware not cooked, something wrong happened on the ImageBuilder compilation process"
Expand Down

0 comments on commit f8afee9

Please sign in to comment.