Skip to content

Install relative symlinks #802

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
ydirson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Install relative symlinks #802

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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ install: precheck
# Plugin utilities
for i in $(SM_PLUGIN_UTILS); do \
install -D -m 755 utils/$$i $(SM_STAGING)/$(SM_LIBEXEC)$$i; \
ln -sf $(SM_LIBEXEC)$$i $(SM_STAGING)$(OPT_SM_DEST)plugins/$$i".py"; \
ln -sf --relative $(SM_STAGING)$(SM_LIBEXEC)$$i $(SM_STAGING)$(OPT_SM_DEST)plugins/$$i".py"; \
done
# Actual plugins (and plugin libraries)
for i in $(SM_PLUGINS); do \
Expand Down Expand Up @@ -331,7 +331,7 @@ install: precheck
# Install SR drivers with symlinks from the legacy location
for i in $(SM_DRIVERS); do \
install -D -m 755 drivers/$$i $(SM_STAGING)/$(SM_LIBEXEC)/drivers/$$i; \
ln -sf $(SM_LIBEXEC)drivers/$$i $(SM_STAGING)$(OPT_SM_DEST)/$$i; \
ln -sf --relative $(SM_STAGING)$(SM_LIBEXEC)drivers/$$i $(SM_STAGING)$(OPT_SM_DEST)/$$i; \
done
# Install legacy SR drivers
cd $(SM_STAGING)$(OPT_SM_DEST) && for i in $(SM_COMPAT_DRIVERS); do \
Expand All @@ -344,17 +344,17 @@ install: precheck
# Install libexec scripts with symlinks from the legacy location
for s in $(SM_LIBEXEC_SCRIPTS); do \
install -m 755 scripts/$$s $(SM_STAGING)$(SM_LIBEXEC)/$$s; \
ln -sf $(SM_LIBEXEC)$$s $(SM_STAGING)$(OPT_LIBEXEC)/$$s; \
ln -sf --relative $(SM_STAGING)$(SM_LIBEXEC)$$s $(SM_STAGING)$(OPT_LIBEXEC)/$$s; \
done
# Install libexec commands with symlinks from the legacy location
for s in $(SM_LIBEXEC_PY_CMDS); do \
install -m 755 utils/$$s $(SM_STAGING)$(SM_LIBEXEC)/$$s; \
ln -sf $(SM_LIBEXEC)$$s $(SM_STAGING)$(OPT_SM_DEST)/"$$s".py; \
ln -sf --relative $(SM_STAGING)$(SM_LIBEXEC)$$s $(SM_STAGING)$(OPT_SM_DEST)/"$$s".py; \
done
# Install libexec extras with symlinks from the legacy location
for s in $(SM_LIBEXEC_PY_XTRAS); do \
install -D -m 755 utils/"$$s".py $(SM_STAGING)$(SM_LIBEXEC)/xtra/$$s; \
ln -sf $(SM_LIBEXEC)xtra/$$s $(SM_STAGING)$(OPT_SM_DEST)/"$$s".py; \
ln -sf --relative $(SM_STAGING)$(SM_LIBEXEC)xtra/$$s $(SM_STAGING)$(OPT_SM_DEST)/"$$s".py; \
done
mkdir -p $(SM_STAGING)/etc/xapi.d/xapi-pre-shutdown
for s in $(SM_XAPI_SHUTDOWN_SCRIPTS); do \
Expand All @@ -365,10 +365,10 @@ install: precheck
done
# Install blktap2 and compatibility symlinks
install -D -m 755 utils/blktap2 $(SM_STAGING)$(BIN_DEST)/blktap2
ln -sf $(BIN_DEST)blktap2 $(SM_STAGING)$(OPT_BIN_DEST)/blktap2
ln -sf --relative $(SM_STAGING)$(BIN_DEST)blktap2 $(SM_STAGING)$(OPT_BIN_DEST)/blktap2
# Install tapdisk-cache-stats and compatibility symlinks
install -D -m 755 utils/tapdisk-cache-stats $(SM_STAGING)$(BIN_DEST)/tapdisk-cache-stats
ln -sf $(BIN_DEST)tapdisk-cache-stats $(SM_STAGING)$(OPT_BIN_DEST)/tapdisk-cache-stats
ln -sf --relative $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats $(SM_STAGING)$(OPT_BIN_DEST)/tapdisk-cache-stats

$(MAKE) -C dcopy install DESTDIR=$(SM_STAGING)

Expand Down
Loading