Skip to content

Commit

Permalink
Made sure that drive's buffer is flushed and it became ready when try…
Browse files Browse the repository at this point in the history
…ing to fixate, needs testing. Moved tarball creation to the tarball Makefile rule, release: now does create the tarball and tag in svn

git-svn-id: svn://svn.debian.org/debburn/cdrkit/trunk@767 a95a6be8-091b-0410-adaf-d31e6857962f
  • Loading branch information
blade committed May 6, 2007
1 parent 18f273f commit a9543a5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cmakepurge:
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
Expand All @@ -45,6 +45,14 @@ release:
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)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.5.1
1.1.6
5 changes: 5 additions & 0 deletions wodim/drv_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2719,6 +2719,11 @@ static int
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.
Expand Down

0 comments on commit a9543a5

Please sign in to comment.