Skip to content

Commit

Permalink
Address RPM spec file and config.kiwi dependency issues
Browse files Browse the repository at this point in the history
Update the syse-migration-services RPM spec file dependencies to use
suseconnect-ng rather than the legacy SUSEConnect.  While the existing
dependency specification works with zypper dependency resolution, it
doesn't work with the build service package resolution mechanism and
breaks the build of the SLE 15 SP1 ISO image containing the package.

Also update the config.kiwi used to build the SLE 15 SP1 ISO image to
explicitly install suseconnect-ng and remove zypper-migration-plugin,
which conflicts with suseconnect-ng.
  • Loading branch information
rtamalin committed Mar 7, 2024
1 parent 081b0cb commit 6cfe631
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion image/pubcloud/sle15/config.kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
</repository>
<packages type="image">
<package name="patterns-base-minimal_base"/>
<package name="suseconnect-ng"/>
<package name="ifplugd"/>
<package name="iputils"/>
<package name="vim"/>
Expand Down Expand Up @@ -65,7 +66,6 @@
<package name="bind-utils"/>
<package name="util-linux"/>
<package name="suse-migration-services"/>
<package name="zypper-migration-plugin"/>
<package name="dialog"/>
<package name="sudo"/>
<package name="mdadm"/>
Expand Down
2 changes: 1 addition & 1 deletion package/suse-migration-services-spec-template
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Requires: kexec-tools
Requires: ca-certificates
Requires: dialog
Requires: rsync
Requires: SUSEConnect >= 0.3.20
Requires: suseconnect-ng
Requires(preun): systemd
Requires(postun): systemd
BuildArch: noarch
Expand Down

0 comments on commit 6cfe631

Please sign in to comment.