diff options
-rw-r--r-- | Config.in | 2 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | docs/manual/customize-rootfs.txt | 4 | ||||
-rw-r--r-- | system/Config.in (renamed from target/generic/Config.in) | 2 | ||||
-rw-r--r-- | system/device_table.txt (renamed from target/generic/device_table.txt) | 0 | ||||
-rw-r--r-- | system/device_table_dev.txt (renamed from target/generic/device_table_dev.txt) | 0 | ||||
-rw-r--r-- | system/skeleton/bin/.empty (renamed from fs/skeleton/bin/.empty) | 0 | ||||
l--------- | system/skeleton/dev/log (renamed from fs/skeleton/dev/log) | 0 | ||||
-rw-r--r-- | system/skeleton/dev/pts/.empty (renamed from fs/skeleton/dev/pts/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/fstab (renamed from fs/skeleton/etc/fstab) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/group (renamed from fs/skeleton/etc/group) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/hostname (renamed from fs/skeleton/etc/hostname) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/hosts (renamed from fs/skeleton/etc/hosts) | 0 | ||||
-rwxr-xr-x | system/skeleton/etc/init.d/S20urandom (renamed from fs/skeleton/etc/init.d/S20urandom) | 0 | ||||
-rwxr-xr-x | system/skeleton/etc/init.d/S40network (renamed from fs/skeleton/etc/init.d/S40network) | 0 | ||||
-rwxr-xr-x | system/skeleton/etc/init.d/rcK (renamed from fs/skeleton/etc/init.d/rcK) | 0 | ||||
-rwxr-xr-x | system/skeleton/etc/init.d/rcS (renamed from fs/skeleton/etc/init.d/rcS) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/inittab (renamed from fs/skeleton/etc/inittab) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/inputrc (renamed from fs/skeleton/etc/inputrc) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/issue (renamed from fs/skeleton/etc/issue) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/ld.so.conf.d/.empty (renamed from fs/skeleton/etc/ld.so.conf.d/.empty) | 0 | ||||
l--------- | system/skeleton/etc/mtab (renamed from fs/skeleton/etc/mtab) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/network/if-down.d/.empty (renamed from fs/skeleton/etc/network/if-down.d/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/network/if-post-down.d/.empty (renamed from fs/skeleton/etc/network/if-post-down.d/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/network/if-pre-up.d/.empty (renamed from fs/skeleton/etc/network/if-pre-up.d/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/network/if-up.d/.empty (renamed from fs/skeleton/etc/network/if-up.d/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/network/interfaces (renamed from fs/skeleton/etc/network/interfaces) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/passwd (renamed from fs/skeleton/etc/passwd) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/profile (renamed from fs/skeleton/etc/profile) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/protocols (renamed from fs/skeleton/etc/protocols) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/random-seed (renamed from fs/skeleton/etc/random-seed) | bin | 512 -> 512 bytes | |||
l--------- | system/skeleton/etc/resolv.conf (renamed from fs/skeleton/etc/resolv.conf) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/securetty (renamed from fs/skeleton/etc/securetty) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/services (renamed from fs/skeleton/etc/services) | 0 | ||||
-rw-r--r-- | system/skeleton/etc/shadow (renamed from fs/skeleton/etc/shadow) | 0 | ||||
-rw-r--r-- | system/skeleton/home/ftp/.empty (renamed from fs/skeleton/home/ftp/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/lib/.empty (renamed from fs/skeleton/lib/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/media/.empty (renamed from fs/skeleton/media/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/mnt/.empty (renamed from fs/skeleton/mnt/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/opt/.empty (renamed from fs/skeleton/opt/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/proc/.empty (renamed from fs/skeleton/proc/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/root/.bash_history (renamed from fs/skeleton/root/.bash_history) | 0 | ||||
-rw-r--r-- | system/skeleton/root/.bash_logout (renamed from fs/skeleton/root/.bash_logout) | 0 | ||||
-rw-r--r-- | system/skeleton/root/.bash_profile (renamed from fs/skeleton/root/.bash_profile) | 0 | ||||
-rw-r--r-- | system/skeleton/root/.empty (renamed from fs/skeleton/root/.empty) | 0 | ||||
l--------- | system/skeleton/run (renamed from fs/skeleton/run) | 0 | ||||
-rw-r--r-- | system/skeleton/sbin/.empty (renamed from fs/skeleton/sbin/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/sys/.empty (renamed from fs/skeleton/sys/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/tmp/.empty (renamed from fs/skeleton/tmp/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/usr/bin/.empty (renamed from fs/skeleton/usr/bin/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/usr/lib/.empty (renamed from fs/skeleton/usr/lib/.empty) | 0 | ||||
-rw-r--r-- | system/skeleton/usr/sbin/.empty (renamed from fs/skeleton/usr/sbin/.empty) | 0 | ||||
l--------- | system/skeleton/var/cache (renamed from fs/skeleton/var/cache) | 0 | ||||
l--------- | system/skeleton/var/lib/misc (renamed from fs/skeleton/var/lib/misc) | 0 | ||||
l--------- | system/skeleton/var/lib/pcmcia (renamed from fs/skeleton/var/lib/pcmcia) | 0 | ||||
l--------- | system/skeleton/var/lock (renamed from fs/skeleton/var/lock) | 0 | ||||
l--------- | system/skeleton/var/log (renamed from fs/skeleton/var/log) | 0 | ||||
l--------- | system/skeleton/var/pcmcia (renamed from fs/skeleton/var/pcmcia) | 0 | ||||
l--------- | system/skeleton/var/run (renamed from fs/skeleton/var/run) | 0 | ||||
l--------- | system/skeleton/var/spool (renamed from fs/skeleton/var/spool) | 0 | ||||
l--------- | system/skeleton/var/tmp (renamed from fs/skeleton/var/tmp) | 0 | ||||
-rw-r--r-- | system/system.mk (renamed from target/generic/Makefile.in) | 0 | ||||
-rw-r--r-- | target/Makefile.in | 3 |
63 files changed, 6 insertions, 9 deletions
@@ -419,7 +419,7 @@ endmenu source "toolchain/Config.in" -source "target/generic/Config.in" +source "system/Config.in" source "package/Config.in" @@ -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 8c3ea82ad5..44007c70ff 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 b8472f4e8d..c30c6f7d3c 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 fc397a90c9..fc397a90c9 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 a93a2c8083..a93a2c8083 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 e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/bin/.empty +++ b/system/skeleton/bin/.empty diff --git a/fs/skeleton/dev/log b/system/skeleton/dev/log index d96b3b1cb8..d96b3b1cb8 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 e69de29bb2..e69de29bb2 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 a2f56ffa65..a2f56ffa65 100644 --- a/fs/skeleton/etc/fstab +++ b/system/skeleton/etc/fstab diff --git a/fs/skeleton/etc/group b/system/skeleton/etc/group index 8fc486d1a6..8fc486d1a6 100644 --- a/fs/skeleton/etc/group +++ b/system/skeleton/etc/group diff --git a/fs/skeleton/etc/hostname b/system/skeleton/etc/hostname index 5b26b355e3..5b26b355e3 100644 --- a/fs/skeleton/etc/hostname +++ b/system/skeleton/etc/hostname diff --git a/fs/skeleton/etc/hosts b/system/skeleton/etc/hosts index ba712fe033..ba712fe033 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 f73cea59ed..f73cea59ed 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 e69e61340a..e69e61340a 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 59e9c54ff9..59e9c54ff9 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 de411534da..de411534da 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 85881f4607..85881f4607 100644 --- a/fs/skeleton/etc/inittab +++ b/system/skeleton/etc/inittab diff --git a/fs/skeleton/etc/inputrc b/system/skeleton/etc/inputrc index 2f1cb601a5..2f1cb601a5 100644 --- a/fs/skeleton/etc/inputrc +++ b/system/skeleton/etc/inputrc diff --git a/fs/skeleton/etc/issue b/system/skeleton/etc/issue index 90f177983b..90f177983b 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 e69de29bb2..e69de29bb2 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 4c0a0948bc..4c0a0948bc 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 218b82cde5..218b82cde5 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 ed7006a29c..ed7006a29c 100644 --- a/fs/skeleton/etc/passwd +++ b/system/skeleton/etc/passwd diff --git a/fs/skeleton/etc/profile b/system/skeleton/etc/profile index 31d3180c0d..31d3180c0d 100644 --- a/fs/skeleton/etc/profile +++ b/system/skeleton/etc/profile diff --git a/fs/skeleton/etc/protocols b/system/skeleton/etc/protocols index 1ac8a40967..1ac8a40967 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 Binary files differindex f26038adc5..f26038adc5 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 71f6f96576..71f6f96576 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 c96f2fb9f3..c96f2fb9f3 100644 --- a/fs/skeleton/etc/securetty +++ b/system/skeleton/etc/securetty diff --git a/fs/skeleton/etc/services b/system/skeleton/etc/services index b287b63ea0..b287b63ea0 100644 --- a/fs/skeleton/etc/services +++ b/system/skeleton/etc/services diff --git a/fs/skeleton/etc/shadow b/system/skeleton/etc/shadow index 67b67c1960..67b67c1960 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/lib/.empty +++ b/system/skeleton/lib/.empty diff --git a/fs/skeleton/media/.empty b/system/skeleton/media/.empty index e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/media/.empty +++ b/system/skeleton/media/.empty diff --git a/fs/skeleton/mnt/.empty b/system/skeleton/mnt/.empty index e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/mnt/.empty +++ b/system/skeleton/mnt/.empty diff --git a/fs/skeleton/opt/.empty b/system/skeleton/opt/.empty index e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/opt/.empty +++ b/system/skeleton/opt/.empty diff --git a/fs/skeleton/proc/.empty b/system/skeleton/proc/.empty index e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 77ef1f9508..77ef1f9508 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 27bf14953d..27bf14953d 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 e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/root/.empty +++ b/system/skeleton/root/.empty diff --git a/fs/skeleton/run b/system/skeleton/run index 1c2f433de1..1c2f433de1 120000 --- a/fs/skeleton/run +++ b/system/skeleton/run diff --git a/fs/skeleton/sbin/.empty b/system/skeleton/sbin/.empty index e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/sbin/.empty +++ b/system/skeleton/sbin/.empty diff --git a/fs/skeleton/sys/.empty b/system/skeleton/sys/.empty index e69de29bb2..e69de29bb2 100644 --- a/fs/skeleton/sys/.empty +++ b/system/skeleton/sys/.empty diff --git a/fs/skeleton/tmp/.empty b/system/skeleton/tmp/.empty index e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 e69de29bb2..e69de29bb2 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 1431b0e432..1431b0e432 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 f1fde8c107..f1fde8c107 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 f1fde8c107..f1fde8c107 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 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/lock +++ b/system/skeleton/var/lock diff --git a/fs/skeleton/var/log b/system/skeleton/var/log index 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/log +++ b/system/skeleton/var/log diff --git a/fs/skeleton/var/pcmcia b/system/skeleton/var/pcmcia index 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/pcmcia +++ b/system/skeleton/var/pcmcia diff --git a/fs/skeleton/var/run b/system/skeleton/var/run index 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/run +++ b/system/skeleton/var/run diff --git a/fs/skeleton/var/spool b/system/skeleton/var/spool index 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/spool +++ b/system/skeleton/var/spool diff --git a/fs/skeleton/var/tmp b/system/skeleton/var/tmp index 1431b0e432..1431b0e432 120000 --- a/fs/skeleton/var/tmp +++ b/system/skeleton/var/tmp diff --git a/target/generic/Makefile.in b/system/system.mk index 4185202b73..4185202b73 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 915d62538c..0000000000 --- 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 - |