diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/glibc/glibc-package.bbclass | 11 | ||||
| -rw-r--r-- | packages/matchbox2/matchbox-panel-2_svn.bb | 6 | ||||
| -rw-r--r-- | packages/uboot/u-boot-linkstationppc/defconfig_lsppchd (renamed from packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-linkstationppc/defconfig_lsppchg (renamed from packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg) | 0 | ||||
| -rw-r--r-- | packages/uboot/u-boot-linkstationppc_git.bb | 7 |
5 files changed, 15 insertions, 9 deletions
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 5783ab1fcf..4bd4223657 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -202,9 +202,14 @@ python package_do_split_gconvs () { do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) - f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") - supported = f.readlines() - f.close() + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") + supported = f.readlines() + f.close() + else: + supported = supported.split() + supported = map(lambda s:s.replace(".", " ") + "\n", supported) dot_re = re.compile("(.*)\.(.*)") diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index a0f4a7f484..5022afa41a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,11 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES = "matchbox-panel" -RCONFLICTS = "matchbox-panel" +RREPLACES_${PN} = "matchbox-panel" +RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd index 5919f5eb2c..5919f5eb2c 100644 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchd +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg index b9943b4c76..b9943b4c76 100644 --- a/packages/uboot/u-boot-linkstationppc/defconfig_linkstationppchg +++ b/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg diff --git a/packages/uboot/u-boot-linkstationppc_git.bb b/packages/uboot/u-boot-linkstationppc_git.bb index 2fe2f9e7ff..7baac2ba7c 100644 --- a/packages/uboot/u-boot-linkstationppc_git.bb +++ b/packages/uboot/u-boot-linkstationppc_git.bb @@ -3,15 +3,16 @@ PROVIDES = "virtual/bootloader" SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" DEFAULT_PREFERENCE = "-1" -COMPATIBLE_MACHINE = "linkstationppc" +COMPATIBLE_MACHINE = "(lsppchd|lsppchg)" SRC_URI = "git://www.jdl.com/software/u-boot-86xx.git;protocol=git \ file://u-boot-kurobox.patch;patch=1 \ file://u-boot-kurobox-fdt.patch;patch=1 \ - file://defconfig_linkstationppchg \ - file://defconfig_linkstationppchd \ + file://defconfig_lsppchg \ + file://defconfig_lsppchd \ " S = "${WORKDIR}/git" |