Backport -prune fixes to fix mkinitramfs, fix clap dependency issues
https://phabricator.apertis.org/T8219
Signed-off-by: Ryan Gonzalez ryan.gonzalez@collabora.com
https://phabricator.apertis.org/T8219
Signed-off-by: Ryan Gonzalez ryan.gonzalez@collabora.com