suse-edge/Factory
SHA256
17
0
Fork 17
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat: Include the EIB elemental fix temporary for 3.4 #319

Merged
steven.hardy merged 1 commits from eib-elemental-fix-3.4 into 3.4 2025-12-03 12:11:58 +01:00
Conversation 12 Commits 1 Files Changed 3 +30 -5
eminguez commented 2025-12-01 11:41:38 +01:00
Owner
Copy Link

Backport of #323

Temporarily carry https://github.com/suse-edge/edge-image-builder/pull/810 until it's included in an EIB release

Backport of #323 Temporarily carry https://github.com/suse-edge/edge-image-builder/pull/810 until it's included in an EIB release
eminguez added 1 commit 2025-12-01 11:41:39 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 1h11m34s
Details
7bb31ac69c
eminguez added 2 commits 2025-12-01 11:55:29 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 1h11m34s
Details
7bb31ac69c
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 36m14s
Details
4c87f0a03a
roxenham reviewed 2025-12-01 12:02:57 +01:00
edge-image-builder/0001-eib-elemental-reset-fix.patch Outdated
@@ -0,0 +1,24 @@
From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001
From: e-minguez <e.minguez@gmail.com>
roxenham commented 2025-12-01 12:02:57 +01:00
Owner
Copy Link

Should we move this to @suse.com?

Should we move this to @suse.com?
eminguez commented 2025-12-01 12:38:58 +01:00
Author
Owner
Copy Link

Done

Done
eminguez marked this conversation as resolved
eminguez added 2 commits 2025-12-01 12:38:45 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 36m14s
Details
4c87f0a03a
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 14m19s
Details
49cfd35897
eminguez added 2 commits 2025-12-01 13:41:16 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 14m19s
Details
49cfd35897
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 15s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 27s
Details
72832d56c5
nbelouin requested changes 2025-12-01 13:49:18 +01:00
Dismissed
nbelouin left a comment
Owner
Copy Link

I think we want to update the EIB image tag as well

I think we want to update the EIB image tag as well
edge-image-builder/edge-image-builder.spec Outdated
@@ -19,3 +19,3 @@
Name: edge-image-builder
Version: 1.3.0
Release: 0
Release: 1
nbelouin commented 2025-12-01 13:47:21 +01:00
Owner
Copy Link

This field is automatically managed by OBS on source change, so please keep it to 0 to make it less confusing

This field is automatically managed by OBS on source change, so please keep it to 0 to make it less confusing
eminguez commented 2025-12-01 14:22:26 +01:00
Author
Owner
Copy Link

ACK

ACK
eminguez marked this conversation as resolved
eminguez commented 2025-12-01 14:24:46 +01:00
Author
Owner
Copy Link

I think we want to update the EIB image tag as well

I'm confused now :D Do you want me to bump it to 1.3.0-something? IIRC the BuildTag is 1.3.0-%RELEASE%, shall I just change %RELEASE% by something else?

Also, do you happen to know why it is failing on the patch process? I basically did the same I did before for python-pyhelm3 here https://src.opensuse.org/suse-edge/Factory/src/branch/main/python-pyhelm3/0001-icon-metadata-allow-fileurl.patch but I'm not sure about the directory structure here (I'm confused by the vendor.tar.gz I guess)

