From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 2654C7FEE for ; Wed, 19 Jun 2013 00:36:52 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 0EBBD304043 for ; Tue, 18 Jun 2013 22:36:52 -0700 (PDT) Received: from ipmail07.adl2.internode.on.net (ipmail07.adl2.internode.on.net [150.101.137.131]) by cuda.sgi.com with ESMTP id iZhgJY5DxRVz6xoI for ; Tue, 18 Jun 2013 22:36:50 -0700 (PDT) Received: from disappointment ([192.168.1.1]) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1UpB4Z-0003BT-8i for xfs@oss.sgi.com; Wed, 19 Jun 2013 15:36:47 +1000 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1UpB4T-0000FD-V1 for xfs@oss.sgi.com; Wed, 19 Jun 2013 15:36:41 +1000 From: Dave Chinner Subject: [PATCH 23/50] xfsprogs: fix make deb Date: Wed, 19 Jun 2013 15:35:46 +1000 Message-Id: <1371620173-712-24-git-send-email-david@fromorbit.com> In-Reply-To: <1371620173-712-1-git-send-email-david@fromorbit.com> References: <1371620173-712-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com From: Dave Chinner Commit 48212a30 ("xfsprogs: update 'make deb' to use tarball) fixed a bunch of problems with making the source tarball for releases. However, it broke the debian package builds in a way I hadn't noticed until I rewrote my CI system build script. I noticed that the CI system wasn't building from a pristine workarea, and instead was just updating the old workarea and running 'make deb'. I added a 'make realclean' to remove all previous state from the workarea, and then 'make deb' started failing with errors building the tarball because po/xfsprogs.pot didn't have a build rule The above commit removed the pre-build of the translations target, and instead made the translation build target a dependency of building the the tarball. Hence the lack of a build rule of the translations causes the source tarball build to fail. Signed-off-by: Dave Chinner --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b73bb57..f56aebd 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,8 @@ deb: include/builddefs include/platform_defs.h ifeq ($(HAVE_BUILDDEFS), no) $(Q)$(MAKE) $(MAKEOPTS) -C . $@ else + # need to build translations before the source tarball + $(Q)$(MAKE) $(MAKEOPTS) -C po $(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR) $(Q)cd $(SRCDIR) && dpkg-buildpackage endif -- 1.7.10.4 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs