propagate from branch 'org.openembedded.dev' (head bec0de74737047dc066359246d921fbf51...
authorRod Whitby <rod@whitby.id.au>
Tue, 26 Jul 2005 04:10:51 +0000 (04:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 04:10:51 +0000 (04:10 +0000)
            to branch 'org.openembedded.nslu2-linux' (head 9df4aaab2b771f04a318a53fd0e050ec07eb9f1b)

27 files changed:
conf/machine/h3900.conf
conf/machine/poodle.conf
conf/machine/tosa.conf
conf/machine/zaurus-clamshell.conf
packages/atftp/atftp_0.7.bb
packages/base-files/base-files/spitz/fstab
packages/curl/curl-7.12.2/.mtn2git_empty [deleted file]
packages/curl/curl-7.12.2/m4.patch [deleted file]
packages/curl/curl-7.12.2/pkgconfig.patch [deleted file]
packages/curl/curl_7.14.0.bb [moved from packages/curl/curl_7.12.2.bb with 93% similarity]
packages/curl/files/.mtn2git_empty [deleted file]
packages/curl/files/uclibc.patch [deleted file]
packages/dash/dash_0.5.2.bb
packages/dgen/dgen-sdl-1.18/.mtn2git_empty [deleted file]
packages/dgen/dgen-sdl-1.18/fix-everything.patch [deleted file]
packages/dgen/dgen-sdl_1.18.bb [deleted file]
packages/gkdial/gkdial-gnomeless_1.8.1.bb [deleted file]
packages/hostap/files/hostap-fw-load.patch
packages/hostap/hostap-utils_0.3.7.bb
packages/inkscape/inkscape_0.42.bb
packages/libssh/libssh_0.11.bb [moved from packages/libssh/libssh_0.1.bb with 92% similarity]
packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb
packages/memtester/memtester_4.0.5.bb [moved from packages/memtester/memtester_4.0.4.bb with 85% similarity]
packages/opie-taskbar/opie-taskbar/c7x0/opie [changed mode: 0644->0755]
packages/python/python-imdbpy_2.0.bb
packages/python/python-pycurl_7.14.0.bb [moved from packages/python/python-pycurl_7.12.2.bb with 100% similarity]
packages/slotsig/slotsig_0.6.bb [moved from packages/slotsig/slotsig_0.4.bb with 88% similarity]

index aee3bac..9e91dcf 100644 (file)
@@ -5,7 +5,7 @@
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-OVERRIDES .= "${KERNEL}"
+OVERRIDES =. "${KERNEL}:"
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ipaqpxa h3900"
index 4ff3fe7..e0cc83e 100644 (file)
@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
-EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 include conf/machine/handheld-common.conf
 
index dfdabf4..ab5b169 100644 (file)
@@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
index d03c9a7..285ab85 100644 (file)
@@ -11,7 +11,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
                   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
-EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim sylpheed"
index ab51647..67dd716 100644 (file)
@@ -4,9 +4,10 @@ PRIORITY = "optional"
 MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "ftp://ftp.mamalinux.com/pub/atftp/atftp-${PV}.tar.gz \
+SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \
+           ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \
           file://atftpd.init"
 S = "${WORKDIR}/atftp-${PV}"
 
index 94880f8..b4fc969 100644 (file)
@@ -1,24 +1,26 @@
-# don't mount mtdblocks on spitz since they reside on harddisk
-# /dev/mtdblock2  /       jffs2   rw,noatime      1  1
-# /dev/mtdblock3  /home   jffs2   defaults,noatime        1  2
-
-rootfs               /                    auto       defaults              1 1
-proc                 /proc                proc       defaults              0 0
-
-devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
-usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
-
-tmpfs          /var            tmpfs   defaults                0 0
-tmpfs          /media/ram      tmpfs   defaults                0 0
+# don't mount /dev/mtdblock2 since Spitz uses pivot_root
+# /dev/mtdblock2     /            jffs2   rw,noatime              1  1
+rootfs             /            auto    defaults                1  1
+proc               /proc        proc    defaults                0  0
+tmpfs              /var         tmpfs   defaults                0  0
+tmpfs              /media/ram   tmpfs   defaults                0  0
 
 # Compact Flash memory cards
-/dev/hdb1       /media/cf       auto    defaults,sync,noauto    0 0
+/dev/hdb1       /media/cf       auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.4
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0 0
+/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
-/dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0 0
+#/dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
 
+#
 # USB
-/dev/sda1      /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0 0
-devpts         /dev/pts        devpts          mode=0620,gid=5       0 0
-usbdevfs       /proc/bus/usb   usbdevfs        noauto                0 0
+#
+/dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
+devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
+usbdevfs        /proc/bus/usb   usbdevfs        noauto                0  0
+
+#
+# Harddisk
+#
+/dev/hda1           /media/hdd      ext3       noauto,defaults,noatime    0  0
+
diff --git a/packages/curl/curl-7.12.2/.mtn2git_empty b/packages/curl/curl-7.12.2/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/curl/curl-7.12.2/m4.patch b/packages/curl/curl-7.12.2/m4.patch
deleted file mode 100644 (file)
index c9a9eec..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- curl-7.12.0/acinclude.m4~m4        2004-05-07 20:29:02.000000000 +0200
-+++ curl-7.12.0/acinclude.m4   2004-06-07 19:03:47.000000000 +0200
-@@ -409,45 +409,7 @@
-     dnl determine if this strerror_r() is glibc or POSIX
-     AC_MSG_CHECKING([for a glibc strerror_r API])
--    AC_TRY_RUN([
--#include <string.h>
--#include <errno.h>
--int
--main () {
--  char buffer[1024]; /* big enough to play with */
--  char *string =
--    strerror_r(EACCES, buffer, sizeof(buffer));
--    /* this should've returned a string */
--    if(!string || !string[0])
--      return 99;
--    return 0;
--}
--],
--    AC_DEFINE(HAVE_GLIBC_STRERROR_R, 1, [we have a glibc-style strerror_r()])
--    AC_MSG_RESULT([yes]),
--    AC_MSG_RESULT([no])
--    )
--
-     AC_MSG_CHECKING([for a POSIX strerror_r API])
--    AC_TRY_RUN([
--#include <string.h>
--#include <errno.h>
--int
--main () {
--  char buffer[1024]; /* big enough to play with */
--  int error =
--    strerror_r(EACCES, buffer, sizeof(buffer));
--    /* This should've returned zero, and written an error string in the
--       buffer.*/
--    if(!buffer[0] || error)
--      return 99;
--    return 0;
--}
--],
--    AC_DEFINE(HAVE_POSIX_STRERROR_R, 1, [we have a POSIX-style strerror_r()])
--    AC_MSG_RESULT([yes]),
--    AC_MSG_RESULT([no])
--    )
-   fi
diff --git a/packages/curl/curl-7.12.2/pkgconfig.patch b/packages/curl/curl-7.12.2/pkgconfig.patch
deleted file mode 100644 (file)
index da62b4e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/configure.ac   2004-05-25 16:43:39.000000000 -0500
-+++ curl-7.12.0/configure.ac   2004-07-15 18:13:18.000000000 -0500
-@@ -1389,7 +1389,8 @@
-            packages/EPM/curl.list \
-            packages/EPM/Makefile \
-            packages/vms/Makefile \
--           curl-config
-+           curl-config \
-+         curl.pc
- ])
- AC_OUTPUT
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/Makefile.am    2004-05-17 16:41:02.000000000 -0500
-+++ curl-7.12.0/Makefile.am    2004-07-15 18:10:32.000000000 -0500
-@@ -24,10 +24,16 @@
- AUTOMAKE_OPTIONS = foreign
- EXTRA_DIST = CHANGES COPYING maketgz reconf Makefile.dist     \
--  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES
-+  curl-config.in curl-style.el sample.emacs testcurl.sh RELEASE-NOTES \
-+  curl.pc.in
- bin_SCRIPTS = curl-config
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = curl.pc
-+
-+$(pkgconfig_DATA): config.status
-+
- SUBDIRS = lib src
- DIST_SUBDIRS = $(SUBDIRS) tests include packages docs
---- tmp/work/curl-7.12.0-r0/curl-7.12.0/curl.pc.in     1969-12-31 18:00:00.000000000 -0600
-+++ curl-7.12.0/curl.pc.in     2004-07-15 18:09:14.000000000 -0500
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+versionnum=@VERSIONNUM@
-+features=@FEATURES@
-+
-+Name: curl
-+Description: a library that groks URLs
-+Version: @VERSION@
-+Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
-+Cflags: -I${includedir}
similarity index 93%
rename from packages/curl/curl_7.12.2.bb
rename to packages/curl/curl_7.14.0.bb
index a483c12..1b8a88d 100644 (file)
@@ -4,21 +4,30 @@
 # curl's build should be fixed to manipulate LIBS where appropriate and
 # use that. -CL
 
