summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/jlime-donkey.conf16
-rw-r--r--packages/fbset/fbset_2.1.bb6
-rw-r--r--packages/fbset/files/makefile.patch6
-rw-r--r--packages/gpsd/gpsd.inc3
-rw-r--r--packages/gpsd/gpsd_2.28.bb2
-rw-r--r--packages/gpsd/gpsd_2.32.bb2
-rw-r--r--packages/gpsd/gpsd_2.6.bb50
-rw-r--r--packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime67
-rw-r--r--packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch11
-rw-r--r--packages/pcmcia-cs/pcmcia-cs_3.2.8.bb2
-rw-r--r--packages/rsync/rsync_2.6.7.bb4
-rw-r--r--packages/rsync/rsync_2.6.8.bb17
-rw-r--r--site/sh3-linux3
-rw-r--r--site/sh4-linux-uclibc13
14 files changed, 76 insertions, 126 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 1871af384b..01c90a5b26 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -30,9 +30,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_VERSION_binutils = "2.15.94.0.1"
PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+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"
@@ -71,12 +71,22 @@ OPIE_VERSION = "1.2.2"
include conf/distro/preferred-opie-versions.inc
#<>
+#<> We want pcmciautils, not pcmcia-cs
+#<>
+PCMCIA_MANAGER = "pcmciautils"
+
+#<>
#<>We want to be able to build this for all jornadas so
#<>to not mess up the folders we need to make them dynamic.
#<>It will use different folders depending on Arch (set in local.conf)
include conf/distro/include/multimachine.conf
#<>
+#<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2
+#<>
+FULL_OPTIMIZATION = "-O2"
+
+#<>
#<>Our Image files should look abit better.
#<>
#<>
diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb
index c3fb9bf715..6b6f1fca42 100644
--- a/packages/fbset/fbset_2.1.bb
+++ b/packages/fbset/fbset_2.1.bb
@@ -1,9 +1,9 @@
#
# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license)
#
# Filename: fbset_2.1.bb
-# Date: 27-May-06
+# Date: 28-May-06
DESCRIPTION = "The fbset console tool"
MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
@@ -17,7 +17,7 @@ SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz
######################################################################################
-PR = "r0"
+PR = "r1"
PARALLEL_MAKE=""
######################################################################################
diff --git a/packages/fbset/files/makefile.patch b/packages/fbset/files/makefile.patch
index eda2af5aa1..82b1c61e9c 100644
--- a/packages/fbset/files/makefile.patch
+++ b/packages/fbset/files/makefile.patch
@@ -1,11 +1,11 @@
---- fbset-2.1/Makefile.orig 2006-05-27 21:05:20.228048544 +0200
-+++ fbset-2.1/Makefile 2006-05-27 21:05:37.266458312 +0200
+--- fbset-2.1/Makefile.orig 2006-05-28 04:04:27.412095480 +0200
++++ fbset-2.1/Makefile 2006-05-28 04:14:05.379231120 +0200
@@ -2,7 +2,7 @@
# Linux Frame Buffer Device Configuration
#
-CC = gcc -Wall -O2 -I.
-+CC = arm-linux-gcc -Wall -O2 -I.
++CFLAGS = -Wall -O2 -I.
BISON = bison -d
FLEX = flex
INSTALL = install
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 830385c177..e23167c80a 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -4,6 +4,9 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "dbus-0.23.4 ncurses"
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR}"
+
SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
file://gpsd"
diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb
index cd5e223142..7556782fa8 100644
--- a/packages/gpsd/gpsd_2.28.bb
+++ b/packages/gpsd/gpsd_2.28.bb
@@ -1,2 +1,2 @@
include gpsd.inc
-
+PR = "r1"
diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb
new file mode 100644
index 0000000000..fa1ea9f38f
--- /dev/null
+++ b/packages/gpsd/gpsd_2.32.bb
@@ -0,0 +1,2 @@
+include gpsd.inc
+PR = "r0"
diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb
deleted file mode 100644
index 1bf8d87837..0000000000
--- a/packages/gpsd/gpsd_2.6.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
-SECTION = "network"
-PRIORITY = "optional"
-MAINTAINER = "Robert Anderson <rea@sr.unh.edu>"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://ftp.berlios.de/gpsd/gpsd-${PV}.tar.gz"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "gpsd"
-INITSCRIPT_PARAMS = "defaults 35"
-
-LDFLAGS = "-lm"
-
-do_configure() {
- oe_runconf
-}
-
-do_compile() {
- oe_runmake gpsd gpsd.1 libgps.3 libgpsd.3 gps.h gpsd.h
-}
-
-do_stage () {
- oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
- install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
- install -m 0655 ${S}/gps.h ${STAGING_INCDIR}
- install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
-}
-
-do_install () {
- install -d ${D}${sbindir}
- install -d ${D}${mandir}/man1
- install -d ${D}${mandir}/man3
- install -d ${D}${incdir}
- install -d ${D}${libdir}
- install -d ${D}${sysconfdir}/init.d
-
- install -m 0755 ${S}/.libs/gpsd ${D}${sbindir}
- oe_libinstall -so -C ${S}/.libs libgps ${D}${libdir}
- install -m 755 gpsd.1 ${D}${mandir}/man1/gpsd.1
- install -m 0755 ${S}/libgps.la ${D}${libdir}libgps.la
- install -m 0755 ${S}/gps.h ${S}/gpsd.h ${D}${incdir}
- install -m 755 libgps.3 libgpsd.3 ${D}${mandir}/man3/
- install -m 755 gpsd.init ${D}${sysconfdir}/init.d/gpsd
-}
-
-PACKAGES =+ "gpsd-devdoc "
-FILES_${PN}-devdoc = "${mandir}/man3 "
diff --git a/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
index 4314ec03b3..16a427b68a 100644
--- a/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
+++ b/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Sat Apr 23 23:08:14 2005
+# Fri May 26 02:30:50 2006
#
CONFIG_SUPERH=y
CONFIG_UID16=y
@@ -627,7 +627,7 @@ CONFIG_ATMEL=m
# Wireless 802.11b Pcmcia/Cardbus cards support
#
CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
+# CONFIG_AIRO_CS is not set
CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_WL3501=m
CONFIG_NET_WIRELESS=y
@@ -783,67 +783,7 @@ CONFIG_PRINTER=y
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_ISA=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-CONFIG_I2C_DEBUG_CORE=y
-CONFIG_I2C_DEBUG_ALGO=y
-CONFIG_I2C_DEBUG_BUS=y
-CONFIG_I2C_DEBUG_CHIP=y
+# CONFIG_I2C is not set
#
# Dallas's 1-wire bus
@@ -923,7 +863,6 @@ CONFIG_SOUND_PRIME=y
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
# CONFIG_SOUND_OSS is not set
-# CONFIG_SOUND_TVMIXER is not set
# CONFIG_SOUND_AD1980 is not set
CONFIG_SOUND_SH_DAC_AUDIO=y
CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch
new file mode 100644
index 0000000000..ca28688f04
--- /dev/null
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch
@@ -0,0 +1,11 @@
+--- pcmcia-cs-3.2.8/rules.mk_orig 2006-05-26 23:23:12.000000000 +0000
++++ pcmcia-cs-3.2.8/rules.mk 2006-05-26 23:23:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ # Global defaults
+
+ # Kernel compiles must have optimization enabled!
+-CFLAGS = -O3 -Wall -Wstrict-prototypes -pipe $(WFLAG)
++CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe $(WFLAG)
+ COFLAGS = -kv
+ YFLAGS = -d
+
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 1db3006e14..4ca5377b2c 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -20,6 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://wnv.conf"
SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
+SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
+
S = "${WORKDIR}/pcmcia-cs-${PV}"
INITSCRIPT_NAME = "pcmcia"
diff --git a/packages/rsync/rsync_2.6.7.bb b/packages/rsync/rsync_2.6.7.bb
index 421dc76d48..e349a6eb4a 100644
--- a/packages/rsync/rsync_2.6.7.bb
+++ b/packages/rsync/rsync_2.6.7.bb
@@ -4,8 +4,8 @@ SECTION = "console/network"
PRIORITY = "optional"
PR = "r1"
-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
-file://rsyncd.conf"
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
+ file://rsyncd.conf"
inherit autotools
diff --git a/packages/rsync/rsync_2.6.8.bb b/packages/rsync/rsync_2.6.8.bb
new file mode 100644
index 0000000000..78e2d6eef7
--- /dev/null
+++ b/packages/rsync/rsync_2.6.8.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+DESCRIPTION = "A file-synchronization tool"
+SECTION = "console/network"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
+ file://rsyncd.conf"
+
+inherit autotools
+
+do_install_append() {
+ install -d ${D}/etc
+ install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
+}
+
+EXTRA_OEMAKE='STRIP=""'
diff --git a/site/sh3-linux b/site/sh3-linux
index a31cee3b70..8f7998a3de 100644
--- a/site/sh3-linux
+++ b/site/sh3-linux
@@ -21,6 +21,9 @@ ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=4}
ac_cv_sizeof_unsigned_long_long=${ac_cv_sizeof_unsigned_long_long=8}
ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1}
+# lzo
+ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
+
ac_cv_sys_restartable_syscalls=yes
ac_cv_uchar=${ac_cv_uchar=no}
ac_cv_uint=${ac_cv_uint=yes}
diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc
index a64766fafa..178d05e8e7 100644
--- a/site/sh4-linux-uclibc
+++ b/site/sh4-linux-uclibc
@@ -17,3 +17,16 @@ ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
+
+# ssh
+ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes}
+ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
+ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
+ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
+ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes}
+
+# sudo
+sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
+
+# vim
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}