diff options
27 files changed, 111 insertions, 32 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 7a02e71f1a..33e655dcb6 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -12,7 +12,7 @@ FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe" #FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable" DISTRO_NAME = "OpenSlug" -DISTRO_VERSION = "2.1-beta" +DISTRO_VERSION = "2.2-beta" DISTRO_TYPE ?= "beta" TARGET_FPU_local ?= "soft" diff --git a/packages/sqlite/sqlite3-3.2.1/.mtn2git_empty b/packages/bluez-hcidump/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/sqlite/sqlite3-3.2.1/.mtn2git_empty +++ b/packages/bluez-hcidump/.mtn2git_empty diff --git a/packages/bluez-hcidump/bluez-hcidump_1.23.bb b/packages/bluez-hcidump/bluez-hcidump_1.23.bb new file mode 100644 index 0000000000..0cbc0fd6ec --- /dev/null +++ b/packages/bluez-hcidump/bluez-hcidump_1.23.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools + + diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 568f6bd97c..9225cb3df7 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -7,7 +7,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r4" +PR = "r5" S = "${WORKDIR}" diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb index 47e0c63ad2..12898a28df 100644 --- a/packages/ixp4xx/ixp4xx-csr_1.4.bb +++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb @@ -7,7 +7,7 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip file://badpaths.patch;patch=1 \ file://build-timing-annoyance.patch;patch=1" S = "${WORKDIR}/ixp400_xscale_sw" -PR = "r2" +PR = "r3" COMPATIBLE_HOST = "^armeb-linux.*" diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 5abe7d2063..3eba8afc45 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.12.2 -# Sun Jul 10 19:53:31 2005 +# Tue Jul 12 10:37:36 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -591,7 +591,14 @@ CONFIG_NET_WIRELESS=y # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -# CONFIG_PPP is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +# CONFIG_PPPOE is not set # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set @@ -778,7 +785,36 @@ CONFIG_SENSORS_X1205=y # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m + +# +# Video For Linux +# + +# +# Video Adapters +# +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CX88 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set # # Digital Video Broadcasting Devices @@ -865,10 +901,15 @@ CONFIG_USB_STORAGE=y # USB Multimedia devices # # CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_PWC is not set # # USB Network Adapters diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 4758e335cd..c82a0a13c3 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -56,6 +56,7 @@ OPENSLUG_PACKAGES = "\ gtk-doc \ less libusb \ libxml2 \ + mgetty \ miau \ microcom \ mt-daapd \ @@ -96,7 +97,6 @@ OPENSLUG_PACKAGES_append_linux = "\ BROKEN_PACKAGES = "\ atftp \ strace \ - mgetty \ " DEPENDS = 'openslug-image \ diff --git a/packages/meta/task-python-everything_0.9.2.bb b/packages/meta/task-python-everything_0.9.2.bb index 15963bf32e..54123c6b4f 100644 --- a/packages/meta/task-python-everything_0.9.2.bb +++ b/packages/meta/task-python-everything_0.9.2.bb @@ -1,7 +1,12 @@ DESCRIPTION= "Everything Python" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r0" -DEPENDS = " python-ao \ +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +LICENSE = "MIT" +PR = "ml1" + +DEPENDS = "\ + python-ao \ + python-bluez \ python-constraint \ python-crypto \ python-dialog \ diff --git a/packages/meta/task-python-sharprom_0.9.0.bb b/packages/meta/task-python-sharprom_0.9.0.bb index ebcc123b79..b836ff0c1a 100644 --- a/packages/meta/task-python-sharprom_0.9.0.bb +++ b/packages/meta/task-python-sharprom_0.9.0.bb @@ -1,8 +1,11 @@ DESCRIPTION= "Everything Python for SharpROM" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r2" +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +LICENSE = "MIT" +PR = "ml3" -NONWORKING = " python-codes \ +NONWORKING = "\ + python-codes \ python-crypto \ python-gmpy \ python-pysqlite \ @@ -11,7 +14,9 @@ NONWORKING = " python-codes \ python-sgmlop \ python-vorbis" -DEPENDS = " python-ao \ +DEPENDS = "\ + python-ao \ + python-bluez \ python-constraint \ python-dialog \ python-egenix-mx-base \ @@ -58,4 +63,3 @@ RDEPENDS=${DEPENDS} #fixme add python-pyx once kpathwhich-native is there #fixme add packages dynamically #fixme python-numarray doesn't work with soft-float -LICENSE = MIT diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb index 190397777b..e06249051f 100644 --- a/packages/mgetty/mgetty_1.1.30.bb +++ b/packages/mgetty/mgetty_1.1.30.bb @@ -3,9 +3,11 @@ DESCRIPTION = "The mgetty package contains an intelligent \ getty for allowing logins over a serial line (such as \ through a modem) and receiving incoming faxes." LICENSE = "GPL" -PR="r2" +PR="r3" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz \ +# The source can no longer be found at ${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz +# so the nslu2-linux project has mirrored it until someone updates this package to a newer version. +SRC_URI = "http://nslu.sf.net/downloads/mgetty_1.1.30.orig.tar.gz \ file://debian.patch;patch=1 \ file://00-g3_Makefile;patch=1 \ file://01-adjust-path;patch=1 \ diff --git a/packages/python/python-pybluez_0.2.bb b/packages/python/python-pybluez_0.2.bb new file mode 100644 index 0000000000..aa5d4fec2b --- /dev/null +++ b/packages/python/python-pybluez_0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Python bindings for the Linux Bluetooth stack" +MAINTAINER = "Michael 'Mickey' Lauer" +SECTION = "devel/python" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +SRC_URI = "http://org.csail.mit.edu/pybluez/release/pybluez-src-${PV}.tar.gz" + +S = "${WORKDIR}/pybluez-${PV}" + +PR = "ml0" + +inherit distutils diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb index 9ac8cee701..5dc3542475 100644 --- a/packages/python/python_2.4.1.bb +++ b/packages/python/python_2.4.1.bb @@ -5,8 +5,8 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PROVIDES = "python python-core" -DEPENDS = "python-native zlib gdbm openssl" -PR = "ml5" +DEPENDS = "python-native readline zlib gdbm openssl" +PR = "ml6" PYTHON_MAJMIN = "2.4" diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 38fbb1668f..82623d8fdc 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,7 +1,7 @@ include scummvm.inc DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2" -S=${WORKDIR}/scummvm-${PV}/ +S="${WORKDIR}/scummvm-${PV}/" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb index f0c8ec4116..738ebd2354 100644 --- a/packages/settings-daemon/settings-daemon_svn.bb +++ b/packages/settings-daemon/settings-daemon_svn.bb @@ -6,7 +6,7 @@ SECTION = "gpe" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://70settings-daemon" -S = ${WORKDIR}/${PN} +S = "${WORKDIR}/${PN}" inherit autotools pkgconfig gettext diff --git a/packages/sqlite/sqlite3-3.2.2/.mtn2git_empty b/packages/sqlite/sqlite3-3.2.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.2.2/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.2.1/cross-compile.patch b/packages/sqlite/sqlite3-3.2.2/cross-compile.patch index aaafaa590c..aaafaa590c 100644 --- a/packages/sqlite/sqlite3-3.2.1/cross-compile.patch +++ b/packages/sqlite/sqlite3-3.2.2/cross-compile.patch diff --git a/packages/sqlite/sqlite3-3.2.1/ldflags.patch b/packages/sqlite/sqlite3-3.2.2/ldflags.patch index cdc1c5141e..cdc1c5141e 100644 --- a/packages/sqlite/sqlite3-3.2.1/ldflags.patch +++ b/packages/sqlite/sqlite3-3.2.2/ldflags.patch diff --git a/packages/sqlite/sqlite3-3.2.1/libtool.patch b/packages/sqlite/sqlite3-3.2.2/libtool.patch index ccf9993ed2..ccf9993ed2 100644 --- a/packages/sqlite/sqlite3-3.2.1/libtool.patch +++ b/packages/sqlite/sqlite3-3.2.2/libtool.patch diff --git a/packages/sqlite/sqlite3_3.2.1.bb b/packages/sqlite/sqlite3_3.2.2.bb index a133f832a9..a133f832a9 100644 --- a/packages/sqlite/sqlite3_3.2.1.bb +++ b/packages/sqlite/sqlite3_3.2.2.bb diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index d7630b74b3..3f593c5698 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -8,12 +8,12 @@ include uclibc.inc # packages which relied on it (erroneously - it is defined # in include/linux/posix_types.h and is internal) may stop # building. The patch has only been verified on NSLU2 builds. -PATCH_ipc_h ?= +PATCH_ipc_h ?= "" PATCH_ipc_h_nslu2 = "file://kernel-key-t-ipc.h.patch;patch=1" SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ file://dyn-ldconfig.patch;patch=1 \ file://nokernelheadercheck.patch;patch=1" SRC_URI += " file://armeb-kernel-stat.h.patch;patch=1" -SRC_URI += ${PATCH_ipc_h} +SRC_URI += "${PATCH_ipc_h}" S = "${WORKDIR}/uClibc-${PV}" diff --git a/packages/update-rc.d/update-rc.d_0.6.bb b/packages/update-rc.d/update-rc.d_0.6.bb index cbfc28072b..ba2f551371 100644 --- a/packages/update-rc.d/update-rc.d_0.6.bb +++ b/packages/update-rc.d/update-rc.d_0.6.bb @@ -3,7 +3,7 @@ PRIORITY = "standard" DESCRIPTION = "Manage symlinks in /etc/rcN.d" MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" -S = ${WORKDIR}/update-rc.d +S = "${WORKDIR}/update-rc.d" PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_6 \ diff --git a/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb index 20c6f49b6c..ae1cfe83fe 100644 --- a/packages/update-rc.d/update-rc.d_0.7.bb +++ b/packages/update-rc.d/update-rc.d_0.7.bb @@ -3,7 +3,7 @@ PRIORITY = "standard" DESCRIPTION = "Manage symlinks in /etc/rcN.d" MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" -S = ${WORKDIR}/update-rc.d +S = "${WORKDIR}/update-rc.d" PR = "r0" SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7" diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb index 5d75b6be9a..097d7a26bd 100644 --- a/packages/upslug/upslug-native_cvs.bb +++ b/packages/upslug/upslug-native_cvs.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" LICENSE = "GPL-2" # Use releases in preference -DEFAULT_PREFERENCE = -1 +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug" diff --git a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb index 8fed0b30db..c3044355fb 100644 --- a/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb +++ b/packages/wlags-modules/kernel-module-wlags49-h1-cs_718.bb @@ -1,4 +1,4 @@ -COMPILE_HERMES = 1 +COMPILE_HERMES = "1" DESCRIPTION = "A driver from Agera (a card manufacturer) for wireless LAN cards based on Hermes ${COMPILE_HERMES} cards." PR = "r1" diff --git a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb index e46894325d..4d48490636 100644 --- a/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb +++ b/packages/wlags-modules/kernel-module-wlags49-h2-cs_718.bb @@ -1,4 +1,4 @@ -COMPILE_HERMES = 2 +COMPILE_HERMES = "2" DESCRIPTION = "A driver from Agera (a card manufacturer) for wireless LAN cards based on Hermes ${COMPILE_HERMES} cards." PR = "r1" diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb index 862642027e..b7207dd29e 100644 --- a/packages/xerces-c/xerces-c_2.6.0.bb +++ b/packages/xerces-c/xerces-c_2.6.0.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "MIT" -S=${WORKDIR}/xerces-c-src_2_6_0 +S="${WORKDIR}/xerces-c-src_2_6_0" SRC_URI = "http://www.axint.net/apache/xml/xerces-c/xerces-c-src_2_6_0.tar.gz" diff --git a/packages/zeecookbook/zeecookbook_1.1.bb b/packages/zeecookbook/zeecookbook_1.1.bb index c3ac4a4635..c5996f701f 100644 --- a/packages/zeecookbook/zeecookbook_1.1.bb +++ b/packages/zeecookbook/zeecookbook_1.1.bb @@ -13,7 +13,7 @@ SRC_URI = "http://sf.gds.tuwien.ac.at/z/ze/zeecookbook/zeecookbook-1.1.zip \ file://zeecookbook.patch;patch=1" S="${WORKDIR}/zeecookbook-1.1/src/zeecookbook" -QPEDIR=${OPIEDIR} +QPEDIR="${OPIEDIR}" inherit palmtop |