[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Cluster-devel] [PATCH] cleanup build system a bit.

Robert Peterson wrote:
> Fabio Massimo Di Nitto wrote:
>>> I think this patch is something that we can commit to the -HEAD branch and start 
>>> using for FC8 and beyond.  We shouldn't have a problem patching up any minor 
>>> issues that crop up.  I vote for committing this patch.
> Hi Fabio,
> This looks like a good patch to me.  I've been too busy to look at it in
> any great detail, but I did look at the highlights. 

great thanks.

> I have a minor concern
> about the Makefile in gfs2/mkfs: IIRC, it looked like the default "Make" 
> (all) specified only mkfs.gfs2 as the target, whereas we need to be sure to
> that gfs2_jadd and gfs2_grow get built as well.

Right.. patch in attachment to turn the Makefile in line with the others.

>  Er, well, I guess you don't
> have gfs2_grow yet (but I do).

well i can't really cope with stuff that's not in CVS yet :))) really.. even
when i try hard ;)

>  Maybe it's already assured with some magic 
> and trickery, as it often happens in many Makefiles, but that will be apparent
> soon enough if/when I get a chance to try it.

Once you commit gfs2_grow in CVS HEAD, i can add it to the Makefile.

> As with any change with so many things affected, there might be some minor 
> glitches or gotchas that we'll find, but I think we can work around those 
> as we encounter them.

I got a CVS access, so i can fix most of them once they are reported tho I was
asked to always ask for patch review before applying, so it's just a matter for
somebody to ACK.

>  Good job!


PS I plan to commit sometime on monday EU time. If you can add gfs2_grow i will
merge the Makefiles at the same time.

I'm going to make him an offer he can't refuse.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 010_gfs2_mkfs_cleanup.dpatch by  <fabbione gordian int fabbione net>
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

diff -urNad redhat-cluster-suite-2.20070427~/gfs2/mkfs/Makefile redhat-cluster-suite-2.20070427/gfs2/mkfs/Makefile
--- redhat-cluster-suite-2.20070427~/gfs2/mkfs/Makefile	2007-04-27 15:08:48.000000000 +0200
+++ redhat-cluster-suite-2.20070427/gfs2/mkfs/Makefile	2007-04-27 15:12:12.000000000 +0200
@@ -5,8 +5,8 @@
 include ../../make/defines.mk
-TARGET= mkfs.gfs2
-JADD= gfs2_jadd
+TARGET1= mkfs.gfs2
+TARGET2= gfs2_jadd
 OBJS=	main.o \
 	main_mkfs.o \
@@ -21,24 +21,24 @@
 LDFLAGS += -L${volidlibdir} -lvolume_id
 LDFLAGS += -L../libgfs2 -lgfs2
-all: ${TARGET} ${JADD}
+all: ${TARGET1} ${TARGET2}
+${TARGET1}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
-	ln -s ${TARGET} ${JADD}
+	ln -s ${TARGET1} ${TARGET2}
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 install: all
-	install -m 0755 ${TARGET} ${sbindir}
-	ln -f ${sbindir}/${TARGET} ${sbindir}/${JADD}
+	install -m 0755 ${TARGET1} ${sbindir}
+	ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
-	${UNINSTALL} ${TARGET} ${JADD} ${sbindir}
+	${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-	rm -f *.o ${TARGET} ${JADD}
+	rm -f *.o ${TARGET1} ${TARGET2}

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]