> -----Original Message----- > From: fcoe-devel [mailto:[email protected]] On Behalf Of > Chris Leech > Sent: Thursday, January 29, 2015 4:34 PM > To: [email protected] > Subject: [Open-FCoE] [PATCH] fcoe-utils: automake fixes for dist/distcheck > > I thought I'd give make distcheck a try on fcoe-utils and see if it produced a > working release. It didn't, so here are some fixes for that. > > Missing header files added to git are included in the release archive. > > The systemd unit files are marked dist_DATA so they get included, otherwise > data files are assumed to be generated at build time and left out of the > release. > > A few other missing doc files are added to dist_noinst_DATA. > > The manual rules for handling bash completion files are replaced with > dist_DATA definitions letting automake handle generating rules. > > Any change of applying build system fixes, and getting a new tag and release > tarball anytime in the near future? >
I announced last year of doing away with upstream tar ball release and in fact when we had it, then also it was simply tar of three open-fcoe user tools git trees instead of using distcheck, so I won't be surprised if this doesn't work for other two user tools git trees but any case good to fix all three git repos. I'm not sure if we need tags but sure user tools version bump make sense and I'm thinking of using same for tag instead of we used to have tag every kernel cycle even when no change to user tools. I'll do this after known recent open fipvlan issues gets fixed. Link to related announcement : http://lists.open-fcoe.org/pipermail/fcoe-devel/2014-June/012330.html Thanks, Vasu > Signed-off-by: Chris Leech <[email protected]> > --- > Makefile.am | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index e7df6f5..c6599ef 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -35,7 +35,10 @@ libopenfcoe_a_SOURCES = libopenfcoe.c ## header > files that need to be distributed noinst_HEADERS = fcoeadm_display.h > fcoe_clif.h fcoemon.h \ > include/fcoemon_utils.h include/fcoe_utils.h include/fc_scsi.h \ > - include/fc_types.h include/fip.h include/net_types.h > include/rtnetlink.h > + include/fc_types.h include/fip.h include/net_types.h > include/rtnetlink.h \ > + include/libopenfcoe.h include/scsi_netlink_fc.h > include/scsi_netlink.h \ > + include/strarr.h include/fc_ns.h include/fc_gs.h include/fc_els.h > include/scsi_bsg_fc.h \ > + include/linux/rtnetlink.h include/linux/types.h include/linux/dcbnl.h > > ## install configuration file in $(prefix)/etc/fcoe fcoe_configdir = > ${sysconfdir}/fcoe @@ -43,7 +46,7 @@ dist_fcoe_config_DATA = etc/cfg- > ethx > > ## install systemd service files > if HAVE_SYSTEMD > -systemdsystemunit_DATA = etc/systemd/fcoe.service > etc/systemd/fcoemon.socket > +dist_systemdsystemunit_DATA = etc/systemd/fcoe.service > +etc/systemd/fcoemon.socket > endif > > ## man pages for fcoeadm and fcoemon > @@ -67,15 +70,17 @@ etc/initd/fcoe: > init_ddir = ${sysconfdir}/init.d > init_d_SCRIPTS = etc/initd/fcoe > > -dist_noinst_DATA = README COPYING INSTALL fcoe-utils.spec etc/config > +dist_noinst_DATA = README COPYING INSTALL CONFIGURE QUICKSTART > +fcoe-utils.spec etc/config > > -BASH_COMPLETION_DIR=$(DESTDIR)/etc/bash_completion.d/ > +bashcompletiondir = $(sysconfdir)/bash_completion.d > +dist_bashcompletion_DATA = contrib/bash_completion/fcoeadm > +contrib/bash_completion/fcoemon > > install-data-hook: > if [ ! -f ${DESTDIR}${fcoe_configdir}/config ] ; then \ > cp ${srcdir}/etc/config ${DESTDIR}${fcoe_configdir}/config; \ > - fi; \ > - if [ ! -d "${BASH_COMPLETION_DIR}" ] ; then \ > - mkdir ${BASH_COMPLETION_DIR}; \ > - fi; \ > - cp -f ${srcdir}/contrib/bash_completion/* > ${BASH_COMPLETION_DIR} > + fi; > + > +uninstall-hook: > + rm ${DESTDIR}${fcoe_configdir}/config > + > +AM_DISTCHECK_CONFIGURE_FLAGS = --with- > systemdsystemunitdir='$${prefix}/lib/systemd/system' > -- > 2.1.0 > > _______________________________________________ > fcoe-devel mailing list > [email protected] > http://lists.open-fcoe.org/mailman/listinfo/fcoe-devel _______________________________________________ fcoe-devel mailing list [email protected] http://lists.open-fcoe.org/mailman/listinfo/fcoe-devel
