Mame, disks and program formats

[Under4Mhz]

I'm struggling to create a cpm dsk image.

I've tried using cpmtools 2.21, but it doesn't seem to create valid disks.
When I create a ds40 disk (using the diskdefs from cpmtools 2.10) I get in mame:
Fatal error: Device 5.25" quad density floppy drive load failed: Unable to identify the image format

When I try to add files to an existing boot disk using the ds40 format, mame gives:
Ignoring MAME exception: Incorrect layout on track 5 head 0, expected_size=105000, current_size=1126784
Fatal error: Incorrect layout on track 5 head 0, expected_size=105000, current_size=1126784

I can't use the cpmtools 2.10 from the repository since there's only a i386 version and I'm running i686 Linux. I tried using the diskdefs in cpmtools 2.21 but that didn't make a difference.

I've tried using z88dk.appmake to make a disk, but the disk appears as empty.

What to you use to create cpm disks? Can I get a copy the of the cpmtools 2.10 source if there was a specific problem that needed to be patched?