Remove kernel module supprt from packaging

Signed-off-by: Pauli Nieminen <suokkos@gmail.com>

15 files changed, 4 insertions, 289 deletions

diff --git a/debian/control b/debian/control
index 122705f..e1897d5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,46 +11,15 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/sysprof.git
 Package: sysprof
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: sysprof-module-source, sysprof-module-dkms
 Description: system-wide Linux profiler
- Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile
- the entire system, not just a single application. Sysprof handles shared
- libraries and applications do not need to be recompiled. In fact they don't
- even have to be restarted.
+ Sysprof is a sampling CPU profiler that uses a ptrace in Linux kernel to
+ profile the entire system, not just a single application. Sysprof handles
+ shared libraries and applications do not need to be recompiled. In fact they
+ don't even have to be restarted.
  .
  It has the following features:
   - profiles all running processes, not just a single application
   - has a simple graphical interface
   - shows the time spent in each branch of the call tree
   - profiles can be loaded and saved
- .
- You need the sysprof kernel module (provided in sysprof-module-source) to use
- sysprof.
-
-Package: sysprof-module-source
-Architecture: all
-Depends: debhelper (>= 4.1.0), build-essential, module-assistant, bzip2, ${misc:Depends}
-Description: Source for the sysprof module
- Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile
- the entire system, not just a single application. Sysprof handles shared
- libraries and applications do not need to be recompiled. In fact they don't
- even have to be restarted.
- .
- This package contains the source for the sysprof's kernel module.
- .
- You need a Linux kernel version 2.6.11 or newer on an i386 or amd64
- processor.
 
-Package: sysprof-module-dkms
-Architecture: all
-Depends: debhelper (>= 4.1.0), build-essential, make, dkms (>= 1.95), bzip2, ${misc:Depends}
-Description: Source for the sysprof module - DKMS version
- Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile
- the entire system, not just a single application. Sysprof handles shared
- libraries and applications do not need to be recompiled. In fact they don't
- even have to be restarted.
- .
- This package contains the dkms source for the sysprof's kernel module.
- .
- You need a Linux kernel version 2.6.11 or newer on an i386 or amd64
- processor.
diff --git a/debian/control.modules.in b/debian/control.modules.in
deleted file mode 100644
index dc3ee13..0000000
--- a/debian/control.modules.in
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: sysprof
-Section: devel
-Priority: optional
-Maintainer: Ritesh Raj Sarraf <rrs@debian.org>
-Build-Depends: debhelper (>= 5.0.37), bzip2
-Standards-Version: 3.8.0
-
-Package: sysprof-module-_KVERS_
-Architecture: any
-Description: Sysprof module for Linux (kernel _KVERS_)
- Sysprof is a sampling CPU profiler that uses a Linux kernel module to profile
- the entire system, not just a single application. Sysprof handles shared
- libraries and applications do not need to be recompiled. In fact they don't
- even have to be restarted.
- .
- This package contains the kernel module compiled for linx _KVERS_ needed by
- sysprof.
- .
- If you have compiled your own kernel, you will most likely need to build
- your own sysprof-module. The sysprof-module-source package has been
- provided for use with the Debian's module-assistant or kernel-package
- utilities to produce a version of sysprof-module for your kernel.
- .
- You need a linux kernel version 2.6.11 or newer.
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
deleted file mode 100644
index c4d8479..0000000
--- a/debian/dkms.conf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_NAME="sysprof-module"
-PACKAGE_VERSION="__VERSION__"
-MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build"
-CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
-AUTOINSTALL=yes
-BUILT_MODULE_NAME[0]="sysprof-module"
-DEST_MODULE_LOCATION[0]="/updates"
diff --git a/debian/patches/better_help_for_missing_module.patch b/debian/patches/better_help_for_missing_module.patch
deleted file mode 100644
index 3c28a88..0000000
--- a/debian/patches/better_help_for_missing_module.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Daniel Hahler <ubuntu@thequod.de>
-Description: Better help in case the sysprof-module is not loaded. (LP: #30160)
---- a/sysprof.c
-+++ b/sysprof.c
-@@ -560,7 +560,14 @@
- 		       "\n"
- 		       "       modprobe sysprof-module\n"
- 		       "\n"
--		       "as root.");
-+		       "as root.\n"
-+		       "\n"
-+		       "You may need to build and install this module first:\n"
-+		       "  1. Install the package sysprof-module-source\n"
-+		       "  2. Execute \"m-a a-i sysprof-module\"\n"
-+		       "  3. Load the module as described above\n"
-+		       "  4. Restart sysprof\n"
-+		       "See also /usr/share/doc/sysprof-module-source/README.Debian" );
- 		
- 		update_sensitivity (app);
- 		return;
diff --git a/debian/patches/foreign_kernel.patch b/debian/patches/foreign_kernel.patch
deleted file mode 100644
index dfec4fe..0000000
--- a/debian/patches/foreign_kernel.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Samuel Mimram <smimram@debian.org>
-Description: Use provided kernel version.
---- a/module/Makefile
-+++ b/module/Makefile
-@@ -9,7 +9,8 @@
- endif
- 
- MODULE    := sysprof-module
--KDIR      := /lib/modules/$(shell uname -r)/build
-+KVERS     := $(shell uname -r)
-+KDIR      := /lib/modules/$(KVERS)/build
- INCLUDE   := -isystem $(KDIR)/include
- MODCFLAGS := -DMODULE -D__KERNEL__ -Wall ${INCLUDE}
- 
-@@ -21,7 +22,7 @@
- 	modprobe -r sysprof-module
- 	modprobe sysprof-module
- 
--ifneq ($(shell (uname -r | grep 2.6) > /dev/null ; echo -n $$?),0)
-+ifneq ($(shell ($(KVERS) | grep 2.6) > /dev/null ; echo -n $$?),0)
- 	echo A 2.6 kernel is required; exit 1
- endif
- 
diff --git a/debian/patches/package_version.patch b/debian/patches/package_version.patch
deleted file mode 100644
index 26c242b..0000000
--- a/debian/patches/package_version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Samuel Mimram <smimram@debian.org>
-Description: Define the package_version to avoid necessity for configure.
---- a/module/sysprof-module.c
-+++ b/module/sysprof-module.c
-@@ -19,6 +19,8 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#define PACKAGE_VERSION "1.0.12-debian"
-+
- #ifdef CONFIG_SMP
- # define __SMP__
- #endif
-@@ -36,8 +38,6 @@
- 
- #include "sysprof-module.h"
- 
--#include "../config.h"
--
- #include <linux/version.h>
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
diff --git a/debian/patches/series b/debian/patches/series
index c2349d4..97fbe4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 explicit_library_link.patch
-foreign_kernel.patch
-package_version.patch
 static_libbfd.patch
