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

fix: Added missing files from OG kiwi and updated .kiwi files #305

Merged
eminguez merged 2 commits from eminguez/suse-edge-factory:update-kiwi-files into main 2025-11-20 10:48:06 +01:00
Conversation 8 Commits 2 Files Changed 7 +135 -39
eminguez commented 2025-11-17 14:20:15 +01:00
Owner
Copy Link

https://suse.slack.com/archives/C02BPCB2U1M/p1763366831121139

  • Included missing .sh files
  • Added comments to the .kiwi files on the modifications being made by Edge
  • Removed efipartsize="200" as 512 is now the default 521fad9e5a
  • Included a small doc on where the files come from
  • Bumped BuildTag

NOTE: The original files are downloaded with curl -LO so they contain everything untouched (including the wrong blank spaces and things like that :D). Initially I thought it was my editor doing nasty things but it turns out it is the OG file that changed. See for example 55f41206b7/SL-Micro/SL-Micro.kiwi (L98) where there is a blank space at the end of the line.

https://suse.slack.com/archives/C02BPCB2U1M/p1763366831121139 * Included missing .sh files * Added comments to the .kiwi files on the modifications being made by Edge * Removed efipartsize="200" as 512 is now the default https://src.suse.de/products/SL-Micro/commit/521fad9e5a9e3b087a980ca3eb3b217adf43dd450f954d48d86f54d8e4a18d63 * Included a small doc on where the files come from * Bumped BuildTag NOTE: The original files are downloaded with curl -LO so they contain everything untouched (including the wrong blank spaces and things like that :D). Initially I thought it was my editor doing nasty things but it turns out it is the OG file that changed. See for example 55f41206b7/SL-Micro/SL-Micro.kiwi (L98) where there is a blank space at the end of the line.
eminguez reviewed 2025-11-17 14:45:14 +01:00
kiwi-builder-image/SL-Micro.kiwi Outdated
@@ -1215,9 +1215,6 @@
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
<package name="coreutils"/>
eminguez commented 2025-11-17 14:45:09 +01:00
Author
Owner
Copy Link

I'm not sure about this. It seems the OG file didn't have this since long time ago https://src.suse.de/products/SL-Micro/blame/branch/6.2/SL-Micro/SL-Micro.kiwi

I'm not sure about this. It seems the OG file didn't have this since long time ago https://src.suse.de/products/SL-Micro/blame/branch/6.2/SL-Micro/SL-Micro.kiwi
nbelouin commented 2025-11-18 08:50:57 +01:00
Owner
Copy Link

We should stick to "upstream" definition as much as possible, so I agree with the removal here.

We should stick to "upstream" definition as much as possible, so I agree with the removal here.
eminguez marked this conversation as resolved
eminguez reviewed 2025-11-17 14:50:15 +01:00
kiwi-builder-image/SL-Micro.kiwi.4096 Outdated
@@ -321,6 +321,7 @@
<bootloader-theme>SLE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
<!-- NOTE: Added 4096 support here -->
eminguez commented 2025-11-17 14:50:15 +01:00
Author
Owner
Copy Link

After fighting for a while with diff and xmllint/etc. I've added such comments to make it easy to find what's needed to change once we update the kiwi file for the 4096 use case :)

After fighting for a while with diff and xmllint/etc. I've added such comments to make it easy to find what's needed to change once we update the kiwi file for the 4096 use case :)
eminguez marked this conversation as resolved
steven.hardy requested review from roxenham 2025-11-17 16:54:34 +01:00
steven.hardy requested review from jarndt 2025-11-17 16:54:42 +01:00
jarndt approved these changes 2025-11-18 08:42:15 +01:00
Dismissed
nbelouin approved these changes 2025-11-18 08:55:14 +01:00
nbelouin left a comment
Owner
Copy Link

nit: There are some weird whitespace changes, don't know if it's from source file, or you running those xmllint and so on, but I believe we'd prefer to be consistent for readability.

nit: There are some weird whitespace changes, don't know if it's from source file, or you running those xmllint and so on, but I believe we'd prefer to be consistent for readability.
👍 1
steven.hardy commented 2025-11-18 09:43:17 +01:00
Owner
Copy Link

Looks good but I've not tested it - I think we should bump the BuildTags before merging though? E.g to 10.2.29.1

Looks good but I've not tested it - I think we should bump the [BuildTags](https://src.opensuse.org/suse-edge/Factory/src/branch/main/kiwi-builder-image/Dockerfile#L1) before merging though? E.g to `10.2.29.1`
👍 1
eminguez commented 2025-11-18 13:29:39 +01:00
Author
Owner
Copy Link

nit: There are some weird whitespace changes, don't know if it's from source file, or you running those xmllint and so on, but I believe we'd prefer to be consistent for readability.

I downloaded the files with curl -LO so they should be like the original ones (with all the wrong blank spaces and things like that :D). Initially I thought it was my editor doing nasty things but it turns out it is the OG file that changed. See for example 55f41206b7/SL-Micro/SL-Micro.kiwi (L98) where there is a blank space at the end of the line.

> nit: There are some weird whitespace changes, don't know if it's from source file, or you running those xmllint and so on, but I believe we'd prefer to be consistent for readability. I downloaded the files with curl -LO so they should be like the original ones (with all the _wrong_ blank spaces and things like that :D). Initially I thought it was my editor doing nasty things but it turns out it is the OG file that changed. See for example https://src.suse.de/products/SL-Micro/src/commit/55f41206b7e9d2bb2a85afa84ca89a4cc0d64f7d866442f4cc350c5a02cdb866/SL-Micro/SL-Micro.kiwi#L98 where there is a blank space at the end of the line.
eminguez changed title from fix: Added disk.sh as per https://src.suse.de/products/SL-Micro/src/branch/6.2/SL-Micro/disk.sh to fix: Added missing files from OG kiwi and updated .kiwi files 2025-11-18 13:47:32 +01:00
eminguez requested review from nbelouin 2025-11-18 13:50:34 +01:00
eminguez requested review from jarndt 2025-11-18 13:50:40 +01:00
nbelouin reviewed 2025-11-18 14:53:05 +01:00
kiwi-builder-image/README.build.md Outdated
@@ -0,0 +1,28 @@
The following files are coming from _upstream_ https://src.suse.de/products/SL-Micro/src/branch/6.2/SL-Micro
nbelouin commented 2025-11-18 14:51:07 +01:00
Owner
Copy Link

I'm not really fond of just pointing to internal resources here, might be better to point to https://build.opensuse.org/package/show/SUSE:SLFO:Products:SL-Micro:6.2/SL-Micro

I'm not really fond of just pointing to internal resources here, might be better to point to https://build.opensuse.org/package/show/SUSE:SLFO:Products:SL-Micro:6.2/SL-Micro
eminguez commented 2025-11-20 10:46:36 +01:00
Author
Owner
Copy Link

Done!

Done!
eminguez marked this conversation as resolved
jarndt approved these changes 2025-11-20 10:38:01 +01:00
eminguez added 1 commit 2025-11-20 10:46:23 +01:00
fix: Updated SL-Micro.kiwi files
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 1m7s
Details
4d11270806
eminguez merged commit f4d116b03c into main 2025-11-20 10:48:06 +01:00
eminguez deleted branch update-kiwi-files 2025-11-20 10:48:06 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
eminguez
roxenham
nbelouin
jarndt
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#305
Delete Branch "eminguez/suse-edge-factory:update-kiwi-files"

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?