Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2025-04-03 07:25:13 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2025-04-03 07:25:13 +0200
commit9557b6ced97a26959ccb19de2b0bf248740df306 (patch)
tree87f7aee9ad272f3cf209d2ef57cc8d95918f5f5a
parent58480403d9b74ac5f84108a24544d4e3506fbf35 (diff)
clarified some AUR migration stepsHEADmaster
-rw-r--r--templates/summary.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/summary.m4 b/templates/summary.m4
index c39f6c6..c8cf5ed 100644
--- a/templates/summary.m4
+++ b/templates/summary.m4
@@ -52,7 +52,7 @@ _SECTION_HEADER(h3,_DROPPING_TO_AUR_PREEXISTING_IN_AUR)
git clone ssh://aur@aur.archlinux.org/&lt;package&gt; &lt;package&gt;
cd &lt;package&gt;
attach the upstream gitlab repo of the dropped package
-git remote add gitlab https://gitlab.archlinux.org/archlinux/packaging/packages/mp3wrap.git
+git remote add gitlab https://gitlab.archlinux.org/archlinux/packaging/packages/&lt;package&gt;.git
git fetch gitlab
# gitlab uses main as main branch, AUR still master
git checkout main
@@ -66,6 +66,10 @@ git merge --allow-unrelated-histories main
# last pakcage versions, you can also just rebase to the version of main
# gitlab
git commit -a -m 'merged with gitlab &lt;package&gt; (existed before in the AUR)'
+# AUR doesn't like subdirs, rewrite the git history so that they are in the root directory
+# also, maybe remove the 'keys' subdir with pgp keys
+git filter-repo --path-rename &lt;subdir&gt/:
+git commit -a -m 'rewrote git history removing subdirs'
git push origin master
</code></pre>