Skip to content

Fix RPM linking logic #52703

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

Merged
hugoShaka merged 1 commit into from
Mar 3, 2025
Merged

Fix RPM linking logic #52703

Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion build.assets/build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ if [[ "${RUNTIME}" == "fips" ]]; then
OPTIONAL_RUNTIME_SECTION+="-fips"
fi

# After install is --after-install except for RPM, we use --rpm-posttrans.
# This is because RPM runs after install scrips before the old package removal,
# so old Teleport are still here and we cannot run our teleport-update symlink logic.
AFTER_INSTALL_TARGET="--after-install"

# set variables appropriately depending on type of package being built
if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
TARBALL_FILENAME="teleport-ent-v${TELEPORT_VERSION}-${PLATFORM}-${TARBALL_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
Expand Down Expand Up @@ -240,6 +245,8 @@ else
FILE_PERMISSIONS_STANZA="--rpm-user root --rpm-group root --rpm-use-file-permissions "
# the rpm/rpmmacros file suppresses the creation of .build-id files (see https://github.com/gravitational/teleport/issues/7040)
EXTRA_DOCKER_OPTIONS="-v $(pwd)/rpm/rpmmacros:/root/.rpmmacros"

AFTER_INSTALL_TARGET="--rpm-posttrans"
# if we set this environment variable, don't sign RPMs (can be useful for building test RPMs
# without having the signing keys)
if [ "${UNSIGNED_RPM}" == "true" ]; then
Expand Down Expand Up @@ -375,7 +382,7 @@ else
--provides teleport \
--prefix / \
--verbose \
--after-install /src/post-install \
"$AFTER_INSTALL_TARGET" /src/post-install \
--before-remove /src/before-remove \
${CONFIG_FILE_STANZA} \
${FILE_PERMISSIONS_STANZA} \
Expand Down
8 changes: 6 additions & 2 deletions examples/systemd/before-remove
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@

set -eu

echo "Removing symlinks from Teleport system paths..."
/opt/teleport/system/bin/teleport-update unlink-package || true
if [ $# -ge 1 ] && [ "$1" = "1" ]; then
echo "Skipping symlink removal as this is a package upgrade."
else
echo "Removing symlinks from Teleport system paths..."
/opt/teleport/system/bin/teleport-update unlink-package || true
fi