summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-08 22:40:09 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-08 22:40:09 +0000
commit3f411cefcd355593bfb11e34d537861ccd26b4dc (patch)
treedd1987bd46a02af720ca81b6380c722de2ec3f42
parent708749b6b99848be51d0cc592acf8fcc8c956c3f (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/08 23:37:07+01:00 reciva.com!pb add new maemo bits, courtesy Florian Boor 2005/06/08 23:09:46+01:00 reciva.com!pb add mpfr-native to DEPENDS 2005/06/08 23:05:44+01:00 reciva.com!pb add mpfr 2.1.1 and -native version 2005/06/08 22:50:49+01:00 reciva.com!pb bump PR for previous change BKrev: 42a773c9DHfCwzjkaJ_B3tkh7QpGbA
-rw-r--r--packages/gcc/gcc-cross_4.0.0.bb16
-rw-r--r--packages/maemo/hildon-base-lib_0.8.6-2.bb0
-rw-r--r--packages/maemo/hildon-navigator_0.9.6-2.bb0
-rw-r--r--packages/maemo/osso-af-settings_0.8.5.bb0
-rw-r--r--packages/mpfr/mpfr-native_2.1.1.bb0
-rw-r--r--packages/mpfr/mpfr_2.1.1.bb0
-rw-r--r--packages/xfonts/xfonts-xorg_6.8.bb3
7 files changed, 18 insertions, 1 deletions
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index e69de29bb2..7c2c04a7c1 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -0,0 +1,16 @@
+include gcc_${PV}.bb
+# path mangling, needed by the cross packaging
+include gcc-paths-cross.inc
+inherit cross
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
+# NOTE: split PR. If the main .oe changes something that affects its *build*
+# remember to increment this one too.
+PR = "r0"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+
+# cross build
+include gcc3-build-cross.inc
+# cross packaging
+include gcc-package-cross.inc
diff --git a/packages/maemo/hildon-base-lib_0.8.6-2.bb b/packages/maemo/hildon-base-lib_0.8.6-2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-base-lib_0.8.6-2.bb
diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/maemo/hildon-navigator_0.9.6-2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/hildon-navigator_0.9.6-2.bb
diff --git a/packages/maemo/osso-af-settings_0.8.5.bb b/packages/maemo/osso-af-settings_0.8.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/osso-af-settings_0.8.5.bb
diff --git a/packages/mpfr/mpfr-native_2.1.1.bb b/packages/mpfr/mpfr-native_2.1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mpfr/mpfr-native_2.1.1.bb
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mpfr/mpfr_2.1.1.bb
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb
index 37cdc41933..6395765cb3 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xfonts/xfonts-xorg_6.8.bb
@@ -1,5 +1,6 @@
SECTION = "x11/base"
-PR = "r0"
+PR = "r1"
+# XXX Is this true? These fonts are from X.org.
LICENSE = "XFree86"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \