summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-11-26 14:45:14 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-11-26 14:45:14 +0000
commitdc55bdcac1f124990a9837f39374c753ffd86dec (patch)
tree0b9d26957bf2c51dcff6b8eea2a06adf734681aa
parent0bd5a64203d0d45c4afb7f8723a553a3a830921f (diff)
parent256626d3db13a6f076f69db9ef1ab34ef1acf066 (diff)
merge of '8744f51b03fb8cbe26fbea1e61c9ca8c0cda7571'
and '9722830207e34266d2aae4fe5fba289f2f7cb711'
Diffstat
-rw-r--r--MAINTAINERS2
-rw-r--r--classes/insane.bbclass6
-rw-r--r--conf/machine/fic-gta01.conf1
-rw-r--r--conf/machine/fic-gta02.conf1
-rw-r--r--packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch22
-rw-r--r--packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch22
-rw-r--r--packages/binutils/binutils-cross.inc2
-rw-r--r--packages/binutils/binutils_2.17.50.0.5.bb1
-rw-r--r--packages/binutils/binutils_2.17.50.0.8.bb1
-rw-r--r--packages/busybox/busybox-1.2.0/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.2.1/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.2.1/slugos/defconfig6
-rw-r--r--packages/busybox/busybox-1.2.2/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.3.1/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.5.0/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.6.0/angstrom/defconfig4
-rw-r--r--packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty0
-rw-r--r--packages/busybox/busybox-1.7.2/angstrom/defconfig (renamed from packages/busybox/busybox-1.7.2/defconfig)4
-rw-r--r--packages/busybox/busybox_1.00.bb2
-rw-r--r--packages/busybox/busybox_1.01.bb2
-rw-r--r--packages/busybox/busybox_1.2.0.bb2
-rw-r--r--packages/busybox/busybox_1.2.1.bb2
-rw-r--r--packages/busybox/busybox_1.2.2.bb2
-rw-r--r--packages/busybox/busybox_1.3.1.bb2
-rw-r--r--packages/busybox/busybox_1.5.0.bb2
-rw-r--r--packages/busybox/busybox_1.6.0.bb2
-rw-r--r--packages/busybox/busybox_1.7.2.bb2
-rw-r--r--packages/cacao/cacao-cldc_0.98.bb10
-rw-r--r--packages/cacao/cacao.inc1
-rw-r--r--packages/cacao/cacaoh-cldc-native_0.98.bb2
-rw-r--r--packages/fftw/fftw.inc1
-rw-r--r--packages/gcc/gcc-cross_4.1.2.bb2
-rw-r--r--packages/gcc/gcc-package-cross.inc5
-rw-r--r--packages/gcc/gcc-package.inc12
-rw-r--r--packages/gcc/gcc3-build.inc2
-rw-r--r--packages/gcc/gcc_4.1.0.bb5
-rw-r--r--packages/gcc/gcc_4.1.1.bb3
-rw-r--r--packages/gcc/gcc_4.1.2.bb2
-rw-r--r--packages/gcc/gcc_4.2.1.bb3
-rw-r--r--packages/gcc/gcc_4.2.2.bb3
-rw-r--r--packages/gsl/gsl_1.10.bb (renamed from packages/gsl/gsl_1.4.bb)2
-rw-r--r--packages/libdaemon/libdaemon_0.12.bb20
-rw-r--r--packages/liboil/liboil_0.3.11.bb4
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig100
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.6.bb2
-rw-r--r--packages/linux/linux-hackndev-2.6_git.bb (renamed from packages/linux/linux-hackndev-2.6_svn.bb)7
-rw-r--r--packages/meta/slugos-packages.bb3
-rw-r--r--packages/midpath/midpath-alsa_0.1.bb4
-rw-r--r--packages/midpath/midpath-cldc-sdl_0.1.bb2
-rw-r--r--packages/midpath/midpath-cldc-x11_0.1.bb2
-rw-r--r--packages/midpath/midpath-cldc_0.1.bb1
-rw-r--r--packages/midpath/midpath-gtk_0.1.bb2
-rw-r--r--packages/midpath/midpath-pulseaudio_0.1.bb39
-rw-r--r--packages/midpath/midpath-qt3x11_0.1.bb2
-rw-r--r--packages/midpath/midpath-qte_0.1.bb2
-rw-r--r--packages/midpath/midpath.inc2
-rw-r--r--packages/mpfr/mpfr-native_svn.bb3
-rw-r--r--packages/mpfr/mpfr.inc6
-rw-r--r--packages/mpfr/mpfr_2.1.1.bb9
-rw-r--r--packages/mpfr/mpfr_2.3.0.bb12
-rw-r--r--packages/mpfr/mpfr_cvs.bb19
-rw-r--r--packages/mpfr/mpfr_svn.bb16
-rw-r--r--packages/octave/files/.mtn2git_empty0
-rw-r--r--packages/octave/files/configure.patch15
-rw-r--r--packages/octave/octave.inc (renamed from packages/octave/octave_2.1.71.bb)20
-rw-r--r--packages/octave/octave_2.1.73.bb11
-rw-r--r--packages/octave/octave_2.9.17.bb27
-rw-r--r--packages/openmoko2/neod_svn.bb1
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb2
-rw-r--r--packages/tasks/task-openmoko.bb7
-rw-r--r--packages/uclibc/uclibc-0.9.29/qemux86/.mtn2git_empty0
-rw-r--r--packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine68
-rw-r--r--packages/webcam-server/webcam-server_0.50.bb4
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common/Xserver22
-rw-r--r--packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb2
-rw-r--r--packages/zaurus-updater/zaurus-updater/updater.sh58
-rw-r--r--packages/zaurusd/zaurusd_svn.bb6
78 files changed, 472 insertions, 193 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0b039beeea..53c4380116 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -94,7 +94,7 @@ Person: Junqian Gordon Xu 'xjqian'
Mail: xjqian@gmail.com
Machines: tosa, borzoi, nokia770
Distros: Ångström
-Recipes: gnuplot
+Recipes: gnuplot octave
Person: Justin Patrin
Mail: papercrane@reversefold.com
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index bc72ea5b3b..473fe6ebbf 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -57,8 +57,12 @@ def package_qa_get_machine_dict():
"arm" : ( 40, 97, 0, True, True),
"armeb": ( 40, 97, 0, False, True),
"powerpc": ( 20, 0, 0, False, True),
+ "i386": ( 3, 0, 0, True, True),
+ "i486": ( 3, 0, 0, True, True),
+ "i586": ( 3, 0, 0, True, True),
+ "i686": ( 3, 0, 0, True, True),
"mipsel": ( 8, 0, 0, True, True),
- "avr32": (6317, 0, 0, False, True),
+ "avr32": (6317, 0, 0, False, True),
},
"uclinux-uclibc" : {
"bfin": ( 106, 0, 0, True, True),
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index bd14df5814..09517fd11d 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-fbdev"
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index cbd859d1e9..4cad7924f1 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "285"
+XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
# package machine specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch b/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch
new file mode 100644
index 0000000000..9cc18412fd
--- /dev/null
+++ b/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch
@@ -0,0 +1,22 @@
+--- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700
++++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700
+@@ -6128,7 +6128,7 @@ case " $build_configdirs " in
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+--- binutils-2.18/configure.in.orig 2007-10-11 21:10:54.000000000 -0700
++++ binutils-2.18/configure.in 2007-10-11 21:11:13.000000000 -0700
+@@ -2403,7 +2403,7 @@ changequote(,)
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch
new file mode 100644
index 0000000000..9cc18412fd
--- /dev/null
+++ b/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch
@@ -0,0 +1,22 @@
+--- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700
++++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700
+@@ -6128,7 +6128,7 @@ case " $build_configdirs " in
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
+--- binutils-2.18/configure.in.orig 2007-10-11 21:10:54.000000000 -0700
++++ binutils-2.18/configure.in 2007-10-11 21:11:13.000000000 -0700
+@@ -2403,7 +2403,7 @@ changequote(,)
+ # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # higher, else we use the "missing" dummy.
+ if ${MAKEINFO} --version \
+- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ :
+ else
+ MAKEINFO="$MISSING makeinfo"
diff --git a/packages/binutils/binutils-cross.inc b/packages/binutils/binutils-cross.inc
index fb966d3c7b..642d5318e7 100644
--- a/packages/binutils/binutils-cross.inc
+++ b/packages/binutils/binutils-cross.inc
@@ -6,7 +6,7 @@ PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
--program-prefix=${TARGET_PREFIX} \
--enable-install-libbfd \
- "
+ --disable-werror"
do_stage () {
oe_runmake install
diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb
index dc73dc6909..fa601c18a7 100644
--- a/packages/binutils/binutils_2.17.50.0.5.bb
+++ b/packages/binutils/binutils_2.17.50.0.5.bb
@@ -6,6 +6,7 @@ SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+ file://binutils-configure-texinfo-version.patch;patch=1 \
file://110-arm-eabi-conf.patch;patch=1 \
file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb
index f832d97cd1..a60c7524d7 100644
--- a/packages/binutils/binutils_2.17.50.0.8.bb
+++ b/packages/binutils/binutils_2.17.50.0.8.bb
@@ -5,6 +5,7 @@ SRC_URI = \
"${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+ file://binutils-configure-texinfo-version.patch;patch=1 \
file://110-arm-eabi-conf.patch;patch=1 \
file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
diff --git a/packages/busybox/busybox-1.2.0/angstrom/defconfig b/packages/busybox/busybox-1.2.0/angstrom/defconfig
index 981b7d7c71..e5f48ec64f 100644
--- a/packages/busybox/busybox-1.2.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.2.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig
index c76954e711..74ece9c3b6 100644
--- a/packages/busybox/busybox-1.2.1/slugos/defconfig
+++ b/packages/busybox/busybox-1.2.1/slugos/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
CONFIG_MV=y
# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
CONFIG_OD=y
# CONFIG_PRINTENV is not set
CONFIG_PRINTF=y
@@ -595,8 +595,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.2.2/angstrom/defconfig b/packages/busybox/busybox-1.2.2/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.2.2/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.2/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.3.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.5.0/angstrom/defconfig b/packages/busybox/busybox-1.5.0/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.5.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.5.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.6.0/angstrom/defconfig b/packages/busybox/busybox-1.6.0/angstrom/defconfig
index eb0b8d7c64..1807dab68e 100644
--- a/packages/busybox/busybox-1.6.0/angstrom/defconfig
+++ b/packages/busybox/busybox-1.6.0/angstrom/defconfig
@@ -603,8 +603,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/angstrom/defconfig
index 19cfafab2c..30e71e8ffe 100644
--- a/packages/busybox/busybox-1.7.2/defconfig
+++ b/packages/busybox/busybox-1.7.2/angstrom/defconfig
@@ -677,8 +677,8 @@ CONFIG_ASH=y
# Ash Shell Options
#
CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 073a561e22..ca2db7e760 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -1,6 +1,6 @@
require busybox.inc
-PR = "r37"
+PR = "r38"