github-merge-pr: fix loading .config if symbolic link is used

[maintainer-tools.git] / update_git_source_package.sh

diff --git a/update_git_source_package.sh b/update_git_source_package.sh
index 7a3e137d13ffcb857e947693febbddcd47457d88..d7f823755d6ed7573aa15f703859f01a9017b016 100755 (executable)
--- a/update_git_source_package.sh
+++ b/update_git_source_package.sh
@@ -74,7 +74,7 @@ grep -sq BuildPackage "$MAKEFILE" || {
        }
 }
 
-export TOPDIR
+export TOPDIR=$(cd "$TOPDIR"; pwd)
 export PATH="$TOPDIR/staging_dir/host/bin:$PATH"
 
 eval $(
@@ -160,7 +160,9 @@ GIT_FIXES="$(
                '#'[0-9]*)
                        case "$PKG_SOURCE_URL" in
                        *://github.com/*)
-                               echo "${PKG_SOURCE_URL%/}/issues/${issue#\#}"
+                               repourl=${PKG_SOURCE_URL%/}
+                               repourl=${repourl%.git}
+                               echo "${repourl}/issues/${issue#\#}"
                        ;;
                        *://git.openwrt.org/project/*)
                                project=${PKG_SOURCE_URL#*://git.openwrt.org/project/}
@@ -192,7 +194,7 @@ eval $(
                var.PKG_SOURCE
 )
 
-"$MAKE" -C "$(dirname "$MAKEFILE")" download || {
+"$MAKE" -C "$(dirname "$MAKEFILE")" download CONFIG_SRC_TREE_OVERRIDE= || {
        echo "Unable to download and pack updated Git sources." >&2
        exit 1
 }