All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Steigerwald <ms@teamix.de>
To: fio@vger.kernel.org
Subject: [RFC] packaging fio 2.1.1 for Debian: make clean does not remove all generated files
Date: Mon, 8 Jul 2013 15:06:16 +0200	[thread overview]
Message-ID: <201307081506.16476.ms@teamix.de> (raw)

Hi Jens!

I am in the process of upgrading Debian packaging of fio to current version
2.1.1, but run into this error:

dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building fio using existing ./fio_2.1.1.orig.tar.gz
dpkg-source: info: local changes detected, the modified files are:
 fio/config.log
 fio/crc/crc16.d
 fio/crc/crc32.d
[…]
 fio/engines/binject.d
 fio/engines/cpu.d
[…]
 fio/lib/axmap.d
 fio/lib/flist_sort.d
[…]
 fio/profiles/act.d
 fio/profiles/tiobench.d
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/fio_2.1.1-1.diff.eLtKfe
dpkg-buildpackage: error: dpkg-source -b fio gave error exit status 2



I added the following patch to debian package which fixes it:

Description: Delete config log and .d-files on clean.
  Makefile of fio 2.1.1 leaves them which prevents repeated builds
  with dpkg-buildpackage due to:
  dpkg-source: info: local changes detected, …
Author: Martin Steigerwald <ms@teamix.de>

---
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,7 @@
        $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_LFSR_TEST_OBJS) $(LIBS) $(LDFLAGS)
 
 clean: FORCE
-       -rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d 
config-host.mak config-host.h
+       -rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d */*.d 
config.log config-host.mak config-host.h
 
 distclean: clean FORCE
        @rm -f cscope.out




Any other suggestion? If thats good to go, maybe makes sense to apply
upstream?

Ciao,
-- 
Martin Steigerwald - teamix GmbH - http://www.teamix.de
gpg: 19E3 8D42 896F D004 08AC A0CA 1E10 C593 0399 AE90

             reply	other threads:[~2013-07-08 13:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-08 13:06 Martin Steigerwald [this message]
2013-07-10 12:41 ` [RFC] packaging fio 2.1.1 for Debian: make clean does not remove all generated files Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201307081506.16476.ms@teamix.de \
    --to=ms@teamix.de \
    --cc=fio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.