Changeset 29705 for main

Timestamp:

2015-02-03T09:59:21+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Updated rpm repo script to no longer symlink noarch packages into 32- and 64-bit repos. (see r29704 where the same was done for pacman)

File:

• main/trunk/package-kits/linux/repos/rpm (modified) (3 diffs)

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

@@ -8 +8 @@
 
 createrepo_check() {
-    cd $repos/rpm/ || {
+    test -d $repos/rpm/ || {
         echo "Repository not found. Have you set it up?" >&2
         exit 1
@@ -53 +53 @@
         for pkg in $@; do
             # Default to all architectures unless an architecture is specified
-            arch="any"
+            arch="x86_64 i386"
             echo $pkg | grep 'x86_64\.rpm' >/dev/null 2>/dev/null && {
                 arch="x86_64"
@@ -61 +61 @@
             }
             name="$(basename $pkg)"
-            echo "$name: $arch"
-            cp $pkg $arch/
-            # Unfortunately RPM is (as usual) sub-standard, and will not use
-            # gpg-agent. As such, you will probably be forced to enter a pass
-            # phrase for every single package that gets signed, regardless of
-            # whether your GPG key even has a pass-phrase (just hit enter in
-            # that case)
-            echo "Signing $name..."
-            rpmsign --key-id=$keyid --addsign $arch/$name
-            # If arch is any, symlink package into all architectures
-            if test "$arch" = "any"; then
-                for link in x86_64 i386; do
-                    echo "$name: $link (linked)"
-                    cd $link
-                    ln -sf ../any/$name $name
-                    cd ..
-                done
-            fi
+            for pkgarch in $arch; do
+                dir="$repos/rpm/$pkgarch"
+                cp "$pkg" "$dir/"
+                cd "$dir"
+                echo "$name: $arch"
+                # Unfortunately RPM is (as usual) sub-standard, and will not use
+                # gpg-agent. As such, you will probably be forced to enter a pass
+                # phrase for every single package that gets signed, regardless of
+                # whether your GPG key even has a pass-phrase (just hit enter in
+                # that case)
+                echo "Signing $name..."
+                rpmsign --key-id="$keyid" --addsign "$name"
+                cd -
+            done
         done
         for arch in x86_64 i386; do
-            cd $arch
+            cd "$repos/rpm/$arch"
             createrepo --update .
             rm -f repodata/repomd.xml.asc
-            gpg --detach-sign --armor --use-agent --default-key $keyid repodata/repomd.xml
-            cd ..
+            gpg --detach-sign --armor --use-agent --default-key "$keyid" repodata/repomd.xml
+            cd -
         done
         ;;