Skip to content
Snippets Groups Projects
Commit 6b86a8bf authored by Stan Hu's avatar Stan Hu
Browse files

Provide packages for RaspberryPi OS 11 Bullseye

parent 3f47141b
No related branches found
No related tags found
1 merge request!85Merged upstream 15.5.0+rc42.ce.0
......@@ -92,7 +92,7 @@
bundle 'config force_ruby_platform true', env: env if OhaiHelper.ruby_native_gems_unsupported?
bundle 'config build.gpgme --use-system-libraries', env: env
bundle "config build.nokogiri --use-system-libraries --with-xml2-include=#{install_dir}/embedded/include/libxml2 --with-xslt-include=#{install_dir}/embedded/include/libxslt", env: env
bundle 'config build.grpc --with-ldflags="-latomic"', env: env if OhaiHelper.os_platform == 'raspbian'
bundle 'config build.grpc --with-ldflags=-Wl,--no-as-needed --with-dldflags=-latomic', env: env if OhaiHelper.os_platform == 'raspbian'
bundle "config set --local frozen 'true'"
bundle "install --without #{bundle_without.join(' ')} --jobs #{workers} --retry 5", env: env
......
......@@ -56,6 +56,6 @@
patch source: 'readline-3-9.patch'
# Patch to avoid building nis module in Debian 11. If nis is built, it gets
# linked to system `nsl` and `tirpc` libraries and thus fail omnibus
# linked to system `nsl` and `tirpc` libraries and thus fails omnibus
# healthcheck in Debian 11 and Ubuntu 22.04.
patch source: 'skip-nis-build.patch' if
......@@ -60,6 +60,6 @@
# healthcheck in Debian 11 and Ubuntu 22.04.
patch source: 'skip-nis-build.patch' if
(ohai['platform'] =~ /^debian/ && ohai['platform_version'] =~ /^11/) ||
(ohai['platform_family'] =~ /^debian/ && ohai['platform_version'] =~ /^11/) ||
(ohai['platform'] =~ /^ubuntu/ && ohai['platform_version'] =~ /^22/)
command ['./configure',
......
......@@ -56,6 +56,8 @@
update_config_guess
make "-j #{workers} BUILD_TLS=yes", env: env
make_args = ['BUILD_TLS=yes']
make_args << 'uname_M=armv6l' if OhaiHelper.raspberry_pi?
make "-j #{workers} #{make_args.join(' ')}", env: env
make 'install', env: env
end
......@@ -418,6 +418,11 @@
Raspberry-Pi-2-Buster-branch:
image: "${BUILDER_IMAGE_REGISTRY}/rpi_10:${BUILDER_IMAGE_REVISION}"
extends: .rpi_branch_template
Raspberry-Pi-2-Bullseye-branch:
image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
extends: .rpi_branch_template
# This job runs only on nightly EE builds
RAT-Nightly:
stage: slow_jobs
......@@ -1007,8 +1012,12 @@
extends: .rpi_tag_template
image: "${BUILDER_IMAGE_REGISTRY}/rpi_10:${BUILDER_IMAGE_REVISION}"
Raspberry-Pi-2-Bullseye:
extends: .rpi_tag_template
image: "${BUILDER_IMAGE_REGISTRY}/rpi_11:${BUILDER_IMAGE_REVISION}"
Raspberry-Pi-2-Buster-release:
extends: .raspbian_release_template
needs:
- Raspberry-Pi-2-Buster
......@@ -1010,8 +1019,13 @@
Raspberry-Pi-2-Buster-release:
extends: .raspbian_release_template
needs:
- Raspberry-Pi-2-Buster
Raspberry-Pi-2-Bullseye-release:
extends: .raspbian_release_template
needs:
- Raspberry-Pi-2-Bullseye
AWS-CE-Release:
variables:
AWS_LISTING_NAME: "GitLab Community Edition"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment