From a89765b09bb681acad81d0eab121f95d2f982298 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 21 Nov 2018 23:21:44 +0200 Subject: [PATCH] initramfs configs: remove e2fsprogs --- configs/bananapim1_initramfs_defconfig | 5 ++--- configs/nanopineo2_initramfs_defconfig | 5 ++--- configs/nanopineo_initramfs_defconfig | 5 ++--- configs/odroidc1_initramfs_defconfig | 5 ++--- configs/odroidc2_initramfs_defconfig | 5 ++--- configs/odroidxu4_initramfs_defconfig | 5 ++--- configs/orangepione_initramfs_defconfig | 5 ++--- configs/pine64_initramfs_defconfig | 5 ++--- configs/raspberrypi2_initramfs_defconfig | 5 ++--- configs/raspberrypi3_initramfs_defconfig | 5 ++--- configs/raspberrypi_initramfs_defconfig | 5 ++--- 11 files changed, 22 insertions(+), 33 deletions(-) diff --git a/configs/bananapim1_initramfs_defconfig b/configs/bananapim1_initramfs_defconfig index 62a412d04a..41635e9574 100644 --- a/configs/bananapim1_initramfs_defconfig +++ b/configs/bananapim1_initramfs_defconfig @@ -8,9 +8,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 9daee1d6d9..265d59ca3a 100644 --- a/configs/nanopineo2_initramfs_defconfig +++ b/configs/nanopineo2_initramfs_defconfig @@ -6,9 +6,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 072a55a532..709e0ac606 100644 --- a/configs/nanopineo_initramfs_defconfig +++ b/configs/nanopineo_initramfs_defconfig @@ -8,9 +8,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 0f5b191097..22366974b3 100644 --- a/configs/odroidc1_initramfs_defconfig +++ b/configs/odroidc1_initramfs_defconfig @@ -18,9 +18,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 e6cf4cafe6..5d414065a6 100644 --- a/configs/odroidc2_initramfs_defconfig +++ b/configs/odroidc2_initramfs_defconfig @@ -6,9 +6,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 df5f8be426..a91875221c 100644 --- a/configs/odroidxu4_initramfs_defconfig +++ b/configs/odroidxu4_initramfs_defconfig @@ -8,9 +8,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 e0cfc253fa..81de8031d7 100644 --- a/configs/orangepione_initramfs_defconfig +++ b/configs/orangepione_initramfs_defconfig @@ -8,9 +8,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 3a942d5819..cf34332e04 100644 --- a/configs/pine64_initramfs_defconfig +++ b/configs/pine64_initramfs_defconfig @@ -6,9 +6,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 index 2b7f24ba72..4bb8992d15 100644 --- a/configs/raspberrypi2_initramfs_defconfig +++ b/configs/raspberrypi2_initramfs_defconfig @@ -14,9 +14,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 index 2b7f24ba72..4bb8992d15 100644 --- a/configs/raspberrypi3_initramfs_defconfig +++ b/configs/raspberrypi3_initramfs_defconfig @@ -14,9 +14,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=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 f06095fb0b..768e1ceb9c 100644 --- a/configs/raspberrypi_initramfs_defconfig +++ b/configs/raspberrypi_initramfs_defconfig @@ -20,9 +20,8 @@ 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_PACKAGE_UTIL_LINUX=y +BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y # BR2_TARGET_ROOTFS_TAR is not set