[svn] r5561 - in trunk/tools/dar: . scripts
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Jul 1 23:50:13 CEST 2007
Author: dag
Date: 2007-07-01 23:50:12 +0200 (Sun, 01 Jul 2007)
New Revision: 5561
Modified:
trunk/tools/dar/dar-build
trunk/tools/dar/dar-functions
trunk/tools/dar/dar-perl.py
trunk/tools/dar/dar-shell
trunk/tools/dar/scripts/pre-brand.sh
Log:
Small improvements.
Modified: trunk/tools/dar/dar-build
===================================================================
--- trunk/tools/dar/dar-build 2007-07-01 12:38:17 UTC (rev 5560)
+++ trunk/tools/dar/dar-build 2007-07-01 21:50:12 UTC (rev 5561)
@@ -318,6 +318,10 @@
(
echo "Build command:" $BUILDCMD
echo "Build path: $PATH"
+
+ echo -e "\n----- Spec file -----"
+ cat "$NEWSPECFILE"
+
echo -e "\n----- Build log -----"
### Check for building as user
@@ -353,6 +357,7 @@
--define '$DISTNICK 1' \
$NEWSPECFILE"
fi
+
) >>"$PACKAGEDIR/$app/_buildlogs/$LOGFILE" 2>&1
# CHROOT="/usr/bin/compartment --chroot $CHROOTDIR/$dist --user $BUILD_USER --group $BUILD_USER --init /usr/lib/dar/compartment.sh --quiet"
@@ -365,8 +370,6 @@
### Finish logging
( echo -e "\n----- Return code -----"
echo "$RC"
- echo -e "\n----- Spec file -----"
- cat "$NEWSPECFILE"
if [ -d "$TEMPDIR/$app-$VERSION-$RELEASE-root" ]; then
echo -e "\n----- Buildroot content -----"
find "$TEMPDIR/$app-$VERSION-$RELEASE-root" 2>/dev/null
@@ -416,8 +419,10 @@
done
done
+ RPMFILE="$app-$VERSION-$RELEASE.$TAG.src.rpm"
### Only build when there was a succesful binary build
- if [ "$DARBUILDRC" -eq 0 -a -z "$NOSOURCE" ]; then
+# if [ -z "$NOSOURCE" -a "$DARBUILDRC" -eq 0 -o ! -f "$PACKAGEDIR/$app/$RPMFILE" ]; then
+ if [ -z "$NOSOURCE" -a "$DARBUILDRC" -eq 0 ]; then
if [ -z "$SOURCE_DISTS" ]; then SOURCE_DISTS="$DEFAULT_SOURCE_DISTS"; fi
Modified: trunk/tools/dar/dar-functions
===================================================================
--- trunk/tools/dar/dar-functions 2007-07-01 12:38:17 UTC (rev 5560)
+++ trunk/tools/dar/dar-functions 2007-07-01 21:50:12 UTC (rev 5561)
@@ -95,8 +95,22 @@
local RPMVER="$(chroot $CHROOTDIR/$DISTNICK rpm --version | cut -d' ' -f3)"
fi
- (
- if [ -z "$DISTNICK" ] || [ "$RPMVER" \< "4.1" ] || ! chroot "$CHROOTDIR/$DISTNICK" /bin/su -lm $BUILD_USER -c "rpmdb -D \"dist $DISTNAME\" -D \"$DISTNICK 1\" -D \"$DISTNAME 1\" -E \"%{expand:%(head -n128 $SPECFILE)}\"" | grep -i "^ *$CONFIG *:" | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
+ --define "_smp_mflags $MAKEFLAGS" \
+ --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+ --define "_initrddir %{_sysconfdir}/rc.d/init.d" \
+ --define "_rpmdir $PACKAGEDIR/$app" \
+ --define "_sourcedir $SPECDIR" \
+ --define "_builddir $ROOT/build" \
+ --define "_buildroot $TEMPDIR/$app-$VERSION-$RELEASE-root" \
+ --define "debug_package %nil" \
+ --define "dist $DISTNAME" \
+ --define "disttag $DISTNAME" \
+ --define "$DISTNAME 1" \
+ --define "$DISTNICK 1" \
+
+
+
+ if [ -z "$DISTNICK" ] || [ "$RPMVER" \< "4.1" ] || ! chroot "$CHROOTDIR/$DISTNICK" /bin/su -lm $BUILD_USER -c "rpmdb -D \"dist $DISTNAME\" -D \"disttag $DISTNAME\" -D \"$DISTNICK 1\" -D \"$DISTNAME 1\" -E \"%{expand:%(head -n128 $SPECFILE)}\"" | grep -i "^ *$CONFIG *:" | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
if ! grep -i "^ *$CONFIG *:" $SPECFILE | sed -e "s/^ *$CONFIG *: *//i" | head -1; then
debug "Config $CONFIG not found in $SPECFILE"
fi
@@ -233,6 +247,7 @@
TAGS="$DEFAULT_TAGS"
if [ -n "$FORCE_TAG" ]; then
TAG="$FORCE_TAG"
+ TAGS="$FORCE_TAG"
else
TAG="$(metaconf Tag)"
fi
Modified: trunk/tools/dar/dar-perl.py
===================================================================
--- trunk/tools/dar/dar-perl.py 2007-07-01 12:38:17 UTC (rev 5560)
+++ trunk/tools/dar/dar-perl.py 2007-07-01 21:50:12 UTC (rev 5561)
@@ -57,7 +57,9 @@
def download(url):
filename = os.path.join(tmppath, os.path.basename(url))
- if not os.path.exists(filename):
+ ### FIXME: Check if the files on disk are older than 1 day
+# if not os.path.exists(filename):
+ if True:
try:
req = urllib2.Request(url)
fdin = urllib2.urlopen(req)
@@ -80,7 +82,7 @@
return '%s:%s' % (epoch, version)
try:
- opts, args = getopt.getopt (args, 'dhnv',
+ opts, args = getopt.getopt (args, 'adhnv',
['debug', 'help', 'version'])
except getopt.error, exc:
print >>sys.stderr, 'dar-perl: %s, try dar-perl.py -h for a list of all the options' % str(exc)
@@ -93,6 +95,8 @@
pass
elif opt in ['-d', '--debug']:
debug = True
+ elif opt in ['-a', '--arch']:
+ noarch = False
if not args:
print >>sys.stderr, 'You have to provide a module name.'
@@ -207,11 +211,14 @@
### Parse META.yml (http://module-build.source-forge.net/META-spec-current.html)
if shortfile == 'META.yml':
member = distfd.getmember(file)
- meta = yaml.load(distfd.extractfile(member).read())
- if debug:
- print >>sys.stderr, 'META.yml contains the following info:'
- for key in meta.keys():
- print >>sys.stderr, ' %s: %s' % (key, meta[key])
+ try:
+ meta = yaml.load(distfd.extractfile(member).read())
+ if debug:
+ print >>sys.stderr, 'META.yml contains the following info:'
+ for key in meta.keys():
+ print >>sys.stderr, ' %s: %s' % (key, meta[key])
+ except:
+ pass
docs.sort()
Modified: trunk/tools/dar/dar-shell
===================================================================
--- trunk/tools/dar/dar-shell 2007-07-01 12:38:17 UTC (rev 5560)
+++ trunk/tools/dar/dar-shell 2007-07-01 21:50:12 UTC (rev 5561)
@@ -41,7 +41,7 @@
export arch="$DISTARCH" dist="${DISTNAME// *}" nick="$DISTNICK" path="$DISTPATH" repo="$REPO" tag="${DISTTAG// *}"
fi
- chroot $CHROOTDIR/$distname
+ setarch $DISTARCH chroot $CHROOTDIR/$distname
done
if [ -z "$QUIET" ]; then
echo -en "$_BL_$_WH= Returning to parent shell. Press ENTER.$_DE"
Modified: trunk/tools/dar/scripts/pre-brand.sh
===================================================================
--- trunk/tools/dar/scripts/pre-brand.sh 2007-07-01 12:38:17 UTC (rev 5560)
+++ trunk/tools/dar/scripts/pre-brand.sh 2007-07-01 21:50:12 UTC (rev 5561)
@@ -20,6 +20,8 @@
packager="Dries Verachtert <dries\@ulyssis.org>" ;;
(bert)
packager="Bert de Bruijn <bert\@debruijn.be>" ;;
+ (hadams)
+ packager="Heiko Adams <info\@fedora-blog.de>" ;;
(dag|thias|matthias|*)
packager="Dag Wieers <dag\@wieers.com>" ;;
esac
More information about the svn-commits
mailing list