diff options
68 files changed, 4535 insertions, 99 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index 2d8a27d04d..4007f203ad 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -11,10 +11,10 @@ PACKAGE_EXTRA_ARCHS = "arm-oabi" PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh7" -FEED_ARCH_collie = "arm" -FEED_ARCH_h3600 = "arm" -FEED_ARCH_h3800 = "arm" -FEED_ARCH_simpad = "arm" +FEED_ARCH_collie = "arm-oabi" +FEED_ARCH_h3600 = "arm-oabi" +FEED_ARCH_h3800 = "arm-oabi" +FEED_ARCH_simpad = "arm-oabi" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b95fdb7223..b1855b0ea7 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "28" +DISTRO_REVISION = "30" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -70,7 +70,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b255e85488..7ca663a4d6 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.1" +SLUGOS_VERSION = "4.2" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19+2.6.20-rc4" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" diff --git a/packages/apex/apex_1.4.11.bb b/packages/apex/apex_1.4.11.bb new file mode 100644 index 0000000000..bb45a310b0 --- /dev/null +++ b/packages/apex/apex_1.4.11.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +# FIXME - make this the same as the distro kernel compilation +CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" + +# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config +do_configure() { + rm -f ${S}/.config + if test '${ARCH_BYTE_SEX}' = be + then + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + else + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + fi + oe_runmake oldconfig +} + +DEPENDS += "devio-native" + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + # FIXME - arch-arm should not be hard-coded + if test '${ARCH_BYTE_SEX}' = be + then + cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin + else + devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4' + fi +} diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 2d2784457a..ccec463e98 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: -# Fri Aug 18 09:47:40 2006 +# Tue Jan 9 22:31:18 2007 # CONFIG_ARM=y CONFIG_CPU_ARMV5=y @@ -10,6 +10,7 @@ CONFIG_CPU_XSCALE=y # CONFIG_ARCH_LH7A40X is not set CONFIG_ARCH_IXP42X=y # CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_MX3 is not set CONFIG_EXPERIMENTAL=y # CONFIG_SMALL is not set @@ -31,6 +32,7 @@ CONFIG_DISABLE_MMU_AT_BOOT=y CONFIG_SDRAMBOOT_REPORT=y CONFIG_STACK_SIZE=0x1000 CONFIG_STACKLIMIT=y +# CONFIG_BOOTSTRAP_MEMTEST is not set CONFIG_ATAG_PHYS=0x00000100 CONFIG_ARCH_NUMBER=597 CONFIG_APEX_VMA=0x00200000 @@ -45,6 +47,8 @@ CONFIG_NOR_BANK0_LENGTH=0x00800000 CONFIG_ENV_STARTUP="" CONFIG_MACH="ixp42x" CONFIG_MACH_NSLU2=y +# CONFIG_MACH_NAS100D is not set +# CONFIG_MACH_DSMG600 is not set # CONFIG_MACH_AVILA2347 is not set # CONFIG_USER_DEFAULTENDIAN is not set # CONFIG_USER_BIGENDIAN is not set @@ -73,7 +77,6 @@ CONFIG_CMD_COMPARE=y CONFIG_CMD_DRVINFO=y CONFIG_CMD_DUMP=y CONFIG_CMD_ENV=y -# CONFIG_CMD_ERASEENV is not set CONFIG_CMD_SETENV=y CONFIG_CMD_ERASE=y CONFIG_CMD_FILL=y @@ -94,32 +97,49 @@ CONFIG_DRIVER_FIS=y CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" CONFIG_DRIVER_NOR_CFI=y # CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set +# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set CONFIG_USES_NOR_CFI=y CONFIG_USES_PATHNAME_PARSER=y +CONFIG_USES_IXP4XX_NPE_ETH=y # # Environment # CONFIG_ENV=y +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_LINK=y +CONFIG_ENV_REGION="nor:0x7fc000+15k" +CONFIG_ENV_CHECK_LEN=1024 +CONFIG_VARIATIONS=y +CONFIG_VARIATION_SUFFIX="-alt" # CONFIG_NO_BOOTSTRAP is not set CONFIG_NOR_BOOT=y # CONFIG_NAND_BOOT is not set # CONFIG_COMPANION_EVT1_BOOT is not set # CONFIG_COMPANION_EVT2_BOOT is not set + +# +# Default Startup +# CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 -CONFIG_ENV_MUTABLE=y -CONFIG_ENV_LINK=y -CONFIG_ENV_REGION="nor:0x7fc000+15k" -CONFIG_ENV_CHECK_LEN=1024 CONFIG_ENV_STARTUP_KERNEL_COPY=y -CONFIG_ENV_REGION_KERNEL="fis://kernel" # CONFIG_ENV_REGION_KERNEL_SWAP is not set -# CONFIG_ENV_STARTUP_RAMDISK_COPY is not set + +# +# Regions +# +CONFIG_ENV_REGION_KERNEL="fis://kernel" +# CONFIG_ENV_REGION_KERNEL_ALT_P is not set + +# +# Overrides +# CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" +# CONFIG_ENV_DEFAULT_CMDLINE_ALT_P is not set # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set +# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set CONFIG_USES_NOR_BOOTFLASH=y -# CONFIG_LITTLEENDIAN is not set CONFIG_CLEAR_STACKS=y CONFIG_ALIASES=y diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab index b44d7eacee..63711f989e 100644 --- a/packages/base-files/base-files/h5000/fstab +++ b/packages/base-files/base-files/h5000/fstab @@ -1,8 +1,8 @@ -/dev/mtdblock/1 / jffs2 defaults 1 1 +/dev/mtdblock1 / jffs2 defaults 1 1 #breaks h51xx -/dev/mtdblock/2 /home jffs2 defaults 1 1 +/dev/mtdblock2 /home jffs2 defaults 1 1 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 -/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 +/dev/mmcblk0p1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 tmpfs /var tmpfs defaults 0 0 tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 63e041bf62..c149fd975b 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r57" +PR = "r58" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/blueprobe/blueprobe-0.17/hwuart.patch b/packages/blueprobe/blueprobe-0.17/hwuart.patch new file mode 100644 index 0000000000..274c1455d8 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.17/hwuart.patch @@ -0,0 +1,21 @@ +Index: base/blueprobe/blueprobe.init +=================================================================== +--- base/blueprobe/blueprobe.init (revision 8939) ++++ base/blueprobe/blueprobe.init (working copy) +@@ -46,14 +46,14 @@ + ;; + "HP iPAQ H5400") + BLUETOOTH=yes +- PORT=/dev/tts/1 ++ PORT=/dev/ttyS3 + SPEED=921600 + PROTO=any + PROBE=yes + ;; + "HP iPAQ H3900") + BLUETOOTH=yes +- PORT=/dev/tts/1 ++ PORT=/dev/ttyS1 + SPEED=921600 + PROTO=bcsp + PROBE=yes diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb index ffd83b66ae..b82bedf632 100644 --- a/packages/blueprobe/blueprobe_0.17.bb +++ b/packages/blueprobe/blueprobe_0.17.bb @@ -1,7 +1,8 @@ require blueprobe.inc -PR = "r2" +PR = "r3" -SRC_URI += "file://hx4700.patch;patch=1\ - file://h2200-fixup.patch;patch=1\ - file://htcuniversal.patch;patch=1" +SRC_URI += "file://hx4700.patch;patch=1 \ + file://h2200-fixup.patch;patch=1 \ + file://htcuniversal.patch;patch=1 \ + file://hwuart.patch;patch=1;pnum=2" diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb new file mode 100644 index 0000000000..e48108d530 --- /dev/null +++ b/packages/esound/esound-gpe_20070109.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Enlightened Sound Daemon - GPE version" +SECTION = "gpe/base" +LICENSE = "GPL" +DEPENDS = "audiofile" +PR = "r0" +PROVIDES += "esound" +RPROVIDES += "esound" + +SRCDATE = "${PV}" +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra/;module=esound;date=20070109 \ + file://audiofile-please.patch;patch=1 \ + file://configure.patch;patch=1" + +S = "${WORKDIR}/esound" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--disable-alsa" + +SOV = "0.2.28" + +do_stage () { + install -m 0644 esd.h ${STAGING_INCDIR}/esd.h + oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR} + install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la + install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal +} + +PACKAGES =+ "esddsp esd esd-utils" + +FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" +FILES_esd = "${bindir}/esd" +FILES_esd-utils = "${bindir}/*" diff --git a/packages/fastcgi/.mtn2git_empty b/packages/fastcgi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fastcgi/.mtn2git_empty diff --git a/packages/fastcgi/fastcgi_2.4.0.bb b/packages/fastcgi/fastcgi_2.4.0.bb new file mode 100644 index 0000000000..a42949cb96 --- /dev/null +++ b/packages/fastcgi/fastcgi_2.4.0.bb @@ -0,0 +1,19 @@ +LICENSE = "Open Market" +DESCRIPTION = "Fast CGI backend (web server to CGI handler) library" +PR = "r0" + +SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz" + +S=${WORKDIR}/fcgi-${PV} + +LEAD_SONAME = "libfcgi.so*" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +do_compile() { +} + diff --git a/packages/gnome/kanjipad_svn.bb b/packages/gnome/kanjipad_svn.bb index 95bd174b6d..1e0d943da7 100644 --- a/packages/gnome/kanjipad_svn.bb +++ b/packages/gnome/kanjipad_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition" LICENSE = "GPLv2" -DEPENDS = "gtk perl-native" +DEPENDS = "gtk+ perl-native" PV = "2.0.0+svn${SRCDATE}" diff --git a/packages/gtk+/gtk+-2.10.7/.mtn2git_empty b/packages/gtk+/gtk+-2.10.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.7/.mtn2git_empty diff --git a/packages/gtk+/gtk+-2.10.7/automake-lossage.patch b/packages/gtk+/gtk+-2.10.7/automake-lossage.patch new file mode 100644 index 0000000000..0d423ddbb9 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.7/automake-lossage.patch @@ -0,0 +1,24 @@ +--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100 ++++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100 +@@ -52,21 +52,5 @@ + + dist-hook: html + cp -Rp $(srcdir)/html $(distdir) +-else +-html: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-pdf: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "***" +- +-dist-hook: +- echo "***" +- echo "*** Warning: Tutorial not built" +- echo "*** DISTRIBUTION IS INCOMPLETE" +- echo "***" + endif + diff --git a/packages/gtk+/gtk+-2.10.7/disable-print.patch b/packages/gtk+/gtk+-2.10.7/disable-print.patch new file mode 100644 index 0000000000..1067773f12 --- /dev/null +++ b/packages/gtk+/gtk+-2.10.7/disable-print.patch @@ -0,0 +1,50 @@ +--- gtk+-2.10.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200 ++++ gtk+-2.10.0/configure.in 2006-07-05 18:11:44.000000000 +0200 +@@ -1539,26 +1539,27 @@ + # Printing system checks + ################################################################ + +-AC_PATH_PROG(CUPS_CONFIG, cups-config, no) +-if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` +- CUPS_LIBS=`cups-config --libs` +- +- CUPS_API_VERSION=`cups-config --api-version` +- CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- AC_DEFINE(HAVE_CUPS_API_1_2) +- fi +- +- AC_SUBST(CUPS_API_MAJOR) +- AC_SUBST(CUPS_API_MINOR) +- AC_SUBST(CUPS_CFLAGS) +- AC_SUBST(CUPS_LIBS) +-fi +-AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++#AC_PATH_PROG(CUPS_CONFIG, cups-config, no) ++#if test "x$CUPS_CONFIG" != "xno"; then ++# CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` ++# CUPS_LIBS=`cups-config --libs` ++# ++# CUPS_API_VERSION=`cups-config --api-version` ++# CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'` ++# CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'` ++# ++# if test $CUPS_API_MAJOR -gt 1 -o \ ++# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then ++# AC_DEFINE(HAVE_CUPS_API_1_2) ++# fi ++# ++# AC_SUBST(CUPS_API_MAJOR) ++# AC_SUBST(CUPS_API_MINOR) ++# AC_SUBST(CUPS_CFLAGS) ++# AC_SUBST(CUPS_LIBS) ++#fi ++#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno") ++AM_CONDITIONAL(HAVE_CUPS,false) + + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" diff --git a/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch new file mode 100644 index 0000000000..d71d839c3c --- /dev/null +++ b/packages/gtk+/gtk+-2.10.7/disable-tooltips.patch @@ -0,0 +1,11 @@ +--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100 ++++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100 +@@ -118,7 +118,7 @@ + tooltips->tips_data_list = NULL; + + tooltips->delay = DEFAULT_DELAY; +- tooltips->enabled = TRUE; ++ tooltips->enabled = FALSE; + tooltips->timer_tag = 0; + tooltips->use_sticky_delay = FALSE; + tooltips->last_popdown.tv_sec = -1; diff --git a/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.7/gnome-bug-341177.patch new |