From ccde8906240c23ba0af87063451d23d821786af2 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 10 Nov 2018 19:44:32 +0200 Subject: [PATCH] Remove custom skeleton for initramfs builds --- board/common/skeleton-initramfs/bin/.empty | 0 board/common/skeleton-initramfs/boot/.empty | 0 board/common/skeleton-initramfs/data/.empty | 0 board/common/skeleton-initramfs/dev/log | 1 - board/common/skeleton-initramfs/dev/pts/.empty | 0 board/common/skeleton-initramfs/lib/.empty | 0 board/common/skeleton-initramfs/proc/.empty | 0 board/common/skeleton-initramfs/run | 1 - board/common/skeleton-initramfs/sbin/.empty | 0 board/common/skeleton-initramfs/sys/.empty | 0 board/common/skeleton-initramfs/tmp/.empty | 0 board/common/skeleton-initramfs/usr/lib/.empty | 0 board/common/skeleton-initramfs/var/cache/.empty | 0 board/common/skeleton-initramfs/var/lib/.empty | 0 board/common/skeleton-initramfs/var/lock/.empty | 0 board/common/skeleton-initramfs/var/log/.empty | 0 board/common/skeleton-initramfs/var/run/.empty | 0 board/common/skeleton-initramfs/var/spool/.empty | 0 board/common/skeleton-initramfs/var/tmp/.empty | 0 configs/bananapim1_initramfs_defconfig | 2 -- configs/nanopineo2_initramfs_defconfig | 2 -- configs/nanopineo_initramfs_defconfig | 2 -- configs/odroidc1_initramfs_defconfig | 2 -- configs/odroidc2_initramfs_defconfig | 2 -- configs/odroidxu4_initramfs_defconfig | 2 -- configs/orangepione_initramfs_defconfig | 2 -- configs/pine64_initramfs_defconfig | 2 -- configs/raspberrypi_initramfs_defconfig | 2 -- 28 files changed, 20 deletions(-) delete mode 100644 board/common/skeleton-initramfs/bin/.empty delete mode 100644 board/common/skeleton-initramfs/boot/.empty delete mode 100644 board/common/skeleton-initramfs/data/.empty delete mode 120000 board/common/skeleton-initramfs/dev/log delete mode 100644 board/common/skeleton-initramfs/dev/pts/.empty delete mode 100644 board/common/skeleton-initramfs/lib/.empty delete mode 100644 board/common/skeleton-initramfs/proc/.empty delete mode 120000 board/common/skeleton-initramfs/run delete mode 100644 board/common/skeleton-initramfs/sbin/.empty delete mode 100644 board/common/skeleton-initramfs/sys/.empty delete mode 100644 board/common/skeleton-initramfs/tmp/.empty delete mode 100644 board/common/skeleton-initramfs/usr/lib/.empty delete mode 100644 board/common/skeleton-initramfs/var/cache/.empty delete mode 100644 board/common/skeleton-initramfs/var/lib/.empty delete mode 100644 board/common/skeleton-initramfs/var/lock/.empty delete mode 100644 board/common/skeleton-initramfs/var/log/.empty delete mode 100644 board/common/skeleton-initramfs/var/run/.empty delete mode 100644 board/common/skeleton-initramfs/var/spool/.empty delete mode 100644 board/common/skeleton-initramfs/var/tmp/.empty diff --git a/board/common/skeleton-initramfs/bin/.empty b/board/common/skeleton-initramfs/bin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/boot/.empty b/board/common/skeleton-initramfs/boot/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/data/.empty b/board/common/skeleton-initramfs/data/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/dev/log b/board/common/skeleton-initramfs/dev/log deleted file mode 120000 index d96b3b1cb8..0000000000 --- a/board/common/skeleton-initramfs/dev/log +++ /dev/null @@ -1 +0,0 @@ -../tmp/log \ No newline at end of file diff --git a/board/common/skeleton-initramfs/dev/pts/.empty b/board/common/skeleton-initramfs/dev/pts/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/lib/.empty b/board/common/skeleton-initramfs/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/proc/.empty b/board/common/skeleton-initramfs/proc/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/run b/board/common/skeleton-initramfs/run deleted file mode 120000 index 1c2f433de1..0000000000 --- a/board/common/skeleton-initramfs/run +++ /dev/null @@ -1 +0,0 @@ -tmp \ No newline at end of file diff --git a/board/common/skeleton-initramfs/sbin/.empty b/board/common/skeleton-initramfs/sbin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/sys/.empty b/board/common/skeleton-initramfs/sys/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/tmp/.empty b/board/common/skeleton-initramfs/tmp/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/usr/lib/.empty b/board/common/skeleton-initramfs/usr/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/cache/.empty b/board/common/skeleton-initramfs/var/cache/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/lib/.empty b/board/common/skeleton-initramfs/var/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/lock/.empty b/board/common/skeleton-initramfs/var/lock/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/log/.empty b/board/common/skeleton-initramfs/var/log/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/run/.empty b/board/common/skeleton-initramfs/var/run/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/spool/.empty b/board/common/skeleton-initramfs/var/spool/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton-initramfs/var/tmp/.empty b/board/common/skeleton-initramfs/var/tmp/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/configs/bananapim1_initramfs_defconfig b/configs/bananapim1_initramfs_defconfig index c8562303f7..0ba2dbbb96 100644 --- a/configs/bananapim1_initramfs_defconfig +++ b/configs/bananapim1_initramfs_defconfig @@ -7,8 +7,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapim1/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/nanopineo2_initramfs_defconfig b/configs/nanopineo2_initramfs_defconfig index 6f06611853..9d15808dac 100644 --- a/configs/nanopineo2_initramfs_defconfig +++ b/configs/nanopineo2_initramfs_defconfig @@ -4,8 +4,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo2-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo2/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/nanopineo_initramfs_defconfig b/configs/nanopineo_initramfs_defconfig index 6967be1ee7..bfd5c6b94f 100644 --- a/configs/nanopineo_initramfs_defconfig +++ b/configs/nanopineo_initramfs_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/nanopineo/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/odroidc1_initramfs_defconfig b/configs/odroidc1_initramfs_defconfig index c25b304baf..ab305adae0 100644 --- a/configs/odroidc1_initramfs_defconfig +++ b/configs/odroidc1_initramfs_defconfig @@ -17,8 +17,6 @@ BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_1=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc1/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/odroidc2_initramfs_defconfig b/configs/odroidc2_initramfs_defconfig index 14d1eb01c4..1168a5c6c5 100644 --- a/configs/odroidc2_initramfs_defconfig +++ b/configs/odroidc2_initramfs_defconfig @@ -5,8 +5,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc2-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidc2/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/odroidxu4_initramfs_defconfig b/configs/odroidxu4_initramfs_defconfig index 11c9e613ed..60b17fd790 100644 --- a/configs/odroidxu4_initramfs_defconfig +++ b/configs/odroidxu4_initramfs_defconfig @@ -7,8 +7,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidxu4-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/odroidxu4/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/orangepione_initramfs_defconfig b/configs/orangepione_initramfs_defconfig index 38aebf3f6e..672bf0a3f5 100644 --- a/configs/orangepione_initramfs_defconfig +++ b/configs/orangepione_initramfs_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-orangepione-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/orangepione/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/pine64_initramfs_defconfig b/configs/pine64_initramfs_defconfig index dde8093659..118c761ef7 100644 --- a/configs/pine64_initramfs_defconfig +++ b/configs/pine64_initramfs_defconfig @@ -5,8 +5,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64-initramfs" BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_OPTIMIZATION="-pipe" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/pine64/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y diff --git a/configs/raspberrypi_initramfs_defconfig b/configs/raspberrypi_initramfs_defconfig index a58f3a5aa4..4b43eec379 100644 --- a/configs/raspberrypi_initramfs_defconfig +++ b/configs/raspberrypi_initramfs_defconfig @@ -13,8 +13,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" -BR2_ROOTFS_SKELETON_CUSTOM=y -BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs" BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/raspberrypi/overlay-initramfs" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config" BR2_TARGET_ROOTFS_CPIO=y