diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobwidget.py | 27 |
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 | |||
28 | import subprocess | 28 | import subprocess |
29 | import shlex | 29 | import shlex |
30 | from bb.ui.crumbs.hobcolor import HobColors | 30 | from bb.ui.crumbs.hobcolor import HobColors |
31 | from bb.ui.crumbs.hobwidget import HobViewTable | 31 | from bb.ui.crumbs.hobwidget import hcc, HobViewTable |
32 | from bb.ui.crumbs.progressbar import HobProgressBar | 32 | from 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 @@ | |||
22 | import gobject | 22 | import gobject |
23 | import logging | 23 | import logging |
24 | from bb.ui.crumbs.runningbuild import RunningBuild | 24 | from bb.ui.crumbs.runningbuild import RunningBuild |
25 | from bb.ui.crumbs.hobwidget import hcc | ||
25 | 26 | ||
26 | class HobHandler(gobject.GObject): | 27 | class 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 | ||
53 | class 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 | |||
53 | class HobViewTable (gtk.VBox): | 80 | class 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 |