oprofile: move common stuff to oprofile.inc

5 files changed, 56 insertions, 128 deletions

diff --git a/packages/oprofile/oprofile.inc b/packages/oprofile/oprofile.inc
new file mode 100644
index 0000000000..45bf256c64
--- /dev/null
+++ b/packages/oprofile/oprofile.inc
@@ -0,0 +1,37 @@
+SECTION = "devel"
+DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
+of profiling all running code at low overhead."
+LICENSE = "GPL"
+DEPENDS = "popt binutils"
+
+S = "${WORKDIR}/oprofile-${PV}"
+
+inherit autotools
+
+# NOTE: this disables the build of the kernel modules.
+# Should add the oprofile kernel modules, for those with 2.4
+# kernels, as a seperate .oe file.
+EXTRA_OECONF = "--with-kernel-support \
+		--without-x \
+		--disable-werror "
+
+do_configure () {
+	cp ${WORKDIR}/acinclude.m4 ${S}/
+	autotools_do_configure
+}
+# Available config options
+#  --enable-abi                 enable abi portability code (default is disabled)
+#  --enable-pch                 enable precompiled header (default is disabled)
+#  --enable-gcov                enable option for gcov coverage testing (default is disabled)
+#  --disable-werror            disable -Werror flag (default is enabled for non-release)
+#  --disable-optimization      disable optimization flags (default is enabled)
+#  --with-kernel-support        Use 2.6 kernel (no kernel source tree required)
+#  --with-linux=dir             Path to Linux source tree
+#  --with-module-dir=dir        Path to module installation directory
+#  --with-extra-includes=DIR    add extra include paths
+#  --with-extra-libs=DIR        add extra library paths
+#  --with-x                use the X Window System
+#  --with-qt-dir           where the root of Qt is installed
+#  --with-qt-includes      where the Qt includes are.
+#  --with-qt-libraries     where the Qt library is installed.
+
diff --git a/packages/oprofile/oprofile_0.9.2.bb b/packages/oprofile/oprofile_0.9.2.bb
index e64aa10d49..57e17e51c3 100644
--- a/packages/oprofile/oprofile_0.9.2.bb
+++ b/packages/oprofile/oprofile_0.9.2.bb
@@ -1,39 +1,8 @@
-SECTION = "devel"
-DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
-of profiling all running code at low overhead."
-LICENSE = "GPL"
-DEPENDS = "popt binutils"
+require oprofile.inc
+
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
 	   file://no_arm_mapping_syms.patch;patch=1 \
            file://opcontrol_bashisms.patch;patch=1 \
 	   file://acinclude.m4"
-S = "${WORKDIR}/oprofile-${PV}"
-
-inherit autotools
-
-# NOTE: this disables the build of the kernel modules.
-# Should add the oprofile kernel modules, for those with 2.4
-# kernels, as a seperate .oe file.
-EXTRA_OECONF = "--with-kernel-support \
-		--without-x"
-
-do_configure () {
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-	autotools_do_configure
-}
-# Available config options
-#  --enable-abi                 enable abi portability code (default is disabled)
-#  --enable-pch                 enable precompiled header (default is disabled)
-#  --enable-gcov                enable option for gcov coverage testing (default is disabled)
-#  --disable-werror            disable -Werror flag (default is enabled for non-release)
-#  --disable-optimization      disable optimization flags (default is enabled)
-#  --with-kernel-support        Use 2.6 kernel (no kernel source tree required)
-#  --with-linux=dir             Path to Linux source tree
-#  --with-module-dir=dir        Path to module installation directory
-#  --with-extra-includes=DIR    add extra include paths
-#  --with-extra-libs=DIR        add extra library paths
-#  --with-x                use the X Window System
-#  --with-qt-dir           where the root of Qt is installed
-#  --with-qt-includes      where the Qt includes are.
-#  --with-qt-libraries     where the Qt library is installed.
diff --git a/packages/oprofile/oprofile_0.9.3.bb b/packages/oprofile/oprofile_0.9.3.bb
index 7ffcec3b99..1553c1055c 100644
--- a/packages/oprofile/oprofile_0.9.3.bb
+++ b/packages/oprofile/oprofile_0.9.3.bb
@@ -1,11 +1,8 @@
-SECTION = "devel"
-DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
-of profiling all running code at low overhead."
-LICENSE = "GPL"
-DEPENDS = "popt binutils"
-RDEPENDS = "binutils-symlinks"
-RRECOMMENDS = "kernel-vmlinux"
-PR = "r8"
+require oprofile.inc
+
+RDEPENDS += "binutils-symlinks"
+RRECOMMENDS += "kernel-vmlinux"
+PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
            file://armv6_fix.patch;patch=1 \
