gfs2-utils: Remove some unused build files
PATCH 1/2 gfs2-utils: Remove some unused build files
This removes some build files which are either no longer used or are generated by autoconf and needn't have been committed.
--- .gitignore | 7 + Makefile.am | 2 +- Makefile.new | 126 ---------- README.build | 12 +- config.rpath | 672 ------------------------------------------------- po/Makefile.in.in | 444 -------------------------------- po/Rules-quot | 47 ---- po/boldquot.sed | 10 - po/insert-header.sin | 23 -- po/quot.sed | 6 - po/remove-potcdate.sin | 19 -- 11 files changed, 9 insertions(+), 1359 deletions(-) delete mode 100644 Makefile.new delete mode 100755 config.rpath delete mode 100644 po/Makefile.in.in delete mode 100644 po/Rules-quot delete mode 100644 po/boldquot.sed delete mode 100644 po/insert-header.sin delete mode 100644 po/quot.sed delete mode 100644 po/remove-potcdate.sin
.gitignore +7 -0
@@ -11,6 +11,7 @@ config.guess config.log config.sub config.status +config.rpath Makefile depcomp install-sh
@@ -50,3 +51,9 @@ po/Makevars.template po/POTFILES po/stamp-po po/remove-potcdate.sed +po/Makefile.in.in +po/Rules-quot +po/boldquot.sed +po/insert-header.sin +po/quot.sed +po/remove-potcdate.sin
Makefile.am +1 -1
@@ -1,4 +1,4 @@ -EXTRA_DIST = config.rpath m4/ChangeLog autogen.sh +EXTRA_DIST = autogen.sh AUTOMAKE_OPTIONS = foreign
Makefile.new deleted +0 -0
README.build +1 -11
@@ -38,14 +38,4 @@ To install gfs2-utils, run: make install -There is also an alternative (experimental, but eventually will take over -from the current build system) build system which requires only GNU make. -To use that build system, simply run: - -make -f Makefile.new <target> - -Where <target> is all, install, etc. - -Both build systems are designed to run alongside each other for the time -being. - +See also README.contributing for details on submitting patches.
config.rpath deleted +0 -0
po/Makefile.in.in deleted +0 -0
po/Rules-quot deleted +0 -0
po/boldquot.sed deleted +0 -0
po/insert-header.sin deleted +0 -0
po/quot.sed deleted +0 -0
po/remove-potcdate.sin deleted +0 -0
Signature · 1 line
1.8.1.4
PATCH 2/2 gfs2-utils: Retire gfs_controld
Since linux v3.3 gfs_controld has not been required and it has been disabled by default in gfs2-utils for some time. This patch removes the group/ directory containing gfs_control* and related files and removes them from the build system and .gitignore accordingly.
tunegfs2 also #includes linux_endian.h which was in group/include/ so it has been moved into gfs2/include/ for the time being.
It also fixes some other build system issues causing 'make distcheck' to fail.
--- .gitignore | 2 - Makefile.am | 18 +- configure.ac | 58 - gfs2/include/Makefile.am | 2 +- gfs2/include/linux_endian.h | 68 + gfs2/init.d/gfs2-cluster | 94 - gfs2/system/gfs2-cluster.service | 12 - group/Makefile.am | 3 - group/gfs_control/Makefile.am | 9 - group/gfs_control/main.c | 465 ----- group/gfs_control/target.mk | 3 - group/gfs_controld/Makefile.am | 24 - group/gfs_controld/config.c | 157 -- group/gfs_controld/config.h | 14 - group/gfs_controld/cpg-new.c | 3600 ----------------------------------- group/gfs_controld/crc.c | 72 - group/gfs_controld/gfs_controld.h | 37 - group/gfs_controld/gfs_daemon.h | 241 --- group/gfs_controld/logging.c | 65 - group/gfs_controld/main.c | 1496 --------------- group/gfs_controld/member_cman.c | 207 -- group/gfs_controld/target.mk | 3 - group/gfs_controld/util.c | 266 --- group/include/Makefile.am | 3 - group/include/linux_endian.h | 68 - group/include/list.h | 336 ---- group/libgfscontrol/Makefile.am | 9 - group/libgfscontrol/libgfscontrol.h | 122 -- group/libgfscontrol/main.c | 436 ----- group/libgfscontrol/target.mk | 3 - group/man/Makefile.am | 3 - group/man/gfs_controld.8 | 122 -- group/man/target.mk | 3 - tests/Makefile.am | 1 + 34 files changed, 72 insertions(+), 7950 deletions(-) create mode 100644 gfs2/include/linux_endian.h delete mode 100644 gfs2/init.d/gfs2-cluster delete mode 100644 gfs2/system/gfs2-cluster.service delete mode 100644 group/Makefile.am delete mode 100644 group/gfs_control/Makefile.am delete mode 100644 group/gfs_control/main.c delete mode 100644 group/gfs_control/target.mk delete mode 100644 group/gfs_controld/Makefile.am delete mode 100644 group/gfs_controld/config.c delete mode 100644 group/gfs_controld/config.h delete mode 100644 group/gfs_controld/cpg-new.c delete mode 100644 group/gfs_controld/crc.c delete mode 100644 group/gfs_controld/gfs_controld.h delete mode 100644 group/gfs_controld/gfs_daemon.h delete mode 100644 group/gfs_controld/logging.c delete mode 100644 group/gfs_controld/main.c delete mode 100644 group/gfs_controld/member_cman.c delete mode 100644 group/gfs_controld/target.mk delete mode 100644 group/gfs_controld/util.c delete mode 100644 group/include/Makefile.am delete mode 100644 group/include/linux_endian.h delete mode 100644 group/include/list.h delete mode 100644 group/libgfscontrol/Makefile.am delete mode 100644 group/libgfscontrol/libgfscontrol.h delete mode 100644 group/libgfscontrol/main.c delete mode 100644 group/libgfscontrol/target.mk delete mode 100644 group/man/Makefile.am delete mode 100644 group/man/gfs_controld.8 delete mode 100644 group/man/target.mk
.gitignore +0 -2
@@ -44,8 +44,6 @@ gfs2/tune/tunegfs2 tests/check_libgfs2 tests/testvol tests/tests.log -group/gfs_control/gfs_control -group/gfs_controld/gfs_controld ABOUT-NLS po/Makevars.template po/POTFILES
Makefile.am +2 -16
@@ -1,4 +1,4 @@ -EXTRA_DIST = autogen.sh +EXTRA_DIST = autogen.sh README.build AUTOMAKE_OPTIONS = foreign
@@ -12,21 +12,7 @@ noinst_HEADERS = make/copyright.cf ACLOCAL_AMFLAGS = -I m4 -if BUILD_GFS_CONTROLD -DIR_GROUP = group -endif - -SUBDIRS = po $(DIR_GROUP) gfs2 doc tests - -install-exec-local: - $(INSTALL) -d $(DESTDIR)/$(LOGDIR) - $(INSTALL) -d $(DESTDIR)/$(CLUSTERVARRUN) - $(INSTALL) -d $(DESTDIR)/$(CLUSTERVARLIB) - -uninstall-local: - rmdir $(DESTDIR)/$(LOGDIR) || :; - rmdir $(DESTDIR)/$(CLUSTERVARRUN) || :; - rmdir $(DESTDIR)/$(CLUSTERVARLIB) || :; +SUBDIRS = po gfs2 doc tests maintainer-clean-local: rm -rf m4
configure.ac +0 -58
82 lines not on this page · raw message
gfs2/include/Makefile.am +1 -1
@@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_HEADERS = osi_list.h +noinst_HEADERS = osi_list.h osi_tree.h linux_endian.h
gfs2/include/linux_endian.h new file +68 -0
68 lines not on this page · raw message
gfs2/init.d/gfs2-cluster deleted +0 -0
gfs2/system/gfs2-cluster.service deleted +0 -0
group/Makefile.am deleted +0 -0
group/gfs_control/Makefile.am deleted +0 -0
group/gfs_control/main.c deleted +0 -0
group/gfs_control/target.mk deleted +0 -0
group/gfs_controld/Makefile.am deleted +0 -0
group/gfs_controld/config.c deleted +0 -0
group/gfs_controld/config.h deleted +0 -0
group/gfs_controld/cpg-new.c deleted +0 -0
group/gfs_controld/crc.c deleted +0 -0
group/gfs_controld/gfs_controld.h deleted +0 -0
group/gfs_controld/gfs_daemon.h deleted +0 -0
group/gfs_controld/logging.c deleted +0 -0
group/gfs_controld/main.c deleted +0 -0
group/gfs_controld/member_cman.c deleted +0 -0
group/gfs_controld/target.mk deleted +0 -0
group/gfs_controld/util.c deleted +0 -0
group/include/Makefile.am deleted +0 -0
group/include/linux_endian.h deleted +0 -0
group/include/list.h deleted +0 -0
group/libgfscontrol/Makefile.am deleted +0 -0
group/libgfscontrol/libgfscontrol.h deleted +0 -0
group/libgfscontrol/main.c deleted +0 -0
group/libgfscontrol/target.mk deleted +0 -0
group/man/Makefile.am deleted +0 -0
group/man/gfs_controld.8 deleted +0 -0
group/man/target.mk deleted +0 -0
tests/Makefile.am +1 -0
@@ -1,5 +1,6 @@ TESTS_ENVIRONMENT = TOPBUILDDIR=$(top_builddir) EXTRA_DIST = tool_tests.sh +CLEANFILES = tests.log if BUILD_TESTS check_PROGRAMS = check_libgfs2
Signature · 1 line
1.8.1.4
PATCH 1/2 gfs2-utils: Remove some unused build files
In reply to Andrew PriceHi,
Looks good. Thanks,
Steve.
Quoted 102 lines · Andrew Price
This removes some build files which are either no longer used or are generated by autoconf and needn't have been committed.
Signed-off-by Andrew Price <[email protected]>--- .gitignore | 7 + Makefile.am | 2 +- Makefile.new | 126 ---------- README.build | 12 +- config.rpath | 672 ------------------------------------------------- po/Makefile.in.in | 444 -------------------------------- po/Rules-quot | 47 ---- po/boldquot.sed | 10 - po/insert-header.sin | 23 -- po/quot.sed | 6 - po/remove-potcdate.sin | 19 -- 11 files changed, 9 insertions(+), 1359 deletions(-) delete mode 100644 Makefile.new delete mode 100755 config.rpath delete mode 100644 po/Makefile.in.in delete mode 100644 po/Rules-quot delete mode 100644 po/boldquot.sed delete mode 100644 po/insert-header.sin delete mode 100644 po/quot.sed delete mode 100644 po/remove-potcdate.sin.gitignore +7
-0@@ -11,6 +11,7 @@ config.guess config.log config.sub config.status +config.rpath Makefile depcomp install-sh@@ -50,3 +51,9 @@ po/Makevars.template po/POTFILES po/stamp-po po/remove-potcdate.sed +po/Makefile.in.in +po/Rules-quot +po/boldquot.sed +po/insert-header.sin +po/quot.sed +po/remove-potcdate.sinMakefile.am +1
-1@@ -1,4 +1,4 @@ -EXTRA_DIST = config.rpath m4/ChangeLog autogen.sh +EXTRA_DIST = autogen.sh AUTOMAKE_OPTIONS = foreignMakefile.new deleted +0
-0README.build +1
-11@@ -38,14 +38,4 @@ To install gfs2-utils, run: make install -There is also an alternative (experimental, but eventually will take over -from the current build system) build system which requires only GNU make. -To use that build system, simply run: - -make -f Makefile.new <target> - -Where <target> is all, install, etc. - -Both build systems are designed to run alongside each other for the time -being. - +See also README.contributing for details on submitting patches.config.rpath deleted +0
-0po/Makefile.in.in deleted +0
-0po/Rules-quot deleted +0
-0po/boldquot.sed deleted +0
-0po/insert-header.sin deleted +0
-0po/quot.sed deleted +0
-0po/remove-potcdate.sin deleted +0
-0