[svn] r5169 - in trunk/tools/dar: . dists/el2i dists/el3a
dists/el3i dists/el4a dists/el4i
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Wed Feb 14 19:02:33 CET 2007
Author: dag
Date: 2007-02-14 19:02:32 +0100 (Wed, 14 Feb 2007)
New Revision: 5169
Modified:
trunk/tools/dar/dar-functions
trunk/tools/dar/dar-sync
trunk/tools/dar/dar.conf
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
Log:
Updates
Modified: trunk/tools/dar/dar-functions
===================================================================
--- trunk/tools/dar/dar-functions 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dar-functions 2007-02-14 18:02:32 UTC (rev 5169)
@@ -288,7 +288,7 @@
RC=1
while [ $RC -ne 0 -a $i -lt 4 ]; do
# wget -v -t5 -T2 -O "$filename" "$url"
- wget -q -t5 -T2 -O "$filename" "$url"
+ wget -q -t30 -T2 --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)" -O "$filename" "$url"
# wget -q -T1 -O "$filename" "$url"
# lftpget "$url" -c -o "$filename"
# lftpget "$url" -c -O "$(dirname $filename)" -o "$(basename $filename)"
@@ -360,6 +360,8 @@
local DISTTAG="$1"
local DISTPATH="$2"
+ echo "Building Apt tree."
+
### Creating directories
mkdir -p $FTPDIR/$DISTPATH/{base,RPMS.$REPO}/
@@ -376,16 +378,35 @@
case "$DISTARCH" in
i386)
- echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
+ find $PACKAGEDIR -type f -a \( \
+ -name "*.$tag.$disttag.noarch.rpm" \
+ -o -name "*.$tag.$disttag.i?86.rpm" \
+ -o -name "*.$tag.$disttag.athlon.rpm" \
+ -o -name "*.$disttag.$tag.noarch.rpm" \
+ -o -name "*.$disttag.$tag.i?86.rpm" \
+ -o -name "*.$disttag.$tag.athlon.rpm" \
+ -o -name "*.0.$tag.noarch.rpm" \
+ -o -name "*.0.$tag.i?86.rpm" \
+ -o -name "*.0.$tag.athlon.rpm" \) \
+ -exec ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ \;
+# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
+# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
;;
# x86_64)
# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
# ;;
*)
- echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
+ find $PACKAGEDIR -type f -a \( \
+ -name "*.$tag.$disttag.noarch.rpm" \
+ -o -name "*.$tag.$disttag.$DISTARCH.rpm" \
+ -o -name "*.$disttag.$tag.noarch.rpm" \
+ -o -name "*.$disttag.$tag.$DISTARCH.rpm" \
+ -o -name "*.0.$tag.noarch.rpm" \
+ -o -name "*.0.$tag.$DISTARCH.rpm" \) \
+ -exec ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ \;
+# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null # Backward compatibility
+# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/RPMS.$REPO/ &>/dev/null
;;
esac
@@ -396,8 +417,10 @@
function build_repo_apt {
local DISTPATH="$1"
+ echo "Building Apt repo."
+
### Build Apt repository
- genbasedir --flat --bloat --bz2only $FTPDIR/$DISTPATH $REPO
+ genbasedir --flat --bloat --bz2only $FTPDIR/$DISTPATH $REPO >/dev/null
# genbasedir --progress --flat --bloat $FTPDIR/$DISTPATH $REPO
# genbasedir --progress --hashonly $FTPDIR/$DISTPATH $REPO
}
@@ -406,6 +429,8 @@
local DISTTAG="$1"
local DISTPATH="$2"
+ echo "Building Yum tree."
+
### Creating directories
mkdir -p $FTPDIR/$DISTPATH/$REPO/{RPMS,headers}/
@@ -421,16 +446,35 @@
case "$DISTARCH" in
i386)
- echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
+ find $PACKAGEDIR -type f -a \( \
+ -name "*.$tag.$disttag.noarch.rpm" \
+ -o -name "*.$tag.$disttag.i?86.rpm" \
+ -o -name "*.$tag.$disttag.athlon.rpm" \
+ -o -name "*.$disttag.$tag.noarch.rpm" \
+ -o -name "*.$disttag.$tag.i?86.rpm" \
+ -o -name "*.$disttag.$tag.athlon.rpm" \
+ -o -name "*.0.$tag.noarch.rpm" \
+ -o -name "*.0.$tag.i?86.rpm" \
+ -o -name "*.0.$tag.athlon.rpm" \) \
+ -exec ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ \;
+# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
+# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
;;
# x86_64)
# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,i386,i586,i686,athlon,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,i386,i586,i686,athlon,x86_64}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
# ;;
*)
- echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
- echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
+ find $PACKAGEDIR -type f -a \( \
+ -name "*.$tag.$disttag.noarch.rpm" \
+ -o -name "*.$tag.$disttag.$DISTARCH.rpm" \
+ -o -name "*.$disttag.$tag.noarch.rpm" \
+ -o -name "*.$disttag.$tag.$DISTARCH.rpm" \
+ -o -name "*.0.$tag.noarch.rpm" \
+ -o -name "*.0.$tag.$DISTARCH.rpm" \) \
+ -exec ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ \;
+# echo $PACKAGEDIR/*/*.$tag.$disttag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null # Backward compatibility
+# echo $PACKAGEDIR/*/*.{$disttag,0}.$tag.{noarch,$DISTARCH}.rpm | xargs -n 1 | xargs -i ln -f {} $FTPDIR/$DISTPATH/$REPO/RPMS/ &>/dev/null
;;
esac
@@ -442,6 +486,8 @@
function build_repo_yum {
local DISTPATH="$1"
+ echo "Building Yum repo."
+
### Build Yum repository
# yum-arch -q -z -d -c $FTPDIR/$DISTPATH/$REPO/
yum-arch -q -z $FTPDIR/$DISTPATH/$REPO/ &>/dev/null
@@ -452,6 +498,7 @@
local REPODATA="$FTPDIR/$DISTPATH/$REPO/repodata/"
local DISTDESC="$2"
+ echo "Building repomd."
if [ "$DISTNICK" ]; then
local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
fi
@@ -484,6 +531,7 @@
done
echo "</repomd>" >>"$REPODATA/repomd.xml"
+ echo "Building repoview."
repoview --quiet --title="RPMforge: $DISTDESC" "$FTPDIR/$DISTPATH/$REPO"
repoview --quiet --url="http://apt.sw.be/$DISTPATH/" "$FTPDIR/$DISTPATH/$REPO"
}
Modified: trunk/tools/dar/dar-sync
===================================================================
--- trunk/tools/dar/dar-sync 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dar-sync 2007-02-14 18:02:32 UTC (rev 5169)
@@ -13,12 +13,12 @@
if [ "$GPG_NAME" -a "$GPG_PATH" ]; then
echo "Signing (new) packages."
touch "$STATEDIR/rpmfind"
- pushd $PACKAGEDIR >/dev/null
+ cd $PACKAGEDIR
find . -newer $STATEDIR/rpmsign -name "*.rpm" -type f | xargs rpm --resign \
--define "_signature gpg" \
--define "_gpg_path $GPG_PATH" \
--define "_gpg_name $GPG_NAME"
- popd
+ cd -
if [ $? -eq 0 ]; then
touch -r "$STATEDIR/rpmfind" "$STATEDIR/rpmsign"
elif [ $? -gt 1 ]; then
Modified: trunk/tools/dar/dar.conf
===================================================================
--- trunk/tools/dar/dar.conf 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dar.conf 2007-02-14 18:02:32 UTC (rev 5169)
@@ -10,7 +10,8 @@
BUILDDIR="$ROOT/build"
TEMPDIR="$ROOT/tmp"
-DEFAULT_DISTS="el4a el4i fc3a fc3i fc2a fc2i fc1i el3a el3i rh9i rh7i el2i"
+#DEFAULT_DISTS="el4a el4i fc3a fc3i fc2a fc2i fc1i el3a el3i rh9i rh7i el2i"
+DEFAULT_DISTS="el4a el4i el3a el3i rh9i rh7i el2i"
DEFAULT_SOURCE_DISTS="el4i"
DEFAULT_ARCHS="i386"
DEFAULT_TAGS="rf dag"
Modified: trunk/tools/dar/dists/el2i/config
===================================================================
--- trunk/tools/dar/dists/el2i/config 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dists/el2i/config 2007-02-14 18:02:32 UTC (rev 5169)
@@ -4,9 +4,14 @@
DISTCC_CC="i386-redhat-linux-gcc-2.96"
DISTCC_CXX="i386-redhat-linux-g++-2.96"
-UPDATECMD="up2date -u"
-INSTALLCMD="up2date -if"
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
RPMBUILDOPTS='--define "rhel 2"'
DISTDESC="Red Hat Enterprise Linux 2.1 (i386)"
Modified: trunk/tools/dar/dists/el3a/config
===================================================================
--- trunk/tools/dar/dists/el3a/config 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dists/el3a/config 2007-02-14 18:02:32 UTC (rev 5169)
@@ -4,9 +4,14 @@
DISTCC_CC="x86_64-redhat-linux-gcc-3.2.3"
DISTCC_CXX="x86_64-redhat-linux-g++-3.2.3"
-UPDATECMD="up2date -u"
-INSTALLCMD="up2date -if"
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
RPMBUILDOPTS='--define "rhel 3"'
DISTDESC="Red Hat Enterprise Linux 3 (x86_64)"
Modified: trunk/tools/dar/dists/el3i/config
===================================================================
--- trunk/tools/dar/dists/el3i/config 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dists/el3i/config 2007-02-14 18:02:32 UTC (rev 5169)
@@ -4,9 +4,14 @@
DISTCC_CC="i386-redhat-linux-gcc-3.2.3"
DISTCC_CXX="i386-redhat-linux-g++-3.2.3"
-UPDATECMD="up2date -u"
-INSTALLCMD="up2date -if"
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
RPMBUILDOPTS='--define "rhel 3"'
DISTDESC="Red Hat Enterprise Linux 3 (i386)"
Modified: trunk/tools/dar/dists/el4a/config
===================================================================
--- trunk/tools/dar/dists/el4a/config 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dists/el4a/config 2007-02-14 18:02:32 UTC (rev 5169)
@@ -4,9 +4,14 @@
DISTCC_CC="x86_64-redhat-linux-gcc-3.4.3"
DISTCC_CXX="x86_64-redhat-linux-g++-3.4.3"
-UPDATECMD="up2date -u"
-INSTALLCMD="up2date -if"
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
RPMBUILDOPTS='--define "rhel 4"'
DISTDESC="Red Hat Enterprise Linux 4 (x86_64)"
Modified: trunk/tools/dar/dists/el4i/config
===================================================================
--- trunk/tools/dar/dists/el4i/config 2007-02-14 13:16:18 UTC (rev 5168)
+++ trunk/tools/dar/dists/el4i/config 2007-02-14 18:02:32 UTC (rev 5169)
@@ -4,9 +4,14 @@
DISTCC_CC="i386-redhat-linux-gcc-3.4.3"
DISTCC_CXX="i386-redhat-linux-g++-3.4.3"
-UPDATECMD="up2date -u"
-INSTALLCMD="up2date -if"
+UPDATECMD="apt-get -qq update"
+UPGRADECMD="apt-get -qq -f -y upgrade"
+INSTALLCMD="apt-get -qq -y -m install %p"
+CLEANCMD="apt-get clean"
+#UPDATECMD="up2date -u"
+#INSTALLCMD="up2date -if"
+
RPMBUILDOPTS='--define "rhel 4"'
DISTDESC="Red Hat Enterprise Linux 4 (i386)"
More information about the svn-commits
mailing list