EXCLUDE_PKGS: fix bugs
skip in install, will skip when marked for installation/inclusion skip in build, will skip when dependency. This is a bit icky as I think you could assume in catch22 situation, Where something is marked to be skipped, but something else (marked for installtion) depends on it. However the main reason for EXCLUDE_PKGS atm is to exclude emulators in BASE DEVICES (RK-ARMV8-A) that shall be device optimized for actual devices. Later we probably want to have package flags that signal device optimization. EXCLUDE_PKGS is probably to be marked as a power-user feature to be used at your own risk.
This commit is contained in:
parent
7c3d583893
commit
c9a0d3c902
2 changed files with 12 additions and 6 deletions
|
@ -10,6 +10,12 @@ if [ -z "${1}" ]; then
|
|||
die "usage: ${0} package_name[:<host|target|init|bootstrap>] [parent_pkg]"
|
||||
fi
|
||||
|
||||
# Skip excluded packages
|
||||
listcontains "${EXCLUDE_PKGS}" "${PKG_NAME}" && {
|
||||
echo "Skipping ${PKG_NAME} it's listed in EXCLUDE_PKGS"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if [ "${1}" = "--all" ]; then
|
||||
if [ -n "${2}" ]; then
|
||||
for build_dir in $(ls -1d ${ROOT}/build.*); do
|
||||
|
@ -23,12 +29,6 @@ if [ -z "${PKG_NAME}" ]; then
|
|||
die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
|
||||
fi
|
||||
|
||||
# Skip excluded packages
|
||||
listcontains "${EXCLUDE_PKGS}" "${PKG_NAME}" && {
|
||||
echo "Skipping ${PKG_NAME} it's listed in EXCLUDE_PKGS"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if [ -n "${PKG_ARCH}" ]; then
|
||||
listcontains "${PKG_ARCH}" "!${TARGET_ARCH}" && exit 0
|
||||
listcontains "${PKG_ARCH}" "${TARGET_ARCH}" || listcontains "${PKG_ARCH}" "any" || exit 0
|
||||
|
|
|
@ -11,6 +11,12 @@ if [ -z "${1}" ]; then
|
|||
die "usage: ${0} package_name [parent_pkg]"
|
||||
fi
|
||||
|
||||
# Skip excluded packages
|
||||
listcontains "${EXCLUDE_PKGS}" "${PKG_NAME}" && {
|
||||
echo "Skipping ${PKG_NAME} it's listed in EXCLUDE_PKGS"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if [ -z "${PKG_NAME}" ]; then
|
||||
die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue