From jholcape at redhat.com Mon Jul 18 09:58:02 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 11:58:02 +0200 Subject: [sos-devel] [PATCH 0/3] Build sos package out of git repository Message-ID: <1310983085-18362-1-git-send-email-jholcape@redhat.com> The following patch set aims to fix all tiny little issues that prevented me from successfully building sos package out of git repository. From jholcape at redhat.com Mon Jul 18 09:58:03 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 11:58:03 +0200 Subject: [sos-devel] [PATCH 1/3] Fixed syntax error. In-Reply-To: <1310983085-18362-1-git-send-email-jholcape@redhat.com> References: <1310983085-18362-1-git-send-email-jholcape@redhat.com> Message-ID: <1310983085-18362-2-git-send-email-jholcape@redhat.com> From: Jan Holcapek --- sos/plugins/x11.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py index 7b8d08e..4da3838 100644 --- a/sos/plugins/x11.py +++ b/sos/plugins/x11.py @@ -26,6 +26,6 @@ class x11(sos.plugintools.PluginBase): "/etc/X11", "/var/log/Xorg.*.log", "/var/log/XFree86.*.log", - ) + ]) self.addForbiddenPath("/etc/X11/X") self.addForbiddenPath("/etc/X11/fontpath.d") -- 1.7.6 From jholcape at redhat.com Mon Jul 18 09:58:04 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 11:58:04 +0200 Subject: [sos-devel] [PATCH 2/3] Exclude ChangeLog from file list. In-Reply-To: <1310983085-18362-1-git-send-email-jholcape@redhat.com> References: <1310983085-18362-1-git-send-email-jholcape@redhat.com> Message-ID: <1310983085-18362-3-git-send-email-jholcape@redhat.com> From: Jan Holcapek --- sos.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sos.spec b/sos.spec index 8167139..077eeaf 100644 --- a/sos.spec +++ b/sos.spec @@ -46,7 +46,7 @@ rm -rf ${RPM_BUILD_ROOT} %{python_sitelib}/* %{_mandir}/man1/* %{_mandir}/man5/* -%doc README TODO LICENSE ChangeLog doc/* +%doc README TODO LICENSE doc/* %config(noreplace) %{_sysconfdir}/sos.conf %changelog -- 1.7.6 From jholcape at redhat.com Mon Jul 18 09:58:05 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 11:58:05 +0200 Subject: [sos-devel] [PATCH 3/3] Produce tarball out of git rather than svn. In-Reply-To: <1310983085-18362-1-git-send-email-jholcape@redhat.com> References: <1310983085-18362-1-git-send-email-jholcape@redhat.com> Message-ID: <1310983085-18362-4-git-send-email-jholcape@redhat.com> From: Jan Holcapek --- Makefile | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2e67735..4d705fd 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ # Makefile for sos system support tools # -NAME = sos +NAME = sos VERSION = $(shell echo `awk '/^Version:/ {print $$2}' sos.spec`) RELEASE = $(shell echo `awk '/^Release:/ {gsub(/\%.*/,""); print $2}' sos.spec`) -REPO = http://svn.fedorahosted.org/svn/sos +REPO = http://git.fedorahosted.org/git/sos.git SUBDIRS = po sos sos/plugins PYFILES = $(wildcard *.py) @@ -41,10 +41,9 @@ install: for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done $(NAME)-$(VERSION).tar.gz: clean gpgkey - @mkdir -p $(RPM_BUILD_DIR) - @svn export --force $(PWD) $(RPM_BUILD_DIR)/$(NAME)-$(VERSION) @mkdir -p $(RPM_BUILD_DIR)/$(NAME)-$(VERSION)/gpgkeys - @cp gpgkeys/rhsupport.pub $(RPM_BUILD_DIR)/$(NAME)-$(VERSION)/gpgkeys/. + @git archive --format=tar HEAD | tar -C $(RPM_BUILD_DIR)/$(NAME)-$(VERSION) -x + @cp gpgkeys/rhsupport.pub $(RPM_BUILD_DIR)/$(NAME)-$(VERSION)/gpgkeys @tar Ccvzf $(RPM_BUILD_DIR) $(RPM_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) clean: -- 1.7.6 From jholcape at redhat.com Mon Jul 18 10:02:53 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 06:02:53 -0400 (EDT) Subject: [sos-devel] [PATCH 2/3] Exclude ChangeLog from file list. In-Reply-To: <1310983085-18362-3-git-send-email-jholcape@redhat.com> Message-ID: <1753038565.115084.1310983373510.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> > From: "Jan Holcapek" > To: sos-devel at redhat.com > Cc: "Jan Holcapek" > Sent: Monday, July 18, 2011 11:58:04 AM > Subject: [sos-devel] [PATCH 2/3] Exclude ChangeLog from file list. > From: Jan Holcapek > > --- > sos.spec | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/sos.spec b/sos.spec > index 8167139..077eeaf 100644 > --- a/sos.spec > +++ b/sos.spec > @@ -46,7 +46,7 @@ rm -rf ${RPM_BUILD_ROOT} > %{python_sitelib}/* > %{_mandir}/man1/* > %{_mandir}/man5/* > -%doc README TODO LICENSE ChangeLog doc/* An explanation for this is there is ChangeLog.deprecated file in the repo, but it is, based on its contents and name, deprecated (out-dated). Since there is the changelog contained within sos.spec, I simply excluded the file from %files section, and I guess it can be removed from the repo as well, right? ~Jan > +%doc README TODO LICENSE doc/* > %config(noreplace) %{_sysconfdir}/sos.conf > > %changelog > -- > 1.7.6 > > _______________________________________________ > Sos-devel mailing list > Sos-devel at redhat.com > https://www.redhat.com/mailman/listinfo/sos-devel From jholcape at redhat.com Mon Jul 18 12:49:03 2011 From: jholcape at redhat.com (Jan Holcapek) Date: Mon, 18 Jul 2011 14:49:03 +0200 Subject: [sos-devel] [PATCH] acpitables plugin Message-ID: <1310993343-30349-1-git-send-email-jholcape@redhat.com> Simplistic plugin to collect ACPI tables. BZ https://bugzilla.redhat.com/show_bug.cgi?id=691999 ~Jan Holcapek --- sos/plugins/acpitables.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 sos/plugins/acpitables.py diff --git a/sos/plugins/acpitables.py b/sos/plugins/acpitables.py new file mode 100644 index 0000000..c6d5086 --- /dev/null +++ b/sos/plugins/acpitables.py @@ -0,0 +1,23 @@ +'''sos plugin collecting ACPI tables''' + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 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 General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +import sos.plugintools + +class acpitables(sos.plugintools.PluginBase): + '''ACPI Tables''' + def setup(self): + self.addCopySpec('/sys/firmware/acpi/tables/') + return -- 1.7.6 From bmr at redhat.com Wed Jul 20 14:02:51 2011 From: bmr at redhat.com (Bryn M. Reeves) Date: Wed, 20 Jul 2011 15:02:51 +0100 Subject: [sos-devel] [PATCH 0/3] Build sos package out of git repository In-Reply-To: <1310983085-18362-1-git-send-email-jholcape@redhat.com> References: <1310983085-18362-1-git-send-email-jholcape@redhat.com> Message-ID: <4E26E00B.6030106@redhat.com> On 07/18/2011 10:58 AM, Jan Holcapek wrote: > The following patch set aims to fix all tiny little issues > that prevented me from successfully building sos package > out of git repository. Hi Jan! Thanks for looking at this. As you noticed the current git tree is in a less-than-idea state (a lot of reverts, patch-after-patch fixes etc. in the last 100 or so commits). We have been discussing reverting back to the 2.2 release (i.e. before the last change of maintainer upstream) to get things back into a more reasonable shape upstream and to ensure we have a cleaner history in the upstream repository (right now it is quite painful trying to track changes in some parts of the tree). At the same time Keith is keen to move to a github repository because of the improved review, tracking and collaboration tools they provide so it seems like if we are going to go ahead with this kind of clean up this would be the time to do it. Regards, Bryn. From bmr at redhat.com Wed Jul 20 14:06:31 2011 From: bmr at redhat.com (Bryn M. Reeves) Date: Wed, 20 Jul 2011 15:06:31 +0100 Subject: [sos-devel] [PATCH 2/3] Exclude ChangeLog from file list. In-Reply-To: <1753038565.115084.1310983373510.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> References: <1753038565.115084.1310983373510.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com> Message-ID: <4E26E0E7.8020102@redhat.com> On 07/18/2011 11:02 AM, Jan Holcapek wrote: > An explanation for this is there is ChangeLog.deprecated > file in the repo, but it is, based on its contents and name, > deprecated (out-dated). Since there is the changelog > contained within sos.spec, I simply excluded the file > from %files section, and I guess it can be removed from > the repo as well, right? I think there's still value in maintaining both - especially if we're interested in sos being used outside of RPM based environments the in-tree ChangeLog still has uses. I think if we get things right in how we commit changes upstream the maintenance of both the spec file and package ChangeLog can be largely automated and based on the git log output. Regards, Bryn. From bmr at redhat.com Wed Jul 20 14:25:11 2011 From: bmr at redhat.com (Bryn M. Reeves) Date: Wed, 20 Jul 2011 15:25:11 +0100 Subject: [sos-devel] [PATCH] acpitables plugin In-Reply-To: <1310993343-30349-1-git-send-email-jholcape@redhat.com> References: <1310993343-30349-1-git-send-email-jholcape@redhat.com> Message-ID: <4E26E547.2000103@redhat.com> Hi Jan, Thanks for submitting this plugin! On 07/18/2011 01:49 PM, Jan Holcapek wrote > +class acpitables(sos.plugintools.PluginBase): > + '''ACPI Tables''' > + def setup(self): > + self.addCopySpec('/sys/firmware/acpi/tables/') > + return Ack to the general purpose of the patch but I think we should take care to support older systems that still use the legacy /proc/acpi/*dt interfaces. I don't have a strong preference on how you do that although I think it is probably more robust to check for the presence of the /sys files first and then fall back to /proc than to try to bind this to specific kernel version/release numbers. Regards, Bryn. From jjaggars at redhat.com Fri Jul 22 14:45:31 2011 From: jjaggars at redhat.com (Jesse Jaggars) Date: Fri, 22 Jul 2011 10:45:31 -0400 (EDT) Subject: [sos-devel] sosreport Upstream repository has moved to github.com In-Reply-To: <443535061.220716.1311345801901.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com> Message-ID: <1812537520.220767.1311345931244.JavaMail.root@zmail06.collab.prod.int.phx2.redhat.com> The official upstream repository for sosreport has been relocated to github.com. The main reason for the move is that github.com offers a superior tool set. You can find the project page here: https://github.com/sosreport/sosreport. There are several ways you can clone the repository as well: for read-only access: git://github.com/sosreport/sosreport.git for read/write access: https://yourname at github.com/sosreport/sosreport.git git at github.com:sosreport/sosreport.git If you have a github.com account or don't mind creating one you can use their fork tool to make a clone and work with it in a more public manner. Github.com offers a pull request system for submitting changes. This essentially provides us with a method of performing a public code review before accepting a change. A github.com account is required for this service. We will still be accepting patches from the mailing list as before so there is no need to create a github.com account if you want to contribute. Issue tracking has been moved to github.com as well. If you wish to report an issue please use the issue tracker at: https://github.com/sosreport/sosreport/issues rather than the bugzilla tracker. Thanks Jesse