Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*build*: Make ppc64le build anacondaless #816

Merged
merged 1 commit into from
Oct 9, 2019
Merged

*build*: Make ppc64le build anacondaless #816

merged 1 commit into from
Oct 9, 2019

Conversation

jcajka
Copy link
Collaborator

@jcajka jcajka commented Oct 7, 2019

ppc64le(pseries,PowerNV) anacondaless build.

Allow partition layout to differ per arch, i.e. to include and omit certain partitions.
Use generic Linux FS uuid for root partition as discussed in the #795

Fix: #795

@jcajka
Copy link
Collaborator Author

jcajka commented Oct 7, 2019

For the record tested on ppc64le and x86_64 on Fri. There has been changes to the master over weekend that required rebase, in process to retest the rebase.

ajeddeloh
ajeddeloh reviewed Oct 7, 2019
View reviewed changes
src/cmd-buildextend-metal
@@ -63,7 +63,7 @@ if [ $# -ne 0 ]; then
fi

case "$basearch" in
"x86_64"|"aarch64"|"s390x") use_anaconda=;;
"x86_64"|"aarch64"|"s390x"|"ppc64le") use_anaconda=;;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is all the arches, we can drop the case

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would still argue there are other arches(riscv,arm32,...) and would leave it as is until anaconda gets dropped completely.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but we should aim to just implement those anaconda-less off the bat.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

100% agree, after this PR we should just remove all of the Anaconda-related code.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't disagree, but I think that drop of anaconda is out of the scope for this PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, agreed - this PR as is is fine.

src/create_disk.sh Outdated Show resolved Hide resolved
src/create_disk.sh Outdated Show resolved Hide resolved
src/create_disk.sh Outdated Show resolved Hide resolved
src/create_disk.sh
;;
ppc64le)
# to populate PReP Boot, i.e. support pseries
grub2-install --target=powerpc-ieee1275 --boot-directory rootfs/boot --no-nvram "${disk}${PREPPN}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the plan wrt petitboot?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For petitboot, recent bare metal ppcs(PowerNV), just the grub.cfg on /boot/grub2 should be good enough(no need for PReP Boot partition, etc.) as it searches for know configs on its own.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastic. Do we have a way to test this? Shouldn't block this PR, but it would be good to verify that works.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do plan to and will keep you updated.

@jcajka jcajka force-pushed the ppc-anacondaless branch 2 times, most recently from 69687df to ea197bb Compare October 8, 2019 10:51
@jcajka
Copy link
Collaborator Author

jcajka commented Oct 8, 2019

I'm now getting this on ppc64le:

+ systemctl --user --global preset-all
Created symlink /etc/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer -> /usr/lib/systemd/user/systemd-tmpfiles-clean.timer.
Created symlink /etc/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service -> /usr/lib/systemd/user/systemd-tmpfiles-setup.service.
Created symlink /etc/systemd/user/sockets.target.wants/dbus.socket -> /usr/lib/systemd/user/dbus.socket.
Created symlink /etc/systemd/user/dbus.service -> /usr/lib/systemd/user/dbus-broker.service.
Created symlink /etc/systemd/user/multi-user.target.wants/io.podman.service -> /usr/lib/systemd/user/io.podman.service.
Created symlink /etc/systemd/user/sockets.target.wants/io.podman.socket -> /usr/lib/systemd/user/io.podman.socket.
Assertion 'changes[i].type < 0' failed at ../src/shared/install.c:398, function unit_file_dump_changes(). Aborting.
/usr/bin/rpmostree-postprocess-inline-0: line 6:     6 Aborted                 systemctl --user --global preset-all
error: Postprocessing: While executing inline postprocessing script '0': Executing bwrap(/usr/bin/rpmostree-postprocess-inline-0): Child process killed by signal 6

Could this be related to rpm-ostree-2019.6 hitting stable/mirrors? @jlebon

@jcajka
Copy link
Collaborator Author

jcajka commented Oct 8, 2019 •
edited
Loading

Up-mentioned issue seems to be one tracked in coreos/fedora-coreos-tracker#290

@jcajka
*build*: Make ppc64le build anacondaless
a679a61 
ppc64le(pseries,PowerNV) anacondaless build.

Allow partition layout to differ per arch, i.e. to include and omit certain partitions.
Use generic Linux FS uuid for root partition as discussed in the coreos#795

Fix: coreos#795
ajeddeloh
ajeddeloh approved these changes Oct 8, 2019
View reviewed changes
Copy link
Contributor

@ajeddeloh ajeddeloh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, 💯

jlebon
jlebon reviewed Oct 8, 2019
View reviewed changes
src/create_disk.sh
-U 00000000-0000-4000-a000-000000000001 \
-n 2:0:+4M -c 2:PowerPC-PReP-boot -t 2:9E1A2D38-C612-4316-AA26-8B49521E5A8B \
-n ${BOOTPN}:0:+384M -c ${BOOTPN}:boot \
-n ${ROOTPN}:0:0 -c ${ROOTPN}:root -t ${ROOTPN}:0FC63DAF-8483-4772-8E79-3D69D8477DE4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to leave off the partition type uuid here? Based off of:

     # ppc64le doesn't use special uuid for root partition

Or are you just saying that it doesn't help, but it doesn't hurt either?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is in the context of #795 , If it is too confusing I can drop that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK gotcha, thanks for the context.
I think we can make this decision more explicit, but let's leave that as a follow-up!

jlebon
jlebon approved these changes Oct 9, 2019
View reviewed changes
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 🎉
Will let @cgwalters or @ajeddeloh do the final merge!

src/create_disk.sh
-U 00000000-0000-4000-a000-000000000001 \
-n 2:0:+4M -c 2:PowerPC-PReP-boot -t 2:9E1A2D38-C612-4316-AA26-8B49521E5A8B \
-n ${BOOTPN}:0:+384M -c ${BOOTPN}:boot \
-n ${ROOTPN}:0:0 -c ${ROOTPN}:root -t ${ROOTPN}:0FC63DAF-8483-4772-8E79-3D69D8477DE4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK gotcha, thanks for the context.
I think we can make this decision more explicit, but let's leave that as a follow-up!

@ajeddeloh ajeddeloh merged commit d5299ad into coreos:master Oct 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgwalters cgwalters cgwalters left review comments

@jlebon jlebon jlebon approved these changes

@ajeddeloh ajeddeloh ajeddeloh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

root uuid defined in create_disk.sh is specific to x86-64
4 participants
@jcajka @cgwalters @ajeddeloh @jlebon