poldek: poldek/tests/build-test-rpm.sh, poldek/tests/hello.c (NEW)...
mis
mis at pld-linux.org
Sun Jan 27 16:59:05 CET 2008
Author: mis Date: Sun Jan 27 15:59:05 2008 GMT
Module: poldek Tag: HEAD
---- Log message:
- multilib tests
---- Files affected:
poldek/poldek/tests:
build-test-rpm.sh (1.9 -> 1.10) , hello.c (NONE -> 1.1) (NEW), hello.i686 (NONE -> 1.1) (NEW), hello.x86-64 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: poldek/poldek/tests/build-test-rpm.sh
diff -u poldek/poldek/tests/build-test-rpm.sh:1.9 poldek/poldek/tests/build-test-rpm.sh:1.10
--- poldek/poldek/tests/build-test-rpm.sh:1.9 Wed Jan 23 23:55:08 2008
+++ poldek/poldek/tests/build-test-rpm.sh Sun Jan 27 16:58:59 2008
@@ -75,8 +75,10 @@
TMPDIR="${TMPDIR:-/tmp}"
SPEC="$TMPDIR/$name.$$.spec"
-echo > $SPEC
echo "Building $name $version-$release"
+
+echo > $SPEC
+echo "%define _noautoreq libc.so.6 rtld" >> $SPEC
echo "Name: $name" >> $SPEC
echo "Version: $version" >> $SPEC
echo "Release: $release" >> $SPEC
@@ -107,7 +109,12 @@
for f in $files; do
dn=$(dirname $f)
echo "mkdir -p \$RPM_BUILD_ROOT/$dn" >> $SPEC
- echo "touch \$RPM_BUILD_ROOT/$f" >> $SPEC
+ bn=$(basename $f)
+ if [ -f $bn ]; then
+ echo "cp $(pwd)/$bn \$RPM_BUILD_ROOT$dn" >> $SPEC
+ else
+ echo "touch \$RPM_BUILD_ROOT/$f" >> $SPEC
+ fi
done
fi
================================================================
Index: poldek/poldek/tests/hello.c
diff -u /dev/null poldek/poldek/tests/hello.c:1.1
--- /dev/null Sun Jan 27 16:59:05 2008
+++ poldek/poldek/tests/hello.c Sun Jan 27 16:58:59 2008
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main() {
+ printf("Hello world\n");
+ return 0;
+}
+
================================================================
Index: poldek/poldek/tests/hello.i686
<<Binary file>>
================================================================
Index: poldek/poldek/tests/hello.x86-64
<<Binary file>>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/tests/build-test-rpm.sh?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list