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/ksparser.py | |
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/ksparser.py')
-rw-r--r-- | poky/scripts/lib/wic/ksparser.py | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/poky/scripts/lib/wic/ksparser.py b/poky/scripts/lib/wic/ksparser.py index 3eb669da3..913e3283d 100644 --- a/poky/scripts/lib/wic/ksparser.py +++ b/poky/scripts/lib/wic/ksparser.py @@ -229,23 +229,6 @@ class KickStart(): err = "%s:%d: SquashFS does not support LABEL" \ % (confpath, lineno) raise KickStartError(err) - if parsed.fstype == 'msdos' or parsed.fstype == 'vfat': - if parsed.fsuuid: - if parsed.fsuuid.upper().startswith('0X'): - if len(parsed.fsuuid) > 10: - err = "%s:%d: fsuuid %s given in wks kickstart file " \ - "exceeds the length limit for %s filesystem. " \ - "It should be in the form of a 32 bit hexadecimal" \ - "number (for example, 0xABCD1234)." \ - % (confpath, lineno, parsed.fsuuid, parsed.fstype) - raise KickStartError(err) - elif len(parsed.fsuuid) > 8: - err = "%s:%d: fsuuid %s given in wks kickstart file " \ - "exceeds the length limit for %s filesystem. " \ - "It should be in the form of a 32 bit hexadecimal" \ - "number (for example, 0xABCD1234)." \ - % (confpath, lineno, parsed.fsuuid, parsed.fstype) - raise KickStartError(err) if parsed.use_label and not parsed.label: err = "%s:%d: Must set the label with --label" \ % (confpath, lineno) |