diff options
Diffstat (limited to 'packages')
18 files changed, 238 insertions, 56 deletions
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index c02f1c6875..e22341483c 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,7 +6,6 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PV = "0.0.1+cvs-${CVSDATE}" PR = "r3" @@ -49,9 +48,18 @@ pkg_postinst_spitz() { # /l/m only exists on the HDD on spitz if test -d /lib/modules then - # FIXME: Do be written - a=a # do nothing - fi + if [ -e /media/realroot/sbin/init ]; then + ROOT_MOUNT_POINT="/media/realroot" + elif [ -e /media/ROM/sbin/init ]; then + ROOT_MOUNT_POINT="/media/ROM" + fi + ROOT_MOUNT_DEVICE = `cat /proc/mounts | grep $REALROOT | grep jffs2 | cut -d " " -f 1` + mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT + cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc + cp /sbin/init.altboot $ROOT_MOINT_POINT/sbin + mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig + ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init + fi } pkg_postrm() { diff --git a/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch b/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch deleted file mode 100644 index de18063280..0000000000 --- a/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urNd ../gpe-irc-0.07-r0/gpe-irc-0.07/Makefile gpe-irc-0.07/Makefile ---- ../gpe-irc-0.07-r0/gpe-irc-0.07/Makefile 2004-08-03 15:40:50.000000000 +0100 -+++ gpe-irc-0.07/Makefile 2004-08-03 16:01:29.000000000 +0100 -@@ -1,12 +1,13 @@ - PREFIX = /usr/local - PACKAGE = gpe-irc - VERSION = 0.07 --DEBUG = yes -+DEBUG = no - CVSBUILD = no -+BUILD = ./build - - ifeq ($(DEBUG),yes) - CFLAGS += -O2 -g -DDEBUG --LDFLAGS = -g #-lefence -+LDFLAGS += -g #-lefence - else - CFLAGS += -Os -fomit-frame-pointer - endif -@@ -41,7 +42,7 @@ - $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) - - install-program: all -- install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) -+ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png - install -d $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc - install -d $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc/smileys -@@ -56,7 +57,6 @@ - install -m 644 pixmaps/colors/blue.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc/colors/blue.png - mkdir -p $(DESTDIR)$(PREFIX)/share/applications - install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/ -- strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - - clean: - rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/packages/gpe-irc/gpe-irc_0.07.bb b/packages/gpe-irc/gpe-irc_0.08.bb index fc08b72de3..77476a7cb9 100644 --- a/packages/gpe-irc/gpe-irc_0.07.bb +++ b/packages/gpe-irc/gpe-irc_0.08.bb @@ -4,5 +4,3 @@ DESCRIPTION = "31337 IRC client." DEPENDS = "gtk+ libgpewidget" SECTION = "gpe" PRIORITY = "optional" - -SRC_URI += "file://fix_makefile.patch;patch=1" diff --git a/packages/gpe-irc/gpe-irc-0.07/.mtn2git_empty b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-irc/gpe-irc-0.07/.mtn2git_empty +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch new file mode 100644 index 0000000000..a5f7063af7 --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch @@ -0,0 +1,126 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libsigc++-1.2.7/configure.in~autofoo.patch ++++ libsigc++-1.2.7/configure.in +@@ -35,9 +35,9 @@ + dnl AC_SUBST(SIGC_RELEASE, $SIGC_RELEASE) + AC_SUBST(SIGC_VERSION) + +-AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION) +-AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION) +-AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION) ++AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION, [library major version]) ++AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION, [library minor version]) ++AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION, [library micro version]) + + AC_CONFIG_AUX_DIR(scripts) + +@@ -50,7 +50,23 @@ + + dnl Specify a configuration file + AM_CONFIG_HEADER(sigc++/config/sigcconfig.h) ++AH_BOTTOM([ ++// Window DLL declarations + ++#ifdef LIBSIGC_DLL ++ #if defined(LIBSIGC_COMPILATION) && defined(DLL_EXPORT) ++ #define LIBSIGC_API __declspec(dllexport) ++ #define LIBSIGC_TMPL ++ #elif !defined(LIBSIGC_COMPILATION) ++ #define LIBSIGC_API __declspec(dllimport) ++ #define LIBSIGC_TMPL extern ++ #else ++ #define LIBSIGC_API ++ #endif /* LIBSIGC_COMPILATION - DLL_EXPORT */ ++#else ++ #define LIBSIGC_API ++#endif /* LIBSIGC_DLL */ ++]) + AM_MAINTAINER_MODE + + # echo $USE_MAINTAINER_MODE +@@ -288,7 +304,7 @@ + }; + ],[ + ], +- AC_DEFINE(SIGC_CXX_EXPLICIT,explicit) ++ AC_DEFINE(SIGC_CXX_EXPLICIT,explicit,[if C++ compiler supports explicit]) + ac_cxx_explicit=yes + , + AC_DEFINE(SIGC_CXX_EXPLICIT,) +@@ -305,7 +321,7 @@ + }; + ],[ + ], +- AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit) ++ AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit,[if C++ compiler supports explicit copy ctor]) + ac_cxx_explicit_copy_ctor=yes + , + AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,) +@@ -413,7 +429,7 @@ + k<void,void> a; + ],[ + ac_cxx_partial_specialization=yes +- AC_DEFINE(SIGC_CXX_PARTIAL_SPEC) ++ AC_DEFINE(SIGC_CXX_PARTIAL_SPEC,[if C++ compiler supports partial specialization]) + ],[ + # config_error=yes + ac_cxx_partial_specialization=no +@@ -434,7 +450,7 @@ + ],[ + ac_cxx_namespaces=yes + AC_MSG_RESULT([$ac_cxx_namespaces]) +- AC_DEFINE(SIGC_CXX_NAMESPACES) ++ AC_DEFINE(SIGC_CXX_NAMESPACES,,[if C++ compiler supports name spaces]) + ],[ + ac_cxx_namespaces=no + AC_MSG_RESULT([$ac_cxx_namespaces]) +@@ -474,7 +490,7 @@ + A<int> i; + ],[ + ],[ +- AC_DEFINE(SIGC_CXX_INT_CTOR) ++ AC_DEFINE(SIGC_CXX_INT_CTOR,,[if C++ compiler has intrinsic constructors]) + ac_cxx_tmpl_intctor=yes + ],[ + ac_cxx_tmpl_intctor=no +@@ -515,7 +531,7 @@ + ],[ + ],[ + ac_cxx_void_return=yes +- AC_DEFINE(SIGC_CXX_VOID_RETURN) ++ AC_DEFINE(SIGC_CXX_VOID_RETURN,,[if C++ compiler allows void returns]) + ],[ + ac_cxx_void_return=no + ]) +@@ -530,7 +546,7 @@ + ],[ + ],[ + ac_cxx_void_cast_return=yes +- AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN) ++ AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN,,[if C++ compiler supports void cast return]) + ],[ + ac_cxx_void_cast_return=no + ]) +@@ -565,7 +581,7 @@ + P<int&>::ptr q=b; + ],[ + ac_cxx_specialize_references=yes +- AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES) ++ AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES,,[if C++ compiler allows specialization of references]) + ],[ + ac_cxx_specialize_references=no + ]) +--- libsigc++-1.2.7/Makefile.am~autofoo.patch ++++ libsigc++-1.2.7/Makefile.am +@@ -1,6 +1,6 @@ + SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4 + DIST_SUBDIRS = $(SUBDIRS) examples scripts +-ACLOCAL_AMFLAGS = -I $(srcdir)/scripts ++ACLOCAL_AMFLAGS = -I ./scripts + + EXTRA_DIST = \ + FEATURES IDEAS \ diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch new file mode 100644 index 0000000000..92145a4ec9 --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch @@ -0,0 +1,13 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libsigc++-1.2.7/Makefile.am~disable-tests ++++ libsigc++-1.2.7/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4 ++SUBDIRS = sigc++ + DIST_SUBDIRS = $(SUBDIRS) examples scripts + ACLOCAL_AMFLAGS = -I ./scripts + diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb new file mode 100644 index 0000000000..75e830fd2b --- /dev/null +++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A library for loose coupling of C++ method calls" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL" +PR = "r0" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1 \ + file://disable-tests.patch;patch=1" +S = "${WORKDIR}/libsigc++-${PV}" + +inherit autotools pkgconfig + +# FIXME: Check why tests don't compile + +acpaths = "" + +do_stage() { + install -d ${STAGING_LIBDIR}/sigc++-1.2/include + install -m 0644 sigc++/config/sigcconfig.h ${STAGING_LIBDIR}/sigc++-1.2/include/ + oe_libinstall -so -C sigc++ libsigc-1.2 ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/sigc++-1.2/sigc++ + for f in sigc++/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/sigc++-1.2/sigc++/ + done +} + +FILES_${PN}-dev += "${libdir}/sigc++-*/" diff --git a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb index 9df141ed44..c726d24793 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r0" +PR = "r1" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ + ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \ ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \ ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ @@ -74,7 +75,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-udc-r3.patch;patch=1 \ ${DOSRC}/tosa-irda-r2.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ - ${DOSRC}/tosa-2.6.13-r2.patch;patch=1 \ + ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ diff --git a/packages/linux/nslu2-kernel/2.6/timer.patch b/packages/linux/nslu2-kernel/2.6/timer.patch new file mode 100644 index 0000000000..6279746e64 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6/timer.patch @@ -0,0 +1,24 @@ +# Fix for the NSLU2 timer problem (tickadj 10101.01 when it should be 10000) +# Also contains a fix for the more generate problem on the ixp4xx in that the +# Intel spec says to use a 33.33MHz crystal, not 33.333333Mhz + +--- linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h.orig 2005-08-05 11:02:09.872690723 -0700 ++++ linux-2.6.12.2/include/asm-arm/arch-ixp4xx/timex.h 2005-08-05 11:45:08.786971567 -0700 +@@ -7,7 +7,14 @@ + + /* + * We use IXP425 General purpose timer for our timer needs, it runs at +- * 66.66... MHz ++ * 66.66 MHz (exactly) by the Intel specification. + */ +-#define CLOCK_TICK_RATE (66666666) +- ++#if 0 ++#define CLOCK_TICK_RATE (66660000) ++#else ++/* ++ * Unfortunately the NSLU2 has a 33MHz crystal, so the rate is not the ++ * specified one. ++ */ ++#define CLOCK_TICK_RATE (66000000) ++#endif diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 8b54cdc703..64b5788649 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r6" +PR = "r7" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -22,4 +22,5 @@ N2K_PATCHES = "\ file://x1205-rtc.c-id.patch;patch=1 \ file://mtd-shutdown.patch;patch=1 \ file://missing-exports.patch;patch=1 \ + file://timer.patch;patch=1 \ " diff --git a/packages/linux/nslu2-kernel_2.6.12.bb b/packages/linux/nslu2-kernel_2.6.12.bb index 6cea8a4daa..a8fa808d3a 100644 --- a/packages/linux/nslu2-kernel_2.6.12.bb +++ b/packages/linux/nslu2-kernel_2.6.12.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r2" +PR = "r3" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -21,4 +21,5 @@ N2K_PATCHES = "\ file://xscale-reset.patch;patch=1 \ file://x1205-rtc.c-id.patch;patch=1 \ file://mtd-shutdown.patch;patch=1 \ + file://timer.patch;patch=1 \ " diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index fdbf0d020e..d705de728d 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -110,6 +110,7 @@ UCSLUGC_PACKAGES = "\ # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. # KEEP IN ALPHABETICAL ORDER UCSLUGC_BROKEN_PACKAGES = "\ + iperf \ man man-pages \ php \ psmisc \ @@ -119,7 +120,10 @@ UCSLUGC_BROKEN_PACKAGES = "\ " # These packages will never build because uclibc lacks (and always will lack) -# appropriate support. This define is for documentation of this fact! +# appropriate support. This define is for documentation of this fact! The +# normal cause is that the package uses the "NIS" interfaces (once known as +# YP - a trademark of BT which SUN used without license - the missing function +# calls often still have 'yp' in the name). UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ libpam \ nfs-utils \ diff --git a/packages/microcom/microcom_1.02.bb b/packages/microcom/microcom_1.02.bb index b87ce5e0d5..e0c0512478 100644 --- a/packages/microcom/microcom_1.02.bb +++ b/packages/microcom/microcom_1.02.bb @@ -3,7 +3,11 @@ scripting support." LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -SRC_URI = "http://microcom.port5.com/m102.tar.gz \ +# http://microcom.port5.com/m102.tar.gz is no longer available +#NOTE: this should probably be converted to pull from sourceforge +# CVS, because openwrt is just another mirror of a file which no +# longer seems to exist outside mirrors. mirror magic. +SRC_URI = "http://downloads.openwrt.org/sources/m102.tar.gz \ file://make.patch;patch=1" S = "${WORKDIR}" diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index 752fd1f266..817c3c32f7 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -7,11 +7,6 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" PR = "r4" -# OE core: this is here to prevent this version of ntp from -# changing OE distros other than openslug. This code has -# only been tested on openslug. Feel free to remove these lines! -DEFAULT_PREFERENCE = -1 -DEFAULT_PREFERENCE_openslug = 0 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.96.90.bb new file mode 100644 index 0000000000..bc6fc7992d --- /dev/null +++ b/packages/python/python-scons-native_0.96.90.bb @@ -0,0 +1,12 @@ +include python-scons_${PV}.bb +inherit native + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_LIBDIR}/.. --install-data=${STAGING_DATADIR} || \ + oefatal "python setup.py install execution failed." +} + +do_install() { + : +} diff --git a/packages/sysvinit/sysvinit/nslu2/rcS-default b/packages/sysvinit/sysvinit/nslu2/rcS-default index 7c34294101..d53be762a7 100644 --- a/packages/sysvinit/sysvinit/nslu2/rcS-default +++ b/packages/sysvinit/sysvinit/nslu2/rcS-default @@ -19,5 +19,4 @@ EDITMOTD=no # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. FSCKFIX=yes # Set TICKADJ to the correct tick value for this specific machine -#NSLU2: determined by experiment to be 100/99*10000 usec/tick -TICKADJ=10101 +#TICKADJ=10000 diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default index fb22117aae..46e48b9796 100644 --- a/packages/sysvinit/sysvinit/rcS-default +++ b/packages/sysvinit/sysvinit/rcS-default @@ -17,3 +17,5 @@ VERBOSE=no EDITMOTD=no # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup. FSCKFIX=yes +# Set TICKADJ to the correct tick value for this specific machine +#TICKADJ=10000 diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 73813d293f..e59102d931 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r17" +PR = "r18" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. |