diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-08-11 17:41:05 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2006-08-11 17:41:05 +0000 |
| commit | 793088bf35cab68f4ad12a700f596359505d0ea5 (patch) | |
| tree | 3ab8689943dc6a5ef8d88f4084d899545d74e992 | |
| parent | 796353d016d9f352d70a378c653e3c627014f5bb (diff) | |
| parent | 9420a9848facf3f32f45610beed446d2426ae66d (diff) | |
merge of 8025b1031a3e4a5ddd61c6a7a3f4788138fa0264
and fa44dacbf0a1b7a188ab4126d217aafc5a1f48f8
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 7 | ||||
| -rw-r--r-- | packages/aspell/aspell-native_0.50.5.bb | 16 | ||||
| -rw-r--r-- | packages/aspell/aspell5-en_6.0-0.bb | 10 | ||||
| -rw-r--r-- | packages/mozilla/firefox-1.5.0.6/.mtn2git_empty (renamed from packages/mozilla/firefox-1.5.0.1/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/mozilla/firefox-1.5.0.6/jsautocfg.h (renamed from packages/mozilla/firefox-1.5.0.1/jsautocfg.h) | 0 | ||||
| -rw-r--r-- | packages/mozilla/firefox-1.5.0.6/mozconfig (renamed from packages/mozilla/firefox-1.5.0.1/mozconfig) | 0 | ||||
| -rw-r--r-- | packages/mozilla/firefox_1.5.0.6.bb (renamed from packages/mozilla/firefox_1.5.0.1.bb) | 0 |
7 files changed, 29 insertions, 4 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index fc432afecb..de0cee56fa 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -14,10 +14,9 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" #<> #<> We will set CVS DATE when things are known to work. #<> -PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" #<> We want this so we can crosscompile the kernel using gcc 3.4.3 #<> Also, select version of modules (and kernel) @@ -43,8 +42,8 @@ PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc = "2.4" +PREFERRED_VERSION_glibc-intermediate = "2.4" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc diff --git a/packages/aspell/aspell-native_0.50.5.bb b/packages/aspell/aspell-native_0.50.5.bb new file mode 100644 index 0000000000..e87c6c6fd5 --- /dev/null +++ b/packages/aspell/aspell-native_0.50.5.bb @@ -0,0 +1,16 @@ +SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz \ + file://mk-dirs_h.py \ + file://makefile.patch;patch=1" +DESCRIPTION = "GNU Aspell spell-checker" +SECTION = "console/utils" +LICENSE="LGPL" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/aspell-${PV}" + +inherit autotools native + +S = "${WORKDIR}/aspell-${PV}" + +do_compile_prepend() { + install ${WORKDIR}/mk-dirs_h.py ${S}/common/mk-dirs_h +} + diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb index 8364df06a9..568e692ab9 100644 --- a/packages/aspell/aspell5-en_6.0-0.bb +++ b/packages/aspell/aspell5-en_6.0-0.bb @@ -1,4 +1,14 @@ +LICENSE = "Copyright file" SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2" +PR="r1" require aspell-lang.inc +FILES_${PN} += "${docdir}/Copyright" +FILES_${PN}-doc = "" + +do_install_append() { + install -d ${D}${docdir} + install ${S}/Copyright ${D}${docdir} +} + diff --git a/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mozilla/firefox-1.5.0.1/.mtn2git_empty +++ b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty diff --git a/packages/mozilla/firefox-1.5.0.1/jsautocfg.h b/packages/mozilla/firefox-1.5.0.6/jsautocfg.h index 05f3dad50a..05f3dad50a 100644 --- a/packages/mozilla/firefox-1.5.0.1/jsautocfg.h +++ b/packages/mozilla/firefox-1.5.0.6/jsautocfg.h diff --git a/packages/mozilla/firefox-1.5.0.1/mozconfig b/packages/mozilla/firefox-1.5.0.6/mozconfig index 025b396ac7..025b396ac7 100644 --- a/packages/mozilla/firefox-1.5.0.1/mozconfig +++ b/packages/mozilla/firefox-1.5.0.6/mozconfig diff --git a/packages/mozilla/firefox_1.5.0.1.bb b/packages/mozilla/firefox_1.5.0.6.bb index 8f888db5ca..8f888db5ca 100644 --- a/packages/mozilla/firefox_1.5.0.1.bb +++ b/packages/mozilla/firefox_1.5.0.6.bb |