[oe-commits] Denis 'GNUtoo' Carikli : fso-image.inc: do not search for .desktop files
git version control
git at git.openembedded.org
Sat Apr 3 15:02:38 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: d2bd4a770d2a5b3fd56bd3a8584935240d9012f8
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d2bd4a770d2a5b3fd56bd3a8584935240d9012f8
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date: Sat Apr 3 16:33:54 2010 +0200
fso-image.inc: do not search for .desktop files
We do not ship .desktop files in the image,so if we
search for them we end up with this:
++ find ./usr/share/applications -name '*.desktop'
find: `./usr/share/applications': No such file or directory
+ desktop=
in do_rootfs and it fails.
So commenting that part fixes it
Thanks mickeyl for telling me(#openmoko-cdevel in Freenode)
how to fix(so I didn't have to dig into it,and fixed quicker):
Apr 02 14:55:49 <mickeyl> just comment this line out
PR was not bumped because for mickeyl told me(also #openmoko-cdevel in Freenode)
that it was not necessary for images:
Apr 02 14:59:45 <GNUtoo> should I INC_PR the file?
Apr 02 14:59:53 <mickeyl> not necessary
Apr 02 14:59:59 <mickeyl> image files will be reread
Apr 02 15:00:06 <mickeyl> every time you build
---
recipes/images/fso-image.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc
index 88fc167..cc626f3 100644
--- a/recipes/images/fso-image.inc
+++ b/recipes/images/fso-image.inc
@@ -117,10 +117,10 @@ fso_rootfs_postprocess() {
echo "# NFS Host" >>./etc/fstab
echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
# fix .desktop files for illume
- desktop=`find ./usr/share/applications -name "*.desktop"`
- for file in $desktop; do
- echo "Categories=Office;" >>$file
- done
+ #desktop=`find ./usr/share/applications -name "*.desktop"`
+ #for file in $desktop; do
+ # echo "Categories=Office;" >>$file
+ #done
# minimal gtk theme foo
mkdir -p ./etc/gtk-2.0/
echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
More information about the Openembedded-commits
mailing list