From d9119c0bc55de95967b3de67be1fc49101a9d896 Mon Sep 17 00:00:00 2001 From: Dmytro Milinevskyy Date: Wed, 16 Jun 2010 23:22:40 +0300 Subject: [PATCH] move default skeleton to fs/ and drop busybox skeleton [Peter: fixup patch, adjust for busybox.mk changes] Signed-off-by: Dmytro Milinevskyy Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 1 + configs/at91rm9200df_defconfig | 1 - configs/at91rm9200df_ext_defconfig | 1 - configs/at91sam9260dfc_defconfig | 1 - configs/at91sam9260dfc_ext_defconfig | 1 - configs/at91sam9260pf_defconfig | 1 - configs/at91sam9261ek_defconfig | 1 - configs/at91sam9261ek_ext_defconfig | 1 - configs/at91sam9263ek_defconfig | 1 - configs/at91sam9263ek_ext_defconfig | 1 - configs/at91sam9g20dfc_defconfig | 1 - configs/at91sam9g20dfc_ext_defconfig | 1 - configs/atngw100-base_defconfig | 1 - configs/atngw100_defconfig | 1 - configs/atstk1005_defconfig | 1 - configs/atstk100x_defconfig | 1 - configs/i386_defconfig | 1 - configs/i686_defconfig | 1 - configs/integrator926_defconfig | 1 - configs/integrator926_huge_defconfig | 1 - configs/kb9202_defconfig | 1 - configs/v100sc2_defconfig | 1 - .../dev => fs/skeleton/bin}/.empty | 0 .../target_skeleton => fs/skeleton}/dev/log | 0 .../proc => fs/skeleton/dev/pts}/.empty | 0 .../skeleton}/etc/TZ | 0 .../skeleton}/etc/fstab | 0 .../target_skeleton => fs/skeleton}/etc/group | 0 .../skeleton}/etc/hostname | 0 .../skeleton}/etc/hosts | 0 .../skeleton}/etc/init.d/S20urandom | 0 .../skeleton}/etc/init.d/S40network | 0 .../skeleton}/etc/init.d/rcS | 0 .../skeleton}/etc/inittab | 0 .../skeleton}/etc/inputrc | 0 .../skeleton}/etc/issue | 0 .../skeleton/etc/ld.so.conf.d}/.empty | 0 .../skeleton}/etc/mtab | 0 .../skeleton}/etc/network/interfaces | 0 .../skeleton}/etc/passwd | 0 .../skeleton}/etc/profile | 0 .../skeleton}/etc/protocols | 0 .../skeleton}/etc/random-seed | Bin .../skeleton}/etc/resolv.conf | 0 .../skeleton}/etc/securetty | 0 .../skeleton}/etc/services | 0 .../skeleton}/etc/shadow | 0 .../sys => fs/skeleton/home}/.empty | 0 .../tmp => fs/skeleton/lib}/.empty | 0 .../usr/sbin => fs/skeleton/mnt}/.empty | 0 .../bin => fs/skeleton/opt}/.empty | 0 .../dev/pts => fs/skeleton/proc}/.empty | 0 .../skeleton}/root/.bash_history | 0 .../skeleton}/root/.bash_logout | 0 .../skeleton}/root/.bash_profile | 0 .../skeleton}/root/.bashrc | 0 .../ld.so.conf.d => fs/skeleton/root}/.empty | 0 .../home => fs/skeleton/sbin}/.empty | 0 .../lib => fs/skeleton/sys}/.empty | 0 .../mnt => fs/skeleton/tmp}/.empty | 0 .../opt => fs/skeleton/usr/bin}/.empty | 0 .../proc => fs/skeleton/usr/lib}/.empty | 0 .../root => fs/skeleton/usr/sbin}/.empty | 0 .../skeleton}/usr/share/udhcpc/default.script | 0 .../skeleton}/var/cache | 0 .../skeleton}/var/lib/pcmcia | 0 .../skeleton}/var/lock | 0 .../skeleton}/var/log | 0 .../skeleton}/var/pcmcia | 0 .../skeleton}/var/run | 0 .../skeleton}/var/spool | 0 .../skeleton}/var/tmp | 0 package/busybox/Config.in | 6 - package/busybox/busybox.mk | 8 - target/generic/Makefile.in | 7 - .../generic/target_busybox_skeleton/etc/group | 16 - .../target_busybox_skeleton/etc/inittab | 51 --- target/generic/target_skeleton/etc/TZ | 1 - target/generic/target_skeleton/etc/fstab | 8 - target/generic/target_skeleton/etc/hostname | 1 - target/generic/target_skeleton/etc/hosts | 1 - .../target_skeleton/etc/init.d/S20urandom | 54 ---- .../target_skeleton/etc/init.d/S40network | 25 -- target/generic/target_skeleton/etc/init.d/rcS | 27 -- target/generic/target_skeleton/etc/inputrc | 44 --- target/generic/target_skeleton/etc/issue | 3 - target/generic/target_skeleton/etc/mtab | 1 - .../target_skeleton/etc/network/interfaces | 4 - target/generic/target_skeleton/etc/passwd | 15 - target/generic/target_skeleton/etc/profile | 48 --- target/generic/target_skeleton/etc/protocols | 31 -- .../generic/target_skeleton/etc/random-seed | Bin 512 -> 0 bytes .../generic/target_skeleton/etc/resolv.conf | 1 - target/generic/target_skeleton/etc/securetty | 35 -- target/generic/target_skeleton/etc/services | 302 ------------------ target/generic/target_skeleton/etc/shadow | 12 - target/generic/target_skeleton/sbin/.empty | 0 target/generic/target_skeleton/sys/.empty | 0 target/generic/target_skeleton/tmp/.empty | 0 target/generic/target_skeleton/usr/bin/.empty | 0 target/generic/target_skeleton/usr/lib/.empty | 0 .../generic/target_skeleton/usr/sbin/.empty | 0 target/generic/target_skeleton/var/cache | 1 - target/generic/target_skeleton/var/lib/pcmcia | 1 - target/generic/target_skeleton/var/lock | 1 - target/generic/target_skeleton/var/log | 1 - target/generic/target_skeleton/var/pcmcia | 1 - target/generic/target_skeleton/var/run | 1 - target/generic/target_skeleton/var/spool | 1 - target/generic/target_skeleton/var/tmp | 1 - 110 files changed, 1 insertion(+), 730 deletions(-) rename {target/generic/target_busybox_skeleton/dev => fs/skeleton/bin}/.empty (100%) rename {target/generic/target_skeleton => fs/skeleton}/dev/log (100%) rename {target/generic/target_busybox_skeleton/proc => fs/skeleton/dev/pts}/.empty (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/TZ (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/fstab (100%) rename {target/generic/target_skeleton => fs/skeleton}/etc/group (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/hostname (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/hosts (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/init.d/S20urandom (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/init.d/S40network (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/init.d/rcS (100%) rename {target/generic/target_skeleton => fs/skeleton}/etc/inittab (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/inputrc (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/issue (100%) rename {target/generic/target_busybox_skeleton/root => fs/skeleton/etc/ld.so.conf.d}/.empty (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/mtab (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/network/interfaces (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/passwd (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/profile (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/protocols (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/random-seed (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/resolv.conf (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/securetty (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/services (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/etc/shadow (100%) rename {target/generic/target_busybox_skeleton/sys => fs/skeleton/home}/.empty (100%) rename {target/generic/target_busybox_skeleton/tmp => fs/skeleton/lib}/.empty (100%) rename {target/generic/target_busybox_skeleton/usr/sbin => fs/skeleton/mnt}/.empty (100%) rename {target/generic/target_skeleton/bin => fs/skeleton/opt}/.empty (100%) rename {target/generic/target_skeleton/dev/pts => fs/skeleton/proc}/.empty (100%) rename {target/generic/target_skeleton => fs/skeleton}/root/.bash_history (100%) rename {target/generic/target_skeleton => fs/skeleton}/root/.bash_logout (100%) rename {target/generic/target_skeleton => fs/skeleton}/root/.bash_profile (100%) rename {target/generic/target_skeleton => fs/skeleton}/root/.bashrc (100%) rename {target/generic/target_skeleton/etc/ld.so.conf.d => fs/skeleton/root}/.empty (100%) rename {target/generic/target_skeleton/home => fs/skeleton/sbin}/.empty (100%) rename {target/generic/target_skeleton/lib => fs/skeleton/sys}/.empty (100%) rename {target/generic/target_skeleton/mnt => fs/skeleton/tmp}/.empty (100%) rename {target/generic/target_skeleton/opt => fs/skeleton/usr/bin}/.empty (100%) rename {target/generic/target_skeleton/proc => fs/skeleton/usr/lib}/.empty (100%) rename {target/generic/target_skeleton/root => fs/skeleton/usr/sbin}/.empty (100%) rename {target/generic/target_skeleton => fs/skeleton}/usr/share/udhcpc/default.script (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/cache (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/lib/pcmcia (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/lock (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/log (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/pcmcia (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/run (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/spool (100%) rename {target/generic/target_busybox_skeleton => fs/skeleton}/var/tmp (100%) delete mode 100644 target/generic/target_busybox_skeleton/etc/group delete mode 100644 target/generic/target_busybox_skeleton/etc/inittab delete mode 100644 target/generic/target_skeleton/etc/TZ delete mode 100644 target/generic/target_skeleton/etc/fstab delete mode 100644 target/generic/target_skeleton/etc/hostname delete mode 100644 target/generic/target_skeleton/etc/hosts delete mode 100755 target/generic/target_skeleton/etc/init.d/S20urandom delete mode 100755 target/generic/target_skeleton/etc/init.d/S40network delete mode 100755 target/generic/target_skeleton/etc/init.d/rcS delete mode 100644 target/generic/target_skeleton/etc/inputrc delete mode 100644 target/generic/target_skeleton/etc/issue delete mode 120000 target/generic/target_skeleton/etc/mtab delete mode 100644 target/generic/target_skeleton/etc/network/interfaces delete mode 100644 target/generic/target_skeleton/etc/passwd delete mode 100644 target/generic/target_skeleton/etc/profile delete mode 100644 target/generic/target_skeleton/etc/protocols delete mode 100644 target/generic/target_skeleton/etc/random-seed delete mode 120000 target/generic/target_skeleton/etc/resolv.conf delete mode 100644 target/generic/target_skeleton/etc/securetty delete mode 100644 target/generic/target_skeleton/etc/services delete mode 100644 target/generic/target_skeleton/etc/shadow delete mode 100644 target/generic/target_skeleton/sbin/.empty delete mode 100644 target/generic/target_skeleton/sys/.empty delete mode 100644 target/generic/target_skeleton/tmp/.empty delete mode 100644 target/generic/target_skeleton/usr/bin/.empty delete mode 100644 target/generic/target_skeleton/usr/lib/.empty delete mode 100644 target/generic/target_skeleton/usr/sbin/.empty delete mode 120000 target/generic/target_skeleton/var/cache delete mode 120000 target/generic/target_skeleton/var/lib/pcmcia delete mode 120000 target/generic/target_skeleton/var/lock delete mode 120000 target/generic/target_skeleton/var/log delete mode 120000 target/generic/target_skeleton/var/pcmcia delete mode 120000 target/generic/target_skeleton/var/run delete mode 120000 target/generic/target_skeleton/var/spool delete mode 120000 target/generic/target_skeleton/var/tmp diff --git a/Makefile b/Makefile index d6bcb36f01..59151cc2f0 100644 --- a/Makefile +++ b/Makefile @@ -271,6 +271,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps BINARIES_DIR:=$(BASE_DIR)/images TARGET_DIR:=$(BASE_DIR)/target TOOLCHAIN_DIR=$(BASE_DIR)/toolchain +TARGET_SKELETON=$(BASE_DIR)/fs/skeleton BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig index 0d453b6d50..98158b9851 100644 --- a/configs/at91rm9200df_defconfig +++ b/configs/at91rm9200df_defconfig @@ -322,7 +322,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig index 7245b8a491..c73e372730 100644 --- a/configs/at91rm9200df_ext_defconfig +++ b/configs/at91rm9200df_ext_defconfig @@ -248,7 +248,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index 3de2aea07b..f1d63df2e0 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -334,7 +334,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig index e66a541a3d..91cdeddab5 100644 --- a/configs/at91sam9260dfc_ext_defconfig +++ b/configs/at91sam9260dfc_ext_defconfig @@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig index d83bb8c5ca..651041fd38 100644 --- a/configs/at91sam9260pf_defconfig +++ b/configs/at91sam9260pf_defconfig @@ -238,7 +238,6 @@ BR2_BUSYBOX_VERSION="1.13.4" BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig index b8b5d60348..0d2fa0b060 100644 --- a/configs/at91sam9261ek_defconfig +++ b/configs/at91sam9261ek_defconfig @@ -328,7 +328,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig index 7e0e84fb93..ca9a65cefb 100644 --- a/configs/at91sam9261ek_ext_defconfig +++ b/configs/at91sam9261ek_ext_defconfig @@ -287,7 +287,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig index de2a12df4e..6b4f592ff3 100644 --- a/configs/at91sam9263ek_defconfig +++ b/configs/at91sam9263ek_defconfig @@ -327,7 +327,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig index d757aaa2be..3f6c3b8e9d 100644 --- a/configs/at91sam9263ek_ext_defconfig +++ b/configs/at91sam9263ek_ext_defconfig @@ -249,7 +249,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index ffe4636f80..92171d5e87 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -327,7 +327,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig index 2cf2839b64..bd967235f7 100644 --- a/configs/at91sam9g20dfc_ext_defconfig +++ b/configs/at91sam9g20dfc_ext_defconfig @@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.13.2" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig index 8c3d80bd74..f5eba61aab 100644 --- a/configs/atngw100-base_defconfig +++ b/configs/atngw100-base_defconfig @@ -246,7 +246,6 @@ BR2_BUSYBOX_VERSION="1.14.0" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 763cad7766..d1db2da383 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -243,7 +243,6 @@ BR2_BUSYBOX_VERSION="1.16.1" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -BR2_PACKAGE_BUSYBOX_SKELETON=y # BR2_PACKAGE_CUSTOMIZE is not set # diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig index ab8b369980..b90761b723 100644 --- a/configs/atstk1005_defconfig +++ b/configs/atstk1005_defconfig @@ -266,7 +266,6 @@ BR2_BUSYBOX_VERSION="1.13.4" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index da58c26dc5..c12ccf88a4 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -257,7 +257,6 @@ BR2_BUSYBOX_VERSION="1.14.0" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="target/device/Atmel/atstk100x/busybox-1.9.1.config" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/configs/i386_defconfig b/configs/i386_defconfig index 69e6412a37..65825bee42 100644 --- a/configs/i386_defconfig +++ b/configs/i386_defconfig @@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.14.0" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/i686_defconfig b/configs/i686_defconfig index e4d4f98a11..31ce604fd4 100644 --- a/configs/i686_defconfig +++ b/configs/i686_defconfig @@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.14.0" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig index 815d2591d1..2eb22c5d1d 100644 --- a/configs/integrator926_defconfig +++ b/configs/integrator926_defconfig @@ -254,7 +254,6 @@ BR2_BUSYBOX_VERSION="1.13.4" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig index 9b68258355..e44ac5fbaa 100644 --- a/configs/integrator926_huge_defconfig +++ b/configs/integrator926_huge_defconfig @@ -255,7 +255,6 @@ BR2_BUSYBOX_VERSION="1.13.4" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig index f2dddb73cc..2895d8a941 100644 --- a/configs/kb9202_defconfig +++ b/configs/kb9202_defconfig @@ -254,7 +254,6 @@ BR2_BUSYBOX_VERSION="1.13.4" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -# BR2_PACKAGE_BUSYBOX_SKELETON is not set # # The minimum needed to build a uClibc development system diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index 17a627ef26..80f194a56b 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -229,7 +229,6 @@ BR2_BUSYBOX_VERSION="1.12.1" BR2_PACKAGE_BUSYBOX_FULLINSTALL=y BR2_PACKAGE_BUSYBOX_CONFIG="target/device/valka/v100sc2/busybox.config" BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_BUSYBOX_SKELETON=y # # The minimum needed to build a uClibc development system diff --git a/target/generic/target_busybox_skeleton/dev/.empty b/fs/skeleton/bin/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/dev/.empty rename to fs/skeleton/bin/.empty diff --git a/target/generic/target_skeleton/dev/log b/fs/skeleton/dev/log similarity index 100% rename from target/generic/target_skeleton/dev/log rename to fs/skeleton/dev/log diff --git a/target/generic/target_busybox_skeleton/proc/.empty b/fs/skeleton/dev/pts/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/proc/.empty rename to fs/skeleton/dev/pts/.empty diff --git a/target/generic/target_busybox_skeleton/etc/TZ b/fs/skeleton/etc/TZ similarity index 100% rename from target/generic/target_busybox_skeleton/etc/TZ rename to fs/skeleton/etc/TZ diff --git a/target/generic/target_busybox_skeleton/etc/fstab b/fs/skeleton/etc/fstab similarity index 100% rename from target/generic/target_busybox_skeleton/etc/fstab rename to fs/skeleton/etc/fstab diff --git a/target/generic/target_skeleton/etc/group b/fs/skeleton/etc/group similarity index 100% rename from target/generic/target_skeleton/etc/group rename to fs/skeleton/etc/group diff --git a/target/generic/target_busybox_skeleton/etc/hostname b/fs/skeleton/etc/hostname similarity index 100% rename from target/generic/target_busybox_skeleton/etc/hostname rename to fs/skeleton/etc/hostname diff --git a/target/generic/target_busybox_skeleton/etc/hosts b/fs/skeleton/etc/hosts similarity index 100% rename from target/generic/target_busybox_skeleton/etc/hosts rename to fs/skeleton/etc/hosts diff --git a/target/generic/target_busybox_skeleton/etc/init.d/S20urandom b/fs/skeleton/etc/init.d/S20urandom similarity index 100% rename from target/generic/target_busybox_skeleton/etc/init.d/S20urandom rename to fs/skeleton/etc/init.d/S20urandom diff --git a/target/generic/target_busybox_skeleton/etc/init.d/S40network b/fs/skeleton/etc/init.d/S40network similarity index 100% rename from target/generic/target_busybox_skeleton/etc/init.d/S40network rename to fs/skeleton/etc/init.d/S40network diff --git a/target/generic/target_busybox_skeleton/etc/init.d/rcS b/fs/skeleton/etc/init.d/rcS similarity index 100% rename from target/generic/target_busybox_skeleton/etc/init.d/rcS rename to fs/skeleton/etc/init.d/rcS diff --git a/target/generic/target_skeleton/etc/inittab b/fs/skeleton/etc/inittab similarity index 100% rename from target/generic/target_skeleton/etc/inittab rename to fs/skeleton/etc/inittab diff --git a/target/generic/target_busybox_skeleton/etc/inputrc b/fs/skeleton/etc/inputrc similarity index 100% rename from target/generic/target_busybox_skeleton/etc/inputrc rename to fs/skeleton/etc/inputrc diff --git a/target/generic/target_busybox_skeleton/etc/issue b/fs/skeleton/etc/issue similarity index 100% rename from target/generic/target_busybox_skeleton/etc/issue rename to fs/skeleton/etc/issue diff --git a/target/generic/target_busybox_skeleton/root/.empty b/fs/skeleton/etc/ld.so.conf.d/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/root/.empty rename to fs/skeleton/etc/ld.so.conf.d/.empty diff --git a/target/generic/target_busybox_skeleton/etc/mtab b/fs/skeleton/etc/mtab similarity index 100% rename from target/generic/target_busybox_skeleton/etc/mtab rename to fs/skeleton/etc/mtab diff --git a/target/generic/target_busybox_skeleton/etc/network/interfaces b/fs/skeleton/etc/network/interfaces similarity index 100% rename from target/generic/target_busybox_skeleton/etc/network/interfaces rename to fs/skeleton/etc/network/interfaces diff --git a/target/generic/target_busybox_skeleton/etc/passwd b/fs/skeleton/etc/passwd similarity index 100% rename from target/generic/target_busybox_skeleton/etc/passwd rename to fs/skeleton/etc/passwd diff --git a/target/generic/target_busybox_skeleton/etc/profile b/fs/skeleton/etc/profile similarity index 100% rename from target/generic/target_busybox_skeleton/etc/profile rename to fs/skeleton/etc/profile diff --git a/target/generic/target_busybox_skeleton/etc/protocols b/fs/skeleton/etc/protocols similarity index 100% rename from target/generic/target_busybox_skeleton/etc/protocols rename to fs/skeleton/etc/protocols diff --git a/target/generic/target_busybox_skeleton/etc/random-seed b/fs/skeleton/etc/random-seed similarity index 100% rename from target/generic/target_busybox_skeleton/etc/random-seed rename to fs/skeleton/etc/random-seed diff --git a/target/generic/target_busybox_skeleton/etc/resolv.conf b/fs/skeleton/etc/resolv.conf similarity index 100% rename from target/generic/target_busybox_skeleton/etc/resolv.conf rename to fs/skeleton/etc/resolv.conf diff --git a/target/generic/target_busybox_skeleton/etc/securetty b/fs/skeleton/etc/securetty similarity index 100% rename from target/generic/target_busybox_skeleton/etc/securetty rename to fs/skeleton/etc/securetty diff --git a/target/generic/target_busybox_skeleton/etc/services b/fs/skeleton/etc/services similarity index 100% rename from target/generic/target_busybox_skeleton/etc/services rename to fs/skeleton/etc/services diff --git a/target/generic/target_busybox_skeleton/etc/shadow b/fs/skeleton/etc/shadow similarity index 100% rename from target/generic/target_busybox_skeleton/etc/shadow rename to fs/skeleton/etc/shadow diff --git a/target/generic/target_busybox_skeleton/sys/.empty b/fs/skeleton/home/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/sys/.empty rename to fs/skeleton/home/.empty diff --git a/target/generic/target_busybox_skeleton/tmp/.empty b/fs/skeleton/lib/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/tmp/.empty rename to fs/skeleton/lib/.empty diff --git a/target/generic/target_busybox_skeleton/usr/sbin/.empty b/fs/skeleton/mnt/.empty similarity index 100% rename from target/generic/target_busybox_skeleton/usr/sbin/.empty rename to fs/skeleton/mnt/.empty diff --git a/target/generic/target_skeleton/bin/.empty b/fs/skeleton/opt/.empty similarity index 100% rename from target/generic/target_skeleton/bin/.empty rename to fs/skeleton/opt/.empty diff --git a/target/generic/target_skeleton/dev/pts/.empty b/fs/skeleton/proc/.empty similarity index 100% rename from target/generic/target_skeleton/dev/pts/.empty rename to fs/skeleton/proc/.empty diff --git a/target/generic/target_skeleton/root/.bash_history b/fs/skeleton/root/.bash_history similarity index 100% rename from target/generic/target_skeleton/root/.bash_history rename to fs/skeleton/root/.bash_history diff --git a/target/generic/target_skeleton/root/.bash_logout b/fs/skeleton/root/.bash_logout similarity index 100% rename from target/generic/target_skeleton/root/.bash_logout rename to fs/skeleton/root/.bash_logout diff --git a/target/generic/target_skeleton/root/.bash_profile b/fs/skeleton/root/.bash_profile similarity index 100% rename from target/generic/target_skeleton/root/.bash_profile rename to fs/skeleton/root/.bash_profile diff --git a/target/generic/target_skeleton/root/.bashrc b/fs/skeleton/root/.bashrc similarity index 100% rename from target/generic/target_skeleton/root/.bashrc rename to fs/skeleton/root/.bashrc diff --git a/target/generic/target_skeleton/etc/ld.so.conf.d/.empty b/fs/skeleton/root/.empty similarity index 100% rename from target/generic/target_skeleton/etc/ld.so.conf.d/.empty rename to fs/skeleton/root/.empty diff --git a/target/generic/target_skeleton/home/.empty b/fs/skeleton/sbin/.empty similarity index 100% rename from target/generic/target_skeleton/home/.empty rename to fs/skeleton/sbin/.empty diff --git a/target/generic/target_skeleton/lib/.empty b/fs/skeleton/sys/.empty similarity index 100% rename from target/generic/target_skeleton/lib/.empty rename to fs/skeleton/sys/.empty diff --git a/target/generic/target_skeleton/mnt/.empty b/fs/skeleton/tmp/.empty similarity index 100% rename from target/generic/target_skeleton/mnt/.empty rename to fs/skeleton/tmp/.empty diff --git a/target/generic/target_skeleton/opt/.empty b/fs/skeleton/usr/bin/.empty similarity index 100% rename from target/generic/target_skeleton/opt/.empty rename to fs/skeleton/usr/bin/.empty diff --git a/target/generic/target_skeleton/proc/.empty b/fs/skeleton/usr/lib/.empty similarity index 100% rename from target/generic/target_skeleton/proc/.empty rename to fs/skeleton/usr/lib/.empty diff --git a/target/generic/target_skeleton/root/.empty b/fs/skeleton/usr/sbin/.empty similarity index 100% rename from target/generic/target_skeleton/root/.empty rename to fs/skeleton/usr/sbin/.empty diff --git a/target/generic/target_skeleton/usr/share/udhcpc/default.script b/fs/skeleton/usr/share/udhcpc/default.script similarity index 100% rename from target/generic/target_skeleton/usr/share/udhcpc/default.script rename to fs/skeleton/usr/share/udhcpc/default.script diff --git a/target/generic/target_busybox_skeleton/var/cache b/fs/skeleton/var/cache similarity index 100% rename from target/generic/target_busybox_skeleton/var/cache rename to fs/skeleton/var/cache diff --git a/target/generic/target_busybox_skeleton/var/lib/pcmcia b/fs/skeleton/var/lib/pcmcia similarity index 100% rename from target/generic/target_busybox_skeleton/var/lib/pcmcia rename to fs/skeleton/var/lib/pcmcia diff --git a/target/generic/target_busybox_skeleton/var/lock b/fs/skeleton/var/lock similarity index 100% rename from target/generic/target_busybox_skeleton/var/lock rename to fs/skeleton/var/lock diff --git a/target/generic/target_busybox_skeleton/var/log b/fs/skeleton/var/log similarity index 100% rename from target/generic/target_busybox_skeleton/var/log rename to fs/skeleton/var/log diff --git a/target/generic/target_busybox_skeleton/var/pcmcia b/fs/skeleton/var/pcmcia similarity index 100% rename from target/generic/target_busybox_skeleton/var/pcmcia rename to fs/skeleton/var/pcmcia diff --git a/target/generic/target_busybox_skeleton/var/run b/fs/skeleton/var/run similarity index 100% rename from target/generic/target_busybox_skeleton/var/run rename to fs/skeleton/var/run diff --git a/target/generic/target_busybox_skeleton/var/spool b/fs/skeleton/var/spool similarity index 100% rename from target/generic/target_busybox_skeleton/var/spool rename to fs/skeleton/var/spool diff --git a/target/generic/target_busybox_skeleton/var/tmp b/fs/skeleton/var/tmp similarity index 100% rename from target/generic/target_busybox_skeleton/var/tmp rename to fs/skeleton/var/tmp diff --git a/package/busybox/Config.in b/package/busybox/Config.in index a513380b6c..0016406510 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -79,12 +79,6 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS Show packages in menuconfig that are potentially also provided by busybox. -config BR2_PACKAGE_BUSYBOX_SKELETON - bool "use minimal target skeleton" - help - Use a minimal target skeleton. Make sure to select mdev - which is used to populate /dev/. - endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 78bf21a40c..d7b86cbd26 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -85,13 +85,6 @@ define BUSYBOX_PREFER_STATIC endef endif -# Enable mdev for busybox skeleton -ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y) -define BUSYBOX_SKELETON - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - # Disable usage of inetd if netkit-base package is selected ifeq ($(BR2_PACKAGE_NETKITBASE),y) define BUSYBOX_NETKITBASE @@ -120,7 +113,6 @@ define BUSYBOX_CONFIGURE_CMDS $(BUSYBOX_SET_IPV6) $(BUSYBOX_SET_RPC) $(BUSYBOX_PREFER_STATIC) - $(BUSYBOX_SKELETON) $(BUSYBOX_NETKITBASE) $(BUSYBOX_NETKITTELNET) @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \ diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in index 9a56f76040..1ef2a9d827 100644 --- a/target/generic/Makefile.in +++ b/target/generic/Makefile.in @@ -1,10 +1,3 @@ -# Default target skeleton stuff, may be overridden -TARGET_SKELETON=target/generic/target_skeleton - -ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y) -TARGET_SKELETON=target/generic/target_busybox_skeleton -endif - TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE)) TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) diff --git a/target/generic/target_busybox_skeleton/etc/group b/target/generic/target_busybox_skeleton/etc/group deleted file mode 100644 index f78c22cdaa..0000000000 --- a/target/generic/target_busybox_skeleton/etc/group +++ /dev/null @@ -1,16 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -wheel:x:10:root -utmp:x:43: -staff:x:50: -haldaemon:x:68: -dbus:x:81: -nobody:x:99: -nogroup:x:99: -users:x:100: -default:x:1000: diff --git a/target/generic/target_busybox_skeleton/etc/inittab b/target/generic/target_busybox_skeleton/etc/inittab deleted file mode 100644 index bd3912b24c..0000000000 --- a/target/generic/target_busybox_skeleton/etc/inittab +++ /dev/null @@ -1,51 +0,0 @@ -# /etc/inittab -# -# Copyright (C) 2001 Erik Andersen -# -# Note: BusyBox init doesn't support runlevels. The runlevels field is -# completely ignored by BusyBox init. If you want runlevels, use -# sysvinit. -# -# Format for each entry: ::: -# -# id == tty to run on, or empty for /dev/console -# runlevels == ignored -# action == one of sysinit, respawn, askfirst, wait, and once -# process == program to run - -# Startup the system -::sysinit:/bin/mount -t proc none /proc -::sysinit:/bin/mount -t sysfs none /sys -::sysinit:/bin/mount -t tmpfs -o size=64k,mode=0755 none /dev -::sysinit:/bin/mkdir /dev/pts -::sysinit:/bin/mount -t devpts devpts /dev/pts -::sysinit:/bin/echo /sbin/mdev > /proc/sys/kernel/hotplug -::sysinit:/sbin/mdev -s -::sysinit:/bin/mount -o remount,rw / -::sysinit:/bin/mount -a -::sysinit:/bin/hostname -F /etc/hostname -# now run any rc scripts -::sysinit:/etc/init.d/rcS - -# Set up a couple of getty's -tty1::respawn:/sbin/getty 38400 tty1 -tty2::respawn:/sbin/getty 38400 tty2 - -# Put a getty on the serial port -#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL - -# Logging junk -null::sysinit:/bin/touch /var/log/messages -null::respawn:/sbin/syslogd -n -null::respawn:/sbin/klogd -n -tty3::respawn:/usr/bin/tail -f /var/log/messages - -# Stuff to do for the 3-finger salute -::ctrlaltdel:/sbin/reboot - -# Stuff to do before rebooting -null::shutdown:/usr/bin/killall klogd -null::shutdown:/usr/bin/killall syslogd -null::shutdown:/bin/umount -a -r -null::shutdown:/sbin/swapoff -a - diff --git a/target/generic/target_skeleton/etc/TZ b/target/generic/target_skeleton/etc/TZ deleted file mode 100644 index 9fcb2a3c56..0000000000 --- a/target/generic/target_skeleton/etc/TZ +++ /dev/null @@ -1 +0,0 @@ -MST7MDT diff --git a/target/generic/target_skeleton/etc/fstab b/target/generic/target_skeleton/etc/fstab deleted file mode 100644 index 87d9da08ee..0000000000 --- a/target/generic/target_skeleton/etc/fstab +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/fstab: static file system information. -# -# -/dev/root / ext2 rw,noauto 0 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 -tmpfs /tmp tmpfs defaults 0 0 -sysfs /sys sysfs defaults 0 0 diff --git a/target/generic/target_skeleton/etc/hostname b/target/generic/target_skeleton/etc/hostname deleted file mode 100644 index 5b26b355e3..0000000000 --- a/target/generic/target_skeleton/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -buildroot diff --git a/target/generic/target_skeleton/etc/hosts b/target/generic/target_skeleton/etc/hosts deleted file mode 100644 index ba712fe033..0000000000 --- a/target/generic/target_skeleton/etc/hosts +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1 localhost diff --git a/target/generic/target_skeleton/etc/init.d/S20urandom b/target/generic/target_skeleton/etc/init.d/S20urandom deleted file mode 100755 index f73cea59ed..0000000000 --- a/target/generic/target_skeleton/etc/init.d/S20urandom +++ /dev/null @@ -1,54 +0,0 @@ -#! /bin/sh -# -# urandom This script saves the random seed between reboots. -# It is called from the boot, halt and reboot scripts. -# -# Version: @(#)urandom 1.33 22-Jun-1998 miquels@cistron.nl -# - -[ -c /dev/urandom ] || exit 0 -#. /etc/default/rcS - -case "$1" in - start|"") - if [ "$VERBOSE" != no ] - then - echo -n "Initializing random number generator... " - fi - # Load and then save 512 bytes, - # which is the size of the entropy pool - if [ -f /etc/random-seed ] - then - cat /etc/random-seed >/dev/urandom - fi - # check for read only file system - if ! touch /etc/random-seed 2>/dev/null - then - echo "read-only file system detected...done" - exit - fi - rm -f /etc/random-seed - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom start: failed." - umask 022 - [ "$VERBOSE" != no ] && echo "done." - ;; - stop) - if ! touch /etc/random-seed 2>/dev/null - then - exit - fi - # Carry a random seed from shut-down to start-up; - # see documentation in linux/drivers/char/random.c - [ "$VERBOSE" != no ] && echo -n "Saving random seed... " - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom stop: failed." - [ "$VERBOSE" != no ] && echo "done." - ;; - *) - echo "Usage: urandom {start|stop}" >&2 - exit 1 - ;; -esac diff --git a/target/generic/target_skeleton/etc/init.d/S40network b/target/generic/target_skeleton/etc/init.d/S40network deleted file mode 100755 index ad6d250b5b..0000000000 --- a/target/generic/target_skeleton/etc/init.d/S40network +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Start the network.... -# - -case "$1" in - start) - echo "Starting network..." - /sbin/ifup -a - ;; - stop) - echo -n "Stopping network..." - /sbin/ifdown -a - ;; - restart|reload) - "$0" stop - "$0" start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/target/generic/target_skeleton/etc/init.d/rcS b/target/generic/target_skeleton/etc/init.d/rcS deleted file mode 100755 index de411534da..0000000000 --- a/target/generic/target_skeleton/etc/init.d/rcS +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - - -# Start all init scripts in /etc/init.d -# executing them in numerical order. -# -for i in /etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done - diff --git a/target/generic/target_skeleton/etc/inputrc b/target/generic/target_skeleton/etc/inputrc deleted file mode 100644 index 2f1cb601a5..0000000000 --- a/target/generic/target_skeleton/etc/inputrc +++ /dev/null @@ -1,44 +0,0 @@ -# /etc/inputrc - global inputrc for libreadline -# See readline(3readline) and `info readline' for more information. - -# Be 8 bit clean. -set input-meta on -set output-meta on -set bell-style visible - -# To allow the use of 8bit-characters like the german umlauts, comment out -# the line below. However this makes the meta key not work as a meta key, -# which is annoying to those which don't need to type in 8-bit characters. - -# set convert-meta off - -"\e0d": backward-word -"\e0c": forward-word -"\e[h": beginning-of-line -"\e[f": end-of-line -"\e[1~": beginning-of-line -"\e[4~": end-of-line -#"\e[5~": beginning-of-history -#"\e[6~": end-of-history -"\e[3~": delete-char -"\e[2~": quoted-insert - -# Common standard keypad and cursor -# (codes courtsey Werner Fink, ) -#"\e[1~": history-search-backward -"\e[2~": yank -"\e[3~": delete-char -#"\e[4~": set-mark -"\e[5~": history-search-backward -"\e[6~": history-search-forward -# Normal keypad and cursor of xterm -"\e[F": end-of-line -"\e[H": beginning-of-line -# Application keypad and cursor of xterm -"\eOA": previous-history -"\eOC": forward-char -"\eOB": next-history -"\eOD": backward-char -"\eOF": end-of-line -"\eOH": beginning-of-line - diff --git a/target/generic/target_skeleton/etc/issue b/target/generic/target_skeleton/etc/issue deleted file mode 100644 index 90f177983b..0000000000 --- a/target/generic/target_skeleton/etc/issue +++ /dev/null @@ -1,3 +0,0 @@ - -Welcome to Buildroot - diff --git a/target/generic/target_skeleton/etc/mtab b/target/generic/target_skeleton/etc/mtab deleted file mode 120000 index e1c204547b..0000000000 --- a/target/generic/target_skeleton/etc/mtab +++ /dev/null @@ -1 +0,0 @@ -../proc/mounts \ No newline at end of file diff --git a/target/generic/target_skeleton/etc/network/interfaces b/target/generic/target_skeleton/etc/network/interfaces deleted file mode 100644 index 218b82cde5..0000000000 --- a/target/generic/target_skeleton/etc/network/interfaces +++ /dev/null @@ -1,4 +0,0 @@ -# Configure Loopback -auto lo -iface lo inet loopback - diff --git a/target/generic/target_skeleton/etc/passwd b/target/generic/target_skeleton/etc/passwd deleted file mode 100644 index 377d4df5b4..0000000000 --- a/target/generic/target_skeleton/etc/passwd +++ /dev/null @@ -1,15 +0,0 @@ -root:x:0:0:root:/root:/bin/sh -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:100:sync:/bin:/bin/sync -mail:x:8:8:mail:/var/spool/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -operator:x:37:37:Operator:/var:/bin/sh -haldaemon:x:68:68:hald:/:/bin/sh -dbus:x:81:81:dbus:/var/run/dbus:/bin/sh -nobody:x:99:99:nobody:/home:/bin/sh -sshd:x:103:99:Operator:/var:/bin/sh -default:x:1000:1000:Default non-root user:/home/default:/bin/sh diff --git a/target/generic/target_skeleton/etc/profile b/target/generic/target_skeleton/etc/profile deleted file mode 100644 index cc2e0beb87..0000000000 --- a/target/generic/target_skeleton/etc/profile +++ /dev/null @@ -1,48 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login interactive shells. - -export PATH=\ -/bin:\ -/sbin:\ -/usr/bin:\ -/usr/sbin:\ -/usr/bin/X11:\ -/usr/local/bin - -# If running interactively, then: -if [ "$PS1" ]; then - - if [ "$BASH" ]; then - export PS1="[\u@\h \W]\\$ " - alias ll='/bin/ls --color=tty -laFh' - alias ls='/bin/ls --color=tty -F' - export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:'; - else - if [ "`id -u`" -eq 0 ]; then - export PS1='# ' - else - export PS1='$ ' - fi - fi - - export USER=`id -un` - export LOGNAME=$USER - export HOSTNAME=`/bin/hostname` - export HISTSIZE=1000 - export HISTFILESIZE=1000 - export PAGER='/bin/more ' - export EDITOR='/bin/vi' - export INPUTRC=/etc/inputrc - export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile - - ### Some aliases - alias ps2='ps facux ' - alias ps1='ps faxo "%U %t %p %a" ' - alias af='ps af' - alias cls='clear' - alias df='df -h' - alias indent='indent -bad -bap -bbo -nbc -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -cp33 -cs -d0 -di1 -nfc1 -nfca -hnl -i4 -ip0 -l75 -lp -npcs -npsl -nsc -nsob -nss -ts4 ' - #alias bc='bc -l' - alias minicom='minicom -c on' - alias calc='calc -Cd ' - alias bc='calc -Cd ' -fi; diff --git a/target/generic/target_skeleton/etc/protocols b/target/generic/target_skeleton/etc/protocols deleted file mode 100644 index 1ac8a40967..0000000000 --- a/target/generic/target_skeleton/etc/protocols +++ /dev/null @@ -1,31 +0,0 @@ -# /etc/protocols: -# $Id: protocols,v 1.1 2004/10/09 02:49:18 andersen Exp $ -# -# Internet (IP) protocols -# -# from: @(#)protocols 5.1 (Berkeley) 4/17/89 -# -# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992). - -ip 0 IP # internet protocol, pseudo protocol number -icmp 1 ICMP # internet control message protocol -igmp 2 IGMP # Internet Group Management -ggp 3 GGP # gateway-gateway protocol -ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') -st 5 ST # ST datagram mode -tcp 6 TCP # transmission control protocol -egp 8 EGP # exterior gateway protocol -pup 12 PUP # PARC universal packet protocol -udp 17 UDP # user datagram protocol -hmp 20 HMP # host monitoring protocol -xns-idp 22 XNS-IDP # Xerox NS IDP -rdp 27 RDP # "reliable datagram" protocol -iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4 -xtp 36 XTP # Xpress Tranfer Protocol -ddp 37 DDP # Datagram Delivery Protocol -idpr-cmtp 39 IDPR-CMTP # IDPR Control Message Transport -rspf 73 RSPF #Radio Shortest Path First. -vmtp 81 VMTP # Versatile Message Transport -ospf 89 OSPFIGP # Open Shortest Path First IGP -ipip 94 IPIP # Yet Another IP encapsulation -encap 98 ENCAP # Yet Another IP encapsulation diff --git a/target/generic/target_skeleton/etc/random-seed b/target/generic/target_skeleton/etc/random-seed deleted file mode 100644 index f26038adc5d057a0b9d6ce5d3cda02ccb4a4d12e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmV+b0{{Iq0UOB42;n4xpAvJIL$H4mg*!B4&9jh)7+B2j-fX7o@K*bzj;pJ$FwoQzl&MuZ^Wy zrYS)x9vq<)#e~&1uB|_ITW-fntEg1^KXs3>vvgL7?_kg!+6=fg{S7mwkr$#pmPZ13liCc zi|M+im&71p*p+Z|7f(m-aedNFtEezFN-nZHytAhV~}?OM$-f$(%cG(ioV{==Ub4mfZP}OaJJ7 z25tvCcku=>;L?}O-dvK9`}<^gmg@IrnfQm#P>RRF|C9c;GDgEg_bw26{dkIVt1`{` z3#ol{Q_FL91TBD~{uZnRRZ(Otf!KXM&;q)8B The Registered Ports are not controlled by the IANA and on most systems -#> can be used by ordinary user processes or programs executed by ordinary -#> users. -# -#> Ports are used in the TCP [45,106] to name the ends of logical -#> connections which carry long term conversations. For the purpose of -#> providing services to unknown callers, a service contact port is -#> defined. This list specifies the port used by the server process as its -#> contact port. While the IANA can not control uses of these ports it -#> does register or list uses of these ports as a convienence to the -#> community. -# -nfsdstatus 1110/tcp -nfsd-keepalive 1110/udp - -ingreslock 1524/tcp -ingreslock 1524/udp -prospero-np 1525/tcp # Prospero non-privileged -prospero-np 1525/udp -datametrics 1645/tcp old-radius # datametrics / old radius entry -datametrics 1645/udp old-radius # datametrics / old radius entry -sa-msg-port 1646/tcp old-radacct # sa-msg-port / old radacct entry -sa-msg-port 1646/udp old-radacct # sa-msg-port / old radacct entry -radius 1812/tcp # Radius -radius 1812/udp # Radius -radacct 1813/tcp # Radius Accounting -radacct 1813/udp # Radius Accounting -nfsd 2049/tcp nfs -nfsd 2049/udp nfs -cvspserver 2401/tcp # CVS client/server operations -cvspserver 2401/udp # CVS client/server operations -mysql 3306/tcp # MySQL -mysql 3306/udp # MySQL -rfe 5002/tcp # Radio Free Ethernet -rfe 5002/udp # Actually uses UDP only -cfengine 5308/tcp # CFengine -cfengine 5308/udp # CFengine -bbs 7000/tcp # BBS service -# -# -# Kerberos (Project Athena/MIT) services -# Note that these are for Kerberos v4, and are unofficial. Sites running -# v4 should uncomment these and comment out the v5 entries above. -# -kerberos4 750/udp kerberos-iv kdc # Kerberos (server) udp -kerberos4 750/tcp kerberos-iv kdc # Kerberos (server) tcp -kerberos_master 751/udp # Kerberos authentication -kerberos_master 751/tcp # Kerberos authentication -passwd_server 752/udp # Kerberos passwd server -krb_prop 754/tcp # Kerberos slave propagation -krbupdate 760/tcp kreg # Kerberos registration -kpasswd 761/tcp kpwd # Kerberos "passwd" -kpop 1109/tcp # Pop with Kerberos -knetd 2053/tcp # Kerberos de-multiplexor -zephyr-srv 2102/udp # Zephyr server -zephyr-clt 2103/udp # Zephyr serv-hm connection -zephyr-hm 2104/udp # Zephyr hostmanager -eklogin 2105/tcp # Kerberos encrypted rlogin -# -# Unofficial but necessary (for NetBSD) services -# -supfilesrv 871/tcp # SUP server -supfiledbg 1127/tcp # SUP debugging -# -# Datagram Delivery Protocol services -# -rtmp 1/ddp # Routing Table Maintenance Protocol -nbp 2/ddp # Name Binding Protocol -echo 4/ddp # AppleTalk Echo Protocol -zip 6/ddp # Zone Information Protocol -# -# Services added for the Debian GNU/Linux distribution -poppassd 106/tcp # Eudora -poppassd 106/udp # Eudora -mailq 174/tcp # Mailer transport queue for Zmailer -mailq 174/tcp # Mailer transport queue for Zmailer -omirr 808/tcp omirrd # online mirror -omirr 808/udp omirrd # online mirror -rmtcfg 1236/tcp # Gracilis Packeten remote config server -xtel 1313/tcp # french minitel -coda_opcons 1355/udp # Coda opcons (Coda fs) -coda_venus 1363/udp # Coda venus (Coda fs) -coda_auth 1357/udp # Coda auth (Coda fs) -coda_udpsrv 1359/udp # Coda udpsrv (Coda fs) -coda_filesrv 1361/udp # Coda filesrv (Coda fs) -codacon 1423/tcp venus.cmu # Coda Console (Coda fs) -coda_aux1 1431/tcp # coda auxiliary service (Coda fs) -coda_aux1 1431/udp # coda auxiliary service (Coda fs) -coda_aux2 1433/tcp # coda auxiliary service (Coda fs) -coda_aux2 1433/udp # coda auxiliary service (Coda fs) -coda_aux3 1435/tcp # coda auxiliary service (Coda fs) -coda_aux3 1435/udp # coda auxiliary service (Coda fs) -cfinger 2003/tcp # GNU Finger -afbackup 2988/tcp # Afbackup system -afbackup 2988/udp # Afbackup system -icp 3130/tcp # Internet Cache Protocol (Squid) -icp 3130/udp # Internet Cache Protocol (Squid) -postgres 5432/tcp # POSTGRES -postgres 5432/udp # POSTGRES -fax 4557/tcp # FAX transmission service (old) -hylafax 4559/tcp # HylaFAX client-server protocol (new) -noclog 5354/tcp # noclogd with TCP (nocol) -noclog 5354/udp # noclogd with UDP (nocol) -hostmon 5355/tcp # hostmon uses TCP (nocol) -hostmon 5355/udp # hostmon uses TCP (nocol) -ircd 6667/tcp # Internet Relay Chat -ircd 6667/udp # Internet Relay Chat -webcache 8080/tcp # WWW caching service -webcache 8080/udp # WWW caching service -tproxy 8081/tcp # Transparent Proxy -tproxy 8081/udp # Transparent Proxy -mandelspawn 9359/udp mandelbrot # network mandelbrot -amanda 10080/udp # amanda backup services -amandaidx 10082/tcp # amanda backup services -amidxtape 10083/tcp # amanda backup services -isdnlog 20011/tcp # isdn logging system -isdnlog 20011/udp # isdn logging system -vboxd 20012/tcp # voice box system -vboxd 20012/udp # voice box system -binkp 24554/tcp # Binkley -binkp 24554/udp # Binkley -asp 27374/tcp # Address Search Protocol -asp 27374/udp # Address Search Protocol -tfido 60177/tcp # Ifmail -tfido 60177/udp # Ifmail -fido 60179/tcp # Ifmail -fido 60179/udp # Ifmail - -# Local services - diff --git a/target/generic/target_skeleton/etc/shadow b/target/generic/target_skeleton/etc/shadow deleted file mode 100644 index 4941a1ac53..0000000000 --- a/target/generic/target_skeleton/etc/shadow +++ /dev/null @@ -1,12 +0,0 @@ -root::10933:0:99999:7::: -bin:*:10933:0:99999:7::: -daemon:*:10933:0:99999:7::: -adm:*:10933:0:99999:7::: -lp:*:10933:0:99999:7::: -sync:*:10933:0:99999:7::: -shutdown:*:10933:0:99999:7::: -halt:*:10933:0:99999:7::: -uucp:*:10933:0:99999:7::: -operator:*:10933:0:99999:7::: -nobody:*:10933:0:99999:7::: -default::10933:0:99999:7::: diff --git a/target/generic/target_skeleton/sbin/.empty b/target/generic/target_skeleton/sbin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/sys/.empty b/target/generic/target_skeleton/sys/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/tmp/.empty b/target/generic/target_skeleton/tmp/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/usr/bin/.empty b/target/generic/target_skeleton/usr/bin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/usr/lib/.empty b/target/generic/target_skeleton/usr/lib/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/usr/sbin/.empty b/target/generic/target_skeleton/usr/sbin/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/target/generic/target_skeleton/var/cache b/target/generic/target_skeleton/var/cache deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/cache +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/lib/pcmcia b/target/generic/target_skeleton/var/lib/pcmcia deleted file mode 120000 index f1fde8c107..0000000000 --- a/target/generic/target_skeleton/var/lib/pcmcia +++ /dev/null @@ -1 +0,0 @@ -../../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/lock b/target/generic/target_skeleton/var/lock deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/lock +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/log b/target/generic/target_skeleton/var/log deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/log +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/pcmcia b/target/generic/target_skeleton/var/pcmcia deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/pcmcia +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/run b/target/generic/target_skeleton/var/run deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/run +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/spool b/target/generic/target_skeleton/var/spool deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/spool +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file diff --git a/target/generic/target_skeleton/var/tmp b/target/generic/target_skeleton/var/tmp deleted file mode 120000 index 1431b0e432..0000000000 --- a/target/generic/target_skeleton/var/tmp +++ /dev/null @@ -1 +0,0 @@ -../tmp \ No newline at end of file -- 2.30.2