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

refactor: neutral layer, pub key lookup, multiconfig #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: neutral layer, pub key lookup, multiconfig #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a4b0d0
feat: unified manifest; neutral layer, pub key lookup, multiconfig
Nov 27, 2024
5e91c05
fix: set bob multiconf packages via distro features for consistency
Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf/multiconfig/bob.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DISTRO_FEATURES:append = " podman searcher"
1 change: 1 addition & 0 deletions recipes-core/images/core-image-tiny-initramfs.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ${@bb.utils.contains('DISTRO_FEATURES', 'searcher', 'core-image-tiny-initramfs.inc', '', d)}
0 recipes-core/images/cvm-initramfs.bbappend → ...core/images/core-image-tiny-initramfs.inc
View file
Open in desktop
File renamed without changes.
24 changes: 7 additions & 17 deletions recipes-core/searcher-ssh-key/searcher-ssh-key.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,15 @@ inherit useradd
USERADD_PACKAGES = "${PN}"
USERADD_PARAM:${PN} = "-m -d /home/searcher -s /bin/sh -u 1000 searcher"

python () {
# Check if SEARCHER_SSH_KEY is set in the environment or in local.conf
searcher_ssh_key = d.getVar('SEARCHER_SSH_KEY')

if searcher_ssh_key is None:
# If not set, check the original environment
origenv = d.getVar("BB_ORIGENV", False)
if origenv:
searcher_ssh_key = origenv.getVar('SEARCHER_SSH_KEY')

if searcher_ssh_key:
# If SEARCHER_SSH_KEY is set, keep its value
d.setVar('SEARCHER_SSH_KEY', searcher_ssh_key)
else:
# If SEARCHER_SSH_KEY is not set, raise an error
bb.fatal("SEARCHER_SSH_KEY must be set. Please provide an SSH public key.")
}
Comment on lines -11 to -27
Copy link
Collaborator

Choose a reason for hiding this comment

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

why remove this?
Passing custom env variables cant be caught directly without either setting them manually in local.conf or building with a specific yocto env variable enabled or with this python to capture it.
I believe the export below will not capture the custom env variables and didn't work for me before

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've removed this because it's to broad of a check. If you haven't added this recipe in your build it will still complain about the variable missing. In favor of neutral layers I've moved the check of the variable right before it's used.
I wasn't aware that we don't want to touch the local.conf for configuration. How would you implement this method such that it takes this env var from the origenv but without failing if it doesn't exist?

Copy link
Collaborator

Choose a reason for hiding this comment

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

For that specific use case we chose to fail because the SEARCHER_SSH_KEY was mandatory in BoBv1.
Which still is in BoBv2 if I am not wrong.
So making it fail, is like a reminder to rebuild with that env var set.

ow would you implement this method such that it takes this env var from the origenv but without failing if it doesn't exist?

You can do that by switching the bb.fatal to bb.info instead or bb.warn
But that would defeat the purpose of stopping the image build if the searcher ssh key was not set, otherwise, the searcher won't be able to log inside its container

export SEARCHER_SSH_KEY := "${SEARCHER_SSH_KEY}"
do_install[vardeps] += "SEARCHER_SSH_KEY"

do_install () {
if [ -z "${SEARCHER_SSH_KEY}" ]; then
echo "ERROR: SEARCHER_SSH_KEY is not set"
return 1
fi

install -d ${D}/home/searcher/.ssh
echo "${SEARCHER_SSH_KEY}" > ${D}/home/searcher/.ssh/authorized_keys
chmod 700 ${D}/home/searcher/.ssh
Expand Down