-DEPENDS = "zlib"
 DESCRIPTION = "Command line tool and library for \
 client-side URL transfers."
 LICENSE = "MIT" 
+DEPENDS = "zlib"
 SECTION = "console/network"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
-          file://uclibc.patch;patch=1"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                --without-ssl --with-random=/dev/urandom"
 
+do_stage () {
+       install -d ${STAGING_INCDIR}/curl
+       install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+       oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+
+       cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
+                        | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
+        chmod a+rx ${STAGING_BINDIR}/curl-config
+}
+
 PACKAGES = "curl curl-doc libcurl libcurl-dev libcurl-doc"
 FILES_${PN} = "${bindir}/curl"
 FILES_${PN}-doc = "${mandir}/man1/curl.1"
@@ -33,12 +42,3 @@ FILES_lib${PN}-dev = "${includedir} \
 FILES_lib${PN}-doc = "${mandir}/man3 \
                       ${mandir}/man1/curl-config.1"
 
-do_stage () {
-       install -d ${STAGING_INCDIR}/curl
-       install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-       oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-
-       cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
-                        | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
-        chmod a+rx ${STAGING_BINDIR}/curl-config
-}
diff --git a/packages/curl/files/.mtn2git_empty b/packages/curl/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/curl/files/uclibc.patch b/packages/curl/files/uclibc.patch
deleted file mode 100644 (file)
index 15a9012..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: curl-7.12.2/lib/mprintf.c
-===================================================================
---- curl-7.12.2.orig/lib/mprintf.c     2004-06-24 07:54:11.000000000 -0400
-+++ curl-7.12.2/lib/mprintf.c  2005-02-02 17:15:45.435748600 -0500
-@@ -1134,8 +1134,10 @@
- }
- #ifndef WIN32 /* not needed on win32 */
-+#ifndef __UCLIBC__ /* not needed for uclibc, and breaks the build */
- extern int fputc(int, FILE *);
- #endif
-+#endif
- int curl_mprintf(const char *format, ...)
- {
index 1dcf81c..c13682c 100644 (file)
@@ -1,11 +1,12 @@
 DESCRIPTION = "The Debian Almquist Shell is a POSIX compliant shell that is much smaller than 'bash'."
 PROVIDES = "virtual/sh"
 LICENSE = "BSD GPL"
+PR = "r1"
 
 SRC_URI = "http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}.orig.tar.gz \
-       http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}-4.diff.gz;patch=1 \
+       http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}-6.diff.gz;patch=1 \
        file://makefile-build-cc.diff;patch=1"
-       
+
 inherit autotools
 
 bindir = "/bin"
diff --git a/packages/dgen/dgen-sdl-1.18/.mtn2git_empty b/packages/dgen/dgen-sdl-1.18/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/dgen/dgen-sdl-1.18/fix-everything.patch b/packages/dgen/dgen-sdl-1.18/fix-everything.patch
deleted file mode 100644 (file)
index 9aa4a02..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/Makefile dgen-sdl-1.18/Makefile
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/Makefile 1999-08-08 21:29:03 +01:00
-+++ dgen-sdl-1.18/Makefile     2005-02-25 04:26:39 +00:00
-@@ -13,7 +13,7 @@
- DGENOBJS = rc.o romload.o md.o mdfr.o md-joe.o decode.o vdp.o mem.o \
-       save.o graph.o myfm.o fm.o sn76496.o ras.o main.o pd.a \
--      $(STAR) $(MUSA) $(M68KEM) $(Z80) $(TILES) $(CTV) $(JOY) $(MEMCPY) \
-+      $(STAR) $(MUSA) $(M68KEM) $(Z80) $(TILES) $(CTV) $(JOY) $(MEMCPY)
- .PHONY: all setuidroot install clean bindist
-@@ -22,7 +22,7 @@
-       @echo "Or, $(MAKE) install to copy dgen to /usr/local/bin."
- dgen : $(DGENOBJS)
--      g++ $(STRIP) -o dgen $(LIB) $(DGENOBJS) $(LIBS) $(PDLIBS)
-+      $(CXX) -o dgen $(LIB) $(LIBS) $(PDLIBS) $(DGENOBJS)
- pd.a :
-       $(MAKE) -C $(INTERFACE)
-@@ -45,7 +45,7 @@
-       cp mz80/mz80.o .
- ras.o : ras.cpp ras-drawplane.h
--      $(CPP) $(INCLUDE) -c ras.cpp
-+      $(CXX) $(INCLUDE) -c ras.cpp
- zz80.o : zz80.c
-       $(CCNW) -c zz80.c
-@@ -58,10 +58,10 @@
- gra.asm_: mkgra
-       ./mkgra
- mkgra : mkgra.c
--      $(CC) -o mkgra mkgra.c
-+      $(HOSTCC) -o mkgra mkgra.c
- %.o : %.cpp
--      $(CPP) $(INCLUDE) -c $<
-+      $(CXX) $(INCLUDE) -c $<
- %.o : %.c
-       $(CC) $(INCLUDE) -c $<
- %.o : %.asm
-@@ -98,4 +98,4 @@
-       tar cvzf dgen-sdl-linuxi386_1.17.tar.gz dgen README sample.dgenrc.?
- tobin: tobin.c romload.o
--      gcc -o tobin tobin.c romload.o
-+      $(CC) -o tobin tobin.c romload.o
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/Makefile.config dgen-sdl-1.18/Makefile.config
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/Makefile.config  1999-08-08 21:42:22 +01:00
-+++ dgen-sdl-1.18/Makefile.config      2005-02-25 05:19:26 +00:00
-@@ -4,37 +4,37 @@
- # Otherwise, you have to use the slower C-based Musashi emulator.
- # Define at least one of these CPU core emulators!  :)
- # You can define all or one, and hot swap them during the game with F11 [PKH]
--STAR=starcpu.o
-+#STAR=starcpu.o
- MUSA=musa68.a
- #M68KEM=68kem.a # Not just yet... but there's some code there. Want to fix? :)
- # Similarly, you can use the assembler MZ80 emulator, or the C ZZ80 emulator.
- # But not both!
--Z80=mz80.o
--#Z80=zz80.o
-+#Z80=mz80.o
-+Z80=zz80.o
- # If you are on a Linux platform and have fairly recent joystick drivers,
- # define JOYSTICK_SUPPORT and enable it using the -j runtime switch.
--JOY=md-phil.o
-+#JOY=md-phil.o
- # If you use StarScream and you want the insanest maximum speed possible, you
- # can use its 'hog mode', which increases speed at the cost of ~130K (!)
- # executable size.
--HOG=-hog
-+#HOG=-hog
- # Also, you may uncomment this if you want to try the assembler crap TV
- # filters. Worth a look! Only works in 16-bit or 15-bit color modes
--CTV=ctv.o
-+#CTV=ctv.o
- # Most Linux/ELF and *BSD systems don't put underscores at the beginning of
- # symbol names, but many other systems do. If your system doesn't, uncomment
- # this. (no effect unless you're using assembler routines)
--NO_USCORE = 1
-+#NO_USCORE = 1
- # Phil has done it again, with some assembly language memcpy() substitutes!
- # asm_memcpy.o is the straight assembler version; mmx_memcpy.o uses MMX.
- # Or pick neither, and use the standard libc memcpy().
--MEMCPY = mmx_memcpy.o
-+#MEMCPY = mmx_memcpy.o
- #MEMCPY = asm_memcpy.o
- # Pick the object format your system uses, for NASM
-@@ -42,7 +42,7 @@
- #                     aoutb (*BSD a.out)
- #                     coff  (COFF ;)
- #                     elf   (Linux/BeOS/FreeBSD ELF)
--NASM_FMT=elf
-+NASM_FMT=aout
- # If your processor is big-endian, try uncommenting this. But all the endian
- # bugs aren't quite ironed out yet, so YMMV.
-@@ -55,8 +55,8 @@
- # Add any other directories you want to grab includes and libraries from, for
- # the SDL includes and libraries
- #INCLUDE = -I/usr/local/include
--INCLUDE = -I/usr/local/include -I/usr/local/include/SDL
--LIB = -L/usr/local/lib
-+INCLUDE = -I$(STAGING_INCDIR) -I$(STAGING_INCDIR)/SDL
-+LIB = -L$(STAGING_LIBDIR) -Wl,-rpath-link,$(STAGING_LIBDIR) -Wl,-rpath,${libdir}
- # If your libraries use the pthread library, use this.
- # Linux libc5 systems should comment this (as well as any other systems without 
-@@ -68,7 +68,7 @@
- DEFINES += -D_REENTRANT
- # Uncomment this for assembler tile rendering. Thanks Phil!
--TILES=asm_tiles.o
-+#TILES=asm_tiles.o
- # My cflags, for pgcc on an AMD K6
- #CFLAGS = -O3 -mk6 -march=k6 -fstrength-reduce \
-@@ -78,10 +78,10 @@
- #      -fomit-frame-pointer
- # For gcc/egcs on Intel:
--CFLAGS = -O3 -mpentium -march=pentium -fstrength-reduce -fomit-frame-pointer \
--         -frerun-cse-after-loop -funroll-loops \
--       -ffast-math -malign-functions=5 -malign-jumps=5 -malign-loops=5 \
--       -malign-double -fno-exceptions -fno-rtti
-+#CFLAGS = -O3 -mpentium -march=pentium -fstrength-reduce -fomit-frame-pointer \
-+#         -frerun-cse-after-loop -funroll-loops \
-+#      -ffast-math -malign-functions=5 -malign-jumps=5 -malign-loops=5 \
-+#      -malign-double -fno-exceptions -fno-rtti
- # For egcs on non-Intel (probably not optimal):
- #CFLAGS = -O3 -ffast-math -fomit-frame-pointer -fno-exceptions -fno-rtti \
-@@ -94,12 +94,12 @@
- # To strip the executable, leave this uncommented. Recommended, unless you're
- # debugging
--STRIP = -s
-+#STRIP = -s
- # Adjust these for your C and C++ compilers
--CPP=g++ -Wall -W $(CFLAGS)
--CCNW=gcc -w $(CFLAGS)
--CC=gcc -Wall -W $(CFLAGS)
-+CXX=$(TARGET_CXX) -Wall -W $(CFLAGS)
-+CCNW=$(TARGET_CC) -w $(CFLAGS)
-+CC=$(TARGET_CC) -Wall -W $(CFLAGS)
- ########## No more configuration options, run make and have fun ##########
- ##########  Don't edit below this line, unless you want to. ;)  ##########
-@@ -142,6 +142,6 @@
- INCLUDE += -I$(INTERFACE) -I. -I..
--CPP  += $(DEFINES) $(INCLUDE)
-+CXX  += $(DEFINES) $(INCLUDE)
- CC   += $(DEFINES) $(INCLUDE)
- CCNW += $(DEFINES) $(INCLUDE)
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/musa/Makefile dgen-sdl-1.18/musa/Makefile
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/musa/Makefile    1999-06-19 19:56:48 +01:00
-+++ dgen-sdl-1.18/musa/Makefile        2005-02-25 02:47:27 +00:00
-@@ -1,7 +1,7 @@
- include ../Makefile.config
- test: musa68.a test.o
--      gcc -s -o test -Wall -W test.c musa68.a
-+      $(CC) -s -o test -Wall -W test.c musa68.a
- %.o : %.c
-       $(CC) -c $<
-@@ -27,7 +27,7 @@
-       ./m68kmake
- m68kmake : m68kmake.c
--      $(CC) m68kmake.c -o m68kmake
-+      $(HOSTCC) m68kmake.c -o m68kmake
- clean:
-       rm -f test
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/rc.cpp dgen-sdl-1.18/rc.cpp
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/rc.cpp   1999-07-28 00:42:34 +01:00
-+++ dgen-sdl-1.18/rc.cpp       2005-02-25 05:35:11 +00:00
-@@ -252,6 +252,12 @@
-   return -1;
- }
-+/* Wrapper for atoi to put it in the struct below */
-+static int _atoi(char *string)
-+{
-+      return atoi(string);
-+}
-+
- /* This is a table of all the RC options, the variables they affect, and the
-  * functions to parse their values. */
- struct rc_field {
-@@ -310,10 +316,10 @@
-   { "bool_show_carthead", boolean, &dgen_show_carthead },
-   { "ctv_craptv_startup", ctv, &dgen_craptv },
-   { "bool_sound", boolean, &dgen_sound },
--  { "int_soundrate", atoi, &dgen_soundrate },
-+  { "int_soundrate", _atoi, &dgen_soundrate },
-   { "bool_16bit", boolean, &dgen_16bit },
--  { "int_soundsegs", atoi, &dgen_soundsegs },
--  { "int_nice", atoi, &dgen_nice },
-+  { "int_soundsegs", _atoi, &dgen_soundsegs },
-+  { "int_nice", _atoi, &dgen_nice },
-   { "bool_joystick", boolean, &dgen_joystick },
- #if defined (__linux) && (JOYSTICK_SUPPORT)
-   { "joypad1_b0", jsmap, &js_map_button[0][1] },
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/Makefile dgen-sdl-1.18/sdl/Makefile
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/Makefile     1999-07-24 22:18:23 +01:00
-+++ dgen-sdl-1.18/sdl/Makefile 2005-02-25 04:27:19 +00:00
-@@ -19,10 +19,13 @@
- dgenfont.cpp: pbm2df dgenfont.pbm
-       ./pbm2df dgenfont.pbm dgenfont.cpp
-+pbm2df: pbm2df.c
-+      $(HOSTCC) $(INCLUDE) -o $@ $<
-+
- %: %.c
-       $(CC) $(INCLUDE) -o $@ $<
- %.o: %.cpp
--      $(CPP) $(INCLUDE) -c $<
-+      $(CXX) $(INCLUDE) -c $<
- %.o: %.c
-       $(CC) $(INCLUDE) -c $<
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/Makefile.pd dgen-sdl-1.18/sdl/Makefile.pd
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/Makefile.pd  1999-08-08 21:42:33 +01:00
-+++ dgen-sdl-1.18/sdl/Makefile.pd      2005-02-25 05:14:53 +00:00
-@@ -1,4 +1,4 @@
- # Platform-dependent libraries
- # Put the libraries your interface needs to link to here.
--PDLIBS = -lSDL -ldl
-+PDLIBS = `$(STAGING_BINDIR)/sdl-config --libs`
-diff -urNd ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/sdl.cpp dgen-sdl-1.18/sdl/sdl.cpp
---- ../dgen-sdl-1.18-r0/dgen-sdl-1.18/sdl/sdl.cpp      1999-07-25 01:18:40 +01:00
-+++ dgen-sdl-1.18/sdl/sdl.cpp  2005-02-25 04:23:31 +00:00
-@@ -123,9 +123,9 @@
-   SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
-   SDL_EventState(SDL_MOUSEBUTTONDOWN, SDL_IGNORE);
-   SDL_EventState(SDL_MOUSEBUTTONUP, SDL_IGNORE);
--  SDL_EventState(SDL_JOYMOTION, SDL_IGNORE);
-+/*  SDL_EventState(SDL_JOYMOTION, SDL_IGNORE);
-   SDL_EventState(SDL_JOYBUTTONDOWN, SDL_IGNORE);
--  SDL_EventState(SDL_JOYBUTTONUP, SDL_IGNORE);
-+  SDL_EventState(SDL_JOYBUTTONUP, SDL_IGNORE); */
-   SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE);
-   // Set up the MegaDrive screen
diff --git a/packages/dgen/dgen-sdl_1.18.bb b/packages/dgen/dgen-sdl_1.18.bb
deleted file mode 100644 (file)
index 3a77525..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-SECTION = "x11/games"
-DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator."
-DEPENDS = "virtual/libsdl"
-SRC_URI = "http://pknet.com/~joe/${PN}_${PV}.tar.gz \
-          file://fix-everything.patch;patch=1"
-
-do_compile () {
-       oe_runmake dgen 'HOSTCC=${BUILD_CC}' 'TARGET_CC=${CC}' 'TARGET_CXX=${CXX}' 'STAGING_INCDIR=${STAGING_INCDIR}' 'STAGING_LIBDIR=${STAGING_LIBDIR}' 'STAGING_BINDIR=${STAGING_BINDIR}' 'libdir=${libdir}'
-}
-
-FILES_${PN} = "${bindir}/dgen ${sysconfdir}/dgenrc"
-
-do_install () {
-       install -d ${D}/${bindir}
-       install -d ${D}/${sysconfdir}
-       install -m 755 -s ${S}/dgen ${D}/${bindir}/
-       install -m 644 ${S}/sample.dgenrc.1 ${D}/${sysconfdir}/dgenrc
-}
diff --git a/packages/gkdial/gkdial-gnomeless_1.8.1.bb b/packages/gkdial/gkdial-gnomeless_1.8.1.bb
deleted file mode 100644 (file)
index a22c24e..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-PR = "r2"
-LICENSE = "GPL"
-
-DESCRIPTION = "GTK PPP dialing tool"
-DEPENDS = "virtual/libc gconf gtk+ libglade gettext"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-SRC_URI = "http://www.kernelconcepts.de/~fuchs/gkdial-${PV}.tar.gz \
-       file://header.patch;patch=1 \
-       file://gkdial.desktop \
-       file://gkdial.png"
-inherit autotools pkgconfig gettext
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/gkdial.png ${D}${datadir}/pixmaps/gkdial.png
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gkdial.desktop ${D}${datadir}/applications/gkdial.desktop
-}
index 1076362..88adee2 100644 (file)
@@ -13,7 +13,7 @@
 -STA=/etc/pcmcia/RF010802.HEX
 -PRISM2_SREC=/usr/local/bin/prism2_srec
 +PRI=/etc/pcmcia/pm010102.hex
-+STA=/etc/pcmcia/rf010803.hex
++STA=/etc/pcmcia/rf010804.hex
 +PRISM2_SREC=/usr/sbin/prism2_srec
  
  set -e
index 93a3cb5..7601129 100644 (file)
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "hostap-modules (${PV})"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
           file://hostap-fw-load.patch;patch=1"
index b6fbcde..e97d862 100644 (file)
@@ -1,3 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
 SECTION = "x11/utils"
 DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \
 blending, node editing, SVG to PNG export, and more. Its goal is for features \
similarity index 92%
rename from packages/libssh/libssh_0.1.bb
rename to packages/libssh/libssh_0.11.bb
index 0d3cd17..ab6949f 100644 (file)
@@ -6,7 +6,7 @@ includes SFTP support, and a sample SSH client is provided."
 DEPENDS = "openssl"
 LICENSE = "LGPL"
 
-SRC_URI = "http://www.0xbadc0de.be/projects/libssh/libssh-${PV}.tgz"
+SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz"
 
 inherit autotools
 
index 65e01a1..31c2b8f 100644 (file)
@@ -5,7 +5,7 @@ SECTION = "kernel"
 PV = "2.4.20-rmk2-embedix"
 LICENSE = "GPL"
 KV = "2.4.20"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \
            file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \
