diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 13:26:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 13:26:27 +0000 |
| commit | cc7c892f5b74db49d4bdd6e3817e7340f128aa45 (patch) | |
| tree | e122261a54fddf11d3c6b143290ab5c5e59892f3 /package/devel/oprofile/patches | |
| parent | 2a60c880ff2fa433cae35ef436a866c3d90ee9ee (diff) | |
move a few development packages to trunk and add myself as a maintainer
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33705 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/devel/oprofile/patches')
| -rw-r--r-- | package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch | 20 | ||||
| -rw-r--r-- | package/devel/oprofile/patches/101-remove_24_support.patch | 64 |
2 files changed, 84 insertions, 0 deletions
diff --git a/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch b/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch new file mode 100644 index 0000000000..10107980a5 --- /dev/null +++ b/package/devel/oprofile/patches/100-use_insmod_instead_of_modprobe.patch @@ -0,0 +1,20 @@ +--- a/utils/opcontrol ++++ b/utils/opcontrol +@@ -248,7 +248,7 @@ load_module_26() + { + grep oprofilefs /proc/filesystems >/dev/null + if test "$?" -ne 0; then +- modprobe oprofile ++ insmod oprofile + if test "$?" != "0"; then + # couldn't load the module + return +@@ -278,7 +278,7 @@ load_module_24() + { + grep oprof /proc/devices >/dev/null + if test "$?" -ne 0; then +- modprobe oprofile ++ insmod oprofile + if test "$?" != "0"; then + # couldn't load a module + return diff --git a/package/devel/oprofile/patches/101-remove_24_support.patch b/package/devel/oprofile/patches/101-remove_24_support.patch new file mode 100644 index 0000000000..99eb928c40 --- /dev/null +++ b/package/devel/oprofile/patches/101-remove_24_support.patch @@ -0,0 +1,64 @@ +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = liblegacy . ++SUBDIRS = . + + oprofiled_SOURCES = \ + init.c \ +@@ -49,7 +49,6 @@ AM_CFLAGS = @OP_CFLAGS@ -fno-omit-frame- + bin_PROGRAMS = oprofiled + + oprofiled_LDADD = \ +- liblegacy/liblegacy.a \ + ../libabi/libabi.a \ + ../libdb/libodb.a \ + ../libop/libop.a \ +--- a/daemon/Makefile.in ++++ b/daemon/Makefile.in +@@ -70,7 +70,7 @@ am_oprofiled_OBJECTS = init.$(OBJEXT) op + opd_extended.$(OBJEXT) opd_ibs.$(OBJEXT) \ + opd_ibs_trans.$(OBJEXT) + oprofiled_OBJECTS = $(am_oprofiled_OBJECTS) +-oprofiled_DEPENDENCIES = liblegacy/liblegacy.a ../libabi/libabi.a \ ++oprofiled_DEPENDENCIES = ../libabi/libabi.a \ + ../libdb/libodb.a ../libop/libop.a ../libutil/libutil.a + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -285,7 +285,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + topdir = @topdir@ +-SUBDIRS = liblegacy . ++SUBDIRS = . + oprofiled_SOURCES = \ + init.c \ + oprofiled.c \ +@@ -331,7 +331,6 @@ AM_CPPFLAGS = \ + # -fno-omit-frame-pointer needed for daemon build: see ChangeLog-2004 02-23 + AM_CFLAGS = @OP_CFLAGS@ -fno-omit-frame-pointer + oprofiled_LDADD = \ +- liblegacy/liblegacy.a \ + ../libabi/libabi.a \ + ../libdb/libodb.a \ + ../libop/libop.a \ +--- a/daemon/oprofiled.c ++++ b/daemon/oprofiled.c +@@ -77,7 +77,6 @@ static char * events; + static char * ext_feature; + static int showvers; + static struct oprofiled_ops * opd_ops; +-extern struct oprofiled_ops opd_24_ops; + extern struct oprofiled_ops opd_26_ops; + + #define OPD_IMAGE_FILTER_HASH_SIZE 32 +@@ -477,9 +476,6 @@ static void opd_options(int argc, char c + static struct oprofiled_ops * get_ops(void) + { + switch (op_get_interface()) { +- case OP_INTERFACE_24: +- printf("Using 2.4 OProfile kernel interface.\n"); +- return &opd_24_ops; + case OP_INTERFACE_26: + printf("Using 2.6+ OProfile kernel interface.\n"); + return &opd_26_ops; |