diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-09-08 14:37:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-08 14:37:27 +0000 |
| commit | 4d10be8ca4cbbebf2b74447e8d8ab45e7ef9b714 (patch) | |
| tree | e979c7bd3b76435a31b4173900a8ce95485dcba7 | |
| parent | 0821a7ef3eb1e2b862c5cf8d1821850c4a14c741 (diff) | |
| parent | 0cba1cb3b9f68280a96055f281ff75b466d15313 (diff) | |
merge of 67d2c7e1bf087c7c007705c24cae5ff93bd007be
and fbd660b279924b2d0ef656f652497ca4a3fd3787
| -rw-r--r-- | conf/distro/openzaurus-3.5.4.conf | 3 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross_3.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc_3.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/meta/opie-collections.inc | 3 | ||||
| -rw-r--r-- | packages/meta/opie-image.bb | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index 7b83dae13b..88822c103d 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -27,6 +27,9 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" + # # Base # diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index 78fc9dde2e..c111ac00b7 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -7,8 +7,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # remember to increment this one too. PR = "r1" -DEFAULT_PREFERENCE_arm-linux = "1" - DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 6c6a3d8276..f4a67b77c2 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -5,8 +5,6 @@ SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -DEFAULT_PREFERENCE_arm-linux = "1" - inherit autotools gettext include gcc-package.inc diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index f45f5916e4..3f52153224 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -8,7 +8,8 @@ OPIE_LIBS_DEPENDS = "qte libopie2 opie-ttf-support ttf-dejavu" OPIE_LIBS_RDEPENDS = "opie-ttf-support ttf-dejavu-sans ttf-dejavu-sans-mono" -OPIE_BASE = "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics opie-sounds" +OPIE_BASE = "opie-qcop opie-freetype opie-qss opie-quicklauncher opie-taskbar \ + opie-pics opie-sounds" # # Things for reasonable bootstrap image diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb index 2272c182a7..5041c757b7 100644 --- a/packages/meta/opie-image.bb +++ b/packages/meta/opie-image.bb @@ -1,12 +1,12 @@ export IMAGE_BASENAME = "opie-image" export IMAGE_LINGUAS = "" - + FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie" FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" LICENSE = "MIT" -PR = "r15" +PR = "r16" include opie-collections.inc @@ -19,7 +19,7 @@ export IPKG_INSTALL = "task-bootstrap ${OPIE_LIBS_RDEPENDS} ${OPIE_BASE} ${OPIE_ ${OPIE_PIM} ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} \ ${OPIE_EXTRA_APPS} ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} \ ${OPIE_BASE_INPUTMETHODS} ${OPIE_MORE_RDEPENDS}" - + DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPENDS} ${OPIE_BASE} ${OPIE_BASE_APPLETS} \ ${OPIE_BASE_SETTINGS} ${OPIE_BASE_APPS} ${OPIE_BASE_DEPENDS} ${OPIE_PIM} \ ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \ |