NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

system: provide no default for custom skeleton path

Browse Source 
Being custom means that our default one is not suitable to start with.
So there is no reason to offer it as the default path.

Add a check that it is not empty.

Add a separating empty line, for good measure, too.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Romain Naour <romain.naour@openwide.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2016-07-17 10:44:25 +02:00 committed by Thomas Petazzoni
parent fbbd7ce201
commit b541b9ff94
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/skeleton/skeleton.mk
View File

@ -17,6 +17,12 @@ ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)) SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
ifeq ($(BR_BUILDING),y)
ifeq ($(SKELETON_PATH),)
$(error No path specified for the custom skeleton)
endif
endif
ifeq ($(BR2_ROOTFS_MERGED_USR),y) ifeq ($(BR2_ROOTFS_MERGED_USR),y)
# Ensure the user has prepared a merged /usr. # Ensure the user has prepared a merged /usr.

2
system/Config.in
View File

@ -184,9 +184,9 @@ config BR2_ROOTFS_SKELETON_CUSTOM
endchoice endchoice
if BR2_ROOTFS_SKELETON_CUSTOM if BR2_ROOTFS_SKELETON_CUSTOM
config BR2_ROOTFS_SKELETON_CUSTOM_PATH config BR2_ROOTFS_SKELETON_CUSTOM_PATH
string "custom target skeleton path" string "custom target skeleton path"
default "system/skeleton"
help help
Path to custom target skeleton. Path to custom target skeleton.