Browse Source

New top-level directory: system

This directory groups the following elements:
 * the default root filesystem skeleton
 * the default device tables
 * the Config.in options for system configuration (UART port for
   getty, system hostname, etc.)
 * the make rules to apply the system configuration options

Even though the skeleton and device tables could have lived in fs/, it
would have been strange to have the UART, system hostname and other
related options into fs/. A new system/ directory makes more sense.

As a consequence, this patch also removes target/Makefile.in, which
has become useless in the process.

[Peter: fixup TARGET_SKELETON settings / documentation to match]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Thomas Petazzoni 12 năm trước cách đây
mục cha
commit
6c3e3ad419
63 tập tin đã thay đổi với 6 bổ sung9 xóa
  1. 1 1
      Config.in
  2. 2 2
      Makefile
  3. 2 2
      docs/manual/customize-rootfs.txt
  4. 1 1
      system/Config.in
  5. 0 0
      system/device_table.txt
  6. 0 0
      system/device_table_dev.txt
  7. 0 0
      system/skeleton/bin/.empty
  8. 0 0
      system/skeleton/dev/log
  9. 0 0
      system/skeleton/dev/pts/.empty
  10. 0 0
      system/skeleton/etc/fstab
  11. 0 0
      system/skeleton/etc/group
  12. 0 0
      system/skeleton/etc/hostname
  13. 0 0
      system/skeleton/etc/hosts
  14. 0 0
      system/skeleton/etc/init.d/S20urandom
  15. 0 0
      system/skeleton/etc/init.d/S40network
  16. 0 0
      system/skeleton/etc/init.d/rcK
  17. 0 0
      system/skeleton/etc/init.d/rcS
  18. 0 0
      system/skeleton/etc/inittab
  19. 0 0
      system/skeleton/etc/inputrc
  20. 0 0
      system/skeleton/etc/issue
  21. 0 0
      system/skeleton/etc/ld.so.conf.d/.empty
  22. 0 0
      system/skeleton/etc/mtab
  23. 0 0
      system/skeleton/etc/network/if-down.d/.empty
  24. 0 0
      system/skeleton/etc/network/if-post-down.d/.empty
  25. 0 0
      system/skeleton/etc/network/if-pre-up.d/.empty
  26. 0 0
      system/skeleton/etc/network/if-up.d/.empty
  27. 0 0
      system/skeleton/etc/network/interfaces
  28. 0 0
      system/skeleton/etc/passwd
  29. 0 0
      system/skeleton/etc/profile
  30. 0 0
      system/skeleton/etc/protocols
  31. 0 0
      system/skeleton/etc/random-seed
  32. 0 0
      system/skeleton/etc/resolv.conf
  33. 0 0
      system/skeleton/etc/securetty
  34. 0 0
      system/skeleton/etc/services
  35. 0 0
      system/skeleton/etc/shadow
  36. 0 0
      system/skeleton/home/ftp/.empty
  37. 0 0
      system/skeleton/lib/.empty
  38. 0 0
      system/skeleton/media/.empty
  39. 0 0
      system/skeleton/mnt/.empty
  40. 0 0
      system/skeleton/opt/.empty
  41. 0 0
      system/skeleton/proc/.empty
  42. 0 0
      system/skeleton/root/.bash_history
  43. 0 0
      system/skeleton/root/.bash_logout
  44. 0 0
      system/skeleton/root/.bash_profile
  45. 0 0
      system/skeleton/root/.empty
  46. 0 0
      system/skeleton/run
  47. 0 0
      system/skeleton/sbin/.empty
  48. 0 0
      system/skeleton/sys/.empty
  49. 0 0
      system/skeleton/tmp/.empty
  50. 0 0
      system/skeleton/usr/bin/.empty
  51. 0 0
      system/skeleton/usr/lib/.empty
  52. 0 0
      system/skeleton/usr/sbin/.empty
  53. 0 0
      system/skeleton/var/cache
  54. 0 0
      system/skeleton/var/lib/misc
  55. 0 0
      system/skeleton/var/lib/pcmcia
  56. 0 0
      system/skeleton/var/lock
  57. 0 0
      system/skeleton/var/log
  58. 0 0
      system/skeleton/var/pcmcia
  59. 0 0
      system/skeleton/var/run
  60. 0 0
      system/skeleton/var/spool
  61. 0 0
      system/skeleton/var/tmp
  62. 0 0
      system/system.mk
  63. 0 3
      target/Makefile.in

+ 1 - 1
Config.in

@@ -419,7 +419,7 @@ endmenu
 
 source "toolchain/Config.in"
 
-source "target/generic/Config.in"
+source "system/Config.in"
 
 source "package/Config.in"
 

+ 2 - 2
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))

+ 2 - 2
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

+ 1 - 1
target/generic/Config.in → 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

+ 0 - 0
target/generic/device_table.txt → system/device_table.txt


+ 0 - 0
target/generic/device_table_dev.txt → system/device_table_dev.txt


+ 0 - 0
fs/skeleton/bin/.empty → system/skeleton/bin/.empty


+ 0 - 0
fs/skeleton/dev/log → system/skeleton/dev/log


+ 0 - 0
fs/skeleton/dev/pts/.empty → system/skeleton/dev/pts/.empty


+ 0 - 0
fs/skeleton/etc/fstab → system/skeleton/etc/fstab


+ 0 - 0
fs/skeleton/etc/group → system/skeleton/etc/group


