63 files changed, 6 insertions, 9 deletions
diff --git a/Config.in b/Config.in
index dab7787df..cce4619cd 100644
--- a/Config.in
+++ b/Config.in
@@ -419,7 +419,7 @@ endmenu
 
 source "toolchain/Config.in"
 
-source "target/generic/Config.in"
+source "system/Config.in"
 
 source "package/Config.in"
 
diff --git a/Makefile b/Makefile
index dff6aeb2f..c526fe1c1 100644
--- a/Makefile
+++ b/Makefile
@@ -259,7 +259,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
-TARGET_SKELETON=$(TOPDIR)/fs/skeleton
+TARGET_SKELETON=$(TOPDIR)/system/skeleton
 
 LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
 REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
@@ -310,7 +310,6 @@ endif
 include package/*/*.mk
 
 include boot/common.mk
-include target/Makefile.in
 include linux/linux.mk
 
 TARGETS+=target-finalize
@@ -325,6 +324,7 @@ TARGETS+=target-generatelocales
 endif
 endif
 
+include system/system.mk
 include fs/common.mk
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 8c3ea82ad..44007c70f 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -11,8 +11,8 @@ There are a few ways to customize the resulting target filesystem:
   rebuild your toolchain and tools, these changes will be lost.
 
 * Create your own 'target skeleton'. You can start with the default
-  skeleton available under +fs/skeleton+ and then customize it to suit
-  your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
+  skeleton available under +system/skeleton+ and then customize it to
+  suit your needs. The +BR2_ROOTFS_SKELETON_CUSTOM+ and
   +BR2_ROOTFS_SKELETON_CUSTOM_PATH+ will allow you to specify the
   location of your custom skeleton. At build time, the contents of the
   skeleton are copied to output/target before any package
diff --git a/target/generic/Config.in b/system/Config.in
index b8472f4e8..c30c6f7d3 100644
--- a/target/generic/Config.in
+++ b/system/Config.in
@@ -111,7 +111,7 @@ endchoice
 if BR2_ROOTFS_SKELETON_CUSTOM
 config BR2_ROOTFS_SKELETON_CUSTOM_PATH
 	string "custom target skeleton path"
-	default "fs/skeleton"
+	default "system/skeleton"
 	help
 	  Path custom target skeleton.
 endif
diff --git a/target/generic/device_table.txt b/system/device_table.txt
index fc397a90c..fc397a90c 100644
--- a/target/generic/device_table.txt
+++ b/system/device_table.txt
diff --git a/target/generic/device_table_dev.txt b/system/device_table_dev.txt
index a93a2c808..a93a2c808 100644
--- a/target/generic/device_table_dev.txt
+++ b/system/device_table_dev.txt
diff --git a/fs/skeleton/bin/.empty b/system/skeleton/bin/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/bin/.empty
+++ b/system/skeleton/bin/.empty
diff --git a/fs/skeleton/dev/log b/system/skeleton/dev/log
index d96b3b1cb..d96b3b1cb 120000
--- a/fs/skeleton/dev/log
+++ b/system/skeleton/dev/log
diff --git a/fs/skeleton/dev/pts/.empty b/system/skeleton/dev/pts/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/dev/pts/.empty
+++ b/system/skeleton/dev/pts/.empty
diff --git a/fs/skeleton/etc/fstab b/system/skeleton/etc/fstab
index a2f56ffa6..a2f56ffa6 100644
--- a/fs/skeleton/etc/fstab
+++ b/system/skeleton/etc/fstab
diff --git a/fs/skeleton/etc/group b/system/skeleton/etc/group
index 8fc486d1a..8fc486d1a 100644
--- a/fs/skeleton/etc/group
+++ b/system/skeleton/etc/group
diff --git a/fs/skeleton/etc/hostname b/system/skeleton/etc/hostname
index 5b26b355e..5b26b355e 100644
--- a/fs/skeleton/etc/hostname
+++ b/system/skeleton/etc/hostname
diff --git a/fs/skeleton/etc/hosts b/system/skeleton/etc/hosts
index ba712fe03..ba712fe03 100644
--- a/fs/skeleton/etc/hosts
+++ b/system/skeleton/etc/hosts
diff --git a/fs/skeleton/etc/init.d/S20urandom b/system/skeleton/etc/init.d/S20urandom
index f73cea59e..f73cea59e 100755
--- a/fs/skeleton/etc/init.d/S20urandom
+++ b/system/skeleton/etc/init.d/S20urandom
diff --git a/fs/skeleton/etc/init.d/S40network b/system/skeleton/etc/init.d/S40network
index e69e61340..e69e61340 100755
--- a/fs/skeleton/etc/init.d/S40network
+++ b/system/skeleton/etc/init.d/S40network
diff --git a/fs/skeleton/etc/init.d/rcK b/system/skeleton/etc/init.d/rcK
index 59e9c54ff..59e9c54ff 100755
--- a/fs/skeleton/etc/init.d/rcK
+++ b/system/skeleton/etc/init.d/rcK
diff --git a/fs/skeleton/etc/init.d/rcS b/system/skeleton/etc/init.d/rcS
index de411534d..de411534d 100755
--- a/fs/skeleton/etc/init.d/rcS
+++ b/system/skeleton/etc/init.d/rcS
diff --git a/fs/skeleton/etc/inittab b/system/skeleton/etc/inittab
index 85881f460..85881f460 100644
--- a/fs/skeleton/etc/inittab
+++ b/system/skeleton/etc/inittab
diff --git a/fs/skeleton/etc/inputrc b/system/skeleton/etc/inputrc
index 2f1cb601a..2f1cb601a 100644
--- a/fs/skeleton/etc/inputrc
+++ b/system/skeleton/etc/inputrc
diff --git a/fs/skeleton/etc/issue b/system/skeleton/etc/issue
index 90f177983..90f177983 100644
--- a/fs/skeleton/etc/issue
+++ b/system/skeleton/etc/issue
diff --git a/fs/skeleton/etc/ld.so.conf.d/.empty b/system/skeleton/etc/ld.so.conf.d/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/etc/ld.so.conf.d/.empty
+++ b/system/skeleton/etc/ld.so.conf.d/.empty
diff --git a/fs/skeleton/etc/mtab b/system/skeleton/etc/mtab
index 4c0a0948b..4c0a0948b 120000
--- a/fs/skeleton/etc/mtab
+++ b/system/skeleton/etc/mtab
diff --git a/fs/skeleton/etc/network/if-down.d/.empty b/system/skeleton/etc/network/if-down.d/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/etc/network/if-down.d/.empty
+++ b/system/skeleton/etc/network/if-down.d/.empty
diff --git a/fs/skeleton/etc/network/if-post-down.d/.empty b/system/skeleton/etc/network/if-post-down.d/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/etc/network/if-post-down.d/.empty
+++ b/system/skeleton/etc/network/if-post-down.d/.empty
diff --git a/fs/skeleton/etc/network/if-pre-up.d/.empty b/system/skeleton/etc/network/if-pre-up.d/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/etc/network/if-pre-up.d/.empty
+++ b/system/skeleton/etc/network/if-pre-up.d/.empty
diff --git a/fs/skeleton/etc/network/if-up.d/.empty b/system/skeleton/etc/network/if-up.d/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/etc/network/if-up.d/.empty
+++ b/system/skeleton/etc/network/if-up.d/.empty
diff --git a/fs/skeleton/etc/network/interfaces b/system/skeleton/etc/network/interfaces
index 218b82cde..218b82cde 100644
--- a/fs/skeleton/etc/network/interfaces
+++ b/system/skeleton/etc/network/interfaces
diff --git a/fs/skeleton/etc/passwd b/system/skeleton/etc/passwd
index ed7006a29..ed7006a29 100644
--- a/fs/skeleton/etc/passwd
+++ b/system/skeleton/etc/passwd
diff --git a/fs/skeleton/etc/profile b/system/skeleton/etc/profile
index 31d3180c0..31d3180c0 100644
--- a/fs/skeleton/etc/profile
+++ b/system/skeleton/etc/profile
diff --git a/fs/skeleton/etc/protocols b/system/skeleton/etc/protocols
index 1ac8a4096..1ac8a4096 100644
--- a/fs/skeleton/etc/protocols
+++ b/system/skeleton/etc/protocols
diff --git a/fs/skeleton/etc/random-seed b/system/skeleton/etc/random-seed
index f26038adc..f26038adc 100644
--- a/fs/skeleton/etc/random-seed
+++ b/system/skeleton/etc/random-seed
diff --git a/fs/skeleton/etc/resolv.conf b/system/skeleton/etc/resolv.conf
index 71f6f9657..71f6f9657 120000
--- a/fs/skeleton/etc/resolv.conf
+++ b/system/skeleton/etc/resolv.conf
diff --git a/fs/skeleton/etc/securetty b/system/skeleton/etc/securetty
index c96f2fb9f..c96f2fb9f 100644
--- a/fs/skeleton/etc/securetty
+++ b/system/skeleton/etc/securetty
diff --git a/fs/skeleton/etc/services b/system/skeleton/etc/services
index b287b63ea..b287b63ea 100644
--- a/fs/skeleton/etc/services
+++ b/system/skeleton/etc/services
diff --git a/fs/skeleton/etc/shadow b/system/skeleton/etc/shadow
index 67b67c196..67b67c196 100644
--- a/fs/skeleton/etc/shadow
+++ b/system/skeleton/etc/shadow
diff --git a/fs/skeleton/home/ftp/.empty b/system/skeleton/home/ftp/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/home/ftp/.empty
+++ b/system/skeleton/home/ftp/.empty
diff --git a/fs/skeleton/lib/.empty b/system/skeleton/lib/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/lib/.empty
+++ b/system/skeleton/lib/.empty
diff --git a/fs/skeleton/media/.empty b/system/skeleton/media/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/media/.empty
+++ b/system/skeleton/media/.empty
diff --git a/fs/skeleton/mnt/.empty b/system/skeleton/mnt/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/mnt/.empty
+++ b/system/skeleton/mnt/.empty
diff --git a/fs/skeleton/opt/.empty b/system/skeleton/opt/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/opt/.empty
+++ b/system/skeleton/opt/.empty
diff --git a/fs/skeleton/proc/.empty b/system/skeleton/proc/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/proc/.empty
+++ b/system/skeleton/proc/.empty
diff --git a/fs/skeleton/root/.bash_history b/system/skeleton/root/.bash_history
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/root/.bash_history
+++ b/system/skeleton/root/.bash_history
diff --git a/fs/skeleton/root/.bash_logout b/system/skeleton/root/.bash_logout
index 77ef1f950..77ef1f950 100644
--- a/fs/skeleton/root/.bash_logout
+++ b/system/skeleton/root/.bash_logout
diff --git a/fs/skeleton/root/.bash_profile b/system/skeleton/root/.bash_profile
index 27bf14953..27bf14953 100644
--- a/fs/skeleton/root/.bash_profile
+++ b/system/skeleton/root/.bash_profile
diff --git a/fs/skeleton/root/.empty b/system/skeleton/root/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/root/.empty
+++ b/system/skeleton/root/.empty
diff --git a/fs/skeleton/run b/system/skeleton/run
index 1c2f433de..1c2f433de 120000
--- a/fs/skeleton/run
+++ b/system/skeleton/run
diff --git a/fs/skeleton/sbin/.empty b/system/skeleton/sbin/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/sbin/.empty
+++ b/system/skeleton/sbin/.empty
diff --git a/fs/skeleton/sys/.empty b/system/skeleton/sys/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/sys/.empty
+++ b/system/skeleton/sys/.empty
diff --git a/fs/skeleton/tmp/.empty b/system/skeleton/tmp/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/tmp/.empty
+++ b/system/skeleton/tmp/.empty
diff --git a/fs/skeleton/usr/bin/.empty b/system/skeleton/usr/bin/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/usr/bin/.empty
+++ b/system/skeleton/usr/bin/.empty
diff --git a/fs/skeleton/usr/lib/.empty b/system/skeleton/usr/lib/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/usr/lib/.empty
+++ b/system/skeleton/usr/lib/.empty
diff --git a/fs/skeleton/usr/sbin/.empty b/system/skeleton/usr/sbin/.empty
index e69de29bb..e69de29bb 100644
--- a/fs/skeleton/usr/sbin/.empty
+++ b/system/skeleton/usr/sbin/.empty
diff --git a/fs/skeleton/var/cache b/system/skeleton/var/cache
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/cache
+++ b/system/skeleton/var/cache
diff --git a/fs/skeleton/var/lib/misc b/system/skeleton/var/lib/misc
index f1fde8c10..f1fde8c10 120000
--- a/fs/skeleton/var/lib/misc
+++ b/system/skeleton/var/lib/misc
diff --git a/fs/skeleton/var/lib/pcmcia b/system/skeleton/var/lib/pcmcia
index f1fde8c10..f1fde8c10 120000
--- a/fs/skeleton/var/lib/pcmcia
+++ b/system/skeleton/var/lib/pcmcia
diff --git a/fs/skeleton/var/lock b/system/skeleton/var/lock
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/lock
+++ b/system/skeleton/var/lock
diff --git a/fs/skeleton/var/log b/system/skeleton/var/log
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/log
+++ b/system/skeleton/var/log
diff --git a/fs/skeleton/var/pcmcia b/system/skeleton/var/pcmcia
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/pcmcia
+++ b/system/skeleton/var/pcmcia
diff --git a/fs/skeleton/var/run b/system/skeleton/var/run
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/run
+++ b/system/skeleton/var/run
diff --git a/fs/skeleton/var/spool b/system/skeleton/var/spool
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/spool
+++ b/system/skeleton/var/spool
diff --git a/fs/skeleton/var/tmp b/system/skeleton/var/tmp
index 1431b0e43..1431b0e43 120000
--- a/fs/skeleton/var/tmp
+++ b/system/skeleton/var/tmp
diff --git a/target/generic/Makefile.in b/system/system.mk
index 4185202b7..4185202b7 100644
--- a/target/generic/Makefile.in
+++ b/system/system.mk
diff --git a/target/Makefile.in b/target/Makefile.in
deleted file mode 100644
index 915d62538..000000000
--- a/target/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# make sure to put everything that is board-specific before the tarroot targets
-include target/generic/Makefile.in
-