summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-02-29 22:15:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:31 +0000
commit53cc2c6cac6961babc283ed8efc34a591c43dbce (patch)
treed2149eab26b5025165f30e27d9c6e1755f85f820
parent73444fb68cae5e2ada44f370443a63bd9e30f4c0 (diff)
downloadpoky-53cc2c6cac6961babc283ed8efc34a591c43dbce.tar.gz
Hob: include hddimg and iso into image types.
For image types, so far we don't include hddimg and iso. Then those files can not be deployed because they are filtered out in the image selection dialog. This patch is to include hddimg and iso (which are "live" in image types). Again, we have a TODO in the code for the future, that is to retrieve image types from the bitbake server instead of to use the walkaround. (Bitbake rev: d565507940be73fb5ea3ae7048d8d143c44c2a95) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py9
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py9
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobwidget.py27
4 files changed, 38 insertions, 11 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 007167337f..eb38819294 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -758,8 +758,8 @@ class Builder(gtk.Window):
758 flags = gtk.DIALOG_MODAL 758 flags = gtk.DIALOG_MODAL
759 | gtk.DIALOG_DESTROY_WITH_PARENT 759 | gtk.DIALOG_DESTROY_WITH_PARENT
760 | gtk.DIALOG_NO_SEPARATOR, 760 | gtk.DIALOG_NO_SEPARATOR,
761 buttons = ("Close", gtk.RESPONSE_NO, 761 buttons = ("Make usb image", gtk.RESPONSE_YES,
762 "Make usb image", gtk.RESPONSE_YES)) 762 "Close", gtk.RESPONSE_NO))
763 response = dialog.run() 763 response = dialog.run()
764 dialog.destroy() 764 dialog.destroy()
765 765
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index 74f4f7b98a..cbad899ae0 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -28,7 +28,7 @@ import re
28import subprocess 28import subprocess
29import shlex 29import shlex
30from bb.ui.crumbs.hobcolor import HobColors 30from bb.ui.crumbs.hobcolor import HobColors
31from bb.ui.crumbs.hobwidget import HobViewTable 31from bb.ui.crumbs.hobwidget import hcc, HobViewTable
32from bb.ui.crumbs.progressbar import HobProgressBar 32from bb.ui.crumbs.progressbar import HobProgressBar
33 33
34""" 34"""
@@ -1083,9 +1083,10 @@ class ImageSelectionDialog (gtk.Dialog):
1083 dirs[:] = [] 1083 dirs[:] = []
1084 for f in files: 1084 for f in files:
1085 for image_type in self.image_types: 1085 for image_type in self.image_types:
1086 if f.endswith('.' + image_type): 1086 for real_image_type in hcc.SUPPORTED_IMAGE_TYPES[image_type]:
1087 imageset.add(f.rsplit('.' + image_type)[0]) 1087 if f.endswith('.' + real_image_type):
1088 self.image_list.append(f) 1088 imageset.add(f.rsplit('.' + real_image_type)[0])
1089 self.image_list.append(f)
1089 1090
1090 for image in imageset: 1091 for image in imageset:
1091 self.image_store.set(self.image_store.append(), 0, image, 1, False) 1092 self.image_store.set(self.image_store.append(), 0, image, 1, False)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index b071ad4503..2bf4ed84a1 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -22,6 +22,7 @@
22import gobject 22import gobject
23import logging 23import logging
24from bb.ui.crumbs.runningbuild import RunningBuild 24from bb.ui.crumbs.runningbuild import RunningBuild
25from bb.ui.crumbs.hobwidget import hcc
25 26
26class HobHandler(gobject.GObject): 27class HobHandler(gobject.GObject):
27 28
@@ -450,10 +451,8 @@ class HobHandler(gobject.GObject):
450 params["incompat_license"] = self.server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) or "" 451 params["incompat_license"] = self.server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) or ""
451 params["sdk_machine"] = self.server.runCommand(["getVariable", "SDKMACHINE"]) or self.server.runCommand(["getVariable", "SDK_ARCH"]) or "" 452 params["sdk_machine"] = self.server.runCommand(["getVariable", "SDKMACHINE"]) or self.server.runCommand(["getVariable", "SDK_ARCH"]) or ""
452 453
453 #params["image_types"] = self.server.runCommand(["getVariable", "IMAGE_TYPES"]) or ""
454 params["image_fstypes"] = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]) or "" 454 params["image_fstypes"] = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]) or ""
455 """ 455
456 A workaround 456 # walkaround
457 """ 457 params["image_types"] = " ".join(hcc.SUPPORTED_IMAGE_TYPES.keys()).lstrip(" ")
458 params["image_types"] = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
459 return params 458 return params
diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py
index 664bf25560..9afbfdbe96 100644
--- a/bitbake/lib/bb/ui/crumbs/hobwidget.py
+++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py
@@ -50,6 +50,33 @@ class hic:
50 ICON_INDI_CONFIRM_FILE = os.path.join(HOB_ICON_BASE_DIR, ('indicators/confirmation.png')) 50 ICON_INDI_CONFIRM_FILE = os.path.join(HOB_ICON_BASE_DIR, ('indicators/confirmation.png'))
51 ICON_INDI_ERROR_FILE = os.path.join(HOB_ICON_BASE_DIR, ('indicators/error.png')) 51 ICON_INDI_ERROR_FILE = os.path.join(HOB_ICON_BASE_DIR, ('indicators/error.png'))
52 52
53class hcc:
54
55 SUPPORTED_IMAGE_TYPES = {
56 "jffs2" : ["jffs2"],
57 "sum.jffs2" : ["sum.jffs2"],
58 "cramfs" : ["cramfs"],
59 "ext2" : ["ext2"],
60 "ext2.gz" : ["ext2.gz"],
61 "ext2.bz2" : ["ext2.bz2"],
62 "ext3" : ["ext3"],
63 "ext3.gz" : ["ext3.gz"],
64 "ext2.lzma" : ["ext2.lzma"],
65 "btrfs" : ["btrfs"],
66 "live" : ["hddimg", "iso"],
67 "squashfs" : ["squashfs"],
68 "squashfs-lzma" : ["squashfs-lzma"],
69 "ubi" : ["ubi"],
70 "tar" : ["tar"],
71 "tar.gz" : ["tar.gz"],
72 "tar.bz2" : ["tar.bz2"],
73 "tar.xz" : ["tar.xz"],
74 "cpio" : ["cpio"],
75 "cpio.gz" : ["cpio.gz"],
76 "cpio.xz" : ["cpio.xz"],
77 "cpio.lzma" : ["cpio.lzma"],
78 }
79
53class HobViewTable (gtk.VBox): 80class HobViewTable (gtk.VBox):
54 """ 81 """
55 A VBox to contain the table for different recipe views and package view 82 A VBox to contain the table for different recipe views and package view