+ 0 - 0
fs/skeleton/etc/hostname → system/skeleton/etc/hostname


+ 0 - 0
fs/skeleton/etc/hosts → system/skeleton/etc/hosts


+ 0 - 0
fs/skeleton/etc/init.d/S20urandom → system/skeleton/etc/init.d/S20urandom


+ 0 - 0
fs/skeleton/etc/init.d/S40network → system/skeleton/etc/init.d/S40network


+ 0 - 0
fs/skeleton/etc/init.d/rcK → system/skeleton/etc/init.d/rcK


+ 0 - 0
fs/skeleton/etc/init.d/rcS → system/skeleton/etc/init.d/rcS


+ 0 - 0
fs/skeleton/etc/inittab → system/skeleton/etc/inittab


+ 0 - 0
fs/skeleton/etc/inputrc → system/skeleton/etc/inputrc


+ 0 - 0
fs/skeleton/etc/issue → system/skeleton/etc/issue


+ 0 - 0
fs/skeleton/etc/ld.so.conf.d/.empty → system/skeleton/etc/ld.so.conf.d/.empty


+ 0 - 0
fs/skeleton/etc/mtab → system/skeleton/etc/mtab


+ 0 - 0
fs/skeleton/etc/network/if-down.d/.empty → system/skeleton/etc/network/if-down.d/.empty


+ 0 - 0
fs/skeleton/etc/network/if-post-down.d/.empty → system/skeleton/etc/network/if-post-down.d/.empty


+ 0 - 0
fs/skeleton/etc/network/if-pre-up.d/.empty → system/skeleton/etc/network/if-pre-up.d/.empty


+ 0 - 0
fs/skeleton/etc/network/if-up.d/.empty → system/skeleton/etc/network/if-up.d/.empty


+ 0 - 0
fs/skeleton/etc/network/interfaces → system/skeleton/etc/network/interfaces


+ 0 - 0
fs/skeleton/etc/passwd → system/skeleton/etc/passwd


+ 0 - 0
fs/skeleton/etc/profile → system/skeleton/etc/profile


+ 0 - 0
fs/skeleton/etc/protocols → system/skeleton/etc/protocols


+ 0 - 0
fs/skeleton/etc/random-seed → system/skeleton/etc/random-seed


+ 0 - 0
fs/skeleton/etc/resolv.conf → system/skeleton/etc/resolv.conf


+ 0 - 0
fs/skeleton/etc/securetty → system/skeleton/etc/securetty


+ 0 - 0
fs/skeleton/etc/services → system/skeleton/etc/services


+ 0 - 0
fs/skeleton/etc/shadow → system/skeleton/etc/shadow


+ 0 - 0
fs/skeleton/home/ftp/.empty → system/skeleton/home/ftp/.empty


+ 0 - 0
fs/skeleton/lib/.empty → system/skeleton/lib/.empty


+ 0 - 0
fs/skeleton/media/.empty → system/skeleton/media/.empty


+ 0 - 0
fs/skeleton/mnt/.empty → system/skeleton/mnt/.empty


+ 0 - 0
fs/skeleton/opt/.empty → system/skeleton/opt/.empty


+ 0 - 0
fs/skeleton/proc/.empty → system/skeleton/proc/.empty


+ 0 - 0
fs/skeleton/root/.bash_history → system/skeleton/root/.bash_history


+ 0 - 0
fs/skeleton/root/.bash_logout → system/skeleton/root/.bash_logout


+ 0 - 0
fs/skeleton/root/.bash_profile → system/skeleton/root/.bash_profile


+ 0 - 0
fs/skeleton/root/.empty → system/skeleton/root/.empty


+ 0 - 0
fs/skeleton/run → system/skeleton/run


+ 0 - 0
fs/skeleton/sbin/.empty → system/skeleton/sbin/.empty


+ 0 - 0
fs/skeleton/sys/.empty → system/skeleton/sys/.empty


+ 0 - 0
fs/skeleton/tmp/.empty → system/skeleton/tmp/.empty


+ 0 - 0
fs/skeleton/usr/bin/.empty → system/skeleton/usr/bin/.empty


+ 0 - 0
fs/skeleton/usr/lib/.empty → system/skeleton/usr/lib/.empty


+ 0 - 0
fs/skeleton/usr/sbin/.empty → system/skeleton/usr/sbin/.empty


+ 0 - 0
fs/skeleton/var/cache → system/skeleton/var/cache


+ 0 - 0
fs/skeleton/var/lib/misc → system/skeleton/var/lib/misc


+ 0 - 0
fs/skeleton/var/lib/pcmcia → system/skeleton/var/lib/pcmcia


+ 0 - 0
fs/skeleton/var/lock → system/skeleton/var/lock


+ 0 - 0
fs/skeleton/var/log → system/skeleton/var/log


+ 0 - 0
fs/skeleton/var/pcmcia → system/skeleton/var/pcmcia


+ 0 - 0
fs/skeleton/var/run → system/skeleton/var/run


+ 0 - 0
fs/skeleton/var/spool → system/skeleton/var/spool


+ 0 - 0
fs/skeleton/var/tmp → system/skeleton/var/tmp


+ 0 - 0
target/generic/Makefile.in → system/system.mk


+ 0 - 3
target/Makefile.in

@@ -1,3 +0,0 @@
-# make sure to put everything that is board-specific before the tarroot targets
-include target/generic/Makefile.in
-