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.

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

Cleanup real-time clock support #1196

Merged
merged 4 commits into from Jul 8, 2019
Merged

Cleanup real-time clock support #1196

merged 4 commits into from Jul 8, 2019

Conversation

jandryuk
Copy link
Contributor

Only the Dom0 and Installer machines have access to a hardware real-time clock. By removing 'rtc' from MACHINE_FEATURES (through MACHINE_FEATURES_BACKFILL_CONSIDERED), we also remove the hwclock.sh initscript from the virtual machines.

We can then clean up some image recipes.

save-rtc.sh is redundant, so we can drop that as well.

@jandryuk
initscripts: Remove save-rtc.sh
fe7cabb 
save-rtc.sh is pointless.  It just calls hwclock.sh stop.  hwclock.sh
comes from busybox-hwclock and installs its own rc symlinks to stop
itself.

busybox-hwclock is installed and used in dom0.  The uivm and ndvm images
remove the initscript calling it and save-rtc.sh since they don't have a
hardware clock.

Just delete save-rtc.sh since it's not adding anything.

Upstream OE has a save-rtc.sh that writes to /etc/timestamp, so that
doesn't work with our read-only rootfs images.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
@jandryuk
Only set rtc for dom0 & installer MACHINE_FEATURES
662797f 
dom0 and installer are the only machines that actually talk to a
hardware real-time clock.  The other virtual machines don't need to work
with an rtc, so it can be remove.  To actually do so, we need to add it
to MACHINE_FEATURES_BACKFILL_CONSIDERED since it defaults enabled when
unset.  With that we need to explicitly add it for dom0 and installer.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
@jandryuk
ndvm-image: drop hwclock.sh initscript removal
bb1cbb8 
hwclock.sh is no longer installed, so we can drop the explicit
initscript removal.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
@jandryuk
uivm-image: drop hwclock.sh PACKAGE_REMOVE
65cd43f 
hwclock.sh is no longer installed, so we don't need to remove it through
PACKAGE_REMOVE.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
@eric-ch
Copy link
Contributor

eric-ch commented Jul 1, 2019

Build $6634

eric-ch
eric-ch approved these changes Jul 1, 2019
View reviewed changes
Copy link
Contributor

@eric-ch eric-ch left a comment

Choose a reason for hiding this comment

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

LGTM.

@eric-ch
Copy link
Contributor

eric-ch commented Jul 1, 2019

MACHINE_FEATURES_BACKFILL_CONSIDERED is pretty useful.
I seem to recall we were looking for something like that with regard to other FEATURES, during or after the Pyro upgrade, I cannot remember which though, does that sound familiar?

@jandryuk
Copy link
Contributor Author

jandryuk commented Jul 1, 2019

I was surprised I needed MACHINE_FEATURES_BACKFILL_CONSIDERED and MACHINE_FEATURES_remove = "rtc" didn't work. I previously fought to remove rtc. and found MACHINE_FEATURES_remove += "rtc" with a += worked (I think).

I didn't know about the BACKFILL stuff until I stumbled upon it in bitbake -e output.

Not sure about the other FEATURES. Maybe it was a general through to review them? I removed nfs from DISTRO_FEATURES to get rid of rpcbind. Maybe you are thinking of that?

@eric-ch
Copy link
Contributor

eric-ch commented Jul 1, 2019

Oh that must be nfs you are correct.

@eric-ch
Copy link
Contributor

eric-ch commented Jul 1, 2019

Will merge soon.

@crogers1 This looks very low risk, do you want it in stable-9?

@crogers1
Copy link
Contributor

crogers1 commented Jul 8, 2019

Yes, would be great to have in stable-9

@eric-ch eric-ch merged commit 6617415 into OpenXT:master Jul 8, 2019
@jandryuk jandryuk mentioned this pull request Jul 8, 2019
Merged
@jandryuk jandryuk deleted the rm-save-rtc branch July 8, 2019 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eric-ch eric-ch eric-ch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jandryuk @eric-ch @crogers1