packager: fetch glibc corresponding to the host architecture on debian multiarch #126
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
specious
reviewed
Nov 25, 2021
| @@ -66,14 +65,16 @@ function package_libc_via_pacman { | |||
|
|
|||
| function package_libc_via_dpkg() { | |||
| if type dpkg-query > /dev/null 2>&1; then | |||
| if [[ $(dpkg-query --listfiles libc6 | wc -l) -gt 0 ]]; then | |||
| dpkg-query --listfiles libc6 | sed -E '/\.so$|\.so\.[0-9]+$/!d' | |||
| architecture=$(dpkg --print-architecture) | |||
There was a problem hiding this comment.
I just added Arch Linux support in the packager the other day, and I switched to using uname -m for checking the system architecture for rpm-based distros.
There was a problem hiding this comment.
Doesn't work on Debian though:
$ uname -m
x86_64
$ dpkg --print-architecture
amd64
Using x86_64 as the architecture does not work with dpkg.
There was a problem hiding this comment.
Oh, interesting.
And I just took a look with a fedora image from docker hub, and it turns out arch comes with coreutils on some distros:
$ arch --help
Usage: arch [OPTION]...
Print machine architecture.
--help display this help and exit
--version output version information and exit
GNU coreutils online help: <https://www.gnu.org/software/coreutils/>
Report any translation bugs to <https://translationproject.org/team/>
Full documentation <https://www.gnu.org/software/coreutils/arch>
or available locally via: info '(coreutils) arch invocation'
And the docs say:
archprints the machine hardware name, and is equivalent touname -m
There was a problem hiding this comment.
Just want to give you a heads up, I just opened PR #136, which has some simplifications in the same area as this PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
This is a Debian version of PR #120. Many Debian machines have both amd64 and i386 (64 and 32 bit x86-64) installed. When "dpkg-query --listfiles libc6" is run, dpkg doesn't know which package it's referring to:
The main page for more information on MultiArch is https://wiki.debian.org/Multiarch .
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.