From 31e172f022da42113b99c778468ac58ba18a0251 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 10 Nov 2018 19:40:22 +0200 Subject: [PATCH] Use buildroot internal skeleton --- board/common/{skeleton => overlay}/bin/sh | 0 board/common/{skeleton => overlay}/dev/log | 0 board/common/{skeleton => overlay}/run | 0 board/common/skeleton/bin/.empty | 0 board/common/skeleton/boot/.empty | 0 board/common/skeleton/data/.empty | 0 board/common/skeleton/dev/pts/.empty | 0 board/common/skeleton/lib/.empty | 0 board/common/skeleton/media/.empty | 0 board/common/skeleton/mnt/.empty | 0 board/common/skeleton/opt/.empty | 0 board/common/skeleton/proc/.empty | 0 board/common/skeleton/root/.bash_history | 0 board/common/skeleton/root/.bash_logout | 6 ------ board/common/skeleton/root/.bash_profile | 6 ------ board/common/skeleton/sbin/.empty | 0 board/common/skeleton/sys/.empty | 0 board/common/skeleton/tmp/.empty | 0 board/common/skeleton/usr/bin/.empty | 0 board/common/skeleton/usr/lib/.empty | 0 board/common/skeleton/usr/sbin/.empty | 0 board/common/skeleton/usr/share/.empty | 1 - board/common/skeleton/var/cache/.empty | 0 board/common/skeleton/var/lib/.empty | 0 board/common/skeleton/var/lock/.empty | 0 board/common/skeleton/var/log/.empty | 0 board/common/skeleton/var/run/.empty | 0 board/common/skeleton/var/spool/.empty | 0 board/common/skeleton/var/tmp/.empty | 0 configs/bananapim1_defconfig | 3 +-- configs/nanopineo2_defconfig | 3 +-- configs/nanopineo_defconfig | 3 +-- configs/odroidc1_defconfig | 3 +-- configs/odroidc2_defconfig | 3 +-- configs/odroidxu4_defconfig | 3 +-- configs/orangepione_defconfig | 3 +-- configs/pine64_defconfig | 3 +-- configs/raspberrypi2_defconfig | 3 +-- configs/raspberrypi3_defconfig | 3 +-- configs/raspberrypi_defconfig | 3 +-- 40 files changed, 11 insertions(+), 35 deletions(-) rename board/common/{skeleton => overlay}/bin/sh (100%) rename board/common/{skeleton => overlay}/dev/log (100%) rename board/common/{skeleton => overlay}/run (100%) delete mode 100644 board/common/skeleton/bin/.empty delete mode 100644 board/common/skeleton/boot/.empty delete mode 100644 board/common/skeleton/data/.empty delete mode 100644 board/common/skeleton/dev/pts/.empty delete mode 100644 board/common/skeleton/lib/.empty delete mode 100644 board/common/skeleton/media/.empty delete mode 100644 board/common/skeleton/mnt/.empty delete mode 100644 board/common/skeleton/opt/.empty delete mode 100644 board/common/skeleton/proc/.empty delete mode 100644 board/common/skeleton/root/.bash_history delete mode 100644 board/common/skeleton/root/.bash_logout delete mode 100644 board/common/skeleton/root/.bash_profile delete mode 100644 board/common/skeleton/sbin/.empty delete mode 100644 board/common/skeleton/sys/.empty delete mode 100644 board/common/skeleton/tmp/.empty delete mode 100644 board/common/skeleton/usr/bin/.empty delete mode 100644 board/common/skeleton/usr/lib/.empty delete mode 100644 board/common/skeleton/usr/sbin/.empty delete mode 100644 board/common/skeleton/usr/share/.empty delete mode 100644 board/common/skeleton/var/cache/.empty delete mode 100644 board/common/skeleton/var/lib/.empty delete mode 100644 board/common/skeleton/var/lock/.empty delete mode 100644 board/common/skeleton/var/log/.empty delete mode 100644 board/common/skeleton/var/run/.empty delete mode 100644 board/common/skeleton/var/spool/.empty delete mode 100644 board/common/skeleton/var/tmp/.empty diff --git a/board/common/skeleton/bin/sh b/board/common/overlay/bin/sh similarity index 100% rename from board/common/skeleton/bin/sh rename to board/common/overlay/bin/sh diff --git a/board/common/skeleton/dev/log b/board/common/overlay/dev/log similarity index 100% rename from board/common/skeleton/dev/log rename to board/common/overlay/dev/log diff --git a/board/common/skeleton/run b/board/common/overlay/run similarity index 100% rename from board/common/skeleton/run rename to board/common/overlay/run diff --git a/board/common/skeleton/bin/.empty b/board/common/skeleton/bin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/boot/.empty b/board/common/skeleton/boot/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/data/.empty b/board/common/skeleton/data/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/dev/pts/.empty b/board/common/skeleton/dev/pts/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/lib/.empty b/board/common/skeleton/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/media/.empty b/board/common/skeleton/media/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/mnt/.empty b/board/common/skeleton/mnt/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/opt/.empty b/board/common/skeleton/opt/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/proc/.empty b/board/common/skeleton/proc/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/root/.bash_history b/board/common/skeleton/root/.bash_history deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/root/.bash_logout b/board/common/skeleton/root/.bash_logout deleted file mode 100644 index d0fb6fceb5..0000000000 --- a/board/common/skeleton/root/.bash_logout +++ /dev/null @@ -1,6 +0,0 @@ -# when leaving the console clear the screen to increase privacy - -case "`tty`" in - /dev/tty[0-9]*) clear -esac - diff --git a/board/common/skeleton/root/.bash_profile b/board/common/skeleton/root/.bash_profile deleted file mode 100644 index 01cdf1b624..0000000000 --- a/board/common/skeleton/root/.bash_profile +++ /dev/null @@ -1,6 +0,0 @@ -umask 022 - -if [ -f ~/.bashrc ]; then - source ~/.bashrc -fi - diff --git a/board/common/skeleton/sbin/.empty b/board/common/skeleton/sbin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/sys/.empty b/board/common/skeleton/sys/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/tmp/.empty b/board/common/skeleton/tmp/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/usr/bin/.empty b/board/common/skeleton/usr/bin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/usr/lib/.empty b/board/common/skeleton/usr/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/usr/sbin/.empty b/board/common/skeleton/usr/sbin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/usr/share/.empty b/board/common/skeleton/usr/share/.empty deleted file mode 100644 index 8b13789179..0000000000 --- a/board/common/skeleton/usr/share/.empty +++ /dev/null @@ -1 +0,0 @@ - diff --git a/board/common/skeleton/var/cache/.empty b/board/common/skeleton/var/cache/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/lib/.empty b/board/common/skeleton/var/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/lock/.empty b/board/common/skeleton/var/lock/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/log/.empty b/board/common/skeleton/var/log/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/run/.empty b/board/common/skeleton/var/run/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/spool/.empty b/board/common/skeleton/var/spool/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/common/skeleton/var/tmp/.empty b/board/common/skeleton/var/tmp/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/configs/bananapim1_defconfig b/configs/bananapim1_defconfig index 452bb1664b..e1c581d8ca 100644 --- a/configs/bananapim1_defconfig +++ b/configs/bananapim1_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/bananapim1/overlay" @@ -61,6 +59,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/nanopineo2_defconfig b/configs/nanopineo2_defconfig index 9534034bf0..e7e4b1945d 100644 --- a/configs/nanopineo2_defconfig +++ b/configs/nanopineo2_defconfig @@ -5,8 +5,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo2" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/nanopineo2/overlay" @@ -52,6 +50,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/nanopineo_defconfig b/configs/nanopineo_defconfig index c04a825efb..f93cadd862 100644 --- a/configs/nanopineo_defconfig +++ b/configs/nanopineo_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-nanopineo" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/nanopineo/overlay" @@ -53,6 +51,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig index 65171e63df..6e90067077 100644 --- a/configs/odroidc1_defconfig +++ b/configs/odroidc1_defconfig @@ -16,8 +16,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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc1/overlay" @@ -65,6 +63,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index aae4490d53..92372f680a 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -4,8 +4,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc2" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay" @@ -53,6 +51,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 5a314dc11e..86106048d7 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidxu4" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidxu4/overlay" @@ -55,6 +53,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig index f80c0a6fb4..57b04f9b53 100644 --- a/configs/orangepione_defconfig +++ b/configs/orangepione_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-orangepione" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/orangepione/overlay" @@ -56,6 +54,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index 29aa31ef58..4f7e1144f4 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -4,8 +4,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-pine64" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/pine64/overlay" @@ -52,6 +50,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 00d4a4a388..e7f5f236c1 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi2" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay" @@ -59,6 +57,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 7e9cc01bb2..3b0ab274e8 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,8 +6,6 @@ BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi3" 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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay" @@ -59,6 +57,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 1ed5ef71a7..f9df5e3377 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -13,8 +13,6 @@ BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_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" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay" @@ -67,6 +65,7 @@ BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP_CLIENT=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y