-better_help_for_missing_module.patch
diff --git a/debian/rules b/debian/rules
index c7d42e1..aae9255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,9 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-# DKMS package
-pdkms=sysprof-module-dkms
-PACKAGE=sysprof-module
-
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS
-export KSRC
-export KVERS
-export KDREV
 
 DESTDIR = $(CURDIR)/debian/tmp
 SYSPROFDIR = $(CURDIR)/debian/sysprof
@@ -53,34 +45,4 @@ override_dh_install:
 
 	dh_installman debian/sysprof.1
 
-	# Install the sources of the kernel module.
-	install -D -m 0755 debian/rules.modules debian/tmp/modules/sysprof-module/debian/rules
-	for f in debian/*.modules.in debian/control debian/compat debian/copyright debian/changelog; do \
-		install -m 0644 $$f debian/tmp/modules/sysprof-module/debian/; \
-	done
-	cp module/* debian/tmp/modules/sysprof-module/
-
-        # For DKMS
-	# Create the directories to install the source into
-	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)
-	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
-	install -D -m 0755 debian/rules.modules debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/rules
-	for f in debian/*.modules.in debian/control debian/compat debian/copyright debian/changelog; do \
-		install -m 0644 $$f debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/; \
-	done
-	cp module/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/
-
-	# Prepare dkms.conf from the dkms.conf.in template
-	sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf
-
-
-
-	cd debian/tmp/; tar jcvf ../sysprof-module-source/usr/src/sysprof-module.tar.bz2 modules; cd ../../
-	rm -rf debian/tmp/modules
-	
-	# Install the override
-	mkdir -p debian/sysprof-module-source/usr/share/lintian/overrides
-	cp debian/sysprof-module-source.overrides \
-		debian/sysprof-module-source/usr/share/lintian/overrides/sysprof-module-source
-
 # .PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/rules.modules b/debian/rules.modules
deleted file mode 100644
index 57a7f39..0000000
--- a/debian/rules.modules
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/make -f
-
-PACKAGE := sysprof-module
-MA_DIR ?= /usr/share/modass
--include $(MA_DIR)/include/generic.make
--include $(MA_DIR)/include/common-rules.make
-
-BASEVERS := $(shell echo $(KVERS) | cut -d. -f-2)
-
-# kernel module filename extension
-ifeq ($(BASEVERS),2.6)
-        modextension := .ko
-else
-        modextension := .o
-endif
-
-.PHONY: kdist_config
-kdist_config: prep-deb-files
-
-.PHONY: binary_modules binary-modules
-binary-modules: binary_modules
-binary-modules: kdist_config
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	# Build the module
-	$(MAKE) -C $(CURDIR) KVERS=$(KVERS) KDIR=$(KSRC)
-
-	# Install the module
-	dh_installdirs lib/modules/$(KVERS)/kernel/lib/
-	dh_install sysprof-module$(modextension) lib/modules/$(KVERS)/kernel/lib/
-	dh_installmodules
-
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol -- -v$(VERSION)
-	dh_md5sums
-	dh_builddeb --destdir=$(DEB_DESTDIR)
-	dh_clean -k
-
-.PHONY: kdist_clean
-kdist_clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	$(MAKE) -C $(CURDIR) clean
diff --git a/debian/sysprof-module-dkms.postinst b/debian/sysprof-module-dkms.postinst
deleted file mode 100644
index c75fb21..0000000
--- a/debian/sysprof-module-dkms.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-package=sysprof-module-dkms
-name=sysprof-module
-
-version=`dpkg-query -W -f='${Version}' "$package" \
-        |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
-
-isadded=`dkms status -m "$name" -v "$version"`
-
-if [ "x${isadded}" = "x" ] ; then
-        dkms add -m "$name" -v "$version"
-fi
-
-if [ "$1" = 'configure' ] ; then
-        dkms build -m "$name" -v "$version" && dkms install -m "$name" -v "$version" || true
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/sysprof-module-dkms.prerm b/debian/sysprof-module-dkms.prerm
deleted file mode 100644
index 13da2a3..0000000
--- a/debian/sysprof-module-dkms.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-package=sysprof-module-dkms
-name=sysprof-module
-
-version=`dpkg-query -W -f='${Version}' "$package" \
-        |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
-
-dkms remove -m "$name" -v "$version" --all || true
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/sysprof-module-source.README.Debian b/debian/sysprof-module-source.README.Debian
deleted file mode 100644
index 7dfa77e..0000000
--- a/debian/sysprof-module-source.README.Debian
+++ /dev/null
@@ -1,23 +0,0 @@
-Prerequisites
--------------
-
-Sysprof needs a 2.6.11 or newer kernel with profiling enabled
-(CONFIG_PROFILING=y).
-
-
-How to compile the driver
-------------------------
-
-The easy way:
-
-type "m-a a-i sysprof-module" and wait. If something is missing (eg. the kernel
-headers), you will see instructions for the additional steps.
-
-Manual way:
-
-Install prerequisite packages: build-essential, hostap-source,
-kernel-headers-$VERSION, where $VERSION is the version of the kernel
-you want to build the driver for.
-
-
--- Samuel Mimram <smimram@debian.org> Sun, 04 Dec 2005 13:54:11 +0100
diff --git a/debian/sysprof-module-source.dirs b/debian/sysprof-module-source.dirs
deleted file mode 100644
index 4c1fff3..0000000
--- a/debian/sysprof-module-source.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/src/modules/sysprof-module
diff --git a/debian/sysprof-module-source.docs b/debian/sysprof-module-source.docs
deleted file mode 100644
index 724e084..0000000
--- a/debian/sysprof-module-source.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-TODO
diff --git a/debian/sysprof-module-source.overrides b/debian/sysprof-module-source.overrides
deleted file mode 100644
index 6f019c4..0000000
--- a/debian/sysprof-module-source.overrides
+++ /dev/null
@@ -1 +0,0 @@
-sysprof-module-source: package-contains-empty-directory usr/src/modules/sysprof-module/