diff options
| -rw-r--r-- | classes/base.bbclass | 39 | ||||
| -rw-r--r-- | conf/documentation.conf | 3 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 2 | ||||
| -rw-r--r-- | packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb | 2 | ||||
| -rw-r--r-- | packages/scratchbox/sbrsh_7.1.bb | 3 | ||||
| -rw-r--r-- | packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb | 2 |
6 files changed, 33 insertions, 18 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 4c88e9a6b7..f5aede6b8b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -677,19 +677,21 @@ python read_subpackage_metadata () { def base_after_parse_two(d): import bb import exceptions - need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) - if need_host: - import re - this_host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match(need_host, this_host): - raise bb.parse.SkipPackage("incompatible with host %s" % this_host) - - need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) - if need_machine: - import re - this_machine = bb.data.getVar('MACHINE', d, 1) - if this_machine and not re.match(need_machine, this_machine): - raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) + source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0) + if not source_mirror_fetch: + need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) + if need_host: + import re + this_host = bb.data.getVar('HOST_SYS', d, 1) + if not re.match(need_host, this_host): + raise bb.parse.SkipPackage("incompatible with host %s" % this_host) + + need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) + if need_machine: + import re + this_machine = bb.data.getVar('MACHINE', d, 1) + if this_machine and not re.match(need_machine, this_machine): + raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) pn = bb.data.getVar('PN', d, 1) @@ -782,5 +784,16 @@ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/ne ftp://ftp.gnutls.org/pub/gnutls http://josefsson.org/gnutls/releases/ http://ftp.info-zip.org/pub/infozip/src/ http://mirror.switch.ch/ftp/mirror/infozip/src/ http://ftp.info-zip.org/pub/infozip/src/ ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tau.ac.il/pub/unix/admin/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.kaizo.org/pub/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tu-darmstadt.de/pub/sysadmin/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://ftp.tux.org/pub/sites/vic.cc.purdue.edu/tools/unix/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ +ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ + } diff --git a/conf/documentation.conf b/conf/documentation.conf index 62622ea255..392d1718b6 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -85,6 +85,7 @@ GROUP_fetcher[doc] = "The key highly influence the fetcher implementations." DL_DIR[doc] = "The directory where tarballs will be stored. @group fetcher" CVSDIR[doc] = "The directory where cvs checkouts will be stored in. @group fetcher" GITDIR[doc] = "The directory where git clones will be stored. @group fetcher" +SVNDIR[doc] = "The directory where subversion checkouts will be stored. @group fetcher" STAMP[doc] = "The directory that holds files to keep track of what was built." WORKDIR[doc] = "The directory where a concrete package will be unpacked and built." @@ -102,3 +103,5 @@ PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps wi COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser." COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." + +SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking." diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 0dfdd4cf81..7f2dc4c77d 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|simpad)' +COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|magician|simpad)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb index 6534285fd4..6193067bfa 100644 --- a/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb +++ b/packages/matchbox-applet-tasks/mb-applet-tasks_1.0.0.bb @@ -14,7 +14,7 @@ CFLAGS += "-I${STAGING_INCDIR} \ -I${STAGING_INCDIR}/cairo \ -DWNCK_I_KNOW_THIS_IS_UNSTABLE" -SRC_URI = "http://mail.pdaxrom.org/1.1.0beta1/src/${P}.tar.bz2" +SRC_URI = "http://www.pdaxrom.org/download/1.1.0beta4/src/${P}.tar.bz2" do_install() { install -d ${D}/${datadir}/applications diff --git a/packages/scratchbox/sbrsh_7.1.bb b/packages/scratchbox/sbrsh_7.1.bb index e692d2f242..43ff0178d6 100644 --- a/packages/scratchbox/sbrsh_7.1.bb +++ b/packages/scratchbox/sbrsh_7.1.bb @@ -5,8 +5,7 @@ DEPENDS = "fakeroot" PR = "r1" RRECOMMENDS = "kernel-module-nfs" - -SRC_URI = "http://scratchbox.org/download/files/sbox-releases/apophis/src/${P}.tar.gz" +SRC_URI = "http://scratchbox.org/download/files/sbox-releases/1.0/src/${P}.tar.gz" do_install() { install -d ${D}${sbindir} diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb index 07a5659300..d633a9c6d1 100644 --- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb +++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb @@ -6,6 +6,6 @@ S="${WORKDIR}/font-util-${PV}" DEPENDS = "bdftopcf-native" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz" inherit native autotools pkgconfig |