diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/scripts/lib/wic/plugins | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/scripts/lib/wic/plugins')
| -rw-r--r-- | poky/scripts/lib/wic/plugins/imager/direct.py | 7 | ||||
| -rw-r--r-- | poky/scripts/lib/wic/plugins/source/empty.py | 32 |
2 files changed, 0 insertions, 39 deletions
diff --git a/poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py index 0ca67b77d..55db826e9 100644 --- a/poky/scripts/lib/wic/plugins/imager/direct.py +++ b/poky/scripts/lib/wic/plugins/imager/direct.py @@ -343,13 +343,6 @@ class PartitionedImage(): part.fsuuid = '0x' + str(uuid.uuid4())[:8].upper() else: part.fsuuid = str(uuid.uuid4()) - else: - #make sure the fsuuid for vfat/msdos align with format 0xYYYYYYYY - if part.fstype == 'vfat' or part.fstype == 'msdos': - if part.fsuuid.upper().startswith("0X"): - part.fsuuid = '0x' + part.fsuuid.upper()[2:].rjust(8,"0") - else: - part.fsuuid = '0x' + part.fsuuid.upper().rjust(8,"0") def prepare(self, imager): """Prepare an image. Call prepare method of all image partitions.""" diff --git a/poky/scripts/lib/wic/plugins/source/empty.py b/poky/scripts/lib/wic/plugins/source/empty.py deleted file mode 100644 index 041617d64..000000000 --- a/poky/scripts/lib/wic/plugins/source/empty.py +++ /dev/null @@ -1,32 +0,0 @@ -# -# SPDX-License-Identifier: MIT -# - -# The empty wic plugin is used to create unformatted empty partitions for wic -# images. -# To use it you must pass "empty" as argument for the "--source" parameter in -# the wks file. For example: -# part foo --source empty --ondisk sda --size="1024" --align 1024 - -import logging - -from wic.pluginbase import SourcePlugin - -logger = logging.getLogger('wic') - -class EmptyPartitionPlugin(SourcePlugin): - """ - Populate unformatted empty partition. - """ - - name = 'empty' - - @classmethod - def do_prepare_partition(cls, part, source_params, cr, cr_workdir, - oe_builddir, bootimg_dir, kernel_dir, - rootfs_dir, native_sysroot): - """ - Called to do the actual content population for a partition i.e. it - 'prepares' the partition to be incorporated into the image. - """ - return |