> I think we want to update the EIB image tag as well I'm confused now :D Do you want me to bump it to 1.3.0-something? IIRC the BuildTag is 1.3.0-%RELEASE%, shall I just change %RELEASE% by something else? Also, do you happen to know why it is failing on the patch process? I basically did the same I did before for python-pyhelm3 here https://src.opensuse.org/suse-edge/Factory/src/branch/main/python-pyhelm3/0001-icon-metadata-allow-fileurl.patch but I'm not sure about the directory structure here (I'm confused by the vendor.tar.gz I guess)
eminguez added 2 commits 2025-12-01 14:28:22 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 15s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 27s
Details
72832d56c5
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 16s
Details
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
6bf519edac
nbelouin commented 2025-12-01 14:33:05 +01:00
Owner
Copy Link

It will get published as 1.3.0-something as expected, but it will also override the 1.3.0 tag (not sure we want that).

I think you got confused in the file path in the patch, in python there is almost always a first level directory that is the name of the package (as in your example with pyhelm3), not here, so your path shouldn't include the edge-image-builder-1.3.0 part

It will get published as `1.3.0-something` as expected, but it will also override the `1.3.0` tag (not sure we want that). I think you got confused in the file path in the patch, in python there is almost always a first level directory that is the name of the package (as in your example with `pyhelm3`), not here, so your path shouldn't include the `edge-image-builder-1.3.0` part
eminguez added 2 commits 2025-12-01 15:38:31 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 16s
Details
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
6bf519edac
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 21s
Details
651d2d2d76
eminguez commented 2025-12-01 15:39:09 +01:00
Author
Owner
Copy Link

It will get published as 1.3.0-something as expected, but it will also override the 1.3.0 tag (not sure we want that).

I don't think we want to override that tag. What should I do then? Keep 1.3.0 and 0 or override them somehow?

I think you got confused in the file path in the patch, in python there is almost always a first level directory that is the name of the package (as in your example with pyhelm3), not here, so your path shouldn't include the edge-image-builder-1.3.0 part

I think I send it without that folder, let me send it again to see the error message again.

> It will get published as `1.3.0-something` as expected, but it will also override the `1.3.0` tag (not sure we want that). I don't think we want to override that tag. What should I do then? Keep 1.3.0 and 0 or override them somehow? > > I think you got confused in the file path in the patch, in python there is almost always a first level directory that is the name of the package (as in your example with `pyhelm3`), not here, so your path shouldn't include the `edge-image-builder-1.3.0` part I think I send it without that folder, let me send it again to see the error message again.
eminguez commented 2025-12-01 15:41:41 +01:00
Author
Owner
Copy Link

Yep, it failed as:

Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.U2walf
[   28s] + umask 022
[   28s] + cd /home/abuild/rpmbuild/BUILD
[   28s] + cd /home/abuild/rpmbuild/BUILD
[   28s] + rm -rf edge-image-builder-1.3.0
[   28s] + /usr/bin/tar -xof /home/abuild/rpmbuild/SOURCES/edge-image-builder-1.3.0.tar
[   28s] + cd edge-image-builder-1.3.0
[   28s] + /usr/bin/gzip -dc /home/abuild/rpmbuild/SOURCES/vendor.tar.gz
[   28s] + /usr/bin/tar -xof -
[   29s] + STATUS=0
[   29s] + '[' 0 -ne 0 ']'
[   29s] + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
[   29s] + /usr/bin/patch -s --fuzz=0 --no-backup-if-mismatch
[   29s] + /usr/bin/cat /home/abuild/rpmbuild/SOURCES/0001-eib-elemental-reset-fix.patch
[   29s] The text leading up to this was:
[   29s] --------------------------
[   29s] |From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001
[   29s] |From: Eduardo Minguez <eduardo.minguez@suse.com>
[   29s] |Date: Tue, 11 Nov 2025 17:10:01 +0100
[   29s] |Subject: [PATCH] Fix #808
[   29s] |
[   29s] |---
[   29s] | pkg/combustion/templates/31-elemental-register.sh.tpl | 2 ++
[   29s] | 1 files changed, 2 insertions(+)
[   29s] |
[   29s] |diff --git a/pkg/combustion/templates/31-elemental-register.sh.tpl b/pkg/combustion/templates/31-elemental-register.sh.tpl
[   29s] |index c1ff4337..91f8b4c2 100644
[   29s] |--- a/pkg/combustion/templates/31-elemental-register.sh.tpl
[   29s] |+++ b/pkg/combustion/templates/31-elemental-register.sh.tpl
[   29s] --------------------------
[   29s] File to patch: 
[   29s] Skip this patch? [y] 
[   29s] 1 out of 1 hunk ignored
[   29s] error: Bad exit status from /var/tmp/rpm-tmp.U2walf (%prep)
[   29s] 
[   29s] 
[   29s] RPM build errors:
[   29s]     Bad exit status from /var/tmp/rpm-tmp.U2walf (%prep)
[   29s] ### VM INTERACTION START ###
[   29s] [   23.669058][    T1] sysrq: Power Off
[   29s] ### VM INTERACTION END ###

Any ideas on why? or how can I replicate it locally? where is the vendor.tar.gz coming from? and the eib-1.3.0.tar file? Upstream releases are .tar.gz 😅

Yep, it failed as: ``` Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.U2walf [ 28s] + umask 022 [ 28s] + cd /home/abuild/rpmbuild/BUILD [ 28s] + cd /home/abuild/rpmbuild/BUILD [ 28s] + rm -rf edge-image-builder-1.3.0 [ 28s] + /usr/bin/tar -xof /home/abuild/rpmbuild/SOURCES/edge-image-builder-1.3.0.tar [ 28s] + cd edge-image-builder-1.3.0 [ 28s] + /usr/bin/gzip -dc /home/abuild/rpmbuild/SOURCES/vendor.tar.gz [ 28s] + /usr/bin/tar -xof - [ 29s] + STATUS=0 [ 29s] + '[' 0 -ne 0 ']' [ 29s] + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . [ 29s] + /usr/bin/patch -s --fuzz=0 --no-backup-if-mismatch [ 29s] + /usr/bin/cat /home/abuild/rpmbuild/SOURCES/0001-eib-elemental-reset-fix.patch [ 29s] The text leading up to this was: [ 29s] -------------------------- [ 29s] |From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001 [ 29s] |From: Eduardo Minguez <eduardo.minguez@suse.com> [ 29s] |Date: Tue, 11 Nov 2025 17:10:01 +0100 [ 29s] |Subject: [PATCH] Fix #808 [ 29s] | [ 29s] |--- [ 29s] | pkg/combustion/templates/31-elemental-register.sh.tpl | 2 ++ [ 29s] | 1 files changed, 2 insertions(+) [ 29s] | [ 29s] |diff --git a/pkg/combustion/templates/31-elemental-register.sh.tpl b/pkg/combustion/templates/31-elemental-register.sh.tpl [ 29s] |index c1ff4337..91f8b4c2 100644 [ 29s] |--- a/pkg/combustion/templates/31-elemental-register.sh.tpl [ 29s] |+++ b/pkg/combustion/templates/31-elemental-register.sh.tpl [ 29s] -------------------------- [ 29s] File to patch: [ 29s] Skip this patch? [y] [ 29s] 1 out of 1 hunk ignored [ 29s] error: Bad exit status from /var/tmp/rpm-tmp.U2walf (%prep) [ 29s] [ 29s] [ 29s] RPM build errors: [ 29s] Bad exit status from /var/tmp/rpm-tmp.U2walf (%prep) [ 29s] ### VM INTERACTION START ### [ 29s] [ 23.669058][ T1] sysrq: Power Off [ 29s] ### VM INTERACTION END ### ``` Any ideas on why? or how can I replicate it locally? where is the vendor.tar.gz coming from? and the eib-1.3.0.tar file? Upstream releases are .tar.gz 😅
nbelouin commented 2025-12-01 16:20:10 +01:00
Owner
Copy Link

They come from the source services, you should be able to replicate by doing an osc build in the directory, you may have to indicate some metadata in .osc directory so that it knows the dependencies and so on, so here is what those should look like:

==> .osc/_apiurl <==
https://api.opensuse.org

==> .osc/_osclib_version <==
2.0

==> .osc/_package <==
edge-image-builder

==> .osc/_project <==
isv:SUSE:Edge:3.4

==> .osc/_scm <==
https://github.com/suse-edge/Factory?subdir=edge-image-builder#3.4

But from a quick look, in the %prep section, the %autosetup may just miss a -p1 argument

They come from the source services, you should be able to replicate by doing an `osc build` in the directory, you may have to indicate some metadata in `.osc` directory so that it knows the dependencies and so on, so here is what those should look like: ``` ==> .osc/_apiurl <== https://api.opensuse.org ==> .osc/_osclib_version <== 2.0 ==> .osc/_package <== edge-image-builder ==> .osc/_project <== isv:SUSE:Edge:3.4 ==> .osc/_scm <== https://github.com/suse-edge/Factory?subdir=edge-image-builder#3.4 ``` But from a quick look, in the `%prep` section, the `%autosetup` may just miss a `-p1` argument
steven.hardy commented 2025-12-01 16:23:12 +01:00
Owner
Copy Link

I agree I think we're missing the -p1 - I pushed #321 to prove but it seems OBS is down

So I checked by downloading the srpm from https://build.opensuse.org/projects/isv:SUSE:Edge:3.4/packages/edge-image-builder/repositories/standard/binaries

Then you can use rpm2cpio to extract the tarball, unpack it and patch which shows the -p1 works:

edge-image-builder-1.3.0 % patch -p1 --dry-run < ../0001-eib-elemental-reset-fix.patch
patching file 'pkg/combustion/templates/31-elemental-register.sh.tpl'
I agree I think we're missing the `-p1` - I pushed #321 to prove but it seems OBS is down So I checked by downloading the srpm from https://build.opensuse.org/projects/isv:SUSE:Edge:3.4/packages/edge-image-builder/repositories/standard/binaries Then you can use `rpm2cpio` to extract the tarball, unpack it and patch which shows the `-p1` works: ``` edge-image-builder-1.3.0 % patch -p1 --dry-run < ../0001-eib-elemental-reset-fix.patch patching file 'pkg/combustion/templates/31-elemental-register.sh.tpl' ```
eminguez added 2 commits 2025-12-01 17:39:22 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 21s
Details
651d2d2d76
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 16s
Details
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 15s
Details
b4c5ee4f4d
eminguez added 2 commits 2025-12-01 17:40:03 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 16s
Details
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 15s
Details
b4c5ee4f4d
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 23s
Details
0478efbec8
eminguez commented 2025-12-01 17:40:22 +01:00
Author
Owner
Copy Link

Sent the -p1 addition. Thanks folks!

Sent the `-p1` addition. Thanks folks!
eminguez added 2 commits 2025-12-01 17:43:06 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 23s
Details
0478efbec8
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 21s
Details
470d06c53c
eminguez added 2 commits 2025-12-02 12:02:38 +01:00
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 21s
Details
470d06c53c
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 3h14m28s
Details
83d123bd5e
eminguez commented 2025-12-02 12:03:42 +01:00
Author
Owner
Copy Link

Bumped version to 1.3.0.1 to avoid overriding the current 1.3.0 one.

Bumped version to 1.3.0.1 to avoid overriding the current 1.3.0 one.
eminguez added 2 commits 2025-12-02 12:26:31 +01:00
feat: Include the EIB elemental fix temporary for 3.4
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 3h14m28s
Details
83d123bd5e
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 20s
Details
9622d6b51e
eminguez added 2 commits 2025-12-02 12:27:09 +01:00
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 20s
Details
9622d6b51e
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 5m31s
Details
31660f0714
eminguez added 2 commits 2025-12-02 12:35:23 +01:00
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 5m31s
Details
31660f0714
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 19s
Details
bf9f2d7755
eminguez added 2 commits 2025-12-02 12:35:58 +01:00
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 19s
Details
bf9f2d7755
feat: Include the EIB elemental fix temporary for 3.4
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 14s
Details
1023469447
eminguez requested review from nbelouin 2025-12-02 14:34:55 +01:00
eminguez requested review from steven.hardy 2025-12-02 14:35:01 +01:00
nbelouin approved these changes 2025-12-03 11:13:46 +01:00
steven.hardy approved these changes 2025-12-03 12:11:46 +01:00
steven.hardy merged commit 376a0a9e4d into 3.4 2025-12-03 12:11:58 +01:00
steven.hardy deleted branch eib-elemental-fix-3.4 2025-12-03 12:11:59 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
roxenham
nbelouin
steven.hardy
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
amorgante antaloala atanasdinov atrendafilov dbekhit dprodanov eminguez fdegirmenci geoagriogiannis ipetrov117 jarndt jtomasek kzhelyazkov mchiappero mkrutov nbelouin roxenham steven.hardy
No Assignees
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: suse-edge/Factory#319
Delete Branch "eib-elemental-fix-3.4"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?