diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-11-03 03:44:49 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-03 23:32:06 +0300 |
| commit | 4873add6e11c1bd421c83cd08df589f1184aa673 (patch) | |
| tree | aec4845be29329cca2a0b2d7c8f94249e48ed067 /poky/scripts/lib | |
| parent | 56a8292be03a7cb27f3b3ad762f4779e7e5ff47d (diff) | |
| download | openbmc-4873add6e11c1bd421c83cd08df589f1184aa673.tar.xz | |
Revert "poky: subtree update:b23aa6b753..ad30a6d470"
This reverts commit af5e4ef732faedf66c6dc1756432e9de2ac72988.
This commit introduced openbmc/openbmc#3720 and no solution has been
forthcoming. Revert until we can get to the bottom of this.
Change-Id: I2fb0d81eb26cf3dadb2f2abdd1a1bb7a95eaf03c
Diffstat (limited to 'poky/scripts/lib')
| -rw-r--r-- | poky/scripts/lib/devtool/standard.py | 1 | ||||
| -rw-r--r-- | poky/scripts/lib/wic/partition.py | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index 261d642d4..d140b97de 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -531,6 +531,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works initial_rev = None + appendexisted = False recipefile = d.getVar('FILE') appendfile = recipe_to_append(recipefile, config) is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d) diff --git a/poky/scripts/lib/wic/partition.py b/poky/scripts/lib/wic/partition.py index ebe250b00..85eb15c8b 100644 --- a/poky/scripts/lib/wic/partition.py +++ b/poky/scripts/lib/wic/partition.py @@ -199,23 +199,21 @@ class Partition(): Currently handles ext2/3/4, btrfs, vfat and squashfs. """ - - rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, - self.lineno, self.fstype) - if os.path.isfile(rootfs): - os.remove(rootfs) - p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) if (pseudo_dir): pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir pseudo += "export PSEUDO_NOSYMLINKEXP=1;" - pseudo += "export PSEUDO_IGNORE_PATHS=%s;" % (rootfs + "," + (get_bitbake_var("PSEUDO_IGNORE_PATHS") or "")) pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") else: pseudo = None + rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, + self.lineno, self.fstype) + if os.path.isfile(rootfs): + os.remove(rootfs) + if not self.size and real_rootfs: # The rootfs size is not set in .ks file so try to get it # from bitbake variable |