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

Support Ubuntu 22.04 #381

Merged
merged 5 commits into from
May 9, 2022
Merged

Support Ubuntu 22.04 #381

merged 5 commits into from
May 9, 2022

Conversation

kenhys
Copy link
Contributor

@kenhys kenhys commented Apr 25, 2022

This draft PR is derived from fluent/fluentd#3704 and push a commit on #378
to attempt to identify Ubuntu 22.04 buildability. (not ready for production)

  • Use newer ruby only for Ubuntu 22.04 because of supporting OpenSSL 3.x

KNOWN ISSUE: dh_shlibdeps causes an error.

dpkg-shlibdeps: error: no dependency information found for /build/td-agent-4.3.1/debian/tmp/opt/td-agent/lib/libruby.so.3.1 (used by debian/

@kenhys
Copy link
Contributor Author

kenhys commented Apr 28, 2022

% tar tvf td-agent-4.3.1.tar.gz |\grep ruby-  
...
-rw-r--r-- kenhys/docker 16919639 2022-04-28 16:34 td-agent-4.3.1/td-agent/downloads/ruby-2.7.6.tar.gz
-rw-r--r-- kenhys/docker 20553628 2022-04-28 16:34 td-agent-4.3.1/td-agent/downloads/ruby-3.1.2.tar.gz

# use ruby 3.x because distribution switches to OpenSSL 3.x.
return false unless File.exist?("/etc/os-release")
os_release_entries = File.open("/etc/os-release").readlines.map(&:strip)
os_release_entries.include?("UBUNTU_CODENAME=jammy") and os_release_entries.include?("ID=ubuntu")
Copy link
Contributor

@cosmo0920 cosmo0920 Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: This is not required but also CentOS Stream 9 (and RockyLinux 9) will be needed to switch using Ruby 3.1.
This is just for your information but we will need to handle this Ruby 3.1 switching in the future.

@cosmo0920
Copy link
Contributor

cosmo0920 commented Apr 28, 2022

FYI: aptly cannot handle Zstandard compressed control.tar.zst and data.tar.zst within debian package, now. This should be affected for Ubuntu Jammy (22.04) packages.
aptly-dev/aptly#1050

@kenhys
Copy link
Contributor Author

kenhys commented May 2, 2022

FYI: aptly cannot handle Zstandard compressed control.tar.zst and data.tar.zst within debian package, now. This should be affected for Ubuntu Jammy (22.04) packages. aptly-dev/aptly#1050

Thanks, as you pointed out, aptly 1.4.0+ds1-6 doesn't support it.

+ aptly -config=/work/fluentd/fluent-package-builder/.aptly.conf repo add td-agent4-jammy td-agent-release/4/ubuntu/jammy/
Loading packages...
[!] Unable to read file td-agent-release/4/ubuntu/jammy/pool/contrib/t/td-agent/td-agent_4.3.1-1_amd64.deb: unsupported tar compression in td-agent-release/4/ubuntu/jammy/pool/contrib/t/td-agent/td-agent_4.3.1-1_amd64.deb: control.tar.zst
[!] Some files were skipped due to errors:
  td-agent-release/4/ubuntu/jammy/pool/contrib/t/td-agent/td-agent_4.3.1-1_amd64.deb
ERROR: some files failed to be added

kenhys added 4 commits May 2, 2022 11:33
@kenhys
Copy link
Contributor Author

kenhys commented May 2, 2022

As a workaround, we can use xz as default package compression again.

Local repo [td-agent4-jammy] successfully added.
You can run 'aptly repo add td-agent4-jammy ...' to add packages to repository.
Loading packages...
[+] td-agent_4.3.1-1_amd64 added

Snapshot td-agent4-jammy-4.3.1-1 successfully created.
You can run 'aptly publish snapshot td-agent4-jammy-4.3.1-1' to publish snapshot as Debian repository.
Loading packages...
Generating metadata files and linking package files...
Finalizing metadata files...
Signing file 'Release' with gpg, please enter your passphrase when prompted:
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:

Snapshot td-agent4-jammy-4.3.1-1 has been successfully published.
Please setup your webserver to serve directory '/work/fluentd/fluent-package-builder/.aptly/public' with autoindexing.
Now you can add following line to apt sources:
  deb http://your-server/ubuntu/jammy/ jammy contrib
Don't forget to add your GPG key to apt with apt-key.

You can also use `aptly serve` to publish your repositories over HTTP quickly.

Don't forget to sync from /work/fluentd/fluent-package-builder/.aptly/.public/ to td-agent-release/4/

Aptly 1.4.0 can't handle zstd compression yet, (supported in
master, but not shipped), as a workaround, specify compression
algorithm explicitly.

Signed-off-by: Kentaro Hayashi <[email protected]>
@kenhys kenhys marked this pull request as ready for review May 2, 2022 05:27
@kenhys kenhys changed the title Draft: support Ubuntu 22.04 Support Ubuntu 22.04 May 2, 2022
@kenhys kenhys mentioned this pull request May 2, 2022
@kenhys kenhys requested a review from ashie May 9, 2022 08:49
Copy link
Member

@ashie ashie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ashie ashie merged commit 83c3fbd into fluent:master May 9, 2022
@ashie
Copy link
Member

ashie commented May 9, 2022

Thanks!
We'll release it as an experimental package.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants