[svn] r4928 - in trunk/tools/dar: . dists/el2i dists/el3a dists/el3i dists/el4a dists/el4i dists/fc1i dists/fc2a dists/fc2i dists/fc3a dists/fc3i dists/fc4i dists/rh6i dists/rh7i dists/rh8i dists/rh9i scripts

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Nov 22 14:52:12 CET 2006


Author: dag
Date: 2006-11-22 14:51:53 +0100 (Wed, 22 Nov 2006)
New Revision: 4928

Modified:
   trunk/tools/dar/dar-build
   trunk/tools/dar/dar-functions
   trunk/tools/dar/dar-sync
   trunk/tools/dar/dists/el2i/config
   trunk/tools/dar/dists/el3a/config
   trunk/tools/dar/dists/el3i/config
   trunk/tools/dar/dists/el4a/config
   trunk/tools/dar/dists/el4i/config
   trunk/tools/dar/dists/fc1i/config
   trunk/tools/dar/dists/fc2a/config
   trunk/tools/dar/dists/fc2i/config
   trunk/tools/dar/dists/fc3a/config
   trunk/tools/dar/dists/fc3i/config
   trunk/tools/dar/dists/fc4i/config
   trunk/tools/dar/dists/rh6i/config
   trunk/tools/dar/dists/rh7i/config
   trunk/tools/dar/dists/rh8i/config
   trunk/tools/dar/dists/rh9i/config
   trunk/tools/dar/scripts/pre-new-release.sh
Log:
A few updates from the past.

Modified: trunk/tools/dar/dar-build
===================================================================
--- trunk/tools/dar/dar-build	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dar-build	2006-11-22 13:51:53 UTC (rev 4928)
@@ -176,6 +176,7 @@
 
 			export origspecfile="$SPECFILE" specfile="$NEWSPECFILE" builddir="$BUILDDIR" chrootdir="$CHROOTDIR/$dist"
 			export app buildarch="$arch" distarch="$DISTARCH" disttag="$DISTNAME" repotag="$TAG" release="$RELEASE"
+			export force="$FORCE_OVERWRITE"
 			for script in $CONFIGDIR/scripts/pre-*.sh; do
 				source "$script"
 			done
@@ -275,6 +276,9 @@
 				unset SETARCH
 			fi
 
+			### Disable ExtUtils::AutoInstall in perl packages
+			export PERL_EXTUTILS_AUTOINSTALL="--skipdeps --skip"
+
 			### Remove buildroot
 			rm -rf "$TEMPDIR/root-$app-$VERSION"
 

