Changeset 29704

Timestamp:

2015-02-03T09:53:54+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Updated pacman repo script to no longer symlink noarch packages into 32- and 64-bit repos. This change results in wasted space (as the files are now duplicated), however it also makes the repo easier to manage, and allows it to be served from a webserver (or filesystem) that doesn't support symlinks

Location:

main/trunk/package-kits/linux/repos

Files:

• ReadMe (modified) (3 diffs)
• pacman (modified) (4 diffs)

main/trunk/package-kits/linux/repos/ReadMe

@@ -33 +33 @@
 and to maintain the repositories for those package-managers (e.g. adding new
 versions of packages)
+Usage:
+    setup           - creates the package manager's repo, and any config / readme files
+    add <pkg> [...] - adds any number of packages to the repo
 
 ./apt
+    Depends on: reprepro gnupg
     Generates an apt package repository under ./repos/
     reprepro is used to manage the repository, so this script just generates the
@@ -40 +44 @@
 
 ./pacman
+    Depends on: repo-add gnupg xdelta3
     Generates a pacman package repository under ./repos/
     repo-add is used to manage the repositories.
@@ -47 +52 @@
 
 ./rpm
+    Depends on: createrepo rpmsign gnupg
     Generates a rpm package repository under ./repos/
     createrepo is used to manage the repositories.

main/trunk/package-kits/linux/repos/pacman

@@ -8 +8 @@
 
 repo_add_check() {
-    cd $repos/arch/ || {
+    test -d $repos/arch/ || {
         echo "Repository not found. Have you set it up?" >&2
         exit 1
@@ -21 +21 @@
     setup)
         echo "Making arch package repository folders"
-        for arch in any x86_64 i686; do
+        for arch in x86_64 i686; do
             mkdir -p $repos/arch/$arch || exit 1
         done
@@ -50 +50 @@
         for pkg in $@; do
             # Default to all architectures unless an architecture is specified
-            arch="any"
+            arch="x86_64 i686"
             echo $pkg | grep 'x86_64\.pkg' >/dev/null 2>/dev/null && {
                 arch="x86_64"
@@ -58 +58 @@
             }
             name="$(basename $pkg)"
-            echo "$name: $arch"
-            cp $pkg $arch/
-            rm -f "$arch/${name}.sig"
-            gpg --detach-sign --use-agent --default-key $keyid "$arch/$name"
-            # If arch is any, symlink package into all architectures
-            if test "$arch" = "any"; then
-                for link in x86_64 i686; do
-                    echo "$name: $link (linked)"
-                    cd $link
-                    ln -sf ../any/$name $name
-                    ln -sf ../any/${name}.sig ${name}.sig
-                    cd ..
-                done
-                arch="any x86_64 i686"
-            fi
-
             for pkgarch in $arch; do
-                cd $pkgarch
-                repo-add -s -k $keyid -v -d ${label}.db.tar.xz $name
-                cd ..
+                dir="$repos/arch/$pkgarch"
+                cp "$pkg" "$dir/"
+                cd "$dir"
+                echo "$name: $pkgarch"
+                rm -f "${name}.sig"
+                gpg --detach-sign --use-agent --default-key "$keyid" "$name"
+                repo-add -s -k "$keyid" -v -d "${label}.db.tar.xz" "$name"
+                cd -
             done
         done