summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-15 10:54:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:21 +0100
commit8f9f48a29a8478dce203b7b0e439ef5303b05475 (patch)
tree780fd0e21f297c339eea639e95275c786b3de775
parentff6d458f9ad4e2aed24997aea15ec930b0915c26 (diff)
downloadpoky-8f9f48a29a8478dce203b7b0e439ef5303b05475.tar.gz
oprofileui: remove
oprofileui doesn't work anymore with not-so-recent changes to the oprofile command line interface, and perf is becoming the expected profiling solution so any future profiling tools should be using that instead. (From OE-Core rev: 324f7cea3e73eb3f64cdfa221398797ddd2b50e9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/distro_alias.inc2
-rw-r--r--meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb1
-rwxr-xr-xmeta/recipes-kernel/oprofile/oprofileui-server/init37
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service6
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server_git.bb34
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui.inc16
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui_git.bb20
7 files changed, 0 insertions, 116 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index f3315b450c..d6ba66bbbb 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -281,8 +281,6 @@ DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/op
281DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" 281DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils"
282DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" 282DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils"
283DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile" 283DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile"
284DISTRO_PN_ALIAS_pn-oprofileui = "Fedora=oprofileui Ubuntu=oprofile-gui Debian=oprofile-gui"
285DISTRO_PN_ALIAS_pn-oprofileui-server = "Fedora=oprofileui Ubuntu=oprofile-gui Debian=oprofile-gui"
286DISTRO_PN_ALIAS_pn-os-release = "OE-Core" 284DISTRO_PN_ALIAS_pn-os-release = "OE-Core"
287DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" 285DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core"
288DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" 286DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"
diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
index b037057491..d20eae756f 100644
--- a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
+++ b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
@@ -10,7 +10,6 @@ RCONFLICTS_${PN} = "qemu-config"
10 10
11RDEPENDS_${PN} = "\ 11RDEPENDS_${PN} = "\
12 distcc-config \ 12 distcc-config \
13 oprofileui-server \
14 nfs-export-root \ 13 nfs-export-root \
15 bash \ 14 bash \
16 " 15 "
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/init b/meta/recipes-kernel/oprofile/oprofileui-server/init
deleted file mode 100755
index 2544ea4ac0..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui-server/init
+++ /dev/null
@@ -1,37 +0,0 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: oprofile-server
4# Required-Start: $network
5# Required-Stop: $network
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: OProfileUI server
9# Description:
10### END INIT INFO
11
12. /etc/init.d/functions
13
14case "$1" in
15 start)
16 echo "Starting OProfileUI server"
17 . /etc/profile
18 /usr/bin/oprofile-server &
19 ;;
20
21 stop)
22 echo "Stopping OProfileUI server"
23 killproc oprofile-server
24 ;;
25
26 restart)
27 $0 stop
28 sleep 1
29 $0 start
30 ;;
31
32 *)
33 echo "usage: $0 { start | stop | restart }"
34 ;;
35esac
36
37exit 0
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service b/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
deleted file mode 100644
index 1a2cbe62ea..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
+++ /dev/null
@@ -1,6 +0,0 @@
1[Unit]
2Description=OProfileUI Server
3After=network.target
4
5[Service]
6ExecStart=/bin/sh -c ". @SYSCONFDIR@/profile; @BINDIR@/oprofile-server"
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
deleted file mode 100644
index cc3477bc7b..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
1require oprofileui.inc
2
3SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59"
4PV = "0.0+git${SRCPV}"
5
6S = "${WORKDIR}/git"
7
8SRC_URI = "git://git.yoctoproject.org/oprofileui \
9 file://init \
10 file://oprofileui-server.service "
11
12DEPENDS += "intltool-native gettext-native"
13
14EXTRA_OECONF += "--disable-client --enable-server"
15
16RDEPENDS_${PN} = "oprofile avahi-daemon"
17
18do_install_append() {
19 install -d ${D}${sysconfdir}/init.d
20 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/oprofileui-server
21
22 install -d ${D}${systemd_unitdir}/system
23 install -m 0644 ${WORKDIR}/oprofileui-server.service ${D}${systemd_unitdir}/system/
24 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
25 -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/oprofileui-server.service
26}
27
28inherit update-rc.d systemd
29
30INITSCRIPT_NAME = "oprofileui-server"
31INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
32
33SYSTEMD_SERVICE_${PN} = "oprofileui-server.service"
34SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta/recipes-kernel/oprofile/oprofileui.inc b/meta/recipes-kernel/oprofile/oprofileui.inc
deleted file mode 100644
index 8fcf014a95..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui.inc
+++ /dev/null
@@ -1,16 +0,0 @@
1SUMMARY = "User Interface for the System-Wide Profiler"
2DESCRIPTION = "User interface for the OProfile tool"
3HOMEPAGE = "http://labs.o-hand.com/oprofileui/"
4BUGTRACKER = "http://bugzilla.yoctoproject.org/"
5
6SECTION = "x11"
7
8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
10
11DEPENDS = "glib-2.0 avahi intltool-native"
12
13inherit autotools pkgconfig gettext
14
15EXTRA_OECONF = "--with-avahi"
16
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb
deleted file mode 100644
index 86f3d8e50e..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require oprofileui.inc
2
3DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native"
4
5inherit distro_features_check
6ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
7
8SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59"
9PV = "0.0+git${SRCPV}"
10
11S = "${WORKDIR}/git"
12
13SRC_URI = "git://git.yoctoproject.org/oprofileui"
14
15EXTRA_OECONF += "--enable-client --disable-server"
16
17PACKAGES =+ "oprofileui-viewer"
18
19FILES_oprofileui-viewer = "${bindir}/oparchconv ${bindir}/oprofile-viewer ${datadir}/applications/ ${datadir}/oprofileui/ ${datadir}/icons"
20RDEPENDS_oprofileui-viewer = "oprofile"