diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/devshell.bbclass | 4 | ||||
| -rw-r--r-- | classes/insane.bbclass | 7 | ||||
| -rw-r--r-- | classes/oplinux-mirrors.bbclass | 21 | ||||
| -rw-r--r-- | classes/patch.bbclass | 5 | ||||
| -rw-r--r-- | classes/xfce.bbclass | 9 |
5 files changed, 37 insertions, 9 deletions
diff --git a/classes/devshell.bbclass b/classes/devshell.bbclass index 06152ef8bc..35456b517b 100644 --- a/classes/devshell.bbclass +++ b/classes/devshell.bbclass @@ -6,6 +6,10 @@ do_devshell[nostamp] = "1" devshell_do_devshell() { export TERMWINDOWTITLE="Bitbake Developer Shell" ${TERMCMD} + if [ $? -ne 0 ]; then + echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable." + exit 1 + fi } addtask devshell after do_patch diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c3a211eefd..385db31784 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -63,7 +63,12 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, - } + "linux-uclibcgnueabi" : { + "arm" : (40, 0, 0, True, True), + "armeb" : (40, 0, 0, False, True), + }, + + } # factory for a class, embedded in a method def package_qa_get_elf(path, bits32): diff --git a/classes/oplinux-mirrors.bbclass b/classes/oplinux-mirrors.bbclass new file mode 100644 index 0000000000..6e9d051c3f --- /dev/null +++ b/classes/oplinux-mirrors.bbclass @@ -0,0 +1,21 @@ +MIRRORS_append () { +ftp://.*/.*/ http://www.ifaistos.awmn/oplinux/stable/sources/ +http://.*/.*/ http://www.ifaistos.awmn/oplinux/stable/sources/ +ftp://.*/.*/ http://www.ifaistos.awmn/oplinux/unstable/sources/ +http://.*/.*/ http://www.ifaistos.awmn/oplinux/unstable/sources/ + +ftp://.*/.*/ http://www.ifaistos.awmn/oplinux-uclibc/stable/sources/ +http://.*/.*/ http://www.ifaistos.awmn/oplinux-uclibc/stable/sources/ +ftp://.*/.*/ http:///www.ifaistos.awmn/oplinux-uclibc/unstable/sources/ +http://.*/.*/ http://www.ifaistos.awmn/oplinux-uclibc/unstable/sources/ + +ftp://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/ +http://.*/.*/ http://digital-opsis.com/oplinux/stable/sources/ +ftp://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/ +http://.*/.*/ http://digital-opsis.com/oplinux/unstable/sources/ + +ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/ +http://.*/.*/ http://digital-opsis.com/oplinux-uclibc/stable/sources/ +ftp://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/ +http://.*/.*/ http://digital-opsis.com/oplinux-uclibc/unstable/sources/ +} diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 84cca7f5a0..12657fa0f6 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -376,7 +376,10 @@ def patch_init(d): os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" os.environ['TERMRCFILE'] = rcfile - os.system(bb.data.getVar('TERMCMDRUN', d, 1)) + rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1)) + if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: + bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ + + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', d, 1)) # Construct a new PatchSet after the user's changes, compare the # sets, checking patches for modifications, and doing a remote diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index 8124dc877c..ecc00825bc 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -6,14 +6,9 @@ HOMEPAGE = "http://www.xfce.org" LICENSE = "LGPL-2" +DEPENDS += "startup-notification" -def xfce_extension(ver): - ext = "gz" - if ver == "4.3.99.2": - ext = "bz2" - return ext - -SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}" +SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2" inherit autotools |