jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/skeleton: don't handle merged /usr for custom skeleton

Browse Source 
In case the user wants to use a custom skeleton, we should not try to
handle the symlinks (resp. mkdir) to handle merged (resp. split) /usr.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2015-11-10 22:36:29 +01:00 committed by Peter Korsgaard
parent 8d9b39a979
commit aab5a2829b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/skeleton/skeleton.mk
View File

@ -15,9 +15,9 @@ SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO
ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)) SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
else else # ! custom skeleton
SKELETON_PATH = system/skeleton SKELETON_PATH = system/skeleton
endif
ifeq ($(BR2_ROOTFS_MERGED_USR),y) ifeq ($(BR2_ROOTFS_MERGED_USR),y)
define SKELETON_USR_SYMLINKS_OR_DIRS define SKELETON_USR_SYMLINKS_OR_DIRS
@ -33,6 +33,8 @@ define SKELETON_USR_SYMLINKS_OR_DIRS
endef endef
endif endif
endif # ! custom skeleton
define SKELETON_INSTALL_TARGET_CMDS define SKELETON_INSTALL_TARGET_CMDS
rsync -a --ignore-times $(SYNC_VCS_EXCLUSIONS) \ rsync -a --ignore-times $(SYNC_VCS_EXCLUSIONS) \
--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \ --chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \