Skip to content

Commit d151b5e

Browse files
committed
board/common: skip qemu.sh et al for bootloader builds
Signed-off-by: Joachim Wiberg <[email protected]>
1 parent 0491c1f commit d151b5e

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

board/common/post-image.sh

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,30 @@ if [ "$FIT_IMAGE" = "y" ]; then
8686
$common/mkfit.sh
8787
fi
8888

89+
# Only for regular builds, not bootloader-only builds
8990
if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
9091
rel=$(ver)
9192
ln -sf rootfs.squashfs "$BINARIES_DIR/${NAME}${rel}.img"
9293
if [ -n "$rel" ]; then
9394
ln -sf "${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
9495
fi
95-
fi
9696

97-
# Menuconfig support for modifying Qemu args in release tarballs
98-
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/rootfs/usr/bin/onieprom" "$BINARIES_DIR/"
99-
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/qemu.sh" "$BINARIES_DIR/"
100-
sed -e "s/@ARCH@/QEMU_$BR2_ARCH/" \
101-
-e "s/@DISK_IMG@/$diskimg/" \
102-
< "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/Config.in.in" \
103-
> "$BINARIES_DIR/Config.in"
104-
rm -f "$BINARIES_DIR/qemu.cfg"
105-
CONFIG_="CONFIG_" BR2_CONFIG="$BINARIES_DIR/qemu.cfg" \
106-
"$O/build/buildroot-config/conf" --olddefconfig "$BINARIES_DIR/Config.in"
107-
rm -f "$BINARIES_DIR/qemu.cfg.old" "$BINARIES_DIR/.config.old"
108-
109-
# Quick intro for beginners, with links to more information
110-
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/README.txt" "$BINARIES_DIR/"
97+
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/rootfs/usr/bin/onieprom" "$BINARIES_DIR/"
98+
99+
# Menuconfig support for modifying Qemu args in release tarballs
100+
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/qemu.sh" "$BINARIES_DIR/"
101+
sed -e "s/@ARCH@/QEMU_$BR2_ARCH/" \
102+
-e "s/@DISK_IMG@/$diskimg/" \
103+
< "$BR2_EXTERNAL_INFIX_PATH/board/common/qemu/Config.in.in" \
104+
> "$BINARIES_DIR/Config.in"
105+
rm -f "$BINARIES_DIR/qemu.cfg"
106+
CONFIG_="CONFIG_" BR2_CONFIG="$BINARIES_DIR/qemu.cfg" \
107+
"$O/build/buildroot-config/conf" --olddefconfig "$BINARIES_DIR/Config.in"
108+
rm -f "$BINARIES_DIR/qemu.cfg.old" "$BINARIES_DIR/.config.old"
109+
110+
# Quick intro for beginners, with links to more information
111+
cp "$BR2_EXTERNAL_INFIX_PATH/board/common/README.txt" "$BINARIES_DIR/"
112+
fi
111113

112114
boards=$(${BR2_EXTERNAL_INFIX_PATH}/board/common/selected-boards.sh ${BR2_EXTERNAL_INFIX_PATH} ${O})
113115
for board in $boards; do

0 commit comments

Comments
 (0)