Skip to content

common/update_version_env(): don't set both ABI_FILE and OSVERSION #1261

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.

Sign up for GitHub

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

Open
svmhdvn wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −1
Open

common/update_version_env(): don't set both ABI_FILE and OSVERSION #1261

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/share/poudriere/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3465,11 +3465,13 @@ update_version_env() {
local osversion="$5"
local login_env

login_env=",UNAME_r=${version% *},UNAME_v=FreeBSD ${version},OSVERSION=${osversion}"
login_env=",UNAME_r=${version% *},UNAME_v=FreeBSD ${version}"

# Tell pkg(8) to not use /bin/sh for the ELF ABI since it is native.
if [ "${QEMU_EMULATING}" -eq 1 ]; then
login_env="${login_env},ABI_FILE=\/usr\/lib\/crt1.o"
else
login_env="${login_env},OSVERSION=${osversion}"
fi

# Check TARGET=i386 not TARGET_ARCH due to pc98/i386
Expand Down