[pacman-dev] [PATCH 1/2] makepkg: do not create symlinks in build directory
Allan McRae
allan at archlinux.org
Mon Apr 17 08:43:34 UTC 2017
Setting PKGDEST and friends enables us to keep all built packages in a single
location. Symlinking these files into the build directory creates unnecessary
clutter and requires clean-up in multiple places when removing old version.
Signed-off-by: Allan McRae <allan at archlinux.org>
---
Does anyone use these symlinks? Are they needed?
Removing this makes the next patch much easier...
scripts/makepkg.sh.in | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 0218e13b..be0ea72e 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -771,20 +771,6 @@ create_package() {
fi
create_signature "$pkg_file"
-
- if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then
- rm -f "${pkg_file/$PKGDEST/$startdir}"
- ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
- ret=$?
- if [[ -f $pkg_file.sig ]]; then
- rm -f "${pkg_file/$PKGDEST/$startdir}.sig"
- ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig"
- fi
- fi
-
- if (( ret )); then
- warning "$(gettext "Failed to create symlink to package file.")"
- fi
}
create_debug_package() {
@@ -884,20 +870,6 @@ create_srcpackage() {
create_signature "$pkg_file"
- if [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
- rm -f "${pkg_file/$SRCPKGDEST/$startdir}"
- ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
- ret=$?
- if [[ -f $pkg_file.sig ]]; then
- rm -f "${pkg_file/$SRCPKGDEST/$startdir}.sig"
- ln -s "$pkg_file.sig" "${pkg_file/$SRCPKGDEST/$startdir}.sig"
- fi
- fi
-
- if (( ret )); then
- warning "$(gettext "Failed to create symlink to source package file.")"
- fi
-
cd_safe "${startdir}"
rm -rf "${srclinks}"
}
--
2.12.0
More information about the pacman-dev
mailing list