[Debburn-changes] r767 - in cdrkit/trunk: . wodim

[Eduard Bloch]

Author: blade
Date: 2007-05-06 10:23:54 +0000 (Sun, 06 May 2007)
New Revision: 767

Modified:
   cdrkit/trunk/Makefile
   cdrkit/trunk/VERSION
   cdrkit/trunk/wodim/drv_mmc.c
Log:
Moved tarball creation to the tarball Makefile rule, release: now does create the tarball and tag in svn

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2007-05-04 19:37:01 UTC (rev 766)
+++ cdrkit/trunk/Makefile	2007-05-06 10:23:54 UTC (rev 767)
@@ -32,7 +32,7 @@
 clean:
 	rm -rf build
 
-release:
+tarball:
 #	if test "$(shell svn status | grep -v -i make)" ; then echo Uncommited files found. Run \"svn status\" to display them. ; exit 1 ; fi
 	@if test -f ../$(DISTNAME).tar.gz ; then echo ../$(DISTNAME).tar.gz exists, not overwritting ; exit 1; fi
 	-svn up
@@ -45,6 +45,14 @@
 	test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../$(DEBSRCNAME) || true
 	test -e ../tarballs && ln -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) || true
 
+tarball-remove:
+	rm -f ../$(DISTNAME).tar.gz ../tarballs/$(DEBSRCNAME) ../$(DEBSRCNAME)
+
+SVNBASE=$(shell svn info | grep URL: | cut -f2 -d' ' | xargs dirname)
+release: tarball
+	svn ci
+	svn cp $(SVNBASE)/trunk $(SVNBASE)/tags/release_$(shell cat VERSION)
+
 #%::
 #	$(MAKE) $(MAKE_FLAGS) build/Makefile
 #	$(CMAKETWEAKS)

Modified: cdrkit/trunk/VERSION
===================================================================
--- cdrkit/trunk/VERSION	2007-05-04 19:37:01 UTC (rev 766)
+++ cdrkit/trunk/VERSION	2007-05-06 10:23:54 UTC (rev 767)
@@ -1 +1 @@
-1.1.5.1
+1.1.6

Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c	2007-05-04 19:37:01 UTC (rev 766)
+++ cdrkit/trunk/wodim/drv_mmc.c	2007-05-06 10:23:54 UTC (rev 767)
@@ -2719,6 +2719,11 @@
 fixate_mdvd(SCSI *usalp, cdr_t *dp, track_t *trackp)
 {
 	int ret;
+	if (scsi_flush_cache(usalp, (dp->cdr_cmdflags&F_IMMED) != 0) < 0) {
+		printf("Trouble flushing the cache\n");
+		return -1;
+	}
+	wait_unit_ready(usalp, 300);		/* XXX Wait for ATAPI */
       /*set a really BIG timeout and call fixate_mmc
 	 The BIG timeout is needed in case there was a very short rzone to write at the 
 	 beginning of the disk, because lead-out needs to be at some distance.