Commit 6c3e3ad4 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ef1e76ae

Config.in

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ endmenu 


source "toolchain/Config.in"



source "target/generic/Config.in"

source "system/Config.in"



source "package/Config.in"

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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))

docs/manual/customize-rootfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

target/generic/Config.in→system/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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