Merge branch 'master' of ssh://gits.daterainc.com:2984/project/2013.KERNEL/bcache-tools

autogen.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export ACLOCAL_FLAGS=""
-export ACLOCAL_AMFLAGS="-I m4"
-
-aclocal $ACLOCAL_FLAGS
-
-if glibtoolize -h > /dev/null 2>&1 ; then
-   glibtoolize --copy --force
-else
-   libtoolize --copy --force
-fi
-
-autoheader
-automake --copy --add-missing --foreign -Wall -Wno-portability
-autoconf

bcache-tools.spec

@@ -1,17 +1,31 @@
-Summary: bcache-tools
-Name: bcache-tools
-Version: 0.1
+Summary: bcache-tools: manage local bcache devices
+Name: %{package_name}
+Version: 0.datera.%{datera_version}
 Release: %{?release:%{release}}%{!?release:eng}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2
 Group: tools
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libblkid
 BuildRequires: pkgconfig libblkid-devel linux-headers libnih-devel
 Summary: tools to manage bcache
+Epoch: 5
 
 
 %description
 bcache tools
 
+%install
+make DESTDIR=%buildroot INSTALL=/usr/bin/install -C /bld/$RPM_PACKAGE_NAME install
+
 %files
+%_bindir/bcacheadm
+%_bindir/bcachectl
+%_bindir/make-bcache
+%_bindir/probe-bcache
+%_bindir/bcache-super-show
+%_libdir/libbcache.a
+%_mandir/man8/*.gz
+%exclude %_prefix/etc/initramfs-tools/hooks/bcache
+%exclude %_prefix/lib/udev/bcache-register
+%exclude %_prefix/lib/udev/rules.d/69-bcache.rules

configure.ac

@@ -2,22 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(bcache-tools, 0.1, support@datera.io)
-AM_INIT_AUTOMAKE
+AC_INIT(m4_esyscmd([echo -n $PACKAGE]), m4_esyscmd([echo -n $DATERA_VERSION]), m4_esyscmd([echo -n $SUPPORT_EMAIL]))
 LT_INIT
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-# Checks for programs.
-AC_PROG_CC
-
-# Checks for libraries.
-
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
+m4_include([../BTools/cscript/ccpp.m4])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT