diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
commit | da710c8bb0dea17982efc20ab4ee226a86992e6f (patch) | |
tree | 06c83c9e85c881f40532972aaa1453298236e029 /poky/scripts | |
parent | 6656af78e6c7b48a1252459a61b3b72dce77ab44 (diff) | |
parent | 2795589128d1f7509ac0ab9eba940d868413ac7d (diff) | |
download | openbmc-da710c8bb0dea17982efc20ab4ee226a86992e6f.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/scripts')
-rwxr-xr-x | poky/scripts/gen-lockedsig-cache | 2 | ||||
-rw-r--r-- | poky/scripts/lib/devtool/standard.py | 2 | ||||
-rw-r--r-- | poky/scripts/lib/wic/plugins/imager/direct.py | 3 | ||||
-rwxr-xr-x | poky/scripts/runqemu | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/poky/scripts/gen-lockedsig-cache b/poky/scripts/gen-lockedsig-cache index 48cb67112..9bfae9d83 100755 --- a/poky/scripts/gen-lockedsig-cache +++ b/poky/scripts/gen-lockedsig-cache @@ -24,6 +24,8 @@ def extract_sha(filename): # a map from hash to list of file with that hash def map_sha_to_files(dir_, prefix, sha_map): sstate_prefix_path = dir_ + '/' + prefix + '/' + if not os.path.exists(sstate_prefix_path): + return sstate_files = os.listdir(sstate_prefix_path) for f in sstate_files: try: diff --git a/poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py index 60c9a046f..1646971a9 100644 --- a/poky/scripts/lib/devtool/standard.py +++ b/poky/scripts/lib/devtool/standard.py @@ -2011,7 +2011,7 @@ def finish(args, config, basepath, workspace): no_clean = args.no_clean tinfoil = setup_tinfoil(basepath=basepath, tracking=True) try: - rd = parse_recipe(config, tinfoil, args.recipename, True) + rd = parse_recipe(config, tinfoil, args.recipename, True, False) if not rd: return 1 diff --git a/poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py index 3ce6ad55b..2441cc33a 100644 --- a/poky/scripts/lib/wic/plugins/imager/direct.py +++ b/poky/scripts/lib/wic/plugins/imager/direct.py @@ -316,6 +316,7 @@ class PartitionedImage(): # Size of a sector used in calculations self.sector_size = SECTOR_SIZE self.native_sysroot = native_sysroot + num_real_partitions = len([p for p in self.partitions if not p.no_table]) # calculate the real partition number, accounting for partitions not # in the partition table and logical partitions @@ -325,7 +326,7 @@ class PartitionedImage(): part.realnum = 0 else: realnum += 1 - if self.ptable_format == 'msdos' and realnum > 3 and len(partitions) > 4: + if self.ptable_format == 'msdos' and realnum > 3 and num_real_partitions > 4: part.realnum = realnum + 1 continue part.realnum = realnum diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 1a5aca98a..a05facd0d 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -457,6 +457,7 @@ class BaseConfig(object): del os.environ['PKG_CONFIG_PATH'] del os.environ['PKG_CONFIG_DIR'] del os.environ['PKG_CONFIG_LIBDIR'] + del os.environ['PKG_CONFIG_SYSROOT_DIR'] except KeyError: pass try: @@ -1197,12 +1198,12 @@ class BaseConfig(object): # All branches above set vm_drive. self.rootfs_options = '%s -no-reboot' % vm_drive - self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT')) + self.kernel_cmdline = 'root=%s rw' % (self.get('QB_KERNEL_ROOT')) if self.fstype == 'nfs': self.rootfs_options = '' k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, os.path.abspath(self.rootfs), self.unfs_opts) - self.kernel_cmdline = 'root=%s rw highres=off' % k_root + self.kernel_cmdline = 'root=%s rw' % k_root if self.fstype == 'none': self.rootfs_options = '' |