Do not include elemental-toolkit sources #400
Conversation
davidcassany
force-pushed
the
remove_elemental_toolkit_data
branch
2 times, most recently
from
a58b825
to
578b666
Compare
| @@ -0,0 +1,3 @@ | |||
| # Paths of systemd dirs on Teal | |||
| systemdutildir=/usr/lib/systemd | |||
| systemdsystemunitdir=/usr/lib/systemd/system | |||
There was a problem hiding this comment.
I realized we had unit files in /lib/systemd/system and also in /usr/lib/systemd/system. This is to only use and relay on the latter.
There was a problem hiding this comment.
blergh. Is this something we can fix under the toolkit?
There was a problem hiding this comment.
Not really, I think in elemental-toolkit we have all our services in /lib/systemd/systemd. The ones provided by the distro I guess they differ depending the distro. The problem is that in OBS our services come from RPMs and those install services using SUSE systemd macros (default paths, requirements, etc), hence they were placed in /usr/lib/system/systemd.
| @@ -1,4 +1,3 @@ | |||
| # This is required for booting a squashfs from network | |||
| add_dracutmodules+=" livenet " | |||
There was a problem hiding this comment.
I is already included in dracut configuration from elemental-toolkit
| @@ -10,12 +10,23 @@ COPY framework/files/etc/luet/luet.yaml /etc/luet/luet.yaml | |||
| ENV LUET_NOLOCK=true | |||
| SHELL ["/usr/bin/luet", "install", "-y", "--system-target", "/framework"] | |||
|
|
|||
| # elemental-toolkit essentials | |||
There was a problem hiding this comment.
All this is the equivalent of the old framework/cos folder
There was a problem hiding this comment.
This is weird because Im sure Ettore added this for something OBS related, IIRC it was asked from @kkaempf ? But I dont remember the reasoning :/
EDIT: Fuck, wrong comment, this was supposed to be added to the auto-framework job below :/
There was a problem hiding this comment.
I didn't do nothing wrong 😇
Signed-off-by: David Cassany <dcassany@suse.com>
davidcassany
force-pushed
the
remove_elemental_toolkit_data
branch
from
578b666
to
83bf5a8
Compare
|
Note after merging this PR |
| @@ -10,12 +10,23 @@ COPY framework/files/etc/luet/luet.yaml /etc/luet/luet.yaml | |||
| ENV LUET_NOLOCK=true | |||
| SHELL ["/usr/bin/luet", "install", "-y", "--system-target", "/framework"] | |||
|
|
|||
| # elemental-toolkit essentials | |||
| RUN system/immutable-rootfs | |||
There was a problem hiding this comment.
cant we just use the meta/cos-light which was the package used to sync the framework files before?
There was a problem hiding this comment.
probably, I have to admit I have not checked the meta-packages. Gonna do it 👍
|
oh @davidcassany we need to drop the github workflow that bumps the framework as part of this! |
Signed-off-by: David Cassany <dcassany@suse.com>
This PR removes the sources from elemental-toolkit as part of the code.
The reasoning behind is that this is not required for github builds (there is luet for that) and in OBS having a specific RPM package that mimics elemental-toolkit luet packages seams to be simpler. This setup allows us to explicitly include in Teal the essential elemental-toolkit utilities based on git repository tags.
Also forces us having to run PRs to elemental-toolkit in case we need a change in that area, it helps to keep the repository alive and make the dependency explicit.
Part of #361
Signed-off-by: David Cassany dcassany@suse.com