Modified: trunk/tools/dar/dar-functions
===================================================================
--- trunk/tools/dar/dar-functions	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dar-functions	2006-11-22 13:51:53 UTC (rev 4928)
@@ -450,6 +450,7 @@
 function build_repo {
 	local DISTPATH="$1"
 	local REPODATA="$FTPDIR/$DISTPATH/$REPO/repodata/"
+	local DISTDESC="$2"
 
 	if [ "$DISTNICK" ]; then
 		local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
@@ -463,7 +464,10 @@
 	if [ -d "$FTPDIR/$DISTPATH/$REPO/.olddata/" ]; then
 		rm -rf "$FTPDIR/$DISTPATH/$REPO/.olddata/"
 	fi
-	createrepo -q $OPTIONS --update -c "$TEMPDIR/.cache/createrepo/" "$FTPDIR/$DISTPATH/$REPO"
+	if [ ! -d "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO" ]; then
+		mkdir -p "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO"
+	fi
+	createrepo -q $OPTIONS --checkts -c "$TEMPDIR/.cache/createrepo/$DISTNICK/$REPO" "$FTPDIR/$DISTPATH/$REPO"
 	sync
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >"$REPODATA/repomd.xml"
 	echo "<repomd xmlns=\"http://linux.duke.edu/metadata/repo\">" >>"$REPODATA/repomd.xml"
@@ -479,6 +483,9 @@
 		echo "  </data>" >>"$REPODATA/repomd.xml"
 	done
 	echo "</repomd>" >>"$REPODATA/repomd.xml"
+
+	repoview --quiet --title="RPMforge: $DISTDESC" "$FTPDIR/$DISTPATH/$REPO"
+	repoview --quiet --url="http://apt.sw.be/$DISTPATH/" "$FTPDIR/$DISTPATH/$REPO"
 }
 
 function build_repo_srpms {

Modified: trunk/tools/dar/dar-sync
===================================================================
--- trunk/tools/dar/dar-sync	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dar-sync	2006-11-22 13:51:53 UTC (rev 4928)
@@ -61,7 +61,7 @@
 		fi
 
 		if [ "$REPO_CREATEREPO" == "yes" ]; then
-			build_repo "$DISTPATH"
+			build_repo "$DISTPATH" "$DISTDESC"
 		fi
 	fi
 	build_env "$DISTNICK" "$DISTNAME"

Modified: trunk/tools/dar/dists/el2i/config
===================================================================
--- trunk/tools/dar/dists/el2i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/el2i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -9,6 +9,7 @@
 
 RPMBUILDOPTS='--define "rhel 2"'
 
+DISTDESC="Red Hat Enterprise Linux 2.1 (i386)"
 DISTNAME="el2"
 DISTNICK="el2i"
 DISTTAG="0.el2 rhel2.1"
@@ -16,7 +17,7 @@
 DISTARCH="i386"
 
 REPO_APT="yes"
-REPO_YUM="no"
+REPO_YUM="yes"
 REPO_CREATEREPO="yes"
 
 export LD_ASSUME_KERNEL="2.4.1"

Modified: trunk/tools/dar/dists/el3a/config
===================================================================
--- trunk/tools/dar/dists/el3a/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/el3a/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -9,6 +9,7 @@
 
 RPMBUILDOPTS='--define "rhel 3"'
 
+DISTDESC="Red Hat Enterprise Linux 3 (x86_64)"
 DISTNAME="el3"
 DISTNICK="el3a"
 DISTTAG="1.el3 rhel3"

Modified: trunk/tools/dar/dists/el3i/config
===================================================================
--- trunk/tools/dar/dists/el3i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/el3i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -9,6 +9,7 @@
 
 RPMBUILDOPTS='--define "rhel 3"'
 
+DISTDESC="Red Hat Enterprise Linux 3 (i386)"
 DISTNAME="el3"
 DISTNICK="el3i"
 DISTTAG="1.el3 rhel3"

Modified: trunk/tools/dar/dists/el4a/config
===================================================================
--- trunk/tools/dar/dists/el4a/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/el4a/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -9,6 +9,7 @@
 
 RPMBUILDOPTS='--define "rhel 4"'
 
+DISTDESC="Red Hat Enterprise Linux 4 (x86_64)"
 DISTNAME="el4"
 DISTNICK="el4a"
 DISTTAG="2.el4"

Modified: trunk/tools/dar/dists/el4i/config
===================================================================
--- trunk/tools/dar/dists/el4i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/el4i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -9,6 +9,7 @@
 
 RPMBUILDOPTS='--define "rhel 4"'
 
+DISTDESC="Red Hat Enterprise Linux 4 (i386)"
 DISTNAME="el4"
 DISTNICK="el4i"
 DISTTAG="2.el4"

Modified: trunk/tools/dar/dists/fc1i/config
===================================================================
--- trunk/tools/dar/dists/fc1i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc1i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "fedora 1"'
 
+DISTDESC="Fedora Core 1 (i386)"
 DISTNAME="fc1"
 DISTNICK="fc1i"
 DISTTAG="1.fc1 rhfc1"

Modified: trunk/tools/dar/dists/fc2a/config
===================================================================
--- trunk/tools/dar/dists/fc2a/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc2a/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -14,6 +14,7 @@
 
 RPMBUILDOPTS='--define "fedora 2"'
 
+DISTDESC="Fedora Core 2 (x86_64)"
 DISTNAME="fc2"
 DISTNICK="fc2a"
 DISTTAG="1.fc2"

Modified: trunk/tools/dar/dists/fc2i/config
===================================================================
--- trunk/tools/dar/dists/fc2i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc2i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "fedora 2"'
 
+DISTDESC="Fedora Core 2 (i386)"
 DISTNAME="fc2"
 DISTNICK="fc2i"
 DISTTAG="1.fc2"

Modified: trunk/tools/dar/dists/fc3a/config
===================================================================
--- trunk/tools/dar/dists/fc3a/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc3a/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "fedora 3"'
 
+DISTDESC="Fedora Core 3 (x86_64)"
 DISTNAME="fc3"
 DISTNICK="fc3a"
 DISTTAG="1.fc3"

Modified: trunk/tools/dar/dists/fc3i/config
===================================================================
--- trunk/tools/dar/dists/fc3i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc3i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "fedora 3"'
 
+DISTDESC="Fedora Core 3 (i386)"
 DISTNAME="fc3"
 DISTNICK="fc3i"
 DISTTAG="1.fc3"

Modified: trunk/tools/dar/dists/fc4i/config
===================================================================
--- trunk/tools/dar/dists/fc4i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/fc4i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -13,6 +13,7 @@
 
 RPMBUILDOPTS='--define "fedora 3"'
 
+DISTDESC="Fedora Core 4 (i386)"
 DISTNAME="fc4"
 DISTNICK="fc4i"
 DISTTAG="2.fc4"

Modified: trunk/tools/dar/dists/rh6i/config
===================================================================
--- trunk/tools/dar/dists/rh6i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/rh6i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "rhl 6"'
 
+DISTDESC="Red Hat Linux 6.2 (i386)"
 DISTNAME="rh6"
 DISTNICK="rh6i"
 DISTTAG="0.rh6 rh62"

Modified: trunk/tools/dar/dists/rh7i/config
===================================================================
--- trunk/tools/dar/dists/rh7i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/rh7i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "rhl 7"'
 
+DISTDESC="Red Hat Linux 7.3 (i386)"
 DISTNAME="rh7"
 DISTNICK="rh7i"
 DISTTAG="0.rh7 rh73"

Modified: trunk/tools/dar/dists/rh8i/config
===================================================================
--- trunk/tools/dar/dists/rh8i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/rh8i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -11,6 +11,7 @@
 
 RPMBUILDOPTS='--define "rhl 8"'
 
+DISTDESC="Red Hat Linux 8.0 (i386)"
 DISTNAME="rh8"
 DISTNICK="rh8i"
 DISTTAG="0.rh8 rh80"

Modified: trunk/tools/dar/dists/rh9i/config
===================================================================
--- trunk/tools/dar/dists/rh9i/config	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/dists/rh9i/config	2006-11-22 13:51:53 UTC (rev 4928)
@@ -13,6 +13,7 @@
 
 RPMBUILDOPTS='--define "rhl 9"'
 
+DISTDESC="Red Hat Linux 9 (i386)"
 DISTNAME="rh9"
 DISTNICK="rh9i"
 DISTTAG="0.rh9 rh90"

Modified: trunk/tools/dar/scripts/pre-new-release.sh
===================================================================
--- trunk/tools/dar/scripts/pre-new-release.sh	2006-11-22 12:57:33 UTC (rev 4927)
+++ trunk/tools/dar/scripts/pre-new-release.sh	2006-11-22 13:51:53 UTC (rev 4928)
@@ -5,7 +5,7 @@
 script="pre-new-release"
 release_regex="\b\.2$"
 
-if [ "$disttag" != "fc5" ] && echo $release | grep -q -E "$release_regex"; then
+if [ -z "$force" ] && [ "$disttag" != "fc5" -a "$disttag" != "fc6" -a "$disttag" != "el5" ] && echo $release | grep -q -E "$release_regex"; then
 	echo "** $script: Not building $app for $disttag/$arch since $release matches new release scheme."
 	continue 2
 fi




More information about the commits mailing list