@@ -53,8 +53,9 @@ inherit kernel
 #
 # Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass.
 #
-CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)  EQUIPMENT=4 RTC_RESET=1"
-CMDLINE_MTDPARTS_akita   = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0"
+CMDLINE_MTDPARTS_spitz   = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)"
+CMDLINE_SHARP_spitz      = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q"
+
 CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q"
 # CMDLINE_INIT = "init=/bin/busybox ash"
 CMDLINE_INIT = " "
@@ -77,7 +78,7 @@ PARALLEL_MAKE = ""
 module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
 module_conf_pxa27x_bi = "below pxa27x_bi net_fd usbdcore "
 module_autoload_pxa27x_bi = "pxa27x_bi"
-module_autoload_usb-ohci-pxa27x = "usb-ohci-pxa27x"
+module_autoload_usb_ohci_pxa27x = "usb_ohci_pxa27x"
 
 do_configure_prepend() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
similarity index 85%
rename from packages/memtester/memtester_4.0.4.bb
rename to packages/memtester/memtester_4.0.5.bb
index e342050..a33f6f5 100644 (file)
@@ -3,7 +3,7 @@ DESCRIPTION = "Utility to test for faulty memory subsystem"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.qcc.ca/~charlesc/software/memtester/memtester-${PV}.tar.gz"
+SRC_URI = "http://pyropus.ca/software/memtester/memtester-${PV}.tar.gz"
 S = "${WORKDIR}/memtester-${PV}"
 
 do_compile () {
old mode 100644 (file)
new mode 100755 (executable)
index 2df3b42..eca49ba 100644 (file)
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 SRCNAME = "IMDbPY"
 PR = "ml0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/imbdbpy/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/imdbpy/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
similarity index 88%
rename from packages/slotsig/slotsig_0.4.bb
rename to packages/slotsig/slotsig_0.6.bb
index be19605..a10859b 100644 (file)
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-SRC_URI = "http://kafka.fr.free.fr/slotsig/slotsig-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/slotsig/slotsig-${PV}.tar.bz2"
 
 do_compile() {
        ${CXX} -c -fPIC ${CXXFLAGS} -o slotsig_bases.o slotsig/slotsig_bases.cpp