RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Sep-2010 18:29:28
Branch: rpm-5_3 Handle: 2010092916292800
Modified files: (Branch: rpm-5_3)
rpm/tests Makefile.am
Log:
- tests: add a repodata target.
Summary:
Revision Changes Path
1.63.2.31 +27 -9 rpm/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.63.2.30 -r1.63.2.31 Makefile.am
--- rpm/tests/Makefile.am 27 Sep 2010 22:07:05 -0000 1.63.2.30
+++ rpm/tests/Makefile.am 29 Sep 2010 16:29:28 -0000 1.63.2.31
@@ -396,7 +396,7 @@
CM14_uri = $(CM_mirror)/14/oficial/i586/media/main/release/
CM14_manifest = $(testdir)/ref/cm14-bash.i586.manifest
CM15_uri = $(CM_mirror)/15/oficial/i586/media/main/release/
-CM15_manifest = $(testdir)/ref/cm15-minimal.manifest
+#CM15_manifest = $(testdir)/ref/cm15-minimal.manifest
# CAOS -- cAos
CAOS_mirror = http://mirror.caoslinux.org
CAOS2_uri = $(CAOS_mirror)/cAos-2/core/i386/
@@ -479,6 +479,7 @@
# VINE -- Vine Linux
VINE_mirror = http://ring.u-toyama.ac.jp/pub/linux/Vine
VINE51_uri = $(VINE_mirror)/Vine-5.1/i386/Vine/RPMS/
+VINE51_manifest = $(testdir)/ref/vine51-everything.manifest
# YDL -- Yellow Dog Linug (ppc)
YDL_mirror = http://ydl.oregonstate.edu/releases
YDL61_uri = $(YDL_mirror)/yellowdog-6.1/os/YellowDog/
@@ -542,6 +543,16 @@
then ${find} $< -name '*.rpm' | sort -u > $@; \
fi
+.PRECIOUS: %/repodata
+%/repodata: %/RPMS
+ @rm -f $...@d}/generate
+# -rm -f $...@d}/repodata
+ @echo "`${now}` ==> $...@d}: Generating ..." | tee -a $...@d}/generate
+ ${rpmrepo} --uncompressed --database --stats $...@d} 2>&1 | tee -a
$...@d}/generate
+ @ls -al $...@d}/repodata
+ @echo "`${now}` <== $...@d}: Generated." | tee -a $...@d}/generate
+
+# -D '_dbi_tags
Packages:Name:Nvra:Providename:Dirnames:Basenames:Filepaths'
.PRECIOUS: %/solve
%/solve: %/todo
@rm -f $...@d}/import
@@ -551,11 +562,11 @@
@echo "`${now}` <== $...@d}: Created." | tee -a $...@d}/import
@echo "`${now}` ==> $...@d}: Importing ..." | tee -a $...@d}/import
@-${rpm} -i -D '_dbpath $...@d}/solve' --justdb --stats \
- --replacepkgs --replacefiles --oldpackage \
- --noaid --ignoresize --nodeps --noorder \
- --noscripts --notriggers --noparentdirs --nolinktos --nosignature \
+ -D '__dbi_txn create nofsync lock log mpool txn auto_commit thread
thread_count=64' \
+ --noaid --ignoresize --nodeps --noorder --nosignature \
$< \
2>&1 | tee -a $...@d}/import
+ ls -al $...@d}/solve
@echo "`${now}` <== $...@d}: Imported." | tee -a $...@d}/import
Install-%: %/solve
@@ -565,12 +576,22 @@
@${sudo} rm -rf $(<D)/ROOT
@mkdir -p $(<D)/ROOT/var/lib/rpm/log $(<D)/ROOT/var/lib/rpm/tmp
@${cp} $(testdir)/ref/DB_CONFIG $(<D)/ROOT/var/lib/rpm
- @-${sudo} ${rpm} -Uvh --nofdigests \
+ -mkdir -p $(<D)/ROOT/proc $(<D)/ROOT/sys
+ -sudo mount -o bind /proc $(<D)/ROOT/proc
+# -sudo mount -o bind /sys $(<D)/ROOT/sys
+ -mkdir -p $(<D)/ROOT/dev/pts
+# -sudo mount -o bind /dev $(<D)/ROOT/dev
+# -sudo mount -o bind /dev/pts $(<D)/ROOT/dev/pts
+ @-${sudo} ${rpm} -Uvh --nofdigests --stats \
-r $(testdir)/$(<D)/ROOT \
-D '_dbpath /var/lib/rpm' \
-D '_solve_A $(<D)/solve' \
--noparentdirs --nolinktos --nosignature \
$(<D)/todo 2>&1 | tee -a $(<D)/install
+# -sudo umount $(<D)/ROOT/dev/pts
+# -sudo umount $(<D)/ROOT/dev
+# -sudo umount $(<D)/ROOT/sys
+ -sudo umount $(<D)/ROOT/proc
@echo "`$(now)` <== ${<D}: Installed." | tee -a $(<D)/install
@-./spew ${<D} > ${<D}/install.mongo
@-${mongo} ${mongoserver} < ${<D}/install.mongo
@@ -631,10 +652,7 @@
check-query:
@echo "=== $@ ==="
- @${rpm} -qW . > /dev/null 2>&1
-#XXX -${rpm} -Uvv --justdb */*.rpm > /dev/null 2>&1
-#XXX -${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null 2>&1
-#XXX -${rpm} -i --justdb --nodeps */*.rpm > /dev/null 2>&1
+#XXX @${rpm} -qW . > /dev/null 2>&1
@${rpm} -qa > /dev/null
@${rpm} -qa 'arch=noarch' > /dev/null
@${rpm} -qa 'arch=!noarch' > /dev/null
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
