diff --git a/build.sh b/build.sh index bc68756c93..ab9791ee18 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z "$1" ]; then - echo "Usage: $0 [mkimage|mkrelease|clean-target|initramfs|make-targets...]" + echo "Usage: $0 <{board}|all|boards> [mkimage|mkrelease|clean-target|initramfs|make-targets...]" echo " mkimage - creates the OS image (.img)" echo " mkrelease - creates the compressed OS image (.img.gz, .img.xz)" echo " clean-target - removes the target dir, preserving the package build dirs" @@ -36,8 +36,17 @@ else osversion=$(source $basedir/board/common/overlay/etc/version && echo $os_version) fi -# when the special "all" keyword is used for board, -# all boards are processed, in turn +# when the special "boards" keyword is used for board, simply list all known boards +if [ "$board" == "boards" ]; then + boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1) + for b in $boards; do + echo $b + done + + exit 0 +fi + +# when the special "all" keyword is used for board, all boards are processed, in turn if [ "$board" == "all" ]; then boards=$(ls $basedir/configs/*_defconfig | grep -v initramfs | grep -oE '\w+_defconfig$' | cut -d '_' -f 1) for b in $boards; do diff --git a/configs/bananapim1_initramfs_defconfig b/configs/bananapim1_initramfs_defconfig index 0ba2dbbb96..62a412d04a 100644 --- a/configs/bananapim1_initramfs_defconfig +++ b/configs/bananapim1_initramfs_defconfig @@ -1,7 +1,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_DL_DIR="$(TOPDIR)/dl" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1-initramfs" BR2_OPTIMIZE_2=y @@ -9,6 +8,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapim1/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/nanopineo2_initramfs_defconfig b/configs/nanopineo2_initramfs_defconfig index 9d15808dac..9daee1d6d9 100644 --- a/configs/nanopineo2_initramfs_defconfig +++ b/configs/nanopineo2_initramfs_defconfig @@ -6,6 +6,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo2/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/configs/nanopineo_initramfs_defconfig b/configs/nanopineo_initramfs_defconfig index bfd5c6b94f..072a55a532 100644 --- a/configs/nanopineo_initramfs_defconfig +++ b/configs/nanopineo_initramfs_defconfig @@ -8,6 +8,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/configs/odroidc1_initramfs_defconfig b/configs/odroidc1_initramfs_defconfig index ab305adae0..0f5b191097 100644 --- a/configs/odroidc1_initramfs_defconfig +++ b/configs/odroidc1_initramfs_defconfig @@ -3,7 +3,6 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_DL_DIR="$(TOPDIR)/dl" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc1-initramfs" BR2_OPTIMIZE_2=y @@ -19,6 +18,9 @@ BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc1/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/odroidc2_initramfs_defconfig b/configs/odroidc2_initramfs_defconfig index 1168a5c6c5..e6cf4cafe6 100644 --- a/configs/odroidc2_initramfs_defconfig +++ b/configs/odroidc2_initramfs_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_DL_DIR="$(TOPDIR)/dl" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc2-initramfs" BR2_OPTIMIZE_2=y @@ -7,6 +6,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc2/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/odroidxu4_initramfs_defconfig b/configs/odroidxu4_initramfs_defconfig index 60b17fd790..df5f8be426 100644 --- a/configs/odroidxu4_initramfs_defconfig +++ b/configs/odroidxu4_initramfs_defconfig @@ -1,7 +1,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_DL_DIR="$(TOPDIR)/dl" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidxu4-initramfs" BR2_OPTIMIZE_2=y @@ -9,6 +8,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidxu4/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/orangepione_initramfs_defconfig b/configs/orangepione_initramfs_defconfig index 672bf0a3f5..e0cfc253fa 100644 --- a/configs/orangepione_initramfs_defconfig +++ b/configs/orangepione_initramfs_defconfig @@ -8,6 +8,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/orangepione/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/configs/pine64_initramfs_defconfig b/configs/pine64_initramfs_defconfig index 118c761ef7..3a942d5819 100644 --- a/configs/pine64_initramfs_defconfig +++ b/configs/pine64_initramfs_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_DL_DIR="$(TOPDIR)/dl" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64-initramfs" BR2_OPTIMIZE_2=y @@ -7,7 +6,9 @@ BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/pine64/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set - diff --git a/configs/raspberrypi2_initramfs_defconfig b/configs/raspberrypi2_initramfs_defconfig deleted file mode 120000 index b5e177d02e..0000000000 --- a/configs/raspberrypi2_initramfs_defconfig +++ /dev/null @@ -1 +0,0 @@ -raspberrypi_initramfs_defconfig \ No newline at end of file diff --git a/configs/raspberrypi2_initramfs_defconfig b/configs/raspberrypi2_initramfs_defconfig new file mode 100644 index 0000000000..2b7f24ba72 --- /dev/null +++ b/configs/raspberrypi2_initramfs_defconfig @@ -0,0 +1,22 @@ +BR2_arm=y +BR2_arm1176jzf_s=y +BR2_CCACHE=y +BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi-initramfs" +BR2_OPTIMIZE_2=y +BR2_STATIC_LIBS=y +BR2_KERNEL_HEADERS_4_4=y +# BR2_UCLIBC_INSTALL_UTILS is not set +BR2_BINUTILS_VERSION_2_31_X=y +BR2_GCC_VERSION_5_X=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_OPTIMIZATION="-pipe" +BR2_TARGET_GENERIC_HOSTNAME="" +BR2_TARGET_GENERIC_ISSUE="" +BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs" +BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/raspberrypi3_initramfs_defconfig b/configs/raspberrypi3_initramfs_defconfig deleted file mode 120000 index b5e177d02e..0000000000 --- a/configs/raspberrypi3_initramfs_defconfig +++ /dev/null @@ -1 +0,0 @@ -raspberrypi_initramfs_defconfig \ No newline at end of file diff --git a/configs/raspberrypi3_initramfs_defconfig b/configs/raspberrypi3_initramfs_defconfig new file mode 100644 index 0000000000..2b7f24ba72 --- /dev/null +++ b/configs/raspberrypi3_initramfs_defconfig @@ -0,0 +1,22 @@ +BR2_arm=y +BR2_arm1176jzf_s=y +BR2_CCACHE=y +BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi-initramfs" +BR2_OPTIMIZE_2=y +BR2_STATIC_LIBS=y +BR2_KERNEL_HEADERS_4_4=y +# BR2_UCLIBC_INSTALL_UTILS is not set +BR2_BINUTILS_VERSION_2_31_X=y +BR2_GCC_VERSION_5_X=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TARGET_OPTIMIZATION="-pipe" +BR2_TARGET_GENERIC_HOSTNAME="" +BR2_TARGET_GENERIC_ISSUE="" +BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs" +BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/raspberrypi_initramfs_defconfig b/configs/raspberrypi_initramfs_defconfig index b55a26926b..2b7f24ba72 100644 --- a/configs/raspberrypi_initramfs_defconfig +++ b/configs/raspberrypi_initramfs_defconfig @@ -14,6 +14,9 @@ BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" +BR2_PACKAGE_E2FSPROGS=y +# BR2_PACKAGE_E2FSPROGS_FSCK is not set +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_TAR is not set