From ffa2665decbf47eb2a1ce642944144061454940c Mon Sep 17 00:00:00 2001 From: Giuseppe Lettieri Date: Thu, 30 Aug 2012 16:12:25 +0200 Subject: [PATCH] list files that do not go into the distribution The Makefile of Open vSwitch checks that all files in the git repository are also distributed and stops with an error otherwise. But we have some files in git that are not meant to be distributed (i.e., installed on a sliver). These files can now be listed in .non-distfiles and the new Makefile will ignore them. --- .non-distfiles | 7 +++++++ Makefile.am | 2 +- planetlab/automake.mk | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .non-distfiles diff --git a/.non-distfiles b/.non-distfiles new file mode 100644 index 000000000..0c43af554 --- /dev/null +++ b/.non-distfiles @@ -0,0 +1,7 @@ +planetlab/exp-tool +planetlab/exp-tool/Makefile +planetlab/exp-tool/showgraph +planetlab/exp-tool/README +sliver-openvswitch.spec +.gitignore +.non-distfiles diff --git a/Makefile.am b/Makefile.am index 5ab0f55e9..d7eadec49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,7 @@ dist-hook-git: distfiles (cd datapath && $(MAKE) distfiles); \ (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \ sort -u > all-distfiles; \ - (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ + (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles | \ sort -u > all-gitfiles; \ comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ if test -s missing-distfiles; then \ diff --git a/planetlab/automake.mk b/planetlab/automake.mk index 84b53b422..65a6e1647 100644 --- a/planetlab/automake.mk +++ b/planetlab/automake.mk @@ -3,15 +3,16 @@ sbin_PROGRAMS += \ planetlab/vsysc/vsysc # this Makefile is not intended to go on the sliver image - esp. not in /usr/sbin -# planetlab/scripts/Makefile \ +# planetlab/scripts/Makefile +# same goes for showgraph +# planetlab/scripts/showgraph dist_sbin_SCRIPTS += \ planetlab/scripts/start_ovsdb-server \ planetlab/scripts/start_vswitchd \ planetlab/scripts/create_bridge \ planetlab/scripts/create_port \ planetlab/scripts/del_bridge \ - planetlab/scripts/del_port \ - planetlab/scripts/showgraph + planetlab/scripts/del_port planetlab_pltap_ovs_pltap_ovs_SOURCES = \ planetlab/pltap-ovs/pltap-ovs.c \ -- 2.43.0