From 52385164213c0a6242ce97b7624133d186a4cce3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 19 Nov 2009 18:39:22 +0100 Subject: recipes from shr: kill SRCPV, no SRCPV for git allowed yet Signed-off-by: Martin Jansa --- recipes/blipomoko/blipomoko_git.bb | 2 +- recipes/bt-configure/bt-configure_git.bb | 2 +- recipes/calc/calc_git.bb | 2 +- recipes/efl1/illume-keyboard-arabic_git.bb | 2 +- recipes/efl1/illume-keyboard-browse_git.bb | 2 +- recipes/efl1/illume-keyboard-danish_git.bb | 2 +- recipes/efl1/illume-keyboard-default-alt_git.bb | 2 +- recipes/efl1/illume-keyboard-dutch_git.bb | 2 +- recipes/efl1/illume-keyboard-dvorak_git.bb | 2 +- recipes/efl1/illume-keyboard-french_git.bb | 2 +- recipes/efl1/illume-keyboard-german_git.bb | 2 +- recipes/efl1/illume-keyboard-hebrew_git.bb | 2 +- recipes/efl1/illume-keyboard-numeric-alt_git.bb | 2 +- recipes/efl1/illume-keyboard-russian-terminal_git.bb | 2 +- recipes/efl1/illume-keyboard-russian_git.bb | 2 +- recipes/linux/linux-openmoko-2.6.31_git.bb | 2 +- recipes/linux/linux-openmoko-shr-devel_git.bb | 2 +- recipes/linux/linux-openmoko-shr-drm-devel_git.bb | 2 +- recipes/openmoko-3rdparty/advancedcaching_git.bb | 2 +- recipes/openmoko-projects/paroli_git.bb | 2 +- recipes/openmoocow/openmoocow_git.bb | 2 +- recipes/pidgin/msn-pecan_git.bb | 2 +- recipes/pyphonelog/pyphonelog_git.bb | 2 +- recipes/python/python-phoneutils_git.bb | 2 +- recipes/shr/alsa-scenarii-shr_git.bb | 2 +- recipes/shr/e-wm-config-illume-shr_git.bb | 2 +- recipes/shr/e-wm-menu-shr_git.bb | 2 +- recipes/shr/e-wm-sysactions-shr_git.bb | 2 +- recipes/shr/e-wm-theme-illume-gry_git.bb | 2 +- recipes/shr/e-wm-theme-illume-neo_git.bb | 2 +- recipes/shr/e-wm-theme-illume-niebiee_git.bb | 2 +- recipes/shr/e-wm-theme-illume-shr_git.bb | 2 +- recipes/shr/e-wm-theme-illume-sixteen_git.bb | 2 +- recipes/shr/elementary-theme-gry_git.bb | 2 +- recipes/shr/elementary-theme-neo_git.bb | 2 +- recipes/shr/elementary-theme-niebiee_git.bb | 2 +- recipes/shr/elementary-theme-sixteen_git.bb | 2 +- recipes/shr/etk-theme-neo_git.bb | 2 +- recipes/shr/etk-theme-shr_git.bb | 2 +- recipes/shr/frameworkd-config-shr_git.bb | 2 +- recipes/shr/gtk-theme-neo_git.bb | 2 +- recipes/shr/icon-theme-neo_git.bb | 2 +- recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb | 2 +- recipes/shr/libframeworkd-phonegui-efl2_git.bb | 2 +- recipes/shr/libframeworkd-phonegui-efl_git.bb | 2 +- recipes/shr/libframeworkd-phonegui_git.bb | 2 +- recipes/shr/libmodulo_git.bb | 2 +- recipes/shr/libphone-ui-shr_git.bb | 2 +- recipes/shr/libphone-ui_git.bb | 2 +- recipes/shr/libphone-utils_git.bb | 2 +- recipes/shr/ologicd_git.bb | 2 +- recipes/shr/phonefsod_git.bb | 2 +- recipes/shr/phoneui-apps_git.bb | 2 +- recipes/shr/phoneuid_git.bb | 2 +- recipes/shr/shr-config_git.bb | 2 +- recipes/shr/shr-contacts_git.bb | 2 +- recipes/shr/shr-dialer_git.bb | 2 +- recipes/shr/shr-installer_git.bb | 2 +- recipes/shr/shr-messages_git.bb | 2 +- recipes/shr/shr-settings_git.bb | 2 +- recipes/shr/shr-specs_git.bb | 2 +- recipes/shr/shr-splash-theme-dontpanic_git.bb | 2 +- recipes/shr/shr-splash-theme-handy_git.bb | 2 +- recipes/shr/shr-splash-theme-logo_git.bb | 2 +- recipes/shr/shr-splash-theme-niebiee_git.bb | 2 +- recipes/shr/shr-splash-theme-simple_git.bb | 2 +- recipes/shr/shr-splash-theme-tux_git.bb | 2 +- recipes/shr/shr-splash_git.bb | 2 +- recipes/shr/shr-theme-gtk-e17lookalike_git.bb | 2 +- recipes/shr/shr-theme_git.bb | 2 +- recipes/shr/shr-today_git.bb | 2 +- recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/recipes/blipomoko/blipomoko_git.bb b/recipes/blipomoko/blipomoko_git.bb index 22a34077ce..82f190a73c 100644 --- a/recipes/blipomoko/blipomoko_git.bb +++ b/recipes/blipomoko/blipomoko_git.bb @@ -8,7 +8,7 @@ SECTION = "x11/applications" SRC_URI = "git://github.com/dos1/blipomoko.git;protocol=http" S = "${WORKDIR}/git" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PR = "r0" inherit distutils diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb index 1bc9d8520f..226faa9b98 100644 --- a/recipes/bt-configure/bt-configure_git.bb +++ b/recipes/bt-configure/bt-configure_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python python-pygtk bluez4" -PV = "1.0.0+gitr${SRCPV}" +PV = "1.0.0+gitr${SRCREV}" PR = "r1" ARCH_bt-configure = "all" diff --git a/recipes/calc/calc_git.bb b/recipes/calc/calc_git.bb index e64bf655a4..9914d23717 100644 --- a/recipes/calc/calc_git.bb +++ b/recipes/calc/calc_git.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" RDEPENDS = "python-elementary python python-edbus" SECTION = "x11/application" SRCREV ?= "1c17792094eb" -PV = "0.0.1+gitr${SRCPV}" +PV = "0.0.1+gitr${SRCREV}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb index 900c745fe5..fcc01c905a 100644 --- a/recipes/efl1/illume-keyboard-arabic_git.bb +++ b/recipes/efl1/illume-keyboard-arabic_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Mohammad Fahmi / Tom Hacohen" DESCRIPTION = "Illume keyboard with arabic layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb index 4eda497c4c..b9f5e750d1 100644 --- a/recipes/efl1/illume-keyboard-browse_git.bb +++ b/recipes/efl1/illume-keyboard-browse_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with a layout optimized for browsing" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb index 5a042d9c6b..b824a9e9d9 100644 --- a/recipes/efl1/illume-keyboard-danish_git.bb +++ b/recipes/efl1/illume-keyboard-danish_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Esben Damgaard" DESCRIPTION = "Illume keyboard with danish layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb index f367f11f79..4ceca530ae 100644 --- a/recipes/efl1/illume-keyboard-default-alt_git.bb +++ b/recipes/efl1/illume-keyboard-default-alt_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative default layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb index 2eb137db85..15d0022de8 100644 --- a/recipes/efl1/illume-keyboard-dutch_git.bb +++ b/recipes/efl1/illume-keyboard-dutch_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with dutch layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb index dd6b96c31e..61c58b406b 100644 --- a/recipes/efl1/illume-keyboard-dvorak_git.bb +++ b/recipes/efl1/illume-keyboard-dvorak_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Gabor Adam TOTH" DESCRIPTION = "Illume keyboard with dvorak layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb index 8c8041a9b1..5e957e98e1 100644 --- a/recipes/efl1/illume-keyboard-french_git.bb +++ b/recipes/efl1/illume-keyboard-french_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Illume keyboard with french layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb index a1ad5481df..7120dea750 100644 --- a/recipes/efl1/illume-keyboard-german_git.bb +++ b/recipes/efl1/illume-keyboard-german_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Florian Hackenberger" DESCRIPTION = "Illume keyboard with german layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb index e7cda399f2..cbd47eaad3 100644 --- a/recipes/efl1/illume-keyboard-hebrew_git.bb +++ b/recipes/efl1/illume-keyboard-hebrew_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Tom Hacohen" DESCRIPTION = "Illume keyboard with hebrew layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb index 92090d925d..8abfb8f020 100644 --- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb +++ b/recipes/efl1/illume-keyboard-numeric-alt_git.bb @@ -1,6 +1,6 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative numeric layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb index 7b126bbf09..b625e937c2 100644 --- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb +++ b/recipes/efl1/illume-keyboard-russian-terminal_git.bb @@ -1,6 +1,6 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout for the Terminal" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb index c067871848..ed0644ee58 100644 --- a/recipes/efl1/illume-keyboard-russian_git.bb +++ b/recipes/efl1/illume-keyboard-russian_git.bb @@ -1,6 +1,6 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout" -PV = "0.0+gitr${SRCPV}" +PV = "0.0+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb index 3d6a84b81d..d65c964a08 100644 --- a/recipes/linux/linux-openmoko-2.6.31_git.bb +++ b/recipes/linux/linux-openmoko-2.6.31_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.31" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe1" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" PR = "r1" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index 4f300ff73a..36c48378a3 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3" OMV = "oe11" -PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}" +PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}" PR = "r3.5" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb index 12627cdf43..6b6887918f 100644 --- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3-drm" OMV = "oe14" -PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}" +PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}" PR = "r2" SRC_URI = "\ diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb index 2c2e14c61a..d9379333f8 100644 --- a/recipes/openmoko-3rdparty/advancedcaching_git.bb +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.opkg.org/package_268.html" RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" -PV = "0.1.2+gitr${SRCPV}" +PV = "0.1.2+gitr${SRCREV}" SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index 09c95c63c6..4b4c9add4a 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Paroli" SECTION = "x11" LICENSE = "GPL" -PV = "0.2.1+gitr${SRCPV}" +PV = "0.2.1+gitr${SRCREV}" PE = "1" PR = "r0" diff --git a/recipes/openmoocow/openmoocow_git.bb b/recipes/openmoocow/openmoocow_git.bb index 1071f2afac..ab53313a3f 100644 --- a/recipes/openmoocow/openmoocow_git.bb +++ b/recipes/openmoocow/openmoocow_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.srcf.ucam.org/~taw27/openmoko/openmoocow/" AUTHOR = "Thomas White" LICENSE = "GPLv3" SECTION = "applications/games" -PV = "0.0.3+gitr${SRCPV}" +PV = "0.0.3+gitr${SRCREV}" PR = "r1" SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master" diff --git a/recipes/pidgin/msn-pecan_git.bb b/recipes/pidgin/msn-pecan_git.bb index 3e724f01ec..dba7fd77dc 100644 --- a/recipes/pidgin/msn-pecan_git.bb +++ b/recipes/pidgin/msn-pecan_git.bb @@ -4,7 +4,7 @@ SECTION = "x11/network" LICENSE="GPL-2" RDEPENDS="pidgin" DEPENDS="pidgin" -PV="0.0.1+gitr${SRCPV}" +PV="0.0.1+gitr${SRCREV}" PR="r0" inherit pkgconfig diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb index fafdffaf88..e106653c45 100644 --- a/recipes/pyphonelog/pyphonelog_git.bb +++ b/recipes/pyphonelog/pyphonelog_git.bb @@ -8,7 +8,7 @@ RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils" inherit distutils S = "${WORKDIR}/git" -PV = "0.17.0+gitr${SRCPV}" +PV = "0.17.0+gitr${SRCREV}" PR = "r0" SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http" FILES_${PN} += "${datadir}/applications/phonelog.desktop \ diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb index 1e962d36ad..c1e1dbe16e 100644 --- a/recipes/python/python-phoneutils_git.bb +++ b/recipes/python/python-phoneutils_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Bindings for libphone-utils" SECTION = "devel/python" DEPENDS = "libphone-utils" -PV = "0.0.2+gitr${SRCPV}" +PV = "0.0.2+gitr${SRCREV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master" diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index 97b84984b6..dff37cc083 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+gitr${SRCPV}" +PV = "1.0+gitr${SRCREV}" PR = "r2" COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 36154cef8e..28474d4915 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR config" SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r6" inherit e diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 1deef919fd..b8b267b504 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR applications.menu config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" RPROVIDES_${PN} = "e-wm-menu" RCONFLICTS_${PN} = "e-wm-menu" diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb index 07508c9fbb..1474651093 100644 --- a/recipes/shr/e-wm-sysactions-shr_git.bb +++ b/recipes/shr/e-wm-sysactions-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR sysactions config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r3" RPROVIDES_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb index e993cb6e37..35da5231f0 100644 --- a/recipes/shr/e-wm-theme-illume-gry_git.bb +++ b/recipes/shr/e-wm-theme-illume-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "elementary-theme-gry" LICENCE = "unknown" -PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.3-${EFL_SRCREV}+gitr${SRCREV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb index 10a5016758..ed6adf71c0 100644 --- a/recipes/shr/e-wm-theme-illume-neo_git.bb +++ b/recipes/shr/e-wm-theme-illume-neo_git.bb @@ -7,7 +7,7 @@ RDEPENDS = "e-wm" RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENCE = "unknown" -PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb index 76aaf6d23b..9dfee0b293 100644 --- a/recipes/shr/e-wm-theme-illume-niebiee_git.bb +++ b/recipes/shr/e-wm-theme-illume-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue Illume theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-shr_git.bb b/recipes/shr/e-wm-theme-illume-shr_git.bb index af126dc92e..2c63be670b 100644 --- a/recipes/shr/e-wm-theme-illume-shr_git.bb +++ b/recipes/shr/e-wm-theme-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-sixteen_git.bb b/recipes/shr/e-wm-theme-illume-sixteen_git.bb index f164f0fc24..da8895d97f 100644 --- a/recipes/shr/e-wm-theme-illume-sixteen_git.bb +++ b/recipes/shr/e-wm-theme-illume-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index 2b1dfaab3c..655f377cab 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-gry" LICENSE = "unknown" -PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.8-${EFL_SRCREV}+gitr${SRCREV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb index 4701c220c6..2c1f2f7831 100644 --- a/recipes/shr/elementary-theme-neo_git.bb +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.2.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index 1736ad9a7a..0c99635fc2 100644 --- a/recipes/shr/elementary-theme-niebiee_git.bb +++ b/recipes/shr/elementary-theme-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue elementary theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb index 4eb43af767..d1045e6498 100644 --- a/recipes/shr/elementary-theme-sixteen_git.bb +++ b/recipes/shr/elementary-theme-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "elementary SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb index 2c68bd29da..2279af0e04 100644 --- a/recipes/shr/etk-theme-neo_git.bb +++ b/recipes/shr/etk-theme-neo_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Jesus McCloud Date: Thu, 19 Nov 2009 18:57:59 +0100 Subject: glamo-dri-tests: move to better directory, included in BBFILES --- recipes/dri/glamo-dri-tests_git.bb | 17 +++++++++++++++++ .../xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 recipes/dri/glamo-dri-tests_git.bb delete mode 100644 recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb diff --git a/recipes/dri/glamo-dri-tests_git.bb b/recipes/dri/glamo-dri-tests_git.bb new file mode 100644 index 0000000000..81e0146e90 --- /dev/null +++ b/recipes/dri/glamo-dri-tests_git.bb @@ -0,0 +1,17 @@ +DEPENDS = "libdrm virtual/libx11 libxext" + +PV = "1.0.0+gitr${SRCREV}" + +SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master" + +inherit pkgconfig + +do_compile_prepend() { + export CROSS_CFLAGS=`pkg-config --cflags libdrm_glamo` +} + +do_install() { + PREFIX=${D}/usr make install +} + +S = "${WORKDIR}/git" diff --git a/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb b/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb deleted file mode 100644 index 81e0146e90..0000000000 --- a/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -DEPENDS = "libdrm virtual/libx11 libxext" - -PV = "1.0.0+gitr${SRCREV}" - -SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master" - -inherit pkgconfig - -do_compile_prepend() { - export CROSS_CFLAGS=`pkg-config --cflags libdrm_glamo` -} - -do_install() { - PREFIX=${D}/usr make install -} - -S = "${WORKDIR}/git" -- cgit v1.2.3 From e27dc196988cd827cce7268440f9fe5f9fc51987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 19 Nov 2009 19:22:52 +0100 Subject: checksums.ini: add missing entry for wbxml2 0.10.7 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 39cd260979..b2bc05b06f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16550,6 +16550,10 @@ sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7 md5=478646358c49f34aedcce58948793619 sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73 +[http://downloads.sourceforge.net/libwbxml/libwbxml-0.10.7.tar.gz] +md5=ef3e66df3c4223ce5ce0a70ded5c5221 +sha256=24112231e70c21f90348cefeea362de36aa7bace4088355efcbf4efe0dd242d0 + [http://downloads.sourceforge.net/libwiimote/libwiimote-0.4.tgz] md5=0d8d61dc989d8ad83e1005a26136d388 sha256=a1e9d45a0d4dd367f1371dd477e30ecaa95e59b9fb8635dc9e7f26e4eb231d90 -- cgit v1.2.3 From e0663b38790816d40d8d168d836d2a5c1232e6ea Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 19 Nov 2009 16:15:55 -0200 Subject: squashfs-tools: add .inc usage again to avoid duplicated logic In the effort to avoid duplicated code we've added back the .inc usage otherwise most of code and compilation logic is duplicated between 3.3 and 4.0 recipes. Signed-off-by: Otavio Salvador --- recipes/squashfs-tools/squashfs-tools.inc | 2 +- recipes/squashfs-tools/squashfs-tools_4.0.bb | 33 +++++----------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index d06e1e52ec..aa75eaa898 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." SECTION = "base" LICENSE = "GPLv2" DEPENDS = "zlib" -INC_PR = "r1" +INC_PR = "r2" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index 4e18489e7b..29d82a83b0 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -1,36 +1,15 @@ -DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." -SECTION = "base" -LICENSE = "GPLv2" -DEPENDS = "zlib" -PR = "r2" +require squashfs-tools.inc +PR = "${INC_PR}.2" -# 2009-10-22 snapshot -#SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/pkl/squashfs4.0-lzma-snapshot.tgz" -#S = "${WORKDIR}/squashfs4.0-lzma-snapshot/squashfs-tools" - -SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE}" +# This override is required since this has not yet been released +SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE} \ + http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2" S = "${WORKDIR}/squashfs/squashfs-tools" -SRC_URI += "http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2" - -COMP_DEFAULT = gzip - EXTRA_OEMAKE += "LZMA_SUPPORT=1 LZMA_DIR=../.." - TARGET_CC_ARCH += "${LDFLAGS}" # the COMP_DEFAULT macro should result in a string including quotes: "gzip" +COMP_DEFAULT = gzip CFLAGS_append = ' -I. -I../../C -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_GNU_SOURCE -DLZMA_SUPPORT -DCOMP_DEFAULT=\\"${COMP_DEFAULT}\\" ' - -prefix = "" - -do_compile() { - oe_runmake mksquashfs -} - -do_install () { - install -d ${D}${sbindir} - install -m 0755 mksquashfs ${D}${sbindir}/ -} - -- cgit v1.2.3 From 5555bc82e576dfe4a58b5a0ccf0ee12aed8ad2aa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 19 Nov 2009 17:03:53 -0200 Subject: lzma.inc: use CXX and CC environment values to really do cross compile Signed-off-by: Otavio Salvador --- recipes/lzma/lzma.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/lzma/lzma.inc b/recipes/lzma/lzma.inc index bffbeb2d3b..4d31a44cd0 100644 --- a/recipes/lzma/lzma.inc +++ b/recipes/lzma/lzma.inc @@ -2,7 +2,7 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" DEPENDS = "zlib" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://downloads.sourceforge.net/sevenzip/lzma${@bb.data.getVar('PV',d,1).replace('.','')}.tar.bz2 \ file://001-large_files.patch;patch=1 \ @@ -21,6 +21,11 @@ do_unpack_append() { os.system("find ${S} -type f -print0 | xargs -0 sed 's/\r$//' -i") } +do_patch_append() { + # Hack to ensure we use our environment values + os.system("find ${S} -type f -name makefile.gcc -print0 | xargs -0 sed 's/^CXX =/CXX ?=/;s/^CXX_C =/CXX_C ?=/;s/CXX_C/CC/' -i") +} + do_compile() { oe_runmake -C C/LzmaUtil oe_runmake -C CPP/7zip/Compress/LZMA_Alone -- cgit v1.2.3 From 70af4a882915cb51302734ca0de3b810f05df072 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 19 Nov 2009 20:18:55 +0100 Subject: bitbake.conf: Fix OVERRIDES description (After pb's explanation) Signed-off-by: Martin Jansa --- conf/bitbake.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 4435fdd8bd..b69b6757db 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -651,10 +651,16 @@ BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS" ### Config file processing ### +# Overrides are processed left to right, so the ones that are named later take precedence. +# You generally want them to go from least to most specific. +# # This means that an envionment variable named '_arm' overrides an -# environment variable '' (when ${TARGET_ARCH} is arm). And the same: an -# environment variable '_ramses' overrides both '' and '_arm -# when ${MACHINE} is 'ramses'. And finally '_local' overrides anything. +# environment variable '' (when ${TARGET_ARCH} is arm). +# an environment variable '_ramses' overrides '' but doesn't override +# '_arm' when ${MACHINE} is 'ramses'. +# If you use combination ie '_arm_ramses', then '_arm_ramses' will override +# '_arm' and then '' will be overriden with that value from '_arm'. +# And finally '_local' overrides anything, but with lowest priority. # # This works for functions as well, they are really just environment variables. # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. -- cgit v1.2.3 From 2cdd046f46f89dbb16113166cd51bcc38bdfca04 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 18 Nov 2009 12:23:10 +0000 Subject: midori: add shr specific patch Signed-off-by: Martin Jansa --- recipes/gtk-webcore/midori/config | 4 +++ recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch | 34 +++++++++++++++++++++++ recipes/gtk-webcore/midori_0.1.10.bb | 13 +++++++-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 recipes/gtk-webcore/midori/config create mode 100644 recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch diff --git a/recipes/gtk-webcore/midori/config b/recipes/gtk-webcore/midori/config new file mode 100644 index 0000000000..7b6991d063 --- /dev/null +++ b/recipes/gtk-webcore/midori/config @@ -0,0 +1,4 @@ + +[settings] +enforce-96-dpi=true +toolbar-items=Back,Forward,ReloadStop,Fullscreen,Location,Panel, diff --git a/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch new file mode 100644 index 0000000000..b2541a5edb --- /dev/null +++ b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch @@ -0,0 +1,34 @@ +diff -Nur o/midori/midori-websettings.c n/midori/midori-websettings.c +--- o/midori/midori-websettings.c 2009-09-12 00:09:38.000000000 +0200 ++++ n/midori/midori-websettings.c 2009-09-14 13:55:12.000000000 +0200 +@@ -285,6 +285,7 @@ + { + static const GEnumValue values[] = { + { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("Midori") }, ++ { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") }, + { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") }, + { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") }, + { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") }, +@@ -1118,6 +1119,11 @@ + case MIDORI_IDENT_MIDORI: + return g_strdup_printf ("%s (%s; %s; U; %s) %s", + appname, platform, os, lang, webcore); ++ case MIDORI_IDENT_IPHONE: ++ return g_strdup_printf ("Mozilla/5.0 (iPhone; U; %s; %s) " ++ "AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b " ++ "Safari/419.3 %s", ++ os, lang, appname); + case MIDORI_IDENT_SAFARI: + return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) " + "AppleWebKit/532+ (KHTML, like Gecko) Safari/%s %s", +diff -Nur o/midori/midori-websettings.h n/midori/midori-websettings.h +--- -o/midori/midori-websettings.h 2009-09-12 00:09:38.000000000 +0200 ++++ n/midori/midori-websettings.h 2009-09-14 13:55:14.000000000 +0200 +@@ -132,6 +132,7 @@ + typedef enum + { + MIDORI_IDENT_MIDORI, ++ MIDORI_IDENT_IPHONE, + MIDORI_IDENT_SAFARI, + MIDORI_IDENT_FIREFOX, + MIDORI_IDENT_EXPLORER, diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb index 06d8964082..9d1f1dcec8 100644 --- a/recipes/gtk-webcore/midori_0.1.10.bb +++ b/recipes/gtk-webcore/midori_0.1.10.bb @@ -1,9 +1,15 @@ require midori.inc +PR = "r2" + DEPENDS += "python-native python-docutils-native" SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \ - file://waf" + file://waf \ + " + +SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \ + file://config" do_configure() { cp -f ${WORKDIR}/waf ${S}/ @@ -27,5 +33,8 @@ do_configure() { echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py } - +do_install_append_shr() { + install -d ${D}${sysconfdir}/xdg/midori + install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori +} -- cgit v1.2.3 From 1f373d7669b5f8be062be7207a25d81759838f85 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 19 Nov 2009 19:04:20 +0000 Subject: midori: add shr config for midori Signed-off-by: Martin Jansa --- recipes/gtk-webcore/midori_0.2.1.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb index 7439a85e3e..3eaf0f0bf8 100644 --- a/recipes/gtk-webcore/midori_0.2.1.bb +++ b/recipes/gtk-webcore/midori_0.2.1.bb @@ -5,6 +5,10 @@ DEPENDS += "python-native python-docutils-native" SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \ file://waf" +SRC_URI_append_shr = " file://config " + +PR = "r1" + do_configure() { cp -f ${WORKDIR}/waf ${S}/ sed -i -e 's:, shell=False::g' wscript @@ -27,5 +31,8 @@ do_configure() { echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py } - +do_install_append_shr() { + install -d ${D}${sysconfdir}/xdg/midori + install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori +} -- cgit v1.2.3 From 00e6bf1fa92ab2ab214417edf2d63db832428632 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 19 Nov 2009 16:47:57 +0000 Subject: om-gta02.conf: correct fbreader spezific config variables Signed-off-by: Martin Jansa --- conf/machine/om-gta02.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5882019e19..d47320e59d 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -36,7 +36,8 @@ XSERVER ?= "xserver-xorg \ # fbreader specific READER_RESOLUTION = "480x640" -READER_ARCH = "openzaurus" +READER_ARCH = "desktop" +READER_UI = "gtk" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ -- cgit v1.2.3 From ce1c7e98a376f64bf4a8f3b8e91ddd48eaf2bcae Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 19 Nov 2009 21:37:14 +0100 Subject: conf/machine/ion.conf: NVidia Ion based x86 machines. This introduces tune-atom.inc, using core2 arch as we can rely on GCC 4.3.1+, which supports core2 reliably. Signed-off-by: Leon Woestenberg --- conf/machine/include/tune-atom.inc | 6 ++++++ conf/machine/ion.conf | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 conf/machine/include/tune-atom.inc create mode 100644 conf/machine/ion.conf diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc new file mode 100644 index 0000000000..3c5dd9b25d --- /dev/null +++ b/conf/machine/include/tune-atom.inc @@ -0,0 +1,6 @@ +# was: TARGET_CC_ARCH = "-march=i586" +# +# since GCC 4.3.1, use core2 for +15% performance +# http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel#Atom + +TARGET_CC_ARCH = "-march=core2" diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf new file mode 100644 index 0000000000..db0ca49f07 --- /dev/null +++ b/conf/machine/ion.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: Ion + +#@DESCRIPTION: Machine configuration for NVidia Ion based machines. +#Point of View ION, Asrock 330, etc. + +TARGET_ARCH = "core2" +PACKAGE_EXTRA_ARCHS = "x86 core2" + +include conf/machine/include/tune-atom.inc + +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ + acpi" + +KERNEL_IMAGETYPE = "bzImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" -- cgit v1.2.3 From f73eb119414c6b7047df202943e61bd74ada1692 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Thu, 19 Nov 2009 22:39:04 +0100 Subject: task-fso2-compliance: add tzdata-africa and tzdata-australia to rrecommends Signed-off-by: Klaus Kurzmann --- recipes/tasks/task-fso2-compliance.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb index c0b84a7347..063088d4e8 100644 --- a/recipes/tasks/task-fso2-compliance.bb +++ b/recipes/tasks/task-fso2-compliance.bb @@ -3,7 +3,7 @@ Install this task to make your distribution FSO 2.0-compliant." SECTION = "fso/base" LICENSE = "MIT" PV = "1.9.0" -PR = "r2" +PR = "r3" inherit task @@ -46,7 +46,9 @@ RRECOMMENDS_${PN} = "\ fso-abyss \ wmiconfig \ tzdata \ + tzdata-africa \ tzdata-americas \ tzdata-asia \ + tzdata-australia \ tzdata-europe \ " -- cgit v1.2.3 From 36aac4867a2aa5fc95169315a4691620408ec55c Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 19 Nov 2009 22:57:16 +0100 Subject: ion.conf: TARGET_CC_ARCH = "-march=i686 -mtune=atom" for Atom. --- conf/machine/include/tune-atom.inc | 10 ++++++---- conf/machine/ion.conf | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc index 3c5dd9b25d..b1f6453526 100644 --- a/conf/machine/include/tune-atom.inc +++ b/conf/machine/include/tune-atom.inc @@ -1,6 +1,8 @@ -# was: TARGET_CC_ARCH = "-march=i586" +# GCC 4.3.0- (see Poky) +# TARGET_CC_ARCH = "-march=i586" # -# since GCC 4.3.1, use core2 for +15% performance -# http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel#Atom +# GCC 4.3.1+ (see Gentoo) +#TARGET_CC_ARCH = "-march=core2" -TARGET_CC_ARCH = "-march=core2" +# GCC 4.4.2+ (see Fedora 12) +TARGET_CC_ARCH = "-march=i686 -mtune=atom" diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf index db0ca49f07..f58219bd1a 100644 --- a/conf/machine/ion.conf +++ b/conf/machine/ion.conf @@ -4,8 +4,11 @@ #@DESCRIPTION: Machine configuration for NVidia Ion based machines. #Point of View ION, Asrock 330, etc. -TARGET_ARCH = "core2" -PACKAGE_EXTRA_ARCHS = "x86 core2" +TARGET_ARCH = "i686" + +#MACHINE_ARCH = "core2" + +PACKAGE_EXTRA_ARCHS = "x86" include conf/machine/include/tune-atom.inc -- cgit v1.2.3 From 5c45acafcbf2d76f6d180259b935e54ea8fb76ef Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Thu, 19 Nov 2009 23:00:07 +0100 Subject: sane-srcrevs.inc: bump rev for e-wm-config-illume-shr Signed-off-by: Klaus Kurzmann --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3143ecbbd2..9dd45fdf1e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -46,7 +46,7 @@ SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-e-tasks ?= "14" -SRCREV_pn-e-wm-config-illume-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" +SRCREV_pn-e-wm-config-illume-shr ?= "0c5028ccfda72c36b2880382139cb4565a1625ca" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -- cgit v1.2.3 From 9ffb647a3642705698322152f6add1269e44f0eb Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Thu, 19 Nov 2009 17:41:03 +0000 Subject: guile-native: Add patch to inhibit generation of linemarkers from cpp. Add the "-P" option to inhibit generation of linemarkers in the output from the preprocessor. Signed-off-by: Robert P. J. Day --- recipes/guile/files/cpp-linemarkers.patch | 8 ++++++++ recipes/guile/guile-native_1.8.5.bb | 1 + recipes/guile/guile-native_1.8.6.bb | 1 + 3 files changed, 10 insertions(+) create mode 100644 recipes/guile/files/cpp-linemarkers.patch diff --git a/recipes/guile/files/cpp-linemarkers.patch b/recipes/guile/files/cpp-linemarkers.patch new file mode 100644 index 0000000000..3e48932a3c --- /dev/null +++ b/recipes/guile/files/cpp-linemarkers.patch @@ -0,0 +1,8 @@ +--- guile.orig/libguile/guile-snarf-docs.in 2009-07-03 18:19:00.000000000 -0400 ++++ guile/libguile/guile-snarf-docs.in 2009-11-19 12:55:32.487266268 -0500 +@@ -23,4 +23,4 @@ + ## Let the user override the preprocessor autoconf found. + test -n "${CPP+set}" || CPP="@CPP@" + +-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" ++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@" diff --git a/recipes/guile/guile-native_1.8.5.bb b/recipes/guile/guile-native_1.8.5.bb index 9c2eb13d8d..5c999dbade 100644 --- a/recipes/guile/guile-native_1.8.5.bb +++ b/recipes/guile/guile-native_1.8.5.bb @@ -4,6 +4,7 @@ DEPENDS = "libtool (< 2)" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ file://configure-fix.patch;patch=1 \ + file://cpp-linemarkers.patch;patch=1 \ " PR = "r1" diff --git a/recipes/guile/guile-native_1.8.6.bb b/recipes/guile/guile-native_1.8.6.bb index d511807e09..2f87c482ca 100644 --- a/recipes/guile/guile-native_1.8.6.bb +++ b/recipes/guile/guile-native_1.8.6.bb @@ -1,4 +1,5 @@ require guile-native.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ file://configure-fix.patch;patch=1 \ + file://cpp-linemarkers.patch;patch=1 \ " -- cgit v1.2.3 From 04fcc4314b0c28164e3fc09ce5a49d17642d9e48 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 Nov 2009 14:05:00 +0000 Subject: libacpi: Drop undeeded custom staging function Signed-off-by: Richard Purdie --- recipes/libacpi/libacpi_0.2.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes/libacpi/libacpi_0.2.bb b/recipes/libacpi/libacpi_0.2.bb index f3990306b1..e60d934ea8 100644 --- a/recipes/libacpi/libacpi_0.2.bb +++ b/recipes/libacpi/libacpi_0.2.bb @@ -14,11 +14,6 @@ FILES_${PN}-bin = "${bindir}" COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)' -do_stage() { - install -m 0644 libacpi.h ${STAGING_INCDIR} - oe_libinstall -so libacpi ${STAGING_LIBDIR} -} - do_install() { oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} } -- cgit v1.2.3 From b666b55230d7d017e147366cc64fd105efb5bae4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Nov 2009 00:50:29 +0000 Subject: glibc: Separate out core glibc packaging functionality into a class which can be reused by external toolchains (from Poky) Signed-off-by: Richard Purdie --- classes/glibc-package.bbclass | 290 +++++++++++++++++++++++++ recipes/glibc/glibc-package.bbclass | 362 ------------------------------- recipes/glibc/glibc-package.inc | 89 ++++++++ recipes/glibc/glibc_2.10.1.bb | 2 +- recipes/glibc/glibc_2.2.5.bb | 2 +- recipes/glibc/glibc_2.3.2+cvs20040726.bb | 2 +- recipes/glibc/glibc_2.3.2.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20041128.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20050221.bb | 2 +- recipes/glibc/glibc_2.3.3+cvs20050420.bb | 2 +- recipes/glibc/glibc_2.3.3.bb | 2 +- recipes/glibc/glibc_2.3.5+cvs20050627.bb | 2 +- recipes/glibc/glibc_2.3.6.bb | 2 +- recipes/glibc/glibc_2.4.bb | 2 +- recipes/glibc/glibc_2.5.bb | 2 +- recipes/glibc/glibc_2.6.1.bb | 2 +- recipes/glibc/glibc_2.7.bb | 2 +- recipes/glibc/glibc_2.9.bb | 2 +- recipes/glibc/glibc_cvs.bb | 2 +- 19 files changed, 395 insertions(+), 378 deletions(-) create mode 100644 classes/glibc-package.bbclass delete mode 100644 recipes/glibc/glibc-package.bbclass create mode 100644 recipes/glibc/glibc-package.inc diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass new file mode 100644 index 0000000000..29660867b0 --- /dev/null +++ b/classes/glibc-package.bbclass @@ -0,0 +1,290 @@ +# +# This class knows how to package up glibc. Its shared since prebuild binary toolchains +# may need packaging and its pointless to duplicate this code. +# +# Caller should set GLIBC_INTERNAL_USE_BINARY_LOCALE to one of: +# "compile" - Use QEMU to generate the binary locale files +# "precompiled" - The binary locale files are pregenerated and already present +# "ondevice" - The device will build the locale files upon first boot through the postinst + +GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" + +PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" + +INSANE_SKIP_glibc-dbg = True + +libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" + +FILES_glibc = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" +FILES_ldd = "${bindir}/ldd" +FILES_libsegfault = "${base_libdir}/libSegFault*" +FILES_libcidn = "${base_libdir}/libcidn*.so" +FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_glibc-extra-nss = "${base_libdir}/libnss*" +FILES_sln = "${base_sbindir}/sln" +FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*nonshared.a" +FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" +FILES_glibc-utils = "${bindir}/* ${sbindir}/*" +FILES_glibc-gconv = "${libdir}/gconv/*" +FILES_glibc-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ + ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ + ${libdir}/gconv/.debug ${libexecdir}/*/.debug" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" +FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" +FILES_glibc-thread-db = "${base_libdir}/libthread_db*" +FILES_localedef = "${bindir}/localedef" +RPROVIDES_glibc-dev += "libc-dev" + +DESCRIPTION_sln = "glibc: create symbolic links between files" +DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts" +DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services" +DESCRIPTION_ldd = "glibc: print shared library dependencies" +DESCRIPTION_localedef = "glibc: compile locale definition files" +DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." + +TMP_LOCALE="/tmp/locale${libdir}/locale" + +locale_base_postinst() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s +mkdir -p ${libdir}/locale/ +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +locale_base_postrm() { +#!/bin/sh + +rm -rf ${TMP_LOCALE} +mkdir -p ${TMP_LOCALE} +if [ -f ${libdir}/locale/locale-archive ]; then + cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ +fi +localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s +mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ +rm -rf ${TMP_LOCALE} +} + +do_prep_locale_tree() { + treedir=${WORKDIR}/locale-tree + rm -rf $treedir + mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale + cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n + # unzip to avoid parsing errors + for i in $treedir/${datadir}/i18n/charmaps/*gz; do + gunzip $i + done + ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + fi + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + fi + install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin +} + +do_collect_bins_from_locale_tree() { + treedir=${WORKDIR}/locale-tree + + mkdir -p ${PKGD}${libdir} + cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} +} + +python package_do_split_gconvs () { + import os, re + if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): + bb.note("package requested not splitting gconvs") + return + + if not bb.data.getVar('PACKAGES', d, 1): + return + + libdir = bb.data.getVar('libdir', d, 1) + if not libdir: + bb.error("libdir not defined") + return + datadir = bb.data.getVar('datadir', d, 1) + if not datadir: + bb.error("datadir not defined") + return + + gconv_libdir = base_path_join(libdir, "gconv") + charmap_dir = base_path_join(datadir, "i18n", "charmaps") + locales_dir = base_path_join(datadir, "i18n", "locales") + binary_locales_dir = base_path_join(libdir, "locale") + + do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') + + do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', extra_depends='') + + def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): + deps = [] + f = open(fn, "r") + c_re = re.compile('^copy "(.*)"') + i_re = re.compile('^include "(\w+)".*') + for l in f.readlines(): + m = c_re.match(l) or i_re.match(l) + if m: + dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) + if not dp in deps: + deps.append(dp) + f.close() + if deps != []: + bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) + + 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) + + supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) + if not supported or supported == "all": + f = open(base_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("(.*)\.(.*)") + + # Collate the locales by base and encoding + utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0) + encodings = {} + for l in supported: + l = l[:-1] + (locale, charset) = l.split(" ") + if utf8_only and charset != 'UTF-8': + continue + m = dot_re.match(locale) + if m: + locale = m.group(1) + if not encodings.has_key(locale): + encodings[locale] = [] + encodings[locale].append(charset) + + def output_locale_source(name, locale, encoding): + pkgname = 'locale-base-' + legitimize_package_name(name) + + bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) + bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) + + def output_locale_binary(name, locale, encoding): + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + if target_arch in ("i486", "i586", "i686"): + target_arch = "i386" + elif target_arch == "powerpc": + target_arch = "ppc" + + # This is a hack till linux-libc-headers gets patched for the missing arm syscalls and all arm device kernels as well + if bb.data.getVar("DISTRO_NAME", d, 1) == "Angstrom": + kernel_ver = "2.6.24" + elif bb.data.getVar("DISTRO_NAME", d, 1) == "KaeilOS": + kernel_ver = "2.6.24" + else: + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) + pkgname = 'locale-base-' + legitimize_package_name(name) + m = re.match("(.*)\.(.*)", name) + if m: + glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + glibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) + rprovides = 'virtual-locale-%s' % legitimize_package_name(name) + m = re.match("(.*)_(.*)", name) + if m: + rprovides += ' virtual-locale-%s' % m.group(1) + bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) + bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) + bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) + + treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir + path = bb.data.getVar("PATH", d, 1) + i18npath = base_path_join(treedir, datadir, "i18n") + + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) + + qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1) + if not qemu_options: + qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) + + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts) + bb.note("generating locale %s (%s)" % (locale, encoding)) + if os.system(cmd): + raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) + + def output_locale(name, locale, encoding): + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin == "compile": + output_locale_binary(name, locale, encoding) + else: + output_locale_source(name, locale, encoding) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin == "compile": + bb.note("preparing tree for binary locale generation") + bb.build.exec_func("do_prep_locale_tree", d) + + # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] + for l in encodings.keys(): + if len(encodings[l]) == 1: + output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) + else: + if "UTF-8" in encodings[l]: + output_locale(l, l, "UTF-8") + encodings[l].remove("UTF-8") + else: + non_utf8.append(l) + for e in encodings[l]: + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) + + use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) + if use_bin == "compile": + bb.note("collecting binary locales from locale tree") + bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + +} + +# We want to do this indirection so that we can safely 'return' +# from the called function even though we're prepending +python populate_packages_prepend () { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_glibc', 'libc6', d) + bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d) + bb.build.exec_func('package_do_split_gconvs', d) +} diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass deleted file mode 100644 index f1e38e7c71..0000000000 --- a/recipes/glibc/glibc-package.bbclass +++ /dev/null @@ -1,362 +0,0 @@ -# -# For now, we will skip building of a gcc package if it is a uclibc one -# and our build is not a uclibc one, and we skip a glibc one if our build -# is a uclibc build. -# -# See the note in gcc/gcc_3.4.0.oe -# - -python __anonymous () { - import bb, re - uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) - if uc_os: - raise bb.parse.SkipPackage("incompatible with target %s" % - bb.data.getVar('TARGET_OS', d, 1)) -} - - -# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION -# is set. The idea is to avoid running localedef on the target (at first boot) -# to decrease initial boot time and avoid localedef being killed by the OOM -# killer which used to effectively break i18n on machines with < 128MB RAM. - -# default to disabled until qemu works for everyone -ENABLE_BINARY_LOCALE_GENERATION ?= "0" - -# BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc" - -# Set this to zero if you don't want ldconfig in the output package -USE_LDCONFIG ?= "1" - -PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" - -INSANE_SKIP_glibc-dbg = True - -libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" - -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" -FILES_ldd = "${bindir}/ldd" -FILES_libsegfault = "${base_libdir}/libSegFault*" -FILES_libcidn = "${base_libdir}/libcidn*.so" -FILES_libmemusage = "${base_libdir}/libmemusage.so" -FILES_glibc-extra-nss = "${base_libdir}/libnss*" -FILES_sln = "${base_sbindir}/sln" -FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*nonshared.a" -FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" -FILES_glibc-utils = "${bindir}/* ${sbindir}/*" -FILES_glibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug" -FILES_catchsegv = "${bindir}/catchsegv" -RDEPENDS_catchsegv = "libsegfault" -FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_glibc-thread-db = "${base_libdir}/libthread_db*" -FILES_localedef = "${bindir}/localedef" -RPROVIDES_glibc-dev += "libc-dev" - -DESCRIPTION_sln = "glibc: create symbolic links between files" -DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts" -DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services" -DESCRIPTION_ldd = "glibc: print shared library dependencies" -DESCRIPTION_localedef = "glibc: compile locale definition files" -DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..." - -INITSCRIPT_NAME = "nscd" -INITSCRIPT_PACKAGES = "nscd" -INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." -inherit update-rc.d - -def get_glibc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fp" - return "" - -EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" -EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" - -OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" - -do_install() { - oe_runmake install_root=${D} install - for r in ${rpcsvc}; do - h=`echo $r|sed -e's,\.x$,.h,'` - install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ - done - install -d ${D}${libdir}/locale - make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" - # get rid of some broken files... - for i in ${GLIBC_BROKEN_LOCALES}; do - grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp - mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED - done - rm -f ${D}{sysconfdir}/rpc - install -d ${D}${sysconfdir}/init.d - install -m 0644 ${S}/nscd/nscd.conf ${D}${sysconfdir}/ - install ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd -} - -TMP_LOCALE="/tmp/locale${libdir}/locale" - -locale_base_postinst() { -#!/bin/sh - -if [ "x$D" != "x" ]; then - exit 1 -fi - -rm -rf ${TMP_LOCALE} -mkdir -p ${TMP_LOCALE} -if [ -f ${libdir}/locale/locale-archive ]; then - cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ -fi -localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s --prefix=/tmp/locale %s -mkdir -p ${libdir}/locale/ -mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ -rm -rf ${TMP_LOCALE} -} - -locale_base_postrm() { -#!/bin/sh - -rm -rf ${TMP_LOCALE} -mkdir -p ${TMP_LOCALE} -if [ -f ${libdir}/locale/locale-archive ]; then - cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/ -fi -localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=%s --prefix=/tmp/locale %s -mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/ -rm -rf ${TMP_LOCALE} -} - -python __anonymous () { - enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) - - if enabled and int(enabled): - import re - - target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" - - for regexp in binary_arches.split(" "): - r = re.compile(regexp) - - if r.match(target_arch): - depends = bb.data.getVar("DEPENDS", d, 1) - depends = "%s qemu-native" % depends - bb.data.setVar("DEPENDS", depends, d) - bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d) - break -} - -do_prep_locale_tree() { - treedir=${WORKDIR}/locale-tree - rm -rf $treedir - mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n - # unzip to avoid parsing errors - for i in $treedir/${datadir}/i18n/charmaps/*gz; do - gunzip $i - done - ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then - cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib - fi - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then - cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib - fi - install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin -} - -do_collect_bins_from_locale_tree() { - treedir=${WORKDIR}/locale-tree - - mkdir -p ${PKGD}${libdir} - cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} -} - -python package_do_split_gconvs () { - import os, re - if (bb.data.getVar('PACKAGE_NO_GCONV', d, 1) == '1'): - bb.note("package requested not splitting gconvs") - return - - if not bb.data.getVar('PACKAGES', d, 1): - return - - libdir = bb.data.getVar('libdir', d, 1) - if not libdir: - bb.error("libdir not defined") - return - datadir = bb.data.getVar('datadir', d, 1) - if not datadir: - bb.error("datadir not defined") - return - - gconv_libdir = base_path_join(libdir, "gconv") - charmap_dir = base_path_join(datadir, "i18n", "charmaps") - locales_dir = base_path_join(datadir, "i18n", "locales") - binary_locales_dir = base_path_join(libdir, "locale") - - do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') - - do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', extra_depends='') - - def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): - deps = [] - f = open(fn, "r") - c_re = re.compile('^copy "(.*)"') - i_re = re.compile('^include "(\w+)".*') - for l in f.readlines(): - m = c_re.match(l) or i_re.match(l) - if m: - dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) - if not dp in deps: - deps.append(dp) - f.close() - if deps != []: - bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - - 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) - - supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1) - if not supported or supported == "all": - f = open(base_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("(.*)\.(.*)") - - # Collate the locales by base and encoding - utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0) - encodings = {} - for l in supported: - l = l[:-1] - (locale, charset) = l.split(" ") - if utf8_only and charset != 'UTF-8': - continue - m = dot_re.match(locale) - if m: - locale = m.group(1) - if not encodings.has_key(locale): - encodings[locale] = [] - encodings[locale].append(charset) - - def output_locale_source(name, locale, encoding): - pkgname = 'locale-base-' + legitimize_package_name(name) - - bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) - rprovides = 'virtual-locale-%s' % legitimize_package_name(name) - m = re.match("(.*)_(.*)", name) - if m: - rprovides += ' virtual-locale-%s' % m.group(1) - bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) - bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) - bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) - bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) - bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) - - def output_locale_binary(name, locale, encoding): - target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - if target_arch in ("i486", "i586", "i686"): - target_arch = "i386" - elif target_arch == "powerpc": - target_arch = "ppc" - - # This is a hack till linux-libc-headers gets patched for the missing arm syscalls and all arm device kernels as well - if bb.data.getVar("DISTRO_NAME", d, 1) == "Angstrom": - kernel_ver = "2.6.24" - elif bb.data.getVar("DISTRO_NAME", d, 1) == "KaeilOS": - kernel_ver = "2.6.24" - else: - kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) - - if kernel_ver is None: - qemu = "qemu-%s -s 1048576" % target_arch - else: - qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) - pkgname = 'locale-base-' + legitimize_package_name(name) - m = re.match("(.*)\.(.*)", name) - if m: - glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) - else: - glibc_name = name - bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) - rprovides = 'virtual-locale-%s' % legitimize_package_name(name) - m = re.match("(.*)_(.*)", name) - if m: - rprovides += ' virtual-locale-%s' % m.group(1) - bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) - bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) - bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) - - treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") - ldlibdir = "%s/lib" % treedir - path = bb.data.getVar("PATH", d, 1) - i18npath = base_path_join(treedir, datadir, "i18n") - - localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) - - qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1) - if not qemu_options: - qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) - - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts) - bb.note("generating locale %s (%s)" % (locale, encoding)) - if os.system(cmd): - raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) - - def output_locale(name, locale, encoding): - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - output_locale_binary(name, locale, encoding) - else: - output_locale_source(name, locale, encoding) - - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - bb.note("preparing tree for binary locale generation") - bb.build.exec_func("do_prep_locale_tree", d) - - # Reshuffle names so that UTF-8 is preferred over other encodings - non_utf8 = [] - for l in encodings.keys(): - if len(encodings[l]) == 1: - output_locale(l, l, encodings[l][0]) - if encodings[l][0] != "UTF-8": - non_utf8.append(l) - else: - if "UTF-8" in encodings[l]: - output_locale(l, l, "UTF-8") - encodings[l].remove("UTF-8") - else: - non_utf8.append(l) - for e in encodings[l]: - output_locale('%s.%s' % (l, e), l, e) - - if non_utf8 != []: - bb.note("the following locales are supported only in legacy encodings:") - bb.note(" " + " ".join(non_utf8)) - - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - bb.note("collecting binary locales from locale tree") - bb.build.exec_func("do_collect_bins_from_locale_tree", d) - do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) - else: - bb.note("generation of binary locales disabled. this may break i18n!") - -} - -# We want to do this indirection so that we can safely 'return' -# from the called function even though we're prepending -python populate_packages_prepend () { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_glibc', 'libc6', d) - bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d) - bb.build.exec_func('package_do_split_gconvs', d) -} diff --git a/recipes/glibc/glibc-package.inc b/recipes/glibc/glibc-package.inc new file mode 100644 index 0000000000..c30f315fbc --- /dev/null +++ b/recipes/glibc/glibc-package.inc @@ -0,0 +1,89 @@ +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + + +# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION +# is set. The idea is to avoid running localedef on the target (at first boot) +# to decrease initial boot time and avoid localedef being killed by the OOM +# killer which used to effectively break i18n on machines with < 128MB RAM. + +# default to disabled until qemu works for everyone +ENABLE_BINARY_LOCALE_GENERATION ?= "0" + +# BINARY_LOCALE_ARCHES is a space separated list of regular expressions +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc" + +# Set this to zero if you don't want ldconfig in the output package +USE_LDCONFIG ?= "1" + +inherit glibc-package + +INITSCRIPT_NAME = "nscd" +INITSCRIPT_PACKAGES = "nscd" +INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." +inherit update-rc.d + +def get_glibc_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--without-fp" + return "" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" +EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" + +OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" + +do_install() { + oe_runmake install_root=${D} install + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ + done + install -d ${D}${libdir}/locale + make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" + # get rid of some broken files... + for i in ${GLIBC_BROKEN_LOCALES}; do + grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp + mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED + done + rm -f ${D}{sysconfdir}/rpc + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${S}/nscd/nscd.conf ${D}${sysconfdir}/ + install ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd +} + + +python __anonymous () { + enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) + + if enabled and int(enabled): + import re + + target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or "" + + for regexp in binary_arches.split(" "): + r = re.compile(regexp) + + if r.match(target_arch): + depends = bb.data.getVar("DEPENDS", d, 1) + depends = "%s qemu-native" % depends + bb.data.setVar("DEPENDS", depends, d) + bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile", d) + break +} + + diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb index 27fbef5222..a1ec4e32ca 100644 --- a/recipes/glibc/glibc_2.10.1.bb +++ b/recipes/glibc/glibc_2.10.1.bb @@ -148,4 +148,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb index f810477e73..4327b58da6 100644 --- a/recipes/glibc/glibc_2.2.5.bb +++ b/recipes/glibc/glibc_2.2.5.bb @@ -193,4 +193,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so } -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.2+cvs20040726.bb b/recipes/glibc/glibc_2.3.2+cvs20040726.bb index 0799676592..7773e9cd52 100644 --- a/recipes/glibc/glibc_2.3.2+cvs20040726.bb +++ b/recipes/glibc/glibc_2.3.2+cvs20040726.bb @@ -75,4 +75,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb index 1524420b3b..152d2616b0 100644 --- a/recipes/glibc/glibc_2.3.2.bb +++ b/recipes/glibc/glibc_2.3.2.bb @@ -164,4 +164,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.3+cvs20041128.bb b/recipes/glibc/glibc_2.3.3+cvs20041128.bb index d99bde7384..f52bb07643 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20041128.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20041128.bb @@ -97,4 +97,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.3+cvs20050221.bb b/recipes/glibc/glibc_2.3.3+cvs20050221.bb index 7ce4cce907..34efe71ed5 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20050221.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20050221.bb @@ -80,4 +80,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.3+cvs20050420.bb b/recipes/glibc/glibc_2.3.3+cvs20050420.bb index ea51f9e4e7..36b2c2cfd0 100644 --- a/recipes/glibc/glibc_2.3.3+cvs20050420.bb +++ b/recipes/glibc/glibc_2.3.3+cvs20050420.bb @@ -81,4 +81,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb index 83ef019037..f832cb3cde 100644 --- a/recipes/glibc/glibc_2.3.3.bb +++ b/recipes/glibc/glibc_2.3.3.bb @@ -109,4 +109,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.5+cvs20050627.bb b/recipes/glibc/glibc_2.3.5+cvs20050627.bb index 04231d1901..9c8292c421 100644 --- a/recipes/glibc/glibc_2.3.5+cvs20050627.bb +++ b/recipes/glibc/glibc_2.3.5+cvs20050627.bb @@ -135,4 +135,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb index 9277dd1a54..75de4c39f6 100644 --- a/recipes/glibc/glibc_2.3.6.bb +++ b/recipes/glibc/glibc_2.3.6.bb @@ -92,4 +92,4 @@ do_stage_prepend() { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb index ca6afe284a..a90e06ed72 100644 --- a/recipes/glibc/glibc_2.4.bb +++ b/recipes/glibc/glibc_2.4.bb @@ -146,4 +146,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.5.bb b/recipes/glibc/glibc_2.5.bb index 02cfeaef2b..6792c58a4d 100644 --- a/recipes/glibc/glibc_2.5.bb +++ b/recipes/glibc/glibc_2.5.bb @@ -151,4 +151,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb index 5cbd8b693c..1daa63254f 100644 --- a/recipes/glibc/glibc_2.6.1.bb +++ b/recipes/glibc/glibc_2.6.1.bb @@ -161,4 +161,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb index dcea69cb50..4f52c95190 100644 --- a/recipes/glibc/glibc_2.7.bb +++ b/recipes/glibc/glibc_2.7.bb @@ -159,4 +159,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb index cddae98b08..e675d8923f 100644 --- a/recipes/glibc/glibc_2.9.bb +++ b/recipes/glibc/glibc_2.9.bb @@ -157,4 +157,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc diff --git a/recipes/glibc/glibc_cvs.bb b/recipes/glibc/glibc_cvs.bb index 5290dfa9e6..22f48d29fc 100644 --- a/recipes/glibc/glibc_cvs.bb +++ b/recipes/glibc/glibc_cvs.bb @@ -105,4 +105,4 @@ do_compile () { require glibc-stage.inc -require glibc-package.bbclass +require glibc-package.inc -- cgit v1.2.3 From 3176e14998adc35f9e07af1b1afc4a5801cb8a3d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Nov 2009 00:51:14 +0000 Subject: packaged-staging.bbclass: Add method to disable packaged-staging from recipes Signed-off-by: Richard Purdie --- classes/packaged-staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 3b99e39ed9..1c5c4cd531 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -48,6 +48,9 @@ python () { if bb.data.inherits_class('image', d): pstage_allowed = False + if bb.data.getVar('PSTAGING_DISABLED', d, True) == "1": + pstage_allowed = False + # Add task dependencies if we're active, otherwise mark packaged staging # as inactive. if pstage_allowed: -- cgit v1.2.3 From df62679798bff59b360597a522f16491b5af3146 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Nov 2009 00:52:05 +0000 Subject: libxml-parser-perl: Set DEPENDS properly (from Poky) Signed-off-by: Richard Purdie --- recipes/perl/libxml-parser-perl-native_2.34.bb | 1 + recipes/perl/libxml-parser-perl-native_2.36.bb | 1 + recipes/perl/libxml-parser-perl_2.36.bb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/perl/libxml-parser-perl-native_2.34.bb b/recipes/perl/libxml-parser-perl-native_2.34.bb index 64758ad5f2..6ba56b3b89 100644 --- a/recipes/perl/libxml-parser-perl-native_2.34.bb +++ b/recipes/perl/libxml-parser-perl-native_2.34.bb @@ -4,3 +4,4 @@ require libxml-parser-perl_${PV}.bb inherit native +DEPENDS = "expat-native perl-native" \ No newline at end of file diff --git a/recipes/perl/libxml-parser-perl-native_2.36.bb b/recipes/perl/libxml-parser-perl-native_2.36.bb index 64758ad5f2..6ba56b3b89 100644 --- a/recipes/perl/libxml-parser-perl-native_2.36.bb +++ b/recipes/perl/libxml-parser-perl-native_2.36.bb @@ -4,3 +4,4 @@ require libxml-parser-perl_${PV}.bb inherit native +DEPENDS = "expat-native perl-native" \ No newline at end of file diff --git a/recipes/perl/libxml-parser-perl_2.36.bb b/recipes/perl/libxml-parser-perl_2.36.bb index c96489b2de..179365c180 100644 --- a/recipes/perl/libxml-parser-perl_2.36.bb +++ b/recipes/perl/libxml-parser-perl_2.36.bb @@ -11,7 +11,7 @@ EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} inherit cpan do_compile() { - export LIBC="$(find ${STAGING_DIR}/lib -name 'libc-*.so')" + export LIBC="$(find ${STAGING_DIR_TARGET}/lib -name 'libc-*.so')" cpan_do_compile } -- cgit v1.2.3 From 7a880a7050b915ea498329242bf5ebc71948301b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Nov 2009 00:53:19 +0000 Subject: .gitignore: Ignore backup files (*~) Signed-off-by: Richard Purdie --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 45d62d8696..6fe8a9d457 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.sw? +*~ -- cgit v1.2.3 From 64d85e2e60087cfa62da69df71385dc07f6ea2bf Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Fri, 20 Nov 2009 07:27:58 +0100 Subject: sane-srcrevs-fso.inc: bump rev for fsousaged Signed-off-by: Klaus Kurzmann --- conf/distro/include/sane-srcrevs-fso.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 78eaec4f73..0fa5efbde3 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -8,7 +8,7 @@ SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsousaged ?= "11dbb63abb48094fab63c64de189fe99189b9f73" +SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d" SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14" SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" -- cgit v1.2.3