Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/bin/build-packages
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-11-22 22:44:50 +0100
committerErich Eckner <git@eckner.net>2017-11-22 22:44:50 +0100
commitbfc69b2cd5b771b6483c6e9b95ea36f6f9d82cda (patch)
tree75d89e4b677256a61bfe87708ffbb203b3a1e038 /bin/build-packages
parentff14cb6fc84d96d65b1a7175a361bff605c86bf7 (diff)
bin/build-packages, bin/common-functions: accept and respect sub_pkgrel from get-assignment
Diffstat (limited to 'bin/build-packages')
-rwxr-xr-xbin/build-packages14
1 files changed, 12 insertions, 2 deletions
diff --git a/bin/build-packages b/bin/build-packages
index bb1a5be..4f455b3 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -180,12 +180,22 @@ while [ "${count}" -ne 0 ]; do
0)
[ ${count} -gt 0 ] && \
count=$((count-1))
+ sub_pkgrel="${package##* }"
+ package="${package% *}"
repository="${package##* }"
package="${package% *}"
mod_git_revision="${package##* }"
package="${package% *}"
git_revision="${package##* }"
- package="${package% *}"
+ if [ "${git_revision}" = "${package}" ]; then
+ # build master did not tell us a sub_pkgrel
+ git_revision="${mod_git_revision}"
+ mod_git_revision="${repository}"
+ repository="${sub_pkgrel}"
+ sub_pkgrel='0'
+ else
+ package="${package% *}"
+ fi
if [ "${git_revision##*-}" = 'HEAD' ]; then
git_revision=$(
@@ -233,7 +243,7 @@ while [ "${count}" -ne 0 ]; do
tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
trap bail_out EXIT
- extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}"
+ extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" "${sub_pkgrel}"
cd "${tmp_dir}"
success=false