EL7 compatibility fixes #344
Conversation
|
@miabbott mind doing a rebase from master, and let's put this through an Upshift build? I think we really close to doing EL7 builds there. |
| @@ -42,7 +42,7 @@ def oscontainer_extract(containers_storage, src, dest, | |||
| if commit is None: | |||
| raise SystemExit("Failed to find label '{}'".format(OSCONTAINER_COMMIT_LABEL)) | |||
| iid = inspect['Id'] | |||
| print(f"Preparing to extract cid: {iid}") | |||
There was a problem hiding this comment.
hmm - we are running with python3 in el7 right?
There was a problem hiding this comment.
See my commit message...
TL;DR - we mangle this script to use Python2 on EL7
There was a problem hiding this comment.
yeah I found this:
Line 100 in 460741e
There was a problem hiding this comment.
Also, using .format() is one of the original guidelines noted in #271 😉
There was a problem hiding this comment.
Also, using
.format()is one of the original guidelines noted in #271 wink
yep. that also says * target 3.4 😜
There was a problem hiding this comment.
yep. that also says
* target 3.4
It's not a bad target 😉
The version of `qemu-kvm-rhev` on EL7 is more recent than `qemu-kvm`, so let's use that.
In the EL7 version of the `cosa` image, the `cmd-oscontainer` script gets mangled to use Python2, so f-strings are not an option here.
Must have just missed your changes getting merged...pushed a rebase ⬆️ |
|
LGTM. Merging. |
Against my better judgement, I've been trying to get the EL7 build of the
cosaimage to be usable. This may not be all the required changes, but it got me to a point where I could build the image and then runfetch/build/run/shell/compresssuccessfully.The last papercut noted here was solved by @cgwalters suggestion to use
qemu-kvm-rhev. (On that note, #329 is required for these fixes to be useful)I also had to tweak the
deps.txtto getsyslinuxsuccessfully installed (although, I did not test generating an ISO)Finally, the
cmd-oscontainerscript needed a small change to use.format()instead of f-strings.Depends: #329