[oe-commits] org.oe.dev merge of '0bb67ca8b729200534e9fda164dd38051ee0ec16'

[oe commit]

merge of '0bb67ca8b729200534e9fda164dd38051ee0ec16'
     and '1e604e78eb33aee9476c5e81446bb732dad83760'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5522b4404c3b117f5b3f78bd8e0e0fe14321787b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5522b4404c3b117f5b3f78bd8e0e0fe14321787b
Files:
1
packages/oprofile/oprofile-0.9.1
packages/oprofile/oprofile-0.9.1/acinclude.m4
packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch
packages/oprofile/oprofile_0.9.3.bb
packages/oprofile/oprofile_cvs.bb
classes/update-rc.d.bbclass
Diffs:

#
# mt diff -r0bb67ca8b729200534e9fda164dd38051ee0ec16 -r5522b4404c3b117f5b3f78bd8e0e0fe14321787b
#
# 
# 
# delete "packages/oprofile/oprofile-0.9.1"
# 
# delete "packages/oprofile/oprofile-0.9.1/acinclude.m4"
# 
# delete "packages/oprofile/oprofile-0.9.1/no_arm_mapping_syms.patch"
# 
# add_file "packages/oprofile/oprofile_0.9.3.bb"
#  content [f756427d410e1704dcdc1e0d1000a9e01fbc4313]
# 
# patch "packages/oprofile/oprofile_cvs.bb"
#  from [e1e2c8e310c52cdb0da917f1a463dcfb90ed1be9]
#    to [219f961286e4c839f32b63f5e425108ac7e3dacd]
# 
============================================================
--- packages/oprofile/oprofile_0.9.3.bb	f756427d410e1704dcdc1e0d1000a9e01fbc4313
+++ packages/oprofile/oprofile_0.9.3.bb	f756427d410e1704dcdc1e0d1000a9e01fbc4313
@@ -0,0 +1,38 @@
+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"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
+	   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 \
+		--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.
============================================================
--- packages/oprofile/oprofile_cvs.bb	e1e2c8e310c52cdb0da917f1a463dcfb90ed1be9
+++ packages/oprofile/oprofile_cvs.bb	219f961286e4c839f32b63f5e425108ac7e3dacd
@@ -9,8 +9,6 @@ SRC_URI = "cvs://anonymous@oprofile.cvs.
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
-	   file://no_arm_mapping_syms.patch;patch=1 \
-           file://opcontrol_bashisms.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/oprofile"
 


#
# mt diff -r1e604e78eb33aee9476c5e81446bb732dad83760 -r5522b4404c3b117f5b3f78bd8e0e0fe14321787b
#
# 
# 
# patch "classes/update-rc.d.bbclass"
#  from [8812f2d73cbeef9536c5598c2f3c1888e35b0aa3]
#    to [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
# 
============================================================
--- classes/update-rc.d.bbclass	8812f2d73cbeef9536c5598c2f3c1888e35b0aa3
+++ classes/update-rc.d.bbclass	aad4a9f7c2ea238e727751a6fd3e2675923cc9be
@@ -7,17 +7,15 @@ if test "x$D" != "x"; then
 
 updatercd_postinst() {
 if test "x$D" != "x"; then
-	D="-r $D"
+	OPT="-r $D"
 else
-	D="-s"
+	OPT="-s"
 fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 }
 
 updatercd_prerm() {
-if test "x$D" != "x"; then
-	D="-r $D"
-else
+if test "x$D" = "x"; then
 	${INIT_D_DIR}/${INITSCRIPT_NAME} stop
 fi
 }