diff options
author | Baptiste Durand <baptiste.durand@open.eurogiciel.org> | 2015-05-06 10:08:17 +0200 |
---|---|---|
committer | Baptiste Durand <baptiste.durand@open.eurogiciel.org> | 2015-05-06 14:46:46 +0200 |
commit | 0c042ad8e5070ac96480d593913a29ac2f7e4664 (patch) | |
tree | a81322f03efad04d1ba27a472381f614fbf42b1d | |
parent | f6bbc5f5a2a1d6eb6fd6d31954fc764929a3c93b (diff) | |
download | meta-tizen-0c042ad8e5070ac96480d593913a29ac2f7e4664.tar.gz meta-tizen-0c042ad8e5070ac96480d593913a29ac2f7e4664.tar.bz2 meta-tizen-0c042ad8e5070ac96480d593913a29ac2f7e4664.zip |
Revert commits d0439b9c 9bdffab9
Signed-off-by: Baptiste Durand <baptiste.durand@open.eurogiciel.org>
-rw-r--r-- | meta-tizen-common-base/classes/metatizen.bbclass | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta-tizen-common-base/classes/metatizen.bbclass b/meta-tizen-common-base/classes/metatizen.bbclass index 5f776863..721dee77 100644 --- a/meta-tizen-common-base/classes/metatizen.bbclass +++ b/meta-tizen-common-base/classes/metatizen.bbclass @@ -1,19 +1,15 @@ + +DIRFILES = "1" + + + python () { if bb.data.inherits_class('rootfs_rpm', d): rootfsdepends = d.getVarFlag("do_rootfs", "depends", True) rootfsdepends = rootfsdepends.replace("rpmresolve-native:do_populate_sysroot", "") d.setVarFlag("do_rootfs", "depends", rootfsdepends) - - if bb.data.inherits_class('image-live', d): - bootimgdepends = d.getVarFlag("do_bootimg", "depends", True) - bootimgdepends = bootimgdepends.replace(d.expand("${INITRD_IMAGE}:do_rootfs"), "") - d.setVarFlag("do_bootimg", "depends", bootimgdepends) - d.setVar("INITRD_IMAGE", "") - d.setVar("INITRD", "") } -DIRFILES = "1" - # MANIFESTFILES_<pn> is the Tizen Smack .manifest file to be used for a binary .rpm. # It must be part of the source tree (either at the root or in a sub-directory) # or get created there during configure. Out-of-tree compilation is not supported. |