Changeset 808 for dassbuild/trunk/usr

Timestamp:

Dec 14, 2009, 2:45:37 PM (15 years ago)

Author:

joergs

Message:

after successful build, copy all RPMs from build environment to target directory. Disadvantages: it may copy outdated/not relevant RPMs to target. Advantage: all resulting RPMs are copied to target. Some source RPMs generate multiple RPMs

File:

• dassbuild/trunk/usr/bin/dassbuild.sh (modified) (1 diff)

dassbuild/trunk/usr/bin/dassbuild.sh

@@ -152 +152 @@
 
 mkdir -p ${DEST_DIR}/${BUILD_DIST}
-# delete all old versions of this package
-for i in ${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-*.rpm; do
-        if [ -f $i -a ${PACKAGE} = "`rpm -qp --qf "%{NAME}\n" $i`" ]; then
-                rm $i
-        fi
-done
 
-if !(cp -a ${BUILD_ROOT}/usr/src/packages/RPMS/*/${PACKAGE}*${VERSION}-*.*.rpm ${DEST_DIR}/${BUILD_DIST} ); then 
-        ERROR=8
+# if !(cp -a ${BUILD_ROOT}/usr/src/packages/RPMS/*/${PACKAGE}*${VERSION}-*.*.rpm ${DEST_DIR}/${BUILD_DIST} ); then 
+#       ERROR=8
+# fi
+
+# check, if RPM with correct name and version is generated
+if [ -z "`find ${BUILD_ROOT}/usr/src/packages/RPMS/ -name \"${PACKAGE}*${VERSION}-*.rpm\" 2>/dev/null`" ]; then
+    ERROR=8
+else
+    # delete all old versions of this package
+    for i in ${DEST_DIR}/${BUILD_DIST}/${PACKAGE}-*.rpm; do
+        if [ -f $i -a ${PACKAGE} = "`rpm -qp --qf "%{NAME}\n" $i`" ]; then
+            rm $i
+        fi
+    done
+
+    # copy ALL RPMs, 
+    # not only the one, that includes the target name.
+    # this is done, 
+    # because some source RPMs results the multiple RPMs
+    find ${BUILD_ROOT}/usr/src/packages/RPMS/ -name "*.rpm" -exec cp -a {} ${DEST_DIR}/${BUILD_DIST} \;
 fi