diff options
author | Richard Purdie <richard@openedhand.com> | 2008-02-06 11:56:38 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-02-06 11:56:38 +0000 |
commit | 1d4973ef081f04c09d027a8d6c3b6f925796be26 (patch) | |
tree | e552441f68adf68b6cbbc87d9b6af890952fb156 /meta/packages/oh | |
parent | 3f4d5483c7d8d5f9a4d33e0b07617aa74d0d0324 (diff) | |
download | poky-1d4973ef081f04c09d027a8d6c3b6f925796be26.tar.gz |
qemu-config: Update to use system-shutdown icon
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3672 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/oh')
-rw-r--r-- | meta/packages/oh/qemu-config.bb | 6 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config/qemuarm/shutdown.desktop | 2 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config/shutdown.desktop | 2 | ||||
-rw-r--r-- | meta/packages/oh/qemu-config/shutdown.png | bin | 4823 -> 0 bytes |
4 files changed, 3 insertions, 7 deletions
diff --git a/meta/packages/oh/qemu-config.bb b/meta/packages/oh/qemu-config.bb index 6aed63b338..7255851c1f 100644 --- a/meta/packages/oh/qemu-config.bb +++ b/meta/packages/oh/qemu-config.bb | |||
@@ -1,13 +1,12 @@ | |||
1 | DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" | 1 | DESCRIPTION = "Adds scripts to use distcc on the host system under qemu" |
2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
3 | RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash" | 3 | RDEPENDS = "distcc task-poky-nfs-server fakeroot oprofileui-server rsync bash" |
4 | PR = "r12" | 4 | PR = "r14" |
5 | 5 | ||
6 | SRC_URI = "file://distcc.sh \ | 6 | SRC_URI = "file://distcc.sh \ |
7 | file://anjuta-remote-run \ | 7 | file://anjuta-remote-run \ |
8 | file://exports \ | 8 | file://exports \ |
9 | file://shutdown.desktop \ | 9 | file://shutdown.desktop \ |
10 | file://shutdown.png \ | ||
11 | file://poky-chroot-init \ | 10 | file://poky-chroot-init \ |
12 | file://poky-chroot-launch \ | 11 | file://poky-chroot-launch \ |
13 | file://qemu-autostart" | 12 | file://qemu-autostart" |
@@ -31,9 +30,6 @@ do_install() { | |||
31 | install -d ${D}${datadir}/applications | 30 | install -d ${D}${datadir}/applications |
32 | install -m 0644 shutdown.desktop ${D}${datadir}/applications/ | 31 | install -m 0644 shutdown.desktop ${D}${datadir}/applications/ |
33 | 32 | ||
34 | install -d ${D}${datadir}/pixmaps | ||
35 | install -m 0644 shutdown.png ${D}${datadir}/pixmaps/ | ||
36 | |||
37 | install -d ${D}/etc/init.d | 33 | install -d ${D}/etc/init.d |
38 | install qemu-autostart ${D}/etc/init.d/ | 34 | install qemu-autostart ${D}/etc/init.d/ |
39 | } | 35 | } |
diff --git a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop b/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop index 2a42af5dcd..b973d4318e 100644 --- a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop +++ b/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop | |||
@@ -4,7 +4,7 @@ Type=Application | |||
4 | Name=Shutdown | 4 | Name=Shutdown |
5 | Comment=Close down the machine safely | 5 | Comment=Close down the machine safely |
6 | Exec=reboot | 6 | Exec=reboot |
7 | Icon=shutdown.png | 7 | Icon=system-shutdown |
8 | Terminal=false | 8 | Terminal=false |
9 | Categories=Utility; | 9 | Categories=Utility; |
10 | StartupNotify=true \ No newline at end of file | 10 | StartupNotify=true \ No newline at end of file |
diff --git a/meta/packages/oh/qemu-config/shutdown.desktop b/meta/packages/oh/qemu-config/shutdown.desktop index c1cb805694..272688922c 100644 --- a/meta/packages/oh/qemu-config/shutdown.desktop +++ b/meta/packages/oh/qemu-config/shutdown.desktop | |||
@@ -4,7 +4,7 @@ Type=Application | |||
4 | Name=Shutdown | 4 | Name=Shutdown |
5 | Comment=Close down the machine safely | 5 | Comment=Close down the machine safely |
6 | Exec=halt | 6 | Exec=halt |
7 | Icon=shutdown.png | 7 | Icon=system-shutdown |
8 | Terminal=false | 8 | Terminal=false |
9 | Categories=Utility; | 9 | Categories=Utility; |
10 | StartupNotify=true \ No newline at end of file | 10 | StartupNotify=true \ No newline at end of file |
diff --git a/meta/packages/oh/qemu-config/shutdown.png b/meta/packages/oh/qemu-config/shutdown.png deleted file mode 100644 index abf3f790dc..0000000000 --- a/meta/packages/oh/qemu-config/shutdown.png +++ /dev/null | |||
Binary files differ | |||