Add logpicker support into Makefiles, anaconda.spec.in, configure.ac and upd-instroot.

6 files changed, 56 insertions, 1 deletions

diff --git a/anaconda.spec.in b/anaconda.spec.in
index 1cca42fe0..4d2664e64 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -204,6 +204,7 @@ update-desktop-database &> /dev/null || :
 %doc docs/anaconda-release-notes.txt
 /lib/udev/rules.d/70-anaconda.rules
 %{_sbindir}/anaconda
+%{_sbindir}/logpicker
 %ifarch i386 i486 i586 i686 x86_64
 %{_sbindir}/gptsync
 %{_sbindir}/showpart
@@ -211,6 +212,7 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/anaconda
 %{_prefix}/libexec/anaconda
 %{_libdir}/python*/site-packages/pyanaconda/*
+%{_libdir}/python*/site-packages/log_picker/*
 %{_libdir}/anaconda*
 %ifarch %livearches
 %{_bindir}/liveinst
diff --git a/configure.ac b/configure.ac
index 085222451..8a3c2844a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,5 +293,7 @@ AC_CONFIG_FILES([Makefile
                  tests/regex/Makefile
                  pyanaconda/textw/Makefile
                  data/ui/Makefile
-                 utils/Makefile])
+                 utils/Makefile
+                 utils/log_picker/Makefile
+                 utils/log_picker/sending/Makefile])
 AC_OUTPUT
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 4bdee801c..5a5ee42e3 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1103,6 +1103,7 @@ cp $DEST/usr/share/anaconda/loadkeys-stub $DEST/usr/bin/loadkeys
 cp $DEST/usr/share/anaconda/mknod-stub $DEST/usr/bin/mknod
 cp $DEST/usr/share/anaconda/restart-anaconda $DEST/usr/bin/restart-anaconda
 mv $DEST/usr/sbin/anaconda $DEST/usr/bin/anaconda
+mv $DEST/usr/sbin/logpicker $DEST/usr/bin/logpicker
 mv $DEST/usr/$LIBDIR/python?.?/site-packages/pyanaconda/sitecustomize.py $DEST/usr/$LIBDIR/python?.?/site-packages
 
 mv $DEST/etc/yum.repos.d $DEST/etc/anaconda.repos.d
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d11b80561..7f44c9e27 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -17,8 +17,11 @@
 #
 # Author: David Cantrell <dcantrell@redhat.com>
 
+SUBDIRS = log_picker
+
 utilsdir            = $(libexecdir)/$(PACKAGE_NAME)
 
+dist_sbin_SCRIPTS    = logpicker
 utils_PROGRAMS      = modlist mapshdr readmap
 dist_utils_SCRIPTS  = genmodinfo trimpciids
 noinst_PROGRAMS     = snarffont
diff --git a/utils/log_picker/Makefile.am b/utils/log_picker/Makefile.am
new file mode 100644
index 000000000..a3fb1723f
--- /dev/null
+++ b/utils/log_picker/Makefile.am
@@ -0,0 +1,24 @@
+# log_picker/Makefile.am
+#
+# Copyright (C) 2010  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+SUBDIRS = sending
+
+pkgpyexecdir = $(pyexecdir)/log_picker
+logpickerdir = $(pkgpyexecdir)
+logpicker_PYTHON = *.py
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/utils/log_picker/sending/Makefile.am b/utils/log_picker/sending/Makefile.am
new file mode 100644
index 000000000..d898b3e0c
--- /dev/null
+++ b/utils/log_picker/sending/Makefile.am
@@ -0,0 +1,23 @@
+# log_picker/Makefile.am
+#
+# Copyright (C) 2010  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+pkgpyexecdir = $(pyexecdir)/log_picker
+sendingdir = $(pkgpyexecdir)/sending
+sending_PYTHON = *.py
+
+MAINTAINERCLEANFILES = Makefile.in