Hi Tomas,
two things:
1) did you try building the .rpm to see whether the script is in there,
where you expect it?
2) even if so: are you positive the script will make it to the compose
(i.e. be somewhere in install.img?)
Ales
On 10/04/2010 01:51 PM, Tomas Mlcoch wrote:
---
anaconda.spec.in | 2 ++
configure.ac | 4 +++-
utils/Makefile.am | 3 +++
utils/log_picker/Makefile.am | 24 ++++++++++++++++++++++++
utils/log_picker/sending/Makefile.am | 23 +++++++++++++++++++++++
5 files changed, 55 insertions(+), 1 deletions(-)
create mode 100644 utils/log_picker/Makefile.am
create mode 100644 utils/log_picker/sending/Makefile.am
diff --git a/anaconda.spec.in b/anaconda.spec.in
index e88c505..43085cb 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 9821095..86a494f 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/utils/Makefile.am b/utils/Makefile.am
index d11b805..7f44c9e 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -17,8 +17,11 @@
#
# Author: David Cantrell<dcantrell@xxxxxxxxxx>
+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 0000000..a3fb172
--- /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 0000000..cb73c1b
--- /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
+sendingdir_PYTHON = *.py
+
+MAINTAINERCLEANFILES = Makefile.in
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
