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.

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

S390x rpm list maintenance support #3203

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,12 @@ build:crossbuild-aarch64 --incompatible_enable_cc_toolchain_resolution --platfor
run:crossbuild-aarch64 --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:aarch64-none-linux-gnu --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64_cgo
test:crossbuild-aarch64 --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64_cgo --host_javabase=@local_jdk//:jdk

build:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --incompatible_use_cc_configure_from_rules_cc
run:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --incompatible_use_cc_configure_from_rules_cc
test:s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --host_javabase=@local_jdk//:jdk

build:crossbuild-s390x --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo
run:crossbuild-s390x --incompatible_enable_cc_toolchain_resolution --platforms=//bazel/platforms:s390x-none-linux-gnu --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo
test:crossbuild-s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_cgo --host_javabase=@local_jdk//:jdk

build --define gotags=selinux
52 changes: 52 additions & 0 deletions hack/build/rpm-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,55 @@ bazel run \
bazel run \
--config=aarch64 \
//:bazeldnf -- prune

# s390x #####
# XXX: passing --nobest otherwise we fail to solve the dependencies
bazel run \
--config=s390x \
//:bazeldnf -- rpmtree \
--public \
--name testimage_s390x --arch s390x \
--nobest \
--basesystem centos-stream-release \
${bazeldnf_repos} \
$centos_base \
$centos_extra \
$testimage

bazel run \
--config=s390x \
//:bazeldnf -- rpmtree \
--public --nobest \
--name centos_base_s390x --arch s390x \
--basesystem centos-stream-release \
${bazeldnf_repos} \
$centos_base \
$centos_extra

bazel run \
--config=s390x \
//:bazeldnf -- rpmtree \
--public --nobest \
--name cdi_importer_base_s390x --arch s390x \
--basesystem centos-stream-release \
${bazeldnf_repos} \
$centos_base \
$centos_extra \
$cdi_importer

bazel run \
--config=s390x \
//:bazeldnf -- rpmtree \
--public --nobest \
--name cdi_uploadserver_base_s390x --arch s390x\
--basesystem centos-stream-release \
${bazeldnf_repos} \
$centos_base \
$centos_extra \
$cdi_uploadserver

# remove all RPMs which are no longer referenced by a rpmtree
bazel run \
--config=s390x \
//:bazeldnf -- prune

10 changes: 9 additions & 1 deletion repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,12 @@ repositories:
- arch: aarch64
baseurl: https://download.copr.fedorainfracloud.org/results/nsoffer/ovirt-imageio-preview/centos-stream-9-aarch64/
name: ovirt-imageio-preview
gpgkey: https://download.copr.fedorainfracloud.org/results/nsoffer/ovirt-imageio-preview/pubkey.gpg
gpgkey: https://download.copr.fedorainfracloud.org/results/nsoffer/ovirt-imageio-preview/pubkey.gpg
- arch: s390x
baseurl: http://mirror.stream.centos.org/9-stream/BaseOS/s390x/os/
name: centos/stream9-baseos-s390x
gpgkey: https://www.stream.centos.org/keys/RPM-GPG-KEY-CentOS-Official
- arch: s390x
baseurl: http://mirror.stream.centos.org/9-stream/AppStream/s390x/os/
name: centos/stream9-appstream-s390x
gpgkey: https://www.stream.centos.org/keys/RPM-GPG-KEY-CentOS-Official