Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-30 20:00:25 +0200
committerErich Eckner <git@eckner.net>2018-09-30 20:00:25 +0200
commit98334a1cf9d9b78e29dc39ef55d17162df5bef49 (patch)
treef0f7250ff7e740e46fd01a80f000736940fe5061
parent968bff332a3d1eab840fbc4c9f61bd762b00cde8 (diff)
Revert "Merge branch 'archive-server'"
The changes to the PKGBUILDs should actually happen on a per-package level in our modification repository
-rwxr-xr-xlib/common-functions2
-rw-r--r--misc/PKGBUILD-appendix-for-archive-server68
2 files changed, 0 insertions, 70 deletions
diff --git a/lib/common-functions b/lib/common-functions
index e9585a4..34a3bf6 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -499,8 +499,6 @@ extract_source_directory() {
tar -x --strip-components=3 -C "${output}"
printf '\n' >> \
"${output}/PKGBUILD"
- cat "${base_dir}/misc/PKGBUILD-appendix-for-archive-server" >> \
- "${output}/PKGBUILD"
fi
if [ -n "${PKGBUILD_mod}" ]; then
diff --git a/misc/PKGBUILD-appendix-for-archive-server b/misc/PKGBUILD-appendix-for-archive-server
deleted file mode 100644
index a968159..0000000
--- a/misc/PKGBUILD-appendix-for-archive-server
+++ /dev/null
@@ -1,68 +0,0 @@
-for ((i=0; i<${#source[@]}; i++)); do
- infos=$(
- printf '%s\n' "${source[${i}]}" | \
- sed -n '
- s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\('"$(
- printf '%s\|' \
- 'https://git.archlinux.org/linux.git' \
- 'https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git' \
- 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' \
- 'https://github.com/zen-kernel/zen-kernel' \
- 'https://hg.mozilla.org/mozilla-unified' | \
- sed '
- s/\\|$//
- s/[.]/[.]/g
- '
- )"'\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@
- T
- p
- '
- )
- if [ -n "${infos}" ]; then
- source[${i}]=$(
- type="${infos%% *}"
- infos="${infos#* }"
- if [ -n "${infos%% *}" ]; then
- prefix="${infos%% *}"
- else
- prefix=''
- fi
- infos="${infos#* }"
- repo="${infos%% *}"
- repo64=$(
- printf '%s' "${repo}" | \
- base64 -w0 | \
- sed 's/=/%3D/g'
- )
- infos="${infos#* }"
- if [ "${infos%% *}" = '?signed' ]; then
- key_check=$(
- printf '&valid_keys='
- printf '%s,' "${validpgpkeys[@]}" | \
- sed 's/,$//'
- )
- else
- key_check=''
- fi
- infos="${infos#* }"
- if [ -z "${prefix}" ]; then
- prefix="${repo%.git}"
- prefix="${prefix##*/}"
- fi
- prefix_64=$(
- printf '%s/' "${prefix}" | \
- base64 -w0 | \
- sed 's/=/%3D/g'
- )
-
- printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \
- "${prefix}" \
- "${pkgver}" \
- "${type}" \
- "${prefix_64}" \
- "${repo64}" \
- "${key_check}" \
- "${infos}"
- )
- fi
-done