Three more patches for devtools.
FC
>From 70fd977aa004f51dfd6b3dcaf2ad2037a144fd79 Mon Sep 17 00:00:00 2001
From: Francois Charette <[email protected]>
Date: Fri, 18 Sep 2009 21:39:37 +0200
Subject: [PATCH 1/3] Automate rm of repo-*86* when commiting "any" pkg
This commit integrates part of the functionality of commitpkg2any
in the standard commitpkg script. If the package is for arch=any
and there exists ../repos/$repo-{i686,x86_64}, then these are
removed.
NB: I believe commitpkg2any should be removed, as it encourages
converting a pkg to arch=any with the same $pkgver. It is better
practice to wait for a new version before releasing the pkg
with arch=any. It also saves bandwidth!
---
commitpkg | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/commitpkg b/commitpkg
index 1b1fc46..7b9c133 100755
--- a/commitpkg
+++ b/commitpkg
@@ -119,4 +119,14 @@ if [ $? -ne 0 ]; then
fi
echo "===> Tagged for $repo-$CARCH"
+if [ "$CARCH" == "any"]; then
+ if [ -d ../repos/${repo}-i686 -a -d ../repos/${repo}-x86_64 ]; then
+ pushd ..
+ svn rm $repo-i686
+ svn rm $repo-x86_64
+ svn commit -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+ popd
+ fi
+fi
+
# vim:ft=sh:ts=4:sw=4:et:
--
1.6.4.4
>From baf5e921d201ecd03a932f64ef95bd674d887a92 Mon Sep 17 00:00:00 2001
From: Francois Charette <[email protected]>
Date: Fri, 18 Sep 2009 21:48:59 +0200
Subject: [PATCH 2/3] remove commitpkg2any
---
commitpkg2any | 33 ---------------------------------
1 files changed, 0 insertions(+), 33 deletions(-)
delete mode 100755 commitpkg2any
diff --git a/commitpkg2any b/commitpkg2any
deleted file mode 100755
index db6b70b..0000000
--- a/commitpkg2any
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# This script commits an existing package as an 'any'
-# package. It is simply to help aid in the conversion
-# to any-based packages
-
-if [ $# -ne 1 ]; then
- echo "Syntax: $(basename $0) <repo>"
- exit 1
-fi
-
-repo=$1
-
-source PKGBUILD
-
-sed -i 's|^arch=.\+$|arch=(any)|' PKGBUILD
-
-svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
- Converted to arch=any" > /dev/null
-
-archrelease $repo-any
-if [ $? -ne 0 ]; then
- echo "Cancelled"
- exit 1
-fi
-echo "===> Tagged for $repo-any"
-
-pushd ..
-svn rm $repo-i686
-svn rm $repo-x86_64
-svn commit -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
-popd
-
-echo "Don't forget to run \"/arch/db-update $repo\" on gerolde"
--
1.6.4.4
>From 13b21a16a4b37c592d38a141908ce54526c4bef4 Mon Sep 17 00:00:00 2001
From: Francois Charette <[email protected]>
Date: Fri, 18 Sep 2009 22:00:13 +0200
Subject: [PATCH 3/3] Remove refs to commitpkg2any in Makefile
---
Makefile | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 0bee475..c5915e8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ install:
mkdir -p $(DESTDIR)/usr/bin
install -m 755 checkpkg $(DESTDIR)/usr/bin
install -m 755 commitpkg $(DESTDIR)/usr/bin
- install -m 755 commitpkg2any $(DESTDIR)/usr/bin
ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg
ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg
@@ -42,5 +41,4 @@ uninstall:
rm $(DESTDIR)/usr/bin/archrelease
rm $(DESTDIR)/usr/bin/archrm
rm $(DESTDIR)/usr/bin/communityco
- rm $(DESTDIR)/usr/bin/commitpkg2any
rm $(DESTDIR)/usr/bin/rebuildpkgs
--
1.6.4.4
