diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/kernel.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/license.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/sstate.bbclass | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index d07f69c5ce..eefe574a60 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -607,8 +607,6 @@ kernel_do_deploy() { | |||
607 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} | 607 | ln -sf ${base_name}.bin ${DEPLOYDIR}/${type} |
608 | done | 608 | done |
609 | 609 | ||
610 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | ||
611 | |||
612 | cd ${B} | 610 | cd ${B} |
613 | # Update deploy directory | 611 | # Update deploy directory |
614 | for type in ${KERNEL_IMAGETYPES} ; do | 612 | for type in ${KERNEL_IMAGETYPES} ; do |
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 660b85f619..721343d0f4 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -279,7 +279,7 @@ def get_deployed_files(man_file): | |||
279 | """ | 279 | """ |
280 | 280 | ||
281 | dep_files = [] | 281 | dep_files = [] |
282 | excluded_files = ["README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt"] | 282 | excluded_files = [] |
283 | with open(man_file, "r") as manifest: | 283 | with open(man_file, "r") as manifest: |
284 | all_files = manifest.read() | 284 | all_files = manifest.read() |
285 | for f in all_files.splitlines(): | 285 | for f in all_files.splitlines(): |
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e2bc7355b4..5b92c5485a 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -30,8 +30,6 @@ SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR | |||
30 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" | 30 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" |
31 | # Archive the sources for many architectures in one deploy folder | 31 | # Archive the sources for many architectures in one deploy folder |
32 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" | 32 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" |
33 | # Ignore overlapping README | ||
34 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR}/sdk/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt" | ||
35 | 33 | ||
36 | SSTATE_SCAN_FILES ?= "*.la *-config *_config" | 34 | SSTATE_SCAN_FILES ?= "*.la *-config *_config" |
37 | SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' | 35 | SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' |