Message ID | 20170327164730.16271-3-etienne.phelip@savoirfairelinux.com |
---|---|
State | Changes Requested |
Headers | show |
On 27-03-17 18:47, Phelip Etienne wrote: > This use the generic genimage wrapper for the raspberrypi instead of > calling genimage ourselves. > > Signed-off-by: Phelip Etienne <etienne.phelip@savoirfairelinux.com> > --- > board/raspberrypi/post-image.sh | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh > index b2bb070..a58fa11 100755 > --- a/board/raspberrypi/post-image.sh > +++ b/board/raspberrypi/post-image.sh > @@ -3,7 +3,6 @@ > BOARD_DIR="$(dirname $0)" > BOARD_NAME="$(basename ${BOARD_DIR})" > GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" > -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > > case "${2}" in > --add-pi3-miniuart-bt-overlay) Since this part is in fact only used by raspberrypi3_defconfig, you can actually change all other raspberrypi?_defconfigs to call genimage.sh directly, and use this script only for raspberry3. Then the argument is no longer needed either. Regards, Arnout > @@ -18,13 +17,6 @@ __EOF__ > ;; > esac > > -rm -rf "${GENIMAGE_TMP}" > - > -genimage \ > - --rootpath "${TARGET_DIR}" \ > - --tmppath "${GENIMAGE_TMP}" \ > - --inputpath "${BINARIES_DIR}" \ > - --outputpath "${BINARIES_DIR}" \ > - --config "${GENIMAGE_CFG}" > +sh ./support/scripts/genimage.sh ${GENIMAGE_CFG} > > exit $? >
diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index b2bb070..a58fa11 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -3,7 +3,6 @@ BOARD_DIR="$(dirname $0)" BOARD_NAME="$(basename ${BOARD_DIR})" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" case "${2}" in --add-pi3-miniuart-bt-overlay) @@ -18,13 +17,6 @@ __EOF__ ;; esac -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" +sh ./support/scripts/genimage.sh ${GENIMAGE_CFG} exit $?
This use the generic genimage wrapper for the raspberrypi instead of calling genimage ourselves. Signed-off-by: Phelip Etienne <etienne.phelip@savoirfairelinux.com> --- board/raspberrypi/post-image.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)