1. VectorLinux Core
  2. vlbuildbot

Commits

M0E-lnx  committed 0512e3a

Update 20131224 - Fix upload script and place manifest files in src directory

  • Participants
  • Parent commits 273dcbd
  • Branches master

Comments (0)

Files changed (3)

File slave/usr/local/bin/build-pusher

View file
  • Ignore whitespace
 	for dir in $(ls); do
 		echo "Uploading packages from $dir build"
 		cd $dir
-		for pkg in $(ls *.t?z); do
+		for pkg in *.t?z ; do
 			name=$(pkgname $pkg)
 			version=$(pkgversion $pkg)
 			pkgnam=$name

File slave/usr/local/bin/build-runner

View file
  • Ignore whitespace
 sh $APPNAME.SlackBuild || exit 1
 
 # Generate package manifest
-( cd .. 
-	echo ;
-	for pkg in *.t?z; do
-	echo "Generating $pkg.manifest"
-	tar -tf $pkg > ../$pkg.manifest || exit 1
-	done
-)
+for pkg in ../*.t?z; do
+	tar -tf $i > $PWD/$(basename $i).manifest # This places the manifest file in the src directory to be uploaded to the source dir
+done
+#( cd .. 
+#	echo ;
+#	for pkg in *.t?z; do
+#	echo "Generating $pkg.manifest"
+#	tar -tf $pkg > ../$pkg.manifest || exit 1
+#	done
+#)

File updated/update.conf

View file
  • Ignore whitespace
 #    an update to the slaves.  the function name MUST remain the same and the so must 
 #    everythin else.  The rest of the update system looks for this function.
 
-REMOTEVERSION=20131220a
+REMOTEVERSION=20131224
 CONF=/etc/vlbuildslave/slavehost.conf
 BKCONF=/etc/vlbuildslave/slavehost.conf.backup
 LOGFILE=/var/log/vlbuildbot-updated.log
 function update_slave() {
 
 update_slave_tools
-echo "Installing updated bot rc script"
-cp $BOTREPO/slave/etc/rc.d/rc.vlbuildslave /etc/rc.d/rc.vlbuildslave
-chmod +x /usr/local/bin/build-runner
 
 # Remove the lockfile after we are done updating
 rm -rf /tmp/vlbuildbot-updating.lock