jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/skeleton: make it a virtual package

Browse Source 
We now have two packages that can act as a skeleton, skeleton-common,
also known as our default skeleton, and skeleton-custom.

This means that the skeleton package can be a standard virtual package
now.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-08-02 00:52:18 +02:00 committed by Thomas Petazzoni
parent 22cf98c6af
commit cb09e1c81f
7 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/skeleton-common/Config.in
View File

@ -1,3 +1,6 @@
config BR2_PACKAGE_SKELETON_COMMON config BR2_PACKAGE_SKELETON_COMMON
bool bool
select BR2_PACKAGE_SKELETON select BR2_PACKAGE_HAS_SKELETON
config BR2_PACKAGE_PROVIDES_SKELETON
default "skeleton-common" if BR2_PACKAGE_SKELETON_COMMON

2
package/skeleton-common/skeleton-common.mk
View File

@ -11,6 +11,8 @@
SKELETON_COMMON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_COMMON_ADD_TOOLCHAIN_DEPENDENCY = NO
SKELETON_COMMON_ADD_SKELETON_DEPENDENCY = NO SKELETON_COMMON_ADD_SKELETON_DEPENDENCY = NO
SKELETON_COMMON_PROVIDES = skeleton
# The skeleton also handles the merged /usr case in the sysroot # The skeleton also handles the merged /usr case in the sysroot
SKELETON_COMMON_INSTALL_STAGING = YES SKELETON_COMMON_INSTALL_STAGING = YES

5
package/skeleton-custom/Config.in
View File

@ -1,3 +1,6 @@
config BR2_PACKAGE_SKELETON_CUSTOM config BR2_PACKAGE_SKELETON_CUSTOM
bool bool
select BR2_PACKAGE_SKELETON select BR2_PACKAGE_HAS_SKELETON
config BR2_PACKAGE_PROVIDES_SKELETON
default "skeleton-custom" if BR2_PACKAGE_SKELETON_CUSTOM

3
package/skeleton-custom/skeleton-custom.mk
View File

@ -11,7 +11,8 @@
SKELETON_CUSTOM_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_CUSTOM_ADD_TOOLCHAIN_DEPENDENCY = NO
SKELETON_CUSTOM_ADD_SKELETON_DEPENDENCY = NO SKELETON_CUSTOM_ADD_SKELETON_DEPENDENCY = NO
# The skeleton also handles the merged /usr case in the sysroot SKELETON_CUSTOM_PROVIDES = skeleton
SKELETON_CUSTOM_INSTALL_STAGING = YES SKELETON_CUSTOM_INSTALL_STAGING = YES
SKELETON_CUSTOM_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)) SKELETON_CUSTOM_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))

9
package/skeleton/Config.in
View File

@ -1,4 +1,9 @@
config BR2_PACKAGE_SKELETON config BR2_PACKAGE_SKELETON
bool bool
help default y
The basic skeleton for your rootfs.
config BR2_PACKAGE_HAS_SKELETON
bool
config BR2_PACKAGE_PROVIDES_SKELETON
string

8
package/skeleton/skeleton.mk
View File

@ -11,10 +11,4 @@
SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO
SKELETON_ADD_SKELETON_DEPENDENCY = NO SKELETON_ADD_SKELETON_DEPENDENCY = NO
ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM),y) $(eval $(virtual-package))
SKELETON_DEPENDENCIES = skeleton-custom
else
SKELETON_DEPENDENCIES = skeleton-common
endif
$(eval $(generic-package))

4
system/Config.in
View File

@ -1,5 +1,9 @@
menu "System configuration" menu "System configuration"
# Note: usually, it is not possible to select a provider of a virtual
# package. But here we have an exception: there are only two providers
# and they only get selected each by separate entries in this choice.
# So this is a safe situation.
choice choice
prompt "Root FS skeleton" prompt "Root FS skeleton"