@@ -16,33 +13,3 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
            file://gcc43x-fix.patch;patch=1 \
            file://armv7a.diff;patch=1 \
            file://acinclude.m4"
-
-S = "${WORKDIR}/oprofile-${PV}"
-
-inherit autotools
-
-# NOTE: this disables the build of the kernel modules.
-# Should add the oprofile kernel modules, for those with 2.4
-# kernels, as a seperate .oe file.
-EXTRA_OECONF = "--with-kernel-support \
-		--without-x"
-
-do_configure () {
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-	autotools_do_configure
-}
-# Available config options
-#  --enable-abi                 enable abi portability code (default is disabled)
-#  --enable-pch                 enable precompiled header (default is disabled)
-#  --enable-gcov                enable option for gcov coverage testing (default is disabled)
-#  --disable-werror            disable -Werror flag (default is enabled for non-release)
-#  --disable-optimization      disable optimization flags (default is enabled)
-#  --with-kernel-support        Use 2.6 kernel (no kernel source tree required)
-#  --with-linux=dir             Path to Linux source tree
-#  --with-module-dir=dir        Path to module installation directory
-#  --with-extra-includes=DIR    add extra include paths
-#  --with-extra-libs=DIR        add extra library paths
-#  --with-x                use the X Window System
-#  --with-qt-dir           where the root of Qt is installed
-#  --with-qt-includes      where the Qt includes are.
-#  --with-qt-libraries     where the Qt library is installed.
diff --git a/packages/oprofile/oprofile_0.9.4.bb b/packages/oprofile/oprofile_0.9.4.bb
index f8fb744fcc..63f4093b7e 100644
--- a/packages/oprofile/oprofile_0.9.4.bb
+++ b/packages/oprofile/oprofile_0.9.4.bb
@@ -1,11 +1,8 @@
-SECTION = "devel"
-DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
-of profiling all running code at low overhead."
-LICENSE = "GPL"
-DEPENDS = "popt binutils"
-RDEPENDS = "binutils-symlinks"
-RRECOMMENDS = "kernel-vmlinux"
-PR = "r0"
+require oprofile.inc
+
+RDEPENDS += "binutils-symlinks"
+RRECOMMENDS += "kernel-vmlinux"
+PR = "r1"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
@@ -14,18 +11,6 @@ SRC_URI = "\
 	file://acinclude.m4 \
 	"
 
-inherit autotools
-
-EXTRA_OECONF = " \
-	--with-kernel-support \
-	--without-x \
-	"
-
-do_configure () {
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-	autotools_do_configure
-}
-
 do_stage () {
 	# As of 0.9.4 there is a libopagent library to compile and link against.
 	autotools_stage_all
diff --git a/packages/oprofile/oprofile_cvs.bb b/packages/oprofile/oprofile_cvs.bb
index 786e7046de..083134bb02 100644
--- a/packages/oprofile/oprofile_cvs.bb
+++ b/packages/oprofile/oprofile_cvs.bb
@@ -1,44 +1,14 @@
+require oprofile.inc
+
 PV = "0.9.3+cvs${SRCDATE}"
-PR = "r0"
-SECTION = "devel"
-DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
-of profiling all running code at low overhead."
-LICENSE = "GPL"
-DEPENDS = "popt binutils"
-RDEPENDS = "binutils-symlinks"
+PR = "r1"
+
+RDEPENDS += "binutils-symlinks"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
            file://opstart.patch;patch=1 \
 	   file://acinclude.m4"
-S = "${WORKDIR}/oprofile"
 
-inherit autotools
-
-# NOTE: this disables the build of the kernel modules.
-# Should add the oprofile kernel modules, for those with 2.4
-# kernels, as a seperate .oe file.
-EXTRA_OECONF = "--with-kernel-support \
-		--without-x \
-		--disable-werror "
-
-do_configure () {
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-	autotools_do_configure
-}
-# Available config options
-#  --enable-abi                 enable abi portability code (default is disabled)
-#  --enable-pch                 enable precompiled header (default is disabled)
-#  --enable-gcov                enable option for gcov coverage testing (default is disabled)
-#  --disable-werror            disable -Werror flag (default is enabled for non-release)
-#  --disable-optimization      disable optimization flags (default is enabled)
-#  --with-kernel-support        Use 2.6 kernel (no kernel source tree required)
-#  --with-linux=dir             Path to Linux source tree
-#  --with-module-dir=dir        Path to module installation directory
-#  --with-extra-includes=DIR    add extra include paths
-#  --with-extra-libs=DIR        add extra library paths
-#  --with-x                use the X Window System
-#  --with-qt-dir           where the root of Qt is installed
-#  --with-qt-includes      where the Qt includes are.
-#  --with-qt-libraries     where the Qt library is installed.
+S = "${WORKDIR}/oprofile"