rpms/kerneloops/F-8 kerneloops-fix-manfile-name.patch, NONE, 1.1 kerneloops-ignore-module-list.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 kerneloops.spec, 1.1, 1.2
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Tue Mar 4 19:02:40 UTC 2008
Author: cebbert
Update of /cvs/pkgs/rpms/kerneloops/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26536
Modified Files:
.cvsignore kerneloops.spec
Added Files:
kerneloops-fix-manfile-name.patch
kerneloops-ignore-module-list.patch
Log Message:
* Tue Mar 04 2008 Chuck Ebbert <cebbert at redhat.com> 0.10-3
- Ignore "Modules linked in" when scanning for oopses.
- Fix the manfile name.
kerneloops-fix-manfile-name.patch:
--- NEW FILE kerneloops-fix-manfile-name.patch ---
---
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- kerneloops-0.10.orig/Makefile
+++ kerneloops-0.10/Makefile
@@ -20,7 +20,7 @@ MY_CFLAGS := `pkg-config --cflags libnot
LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0`
LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now"
-all: kerneloops kerneloops-applet kerneloops.1.gz
+all: kerneloops kerneloops-applet kerneloops.8.gz
.c.o:
$(CC) $(CFLAGS) $(MY_CFLAGS) -c -o $@ $<
@@ -33,18 +33,18 @@ kerneloops: kerneloops.o submit.o dmesg.
kerneloops-applet: kerneloops-applet.o
gcc kerneloops-applet.o $(LDF_A)-o kerneloops-applet
-kerneloops.1.gz: kerneloops.1
+kerneloops.8.gz: kerneloops.1
gzip -9 -c $< > $@
clean:
- rm -f *~ *.o *.ko DEADJOE kerneloops kerneloops-applet *.out */*~ kerneloops.1.gz
+ rm -f *~ *.o *.ko DEADJOE kerneloops kerneloops-applet *.out */*~ kerneloops.8.gz
@(cd po/ && $(MAKE) $@)
dist: clean
rm -rf .git .gitignore push.sh .*~ */*~ test/*dbg
-install: kerneloops kerneloops-applet kerneloops.1.gz
+install: kerneloops kerneloops-applet kerneloops.8.gz
mkdir -p $(DESTDIR)/usr/sbin/ $(DESTDIR)/etc/xdg/autostart
mkdir -p $(DESTDIR)/usr/share/kerneloops $(DESTDIR)/etc/dbus-1/system.d/
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
@@ -53,7 +53,7 @@ install: kerneloops kerneloops-applet ke
install -m 0644 kerneloops.conf $(DESTDIR)/etc/kerneloops.conf
desktop-file-install -m 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop
install -m 0644 kerneloops.dbus $(DESTDIR)/etc/dbus-1/system.d/
- install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR)
+ install -m 0644 kerneloops.8.gz $(DESTDIR)$(MANDIR)
install -m 0644 icon.png $(DESTDIR)/usr/share/kerneloops/icon.png
@(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@)
kerneloops-ignore-module-list.patch:
--- NEW FILE kerneloops-ignore-module-list.patch ---
Module list also shows up in sysrq-p output, so ignore it.
Index: kerneloops-0.10/dmesg.c
===================================================================
--- kerneloops-0.10.orig/dmesg.c
+++ kerneloops-0.10/dmesg.c
@@ -174,8 +174,6 @@ static void extract_oops(char *buffer, i
oopsstart = i;
if (strstr(linepointer[i], "------------[ cut here ]------------"))
oopsstart = i;
- if (strstr(linepointer[i], "Modules linked in:") && i >= 4)
- oopsstart = i-4;
if (strstr(linepointer[i], "Oops:") && i >= 3)
oopsstart = i-3;
if (oopsstart >= 0 && testmode) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Jan 2008 00:51:13 -0000 1.2
+++ .cvsignore 4 Mar 2008 19:02:06 -0000 1.3
@@ -1 +1,2 @@
+kerneloops-0.10
kerneloops-0.10.tar.gz
Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kerneloops.spec 9 Jan 2008 00:51:13 -0000 1.1
+++ kerneloops.spec 4 Mar 2008 19:02:06 -0000 1.2
@@ -1,6 +1,6 @@
Name: kerneloops
Version: 0.10
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Tool to automatically collect and submit kernel crash signatures
Group: System Environment/Base
@@ -8,6 +8,9 @@
URL: http://www.kerneloops.org
Source0: http://www.kerneloops.org/download/%{name}-%{version}.tar.gz
+Patch0: kerneloops-fix-manfile-name.patch
+Patch1: kerneloops-ignore-module-list.patch
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: curl-devel
@@ -28,6 +31,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -70,6 +75,10 @@
%{_mandir}/man8/kerneloops.1.gz
%changelog
+* Tue Mar 04 2008 Chuck Ebbert <cebbert at redhat.com> 0.10-3
+- Ignore "Modules linked in" when scanning for oopses.
+- Fix the manfile name.
+
* Sat Jan 5 2008 Arjan van de Ven <arjan at linux.intel.com> - 0.10-1
- fix some bugs caught by the fedora review process
* Tue Jan 1 2008 Arjan van de Ven <arjan at linux.intel.com> - 0.9-1
More information about the fedora-extras-commits
mailing list