From 8100653c220cbd573ce83085cf00e081694c4eb7 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Sun, 29 Aug 2010 23:54:38 +0000
Subject: ksymoops: Updated to version 2.4.11, fixed for current libbfd,
 adjusted /proc/kallsyms.

---
 recipes/ksymoops/ksymoops-2.4.11/flags.patch | 70 ++++++++++++++++++++++++++++
 recipes/ksymoops/ksymoops-2.4.9/flags.patch  | 55 ----------------------
 recipes/ksymoops/ksymoops_2.4.11.bb          | 18 +++++++
 recipes/ksymoops/ksymoops_2.4.9.bb           | 18 -------
 4 files changed, 88 insertions(+), 73 deletions(-)
 create mode 100644 recipes/ksymoops/ksymoops-2.4.11/flags.patch
 delete mode 100644 recipes/ksymoops/ksymoops-2.4.9/flags.patch
 create mode 100644 recipes/ksymoops/ksymoops_2.4.11.bb
 delete mode 100644 recipes/ksymoops/ksymoops_2.4.9.bb

(limited to 'recipes/ksymoops')

diff --git a/recipes/ksymoops/ksymoops-2.4.11/flags.patch b/recipes/ksymoops/ksymoops-2.4.11/flags.patch
new file mode 100644
index 0000000000..6470b40019
--- /dev/null
+++ b/recipes/ksymoops/ksymoops-2.4.11/flags.patch
@@ -0,0 +1,70 @@
+Index: ksymoops-2.4.11/Makefile
+===================================================================
+--- ksymoops-2.4.11.orig/Makefile	2002-10-13 09:13:59.000000000 +0000
++++ ksymoops-2.4.11/Makefile	2010-08-29 18:01:03.000000000 +0000
+@@ -14,7 +14,7 @@
+ # DEF_MAP := \"/boot/System.map-*r\"
+ 
+ DEF_VMLINUX :=				# default no vmlinux
+-DEF_KSYMS := \"/proc/ksyms\"		# default current ksyms
++DEF_KSYMS := \"/proc/kallsyms\"		# default current ksyms
+ DEF_LSMOD := \"/proc/modules\"		# default current lsmod
+ DEF_OBJECTS := \"/lib/modules/*r/\"	# default current modules
+ DEF_MAP := \"/usr/src/linux/System.map\"	# default current map
+@@ -57,36 +57,36 @@
+ PROGS := ksymoops
+ 
+ CC := gcc
+-CFLAGS += -Dlinux \
+-	 -Wall \
++CFLAGS = "-Wall \
+ 	 -Wno-conversion \
+ 	 -Waggregate-return \
+ 	 -Wstrict-prototypes \
+ 	 -Wmissing-prototypes \
++	 $(DEBUG)"
++override CFLAGS += -Dlinux \
+ 	 -DINSTALL_PREFIX="\"$(INSTALL_PREFIX)\"" \
+-	 -DCROSS="\"$(CROSS)\"" \
+-	 $(DEBUG)
++	 -DCROSS="\"$(CROSS)\""
+ 
+ ifneq ($(DEF_VMLINUX),)
+-	CFLAGS += -DDEF_VMLINUX=$(DEF_VMLINUX)
++	override CFLAGS += -DDEF_VMLINUX=$(DEF_VMLINUX)
+ endif
+ ifneq ($(DEF_KSYMS),)
+-	CFLAGS += -DDEF_KSYMS=$(DEF_KSYMS)
++	override CFLAGS += -DDEF_KSYMS=$(DEF_KSYMS)
+ endif
+ ifneq ($(DEF_LSMOD),)
+-	CFLAGS += -DDEF_LSMOD=$(DEF_LSMOD)
++	override CFLAGS += -DDEF_LSMOD=$(DEF_LSMOD)
+ endif
+ ifneq ($(DEF_OBJECTS),)
+-	CFLAGS += -DDEF_OBJECTS=$(DEF_OBJECTS)
++	override CFLAGS += -DDEF_OBJECTS=$(DEF_OBJECTS)
+ endif
+ ifneq ($(DEF_MAP),)
+-	CFLAGS += -DDEF_MAP=$(DEF_MAP)
++	override CFLAGS += -DDEF_MAP=$(DEF_MAP)
+ endif
+ ifneq ($(DEF_TARGET),)
+-	CFLAGS += -DDEF_TARGET=$(DEF_TARGET)
++	override CFLAGS += -DDEF_TARGET=$(DEF_TARGET)
+ endif
+ ifneq ($(DEF_ARCH),)
+-	CFLAGS += -DDEF_ARCH=$(DEF_ARCH)
++	override CFLAGS += -DDEF_ARCH=$(DEF_ARCH)
+ endif
+ ifneq ($(BFD_PREFIX),)
+ 	CFLAGS += -I$(BFD_PREFIX)/include
+@@ -108,7 +108,7 @@
+ $(OBJECTS): $(DEFS)
+ 
+ $(PROGS): %: %.o $(DEFS) $(OBJECTS)
+-	$(CC) $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(STATIC) -lbfd -liberty $(DYNAMIC) -o $@
++	$(CC) $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(STATIC) -lbfd -liberty -lz $(DYNAMIC) -o $@
+ 	-@size $@
+ 
+ clean:
diff --git a/recipes/ksymoops/ksymoops-2.4.9/flags.patch b/recipes/ksymoops/ksymoops-2.4.9/flags.patch
deleted file mode 100644
index 27e4dda923..0000000000
--- a/recipes/ksymoops/ksymoops-2.4.9/flags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ksymoops-2.4.9/Makefile~flags
-+++ ksymoops-2.4.9/Makefile
-@@ -57,36 +57,36 @@
- PROGS := ksymoops
- 
- CC := gcc
--CFLAGS += -Dlinux \
--	 -Wall \
-+CFLAGS = "-Wall \
- 	 -Wno-conversion \
- 	 -Waggregate-return \
- 	 -Wstrict-prototypes \
- 	 -Wmissing-prototypes \
-+	 $(DEBUG)"
-+override CFLAGS += -Dlinux \
- 	 -DINSTALL_PREFIX="\"$(INSTALL_PREFIX)\"" \
--	 -DCROSS="\"$(CROSS)\"" \
--	 $(DEBUG)
-+	 -DCROSS="\"$(CROSS)\""
- 
- ifneq ($(DEF_VMLINUX),)
--	CFLAGS += -DDEF_VMLINUX=$(DEF_VMLINUX)
-+	override CFLAGS += -DDEF_VMLINUX=$(DEF_VMLINUX)
- endif
- ifneq ($(DEF_KSYMS),)
--	CFLAGS += -DDEF_KSYMS=$(DEF_KSYMS)
-+	override CFLAGS += -DDEF_KSYMS=$(DEF_KSYMS)
- endif
- ifneq ($(DEF_LSMOD),)
--	CFLAGS += -DDEF_LSMOD=$(DEF_LSMOD)
-+	override CFLAGS += -DDEF_LSMOD=$(DEF_LSMOD)
- endif
- ifneq ($(DEF_OBJECTS),)
--	CFLAGS += -DDEF_OBJECTS=$(DEF_OBJECTS)
-+	override CFLAGS += -DDEF_OBJECTS=$(DEF_OBJECTS)
- endif
- ifneq ($(DEF_MAP),)
--	CFLAGS += -DDEF_MAP=$(DEF_MAP)
-+	override CFLAGS += -DDEF_MAP=$(DEF_MAP)
- endif
- ifneq ($(DEF_TARGET),)
--	CFLAGS += -DDEF_TARGET=$(DEF_TARGET)
-+	override CFLAGS += -DDEF_TARGET=$(DEF_TARGET)
- endif
- ifneq ($(DEF_ARCH),)
--	CFLAGS += -DDEF_ARCH=$(DEF_ARCH)
-+	override CFLAGS += -DDEF_ARCH=$(DEF_ARCH)
- endif
- ifneq ($(BFD_PREFIX),)
- 	CFLAGS += -I$(BFD_PREFIX)/include
diff --git a/recipes/ksymoops/ksymoops_2.4.11.bb b/recipes/ksymoops/ksymoops_2.4.11.bb
new file mode 100644
index 0000000000..11ee88c5fb
--- /dev/null
+++ b/recipes/ksymoops/ksymoops_2.4.11.bb
@@ -0,0 +1,18 @@
+SECTION = "console/utils"
+DESCRIPTION = "Kernel oops and error message decoder."
+LICENSE = "GPLv2"
+DEPENDS = "binutils"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \
+	   file://flags.patch"
+S = "${WORKDIR}/ksymoops-${PV}"
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 ksymoops ${D}${bindir}/ksymoops
+	install -d ${D}${mandir}/man8
+	install -m 0755 ksymoops.8 ${D}${mandir}/man8/ksymoops.8
+}
+
+SRC_URI[md5sum] = "4a8249e182a5dbc75e566d162e9f3314"
+SRC_URI[sha256sum] = "52d3546062681e91460013acba6150ece9139b7c2787c2f3213ad0770b72a6b4"
diff --git a/recipes/ksymoops/ksymoops_2.4.9.bb b/recipes/ksymoops/ksymoops_2.4.9.bb
deleted file mode 100644
index 662299daa7..0000000000
--- a/recipes/ksymoops/ksymoops_2.4.9.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Kernel oops and error message decoder."
-LICENSE = "GPLv2"
-DEPENDS = "binutils"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \
-	   file://flags.patch"
-S = "${WORKDIR}/ksymoops-${PV}"
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 ksymoops ${D}${bindir}/ksymoops
-	install -d ${D}${mandir}/man8
-	install -m 0755 ksymoops.8 ${D}${mandir}/man8/ksymoops.8
-}
-
-SRC_URI[md5sum] = "231b6ea3afbc318c129ec770d10f8ec8"
-SRC_URI[sha256sum] = "125fcecc9f650dc2ec82db3194d17c0af40b48900204fedb0c695b5fcc5a99e3"
-- 
cgit 1.2.3-korg