From bedcce6f3effef4a76b09fe33b927c5d867911f7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 29 Aug 2007 17:09:23 +0000 Subject: qte-mt-static: Set DEFAULT_PREF=-1, this is hightly adhoc target. * To help a bit people who try to build OPIE w/o reading instructions. --- packages/qte/qte-mt-static_2.3.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index 21feb25fef..c7d962343a 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,6 +1,8 @@ require qte-common_${PV}.inc PR = "r8" +DEFAULT_PREFERENCE = "-1" + EXTRA_OECONF += "-static -thread" do_stage() { -- cgit v1.2.3 From 325f26749da469ef7d90430a1be7b6f1e9d014a8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 3 Sep 2007 18:05:51 +0000 Subject: gpe-applauncher: Add 0.10 --- packages/gpephone/gpe-applauncher_0.10.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/gpephone/gpe-applauncher_0.10.bb diff --git a/packages/gpephone/gpe-applauncher_0.10.bb b/packages/gpephone/gpe-applauncher_0.10.bb new file mode 100644 index 0000000000..fbc47bd091 --- /dev/null +++ b/packages/gpephone/gpe-applauncher_0.10.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +DESCRIPTION = "A cellphone application launcher." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +FILES_${PN} += '${datadir}/themes' -- cgit v1.2.3 From 85e309bd712b4bebc2122702f41e11f52f1a6cf0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:29:21 +0000 Subject: ffmpeg: convert to SRCREV --- packages/ffmpeg/ffmpeg_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 051363474e..5276a8fef6 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libogg zlib libvorbis faac liba52 lame" -PV = "0.4.9+svn${SRCDATE}" +PV = "0.4.9+svnr${SRCREV}" PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 103f1a3120f7e5e74f93d7433d5885c7c7d51e32 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:30:06 +0000 Subject: libxosd: convert to SRCREV --- packages/libxosd/libxosd_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb index 7dfd05d5d9..bb16f7f09a 100644 --- a/packages/libxosd/libxosd_svn.bb +++ b/packages/libxosd/libxosd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A library for displaying a TV-like on-screen display in X." SECTION = "libs/x11" DEPENDS = "virtual/libx11 libxext" LICENSE = "LGPL" -PV = "2.2.15+svn${SRCDATE}" +PV = "2.2.15+svnr${SRCREV}" PR = "r5" SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \ -- cgit v1.2.3 From fe5041d1d2cff25b477e9be132c224869d98f984 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:31:11 +0000 Subject: matchbox*: convert to SRCREV --- packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 10 +++++----- packages/matchbox-panel/matchbox-panel_svn.bb | 2 +- packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb | 4 +++- packages/matchbox2/matchbox-desktop-2_svn.bb | 2 +- packages/matchbox2/matchbox-panel-2_svn.bb | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index ba002869c7..27ea4aea1d 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -4,14 +4,14 @@ DEPENDS = "libfakekey expat libxft" RCONFLICTS = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR="r6" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch;patch=1 \ - file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ - file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ - file://4-Add-rendering-debug-logging.patch;patch=1 \ +# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \ +# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \ +# file://4-Add-rendering-debug-logging.patch;patch=1 \ file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \ file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ " @@ -26,5 +26,5 @@ EXTRA_OECONF = "--disable-cairo" FILES_${PN} = "${bindir}/* \ ${datadir}/applications \ ${datadir}/pixmaps \ - ${datadir}/matchbox-keyboard" + ${datadir}/matchbox-keyboard" diff --git a/packages/matchbox-panel/matchbox-panel_svn.bb b/packages/matchbox-panel/matchbox-panel_svn.bb index 3ff258fe8f..e7fb3e6439 100644 --- a/packages/matchbox-panel/matchbox-panel_svn.bb +++ b/packages/matchbox-panel/matchbox-panel_svn.bb @@ -1,5 +1,5 @@ require matchbox-panel.inc -PV = "0.9.2+svn${SRCDATE}" +PV = "0.9.2+svnr${SRCREV}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb index 39b035bc7a..4972444211 100644 --- a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb +++ b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb @@ -3,7 +3,9 @@ LICENSE = "GPL" DEPENDS = "matchbox-wm" SECTION = "x11/wm" -PV = "0.1+svn${SRCDATE}" +DEFAULT_PREFERENCE = "-1" + +PV = "0.1+svnr${SRCREV}" PR = "r0" PACKAGE_ARCH = "all" diff --git a/packages/matchbox2/matchbox-desktop-2_svn.bb b/packages/matchbox2/matchbox-desktop-2_svn.bb index 31a6b9836d..8dc74ef509 100644 --- a/packages/matchbox2/matchbox-desktop-2_svn.bb +++ b/packages/matchbox2/matchbox-desktop-2_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 44d23e1a55..79fafff202 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ apmd startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r8" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" -- cgit v1.2.3 From ca1da588e45d7e30063a7c377fdc4a9715096c96 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:32:21 +0000 Subject: tinymail: convert to SRCREV --- packages/tinymail/libtinymail_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tinymail/libtinymail_svn.bb b/packages/tinymail/libtinymail_svn.bb index 6792154e7a..300fee2cfa 100644 --- a/packages/tinymail/libtinymail_svn.bb +++ b/packages/tinymail/libtinymail_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile d SECTION = "x11/utils" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r3" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 9fc62019ec8e997e786ef62c033d0b2a8301289a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:32:41 +0000 Subject: libowl: convert to SRCREV --- packages/libowl/libowl_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb index 2126e3d4d0..7abc5e409d 100644 --- a/packages/libowl/libowl_svn.bb +++ b/packages/libowl/libowl_svn.bb @@ -12,7 +12,7 @@ HOMEPAGE = "http://www.o-hand.com" LICENSE = "LGPL" SECTION = "libs" PR = "r3" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" DEPENDS = "gtk+ glib-2.0" PACKAGES = "" -- cgit v1.2.3 From 35530fd02370868ce4fc4ee30036cb51e52409b7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:33:25 +0000 Subject: sphyrna: convert to SRCREV --- packages/sphyrna/sphyrna_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sphyrna/sphyrna_svn.bb b/packages/sphyrna/sphyrna_svn.bb index 048d001905..d2e90cf8f2 100644 --- a/packages/sphyrna/sphyrna_svn.bb +++ b/packages/sphyrna/sphyrna_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering" HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" LICENSE = "GPLv2" DEPENDS = "readline" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r0" SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" -- cgit v1.2.3 From ada77dca069f777d349d9f2946a313921c284301 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 12:33:49 +0000 Subject: xoo: convert to SRCREV --- packages/xoo/xoo_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xoo/xoo_svn.bb b/packages/xoo/xoo_svn.bb index 71a39b057d..231122194b 100644 --- a/packages/xoo/xoo_svn.bb +++ b/packages/xoo/xoo_svn.bb @@ -4,7 +4,7 @@ It is intended for embedded developers that want to simulate a target device \ HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxtst gtk+ libglade" -PV = "0.7+svn${SRCDATE}" +PV = "0.7+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \ -- cgit v1.2.3 From fc0b2987b30686dd5873ff788b7d14a066bb9b9c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 13:16:29 +0000 Subject: angstrom-version: ${D} gets deleted on do_install, so install the files in do_install instead of do_compile --- packages/angstrom/angstrom-version.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index 2488255b53..dd53d1aea0 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -3,7 +3,7 @@ PV = "${DISTRO_VERSION}" PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_compile() { +do_install() { mkdir -p ${D}${sysconfdir} echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version -- cgit v1.2.3 From f43cf6415d2ce98a083b84fb0ca0ba8a98a56558 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 13:18:06 +0000 Subject: angstrom-version: and bump PR --- packages/angstrom/angstrom-version.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index dd53d1aea0..32f3f01635 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,4 +1,5 @@ PV = "${DISTRO_VERSION}" +PR = "r1" PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 3083dcafc767779d0e7db4b73dd85d2b1989e20a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 13:25:32 +0000 Subject: angstrom-feed-configs: mark everything as conffiles so user edits get preserved --- packages/angstrom/angstrom-feed-configs.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb index 7645ee61ec..6730b6a044 100644 --- a/packages/angstrom/angstrom-feed-configs.bb +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds" -PR = "0" +PR = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" FEED_BASEPATH ?= "unstable/feed/" @@ -21,3 +21,12 @@ do_install () { install -m 0644 ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/ } +CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \ + ${sysconfdir}/ipkg/debug-feed.conf \ + ${sysconfdir}/ipkg/perl-feed.conf \ + ${sysconfdir}/ipkg/python-feed.conf \ + ${sysconfdir}/ipkg/gstreamer-feed.conf \ + ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \ + ${sysconfdir}/ipkg/noarch-feed.conf \ + " + -- cgit v1.2.3 From 5bb459b4440a4d642097ecb645785482feb6b4cc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 16:05:06 +0000 Subject: angstrom.inc: include a var that selects which package will provide the feed configs --- conf/distro/include/angstrom.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 865f0bc5a6..0c3ac35672 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -16,6 +16,11 @@ require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc #Use this variable in feeds and other parts that need a URI ANGSTROM_URI ?= "http://www.angstrom-distribution.org" +#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list) +# usefull for derivative distros and local testing +# As this is runtime we can't and won't use virtual/feed-configs +ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs" + #Set the default maintainer to angstrom-dev MAINTAINER = "Angstrom Developers " -- cgit v1.2.3 From ed43a110b2da1c74e5ce2af8658606721df185c8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Sep 2007 16:31:38 +0000 Subject: angstrom 2007, 2008: switch to binutils 2.18 to get rid of the warning spew in stripping and gdb --- conf/distro/angstrom-2007.1.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 909e66dcd9..3b2dcce756 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -267,9 +267,9 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -- cgit v1.2.3 From a0cdc9273d0d04c9adb075850206f7634d3658b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 08:29:48 +0000 Subject: bitbake.conf/image.bbclass: Set IMAGE_BASENAME to a better default and export correctly, add BZR fetcher config (from poky) --- classes/image.bbclass | 2 +- conf/bitbake.conf | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/image.bbclass b/classes/image.bbclass index 04e26e4b35..3420e3f53a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -4,7 +4,7 @@ LICENSE = "MIT" PACKAGES = "" RDEPENDS += "${IMAGE_INSTALL}" -export IMAGE_BASENAME ?= "${PN}" +IMAGE_BASENAME[export] = "1" export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" # We need to recursively follow RDEPENDS and RRECOMMENDS for images diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a72dd75fdc..232986827c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -157,6 +157,7 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool CVSDIR = "${DL_DIR}/cvs" SVNDIR = "${DL_DIR}/svn" GITDIR = "${DL_DIR}/git" +BZRDIR = "${DL_DIR}/bzr" STAMP = "${TMPDIR}/stamps/${PF}" WORKDIR = "${TMPDIR}/work/${PF}" @@ -203,7 +204,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel" ################################################################## IMAGE_ROOTFS = "${TMPDIR}/rootfs" -IMAGE_BASENAME = "rootfs" +IMAGE_BASENAME = "${PN}" IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" IMAGE_CMD = "" @@ -372,6 +373,7 @@ KERNELORG_MIRROR = "http://kernel.org/" FETCHCMD_svn = "/usr/bin/env svn" FETCHCMD_cvs = "/usr/bin/env cvs" FETCHCMD_wget = "/usr/bin/env wget -t 5" +FETCHCMD_bzr = "/usr/bin/env bzr" FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" -- cgit v1.2.3 From edaf3f381d490ff384112e892cbaaeb1582c7d48 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 5 Sep 2007 08:41:37 +0000 Subject: xorg-xserver/xserver-kdrive-imageon_1.2.0.bb : build Ximageon Is a good idea when we go to all the hassle of patching in Ximageon to actually send --enable-imageon to configure :-) --- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb index d8a6c3d795..beb7b0f561 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb @@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate" PROVIDES = "virtual/xserver" PE = "1" -PR = "r1" +PR = "r2" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ @@ -21,6 +21,5 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ S = "${WORKDIR}/xorg-server-${PV}" -IMAGEON_OECONF = "--disable-imageon" -IMAGEON_OECONF_arm = "--enable-imageon" +EXTRA_OECONF += "--enable-imageon" -- cgit v1.2.3 From b8c7a56f1407155f1df69ce942ebef1a585d47dd Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 5 Sep 2007 09:03:04 +0000 Subject: classes/base.bbclass : change to make sure ${D} gets removed before do_install_prepend. Will activate in a future bitbake version. do_install_prepend became do_install[cleandirs] = "${D}" --- classes/base.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 9bcf212e95..d4b327e266 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -375,10 +375,7 @@ oe_machinstall() { } # Remove and re-create ${D} so that is it guaranteed to be empty -do_install_prepend() { - rm -rf ${D} - mkdir -p ${D} -} +do_install[cleandirs] = "${D}" addtask listtasks do_listtasks[nostamp] = "1" -- cgit v1.2.3 From c05d55081272744d21f72e174c1aebc24771fc1f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 5 Sep 2007 09:31:59 +0000 Subject: openmoko-common2: switch to SRCREV --- packages/openmoko2/openmoko-common2_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb index f54a23de18..0cf7f763cb 100644 --- a/packages/openmoko2/openmoko-common2_svn.bb +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r3" inherit openmoko2 -- cgit v1.2.3 From 3c5b824ce48be748aa0aaee336a4e39bb6e6fd79 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 5 Sep 2007 10:40:06 +0000 Subject: linux/linux-rp_2.6.22.bb : fix bitrot in c7x0 and akita defconfig where hostap and other 802.11 drivers are not built. --- packages/linux/linux-rp-2.6.22/defconfig-akita | 1 + packages/linux/linux-rp-2.6.22/defconfig-c7x0 | 2 +- packages/linux/linux-rp_2.6.22.bb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-rp-2.6.22/defconfig-akita b/packages/linux/linux-rp-2.6.22/defconfig-akita index edeaa414db..dd8cb8558f 100644 --- a/packages/linux/linux-rp-2.6.22/defconfig-akita +++ b/packages/linux/linux-rp-2.6.22/defconfig-akita @@ -743,6 +743,7 @@ CONFIG_NET_RADIO=y # # Wireless 802.11b ISA/PCI cards support # +CONFIG_WLAN_80211=y CONFIG_HERMES=m # CONFIG_ATMEL is not set diff --git a/packages/linux/linux-rp-2.6.22/defconfig-c7x0 b/packages/linux/linux-rp-2.6.22/defconfig-c7x0 index c644187e96..d9b3e2b93f 100644 --- a/packages/linux/linux-rp-2.6.22/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.22/defconfig-c7x0 @@ -757,6 +757,7 @@ CONFIG_NET_RADIO=y # # Wireless 802.11b ISA/PCI cards support # +CONFIG_WLAN_80211=y CONFIG_HERMES=m # CONFIG_ATMEL is not set @@ -772,7 +773,6 @@ CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m -CONFIG_NET_WIRELESS=y # # PCMCIA network device support diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb index 03eca283b4..b36189d9fb 100644 --- a/packages/linux/linux-rp_2.6.22.bb +++ b/packages/linux/linux-rp_2.6.22.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r8" +PR = "r9" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 -- cgit v1.2.3 From 35c4f0e8e83f6a9043332e8a7a6ceb4d6ae9a148 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 12:21:27 +0000 Subject: matchbox-keyboard-inputmethod: Add patch for a matchbox-panel-2 keyboard toogle applet, until it goes upstream. --- .../files/matchbox-keyboard-applet.patch | 92 ++++++++++++++++++++++ .../matchbox-keyboard-inputmethod_svn.bb | 5 +- 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch diff --git a/packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch b/packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch new file mode 100644 index 0000000000..29dc9c0ab6 --- /dev/null +++ b/packages/matchbox-keyboard/files/matchbox-keyboard-applet.patch @@ -0,0 +1,92 @@ +Index: applet/applet.c +=================================================================== +--- applet/applet.c (revision 1633) ++++ applet/applet.c (working copy) +@@ -1,30 +1,76 @@ ++/* ++ * keyboard - Tray applet to toggle matchbox-keyboard's gtk-im ++ * ++ * Copyright 2007, Openedhand Ltd. ++ * Author Stefan Schmidt ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; version 2 of the license. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ */ ++ + #include ++#include + #include + #include + #include + ++typedef struct { ++ GtkWidget *event_box; ++ gboolean show; ++} KeyboardApplet; ++ + static void +-on_toggled (GtkToggleButton *button) ++on_toggled (GtkWidget *event_box, GdkEventButton *event, KeyboardApplet *applet) + { +- protocol_send_event (gtk_toggle_button_get_active (button) ? +- INVOKE_KBD_SHOW : INVOKE_KBD_HIDE); ++ ++ protocol_send_event (applet->show ? INVOKE_KBD_SHOW : INVOKE_KBD_HIDE); ++ ++ if (applet->show) ++ applet->show = FALSE; ++ else ++ applet->show = TRUE; + } + ++static void ++keyboard_applet_free (KeyboardApplet *applet) ++{ ++ g_slice_free (KeyboardApplet, applet); ++} ++ + G_MODULE_EXPORT GtkWidget * + mb_panel_applet_create (const char *id, GtkOrientation orientation) + { +- GtkWidget *button, *image; ++ KeyboardApplet *applet; ++ MBPanelScalingImage *image; ++ //GtkImage *image; + +- button = gtk_toggle_button_new (); +- gtk_widget_set_name (button, "MatchboxPanelKeyboard"); +- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); ++ /* Create applet data structure */ ++ applet = g_slice_new (KeyboardApplet); + ++ applet->event_box = gtk_event_box_new (); ++ gtk_event_box_set_visible_window (applet->event_box, FALSE); ++ ++ gtk_widget_set_name (applet->event_box, "MatchboxPanelKeyboard"); ++ + image = mb_panel_scaling_image_new (orientation, "matchbox-keyboard"); +- gtk_container_add (GTK_CONTAINER (button), image); + +- g_signal_connect (button, "toggled", G_CALLBACK (on_toggled), NULL); ++ gtk_container_add (GTK_CONTAINER (applet->event_box), image); + +- gtk_widget_show_all (button); ++ g_object_weak_ref (G_OBJECT (applet->event_box), ++ (GWeakNotify) keyboard_applet_free, applet); + +- return button; ++ /* Toggle the on release event */ ++ g_signal_connect (applet->event_box, "button-release-event", ++ G_CALLBACK (on_toggled), applet); ++ ++ gtk_widget_show_all (applet->event_box); ++ ++ return applet->event_box; + } diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 0ecb5e947d..a0e35824b8 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -6,10 +6,11 @@ RPROVIDES_${PN} = matchbox-keyboard #DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svn${SRCDATE}" -PR = "r2" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ - file://80matchboxkeyboard" + file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \ + file://80matchboxkeyboard" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" -- cgit v1.2.3 From 955d26d465ccb3637adf776afe7b7299e32bd11d Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 12:28:05 +0000 Subject: openmoko-session2: Use the new matchbox-keyboard applet. --- packages/openmoko2/openmoko-session2.bb | 2 +- packages/openmoko2/openmoko-session2/etc/matchbox/session | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 31d38382df..de2d7cdff6 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r30" +PR = "r31" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index dee3e58051..9e1c0a2aad 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -8,7 +8,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar & +matchbox-panel-2 --start-applets startup \ + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar & exec neod -- cgit v1.2.3 From ba5151852e57ddc9216ecab8256cbfb2bd77ffa6 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 15:38:57 +0000 Subject: uboot-openmoko_svn.bb: Use SRCREV. --- packages/uboot/uboot-openmoko_svn.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 9b5dbb509b..e1575884c2 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -4,16 +4,18 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" PROVIDES = "virtual/bootloader" -PV = "1.2.0+git${SRCDATE}+svn${SRCDATE}" +PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}" PR = "r0" +SRCREV_FORMAT = "patches" + UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2" DEFAULT_PREFERENCE = "-1" SRC_URI = "\ - git://www.denx.de/git/u-boot.git/;protocol=git \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \ + git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ " -- cgit v1.2.3 From 9355cbb58a3d118586d56cef639095786189bfb0 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 15:42:55 +0000 Subject: task-openmoko.bb: Add matchbox-keyboard-applet to the default image. --- packages/tasks/task-openmoko.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 0ddf590c9d..28f34d6958 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -98,6 +98,7 @@ RDEPENDS_task-openmoko-base = "\ # openmoko-appmanager \ matchbox-keyboard-inputmethod \ matchbox-keyboard-im \ + matchbox-keyboard-applet \ matchbox-stroke \ openmoko-terminal2 \ openmoko-keyboard \ -- cgit v1.2.3 From bcf33d26d28012b70b1c1351bb6453c31851b218 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 16:46:03 +0000 Subject: task-openmoko.bb: Bump PR --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 28f34d6958..e47f5b22cf 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r60" +PR = "r61" inherit task -- cgit v1.2.3 From 47cf18c4a04e070c6947f1aaf96766d590f722b1 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 16:48:52 +0000 Subject: openmoko-session2: Enable systray again as some people still use inputmgr --- packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 9e1c0a2aad..4f2f8ae110 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -8,7 +8,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -matchbox-panel-2 --start-applets startup \ +matchbox-panel-2 --start-applets systray,startup \ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar & exec neod -- cgit v1.2.3 From 8c9b796622e3705746615f88e52a52b1c90f6ed2 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 5 Sep 2007 16:50:16 +0000 Subject: openmoko.conf: We have september now --- conf/distro/openmoko.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 7061ef2c63..0748b8cb7f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf # DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" -DISTRO_VERSION = "P1-August-Snapshot-${DATE}" +DISTRO_VERSION = "P1-September-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -- cgit v1.2.3 From 8bf8e78b4800915bd4545792b92736a534cea92f Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Wed, 5 Sep 2007 17:21:09 +0000 Subject: conf/machine/i586-generic.conf: Add pentium optimization for i586-generic machine --- conf/machine/i586-generic.conf | 3 +++ conf/machine/include/tune-pentium.conf | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 conf/machine/include/tune-pentium.conf diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 2cae2a87dc..37d2945301 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -24,3 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" +#tune for pentium cpu +require conf/machine/include/tune-pentium.conf + diff --git a/conf/machine/include/tune-pentium.conf b/conf/machine/include/tune-pentium.conf new file mode 100644 index 0000000000..7b1a517895 --- /dev/null +++ b/conf/machine/include/tune-pentium.conf @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentium" +PACKAGE_ARCH = "i586" + -- cgit v1.2.3 From b0b3da0e2a61aa3b387e2fbb22d722292631cbdd Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Wed, 5 Sep 2007 17:22:00 +0000 Subject: conf/machine/i686-generic.conf: Add pentium pro optimization for i686-generic machine --- conf/machine/i686-generic.conf | 3 +++ conf/machine/include/tune-pentiumpro.conf | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 conf/machine/include/tune-pentiumpro.conf diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 883d6b4dd0..3defb29fa5 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -22,3 +22,6 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" +#tune for pentium pro cpu +require conf/machine/include/tune-pentiumpro.conf + diff --git a/conf/machine/include/tune-pentiumpro.conf b/conf/machine/include/tune-pentiumpro.conf new file mode 100644 index 0000000000..aa9a8dfa1d --- /dev/null +++ b/conf/machine/include/tune-pentiumpro.conf @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentiumpro" +PACKAGE_ARCH = "i686" + -- cgit v1.2.3 From a27560d30d78ec8c4d8ea66423b3934ef4a9f86c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 21:36:26 +0000 Subject: package_ipk.bbclass: Add sdk Packages files and fix ipkf-sdk.conf (fixing meta-toolchain) (from poky) --- classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e9e21456dd..31e42cd836 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -82,6 +82,10 @@ package_update_index_ipk () { touch ${DEPLOY_DIR_IPK}/$arch/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ fi + if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then + touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ + fi done } @@ -102,7 +106,7 @@ package_generate_ipkg_conf () { priority=$(expr $priority + 5) if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK} + echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} fi done } -- cgit v1.2.3 From cd413adf1ba62cb4dc83f418998338be601ee912 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 21:40:03 +0000 Subject: package_ipk.bbclass: Improve directory existance check (from poky) --- classes/package_ipk.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 31e42cd836..0b7f274a96 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -106,6 +106,8 @@ package_generate_ipkg_conf () { priority=$(expr $priority + 5) if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} + fi + if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} fi done -- cgit v1.2.3 From 585fdd7e82ad5844a14201ec58e2b5ad5a7148b6 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 6 Sep 2007 05:57:20 +0000 Subject: conf/machine/i586-generic.conf : Rename the included tune file from .conf to .inc --- conf/machine/i586-generic.conf | 2 +- conf/machine/include/tune-pentium.conf | 3 --- conf/machine/include/tune-pentium.inc | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 conf/machine/include/tune-pentium.conf create mode 100644 conf/machine/include/tune-pentium.inc diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 37d2945301..0ef522441b 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -25,5 +25,5 @@ MACHINE_TASK_PROVIDER = "task-base" #tune for pentium cpu -require conf/machine/include/tune-pentium.conf +require conf/machine/include/tune-pentium.inc diff --git a/conf/machine/include/tune-pentium.conf b/conf/machine/include/tune-pentium.conf deleted file mode 100644 index 7b1a517895..0000000000 --- a/conf/machine/include/tune-pentium.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=pentium" -PACKAGE_ARCH = "i586" - diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc new file mode 100644 index 0000000000..7b1a517895 --- /dev/null +++ b/conf/machine/include/tune-pentium.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentium" +PACKAGE_ARCH = "i586" + -- cgit v1.2.3 From 6f784c700d590ff8cab06be8ed854165a8447906 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 6 Sep 2007 05:57:57 +0000 Subject: conf/machine/i686-generic.conf : Rename the included tune file from .conf to .inc --- conf/machine/i686-generic.conf | 2 +- conf/machine/include/tune-pentiumpro.conf | 3 --- conf/machine/include/tune-pentiumpro.inc | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 conf/machine/include/tune-pentiumpro.conf create mode 100644 conf/machine/include/tune-pentiumpro.inc diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 3defb29fa5..8ff87553ba 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -23,5 +23,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" #tune for pentium pro cpu -require conf/machine/include/tune-pentiumpro.conf +require conf/machine/include/tune-pentiumpro.inc diff --git a/conf/machine/include/tune-pentiumpro.conf b/conf/machine/include/tune-pentiumpro.conf deleted file mode 100644 index aa9a8dfa1d..0000000000 --- a/conf/machine/include/tune-pentiumpro.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=pentiumpro" -PACKAGE_ARCH = "i686" - diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc new file mode 100644 index 0000000000..aa9a8dfa1d --- /dev/null +++ b/conf/machine/include/tune-pentiumpro.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-mcpu=pentiumpro" +PACKAGE_ARCH = "i686" + -- cgit v1.2.3 From 9c11eefd926e50df7cf3f8f092bb9bfd49e8d6c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 6 Sep 2007 05:59:29 +0000 Subject: angstrom-2008.1: make binutils overridable --- conf/distro/angstrom-2008.1.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 655d435994..34a1e54959 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -21,10 +21,6 @@ DISTRO_REVISION = "0" PREFERRED_VERSION_gcc = "4.2.1" PREFERRED_VERSION_gcc-cross = "4.2.1" -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12" - #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.22" -- cgit v1.2.3 From f4db3713788397e03d3d41c417f55fa7bb7cb403 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 6 Sep 2007 06:01:13 +0000 Subject: site/ix86-common : Add a def for libpcap --- site/ix86-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/ix86-common b/site/ix86-common index 00c544f382..226e2e0f79 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -166,6 +166,9 @@ libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + # libxfce4util with_broken_putenv=${with_broken_putenv=no} -- cgit v1.2.3 From b48980825be61a2f95ad7ec5d4bf759f1ca3e815 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 6 Sep 2007 06:06:51 +0000 Subject: sane-srcrevs.inc: start collecting SRCREVs to compat parse-errors due to e.g. berlios being down --- conf/distro/include/sane-srcrevs.inc | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 conf/distro/include/sane-srcrevs.inc diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc new file mode 100644 index 0000000000..27ce277965 --- /dev/null +++ b/conf/distro/include/sane-srcrevs.inc @@ -0,0 +1,74 @@ +#Ggenerated with +# bitbake -s | grep svnr | awk '{print "SRCREV_pn-" $1 "=" $2}' | \ +# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 "=\"" $3}' | \ +# awk -F "-r" '{print $1"\""}' + +# This will miss recipes that have skippackage set (e.g. uclibc) + +SRCREV_pn-dfu-util="2866" +SRCREV_pn-dfu-util-native="2866" +SRCREV_pn-eglibc="3376" +SRCREV_pn-eglibc-initial="3376" +SRCREV_pn-eglibc-intermediate="3376" +SRCREV_pn-elf2flt="1786" +SRCREV_pn-gnuradio="6316" +SRCREV_pn-hildon-1="13599" +SRCREV_pn-libgsmd="2806" +SRCREV_pn-libmokogsmd2="2780" +SRCREV_pn-libmokojournal2="2780" +SRCREV_pn-libmokopanelui2="2892" +SRCREV_pn-libmokoui2="2868" +SRCREV_pn-libowl="277" +SRCREV_pn-libxosd="627" +SRCREV_pn-llvm-gcc4="41698" +SRCREV_pn-llvm-gcc4-cross="41698" +SRCREV_pn-matchbox-desktop-2="1649" +SRCREV_pn-matchbox-keyboard="1583" +SRCREV_pn-matchbox-panel-2="1626" +SRCREV_pn-neod="2901" +SRCREV_pn-openmoko-appmanager="1851" +SRCREV_pn-openmoko-calculator="2404" +SRCREV_pn-openmoko-calculator2="2789" +SRCREV_pn-openmoko-common="397" +SRCREV_pn-openmoko-common2="2679" +SRCREV_pn-openmoko-contacts="2298" +SRCREV_pn-openmoko-contacts2="335" +SRCREV_pn-openmoko-dates="467" +SRCREV_pn-openmoko-dialer="2811" +SRCREV_pn-openmoko-dialer2="2869" +SRCREV_pn-openmoko-feedreader2="2905" +SRCREV_pn-openmoko-finger-demo="1671" +SRCREV_pn-openmoko-firststart2="2873" +SRCREV_pn-openmoko-footer="2354" +SRCREV_pn-openmoko-icon-theme-standard="2232" +SRCREV_pn-openmoko-icon-theme-standard2="2840" +SRCREV_pn-openmoko-keyboard="1631" +SRCREV_pn-openmoko-libs="2367" +SRCREV_pn-openmoko-mediaplayer2="2883" +SRCREV_pn-openmoko-messages="2276" +SRCREV_pn-openmoko-panel-battery="2897" +SRCREV_pn-openmoko-panel-bt="2896" +SRCREV_pn-openmoko-panel-clock="2567" +SRCREV_pn-openmoko-panel-demo="1622" +SRCREV_pn-openmoko-panel-demo-simple="1328" +SRCREV_pn-openmoko-panel-gps="2900" +SRCREV_pn-openmoko-panel-gsm="2894" +SRCREV_pn-openmoko-panel-mainmenu="2567" +SRCREV_pn-openmoko-panel-usb="2893" +SRCREV_pn-openmoko-session="152" +SRCREV_pn-openmoko-simplemediaplayer="1688" +SRCREV_pn-openmoko-sound-theme-standard="2827" +SRCREV_pn-openmoko-stylus-demo="2324" +SRCREV_pn-openmoko-stylus-demo-simple="1818" +SRCREV_pn-openmoko-taskmanager="1663" +SRCREV_pn-openmoko-tasks="320" +SRCREV_pn-openmoko-tasks2="320" +SRCREV_pn-openmoko-theme-standard="2370" +SRCREV_pn-openmoko-theme-standard-qvga="2370" +SRCREV_pn-openmoko-today="2556" +SRCREV_pn-openmoko-today2="2919" +SRCREV_pn-openmoko-today2-folders="2680" +SRCREV_pn-opentapi="2012" +SRCREV_pn-sphyrna="43" +SRCREV_pn-webkit-gtk="webcore" +SRCREV_pn-xoo="1623" -- cgit v1.2.3 From 642473871f304eda91209da4bfa9ed6ce7dd72a1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 6 Sep 2007 07:04:02 +0000 Subject: pango.inc: also depend on virtual/libiconv, should fix #2934 --- packages/pango/pango.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc index e73fecbfb2..5189d950c1 100644 --- a/packages/pango/pango.inc +++ b/packages/pango/pango.inc @@ -8,7 +8,7 @@ EXTRA_AUTORECONF = "" SECTION = "x11/libs" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo" PACKAGES_DYNAMIC = "pango-module-*" -- cgit v1.2.3 From 1230cf4ecda8de9a1d974ddc12ddcadf190d4072 Mon Sep 17 00:00:00 2001 From: Petr Stetiar Date: Thu, 6 Sep 2007 07:58:04 +0000 Subject: ts72xx: add machine description for ts72xx based devices --- conf/machine/ts72xx.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 conf/machine/ts72xx.conf diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf new file mode 100644 index 0000000000..632f3044cc --- /dev/null +++ b/conf/machine/ts72xx.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Technologic Systems TS-72xx SBC +#@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen" + +# default is 2.6.22.6 +#PREFERRED_VERSION_linux = "2.6.23-rc5" + +SERIAL_CONSOLE = "115200 ttyAM0" +USE_VT = "0" +CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root" + +require conf/machine/include/tune-arm920t.inc -- cgit v1.2.3 From 69be25f5d1e83ee279cc286e67ace024a2a30665 Mon Sep 17 00:00:00 2001 From: Petr Stetiar Date: Thu, 6 Sep 2007 08:16:40 +0000 Subject: linux: add ts72xx support to 2.6.22.6 and 2.6.22+2.6.23-rc5 (see version policy for the renaming reason), closes #2918 --- .../linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty | 0 .../linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty | 0 .../ts72xx/ep93xx-gpio-interrupt-debounce.diff | 87 ++ .../ts72xx/ep93xx-i2c-bus.diff | 220 ++++ .../linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff | 110 ++ .../ts72xx/ep93xx-leds.diff | 181 +++ .../ts72xx/ep93xx-maverick-uniqid.patch | 38 + .../ts72xx/ep93xx-serial-clocks.diff | 42 + .../ts72xx/ep93xx-serial-uartbaud.diff | 66 ++ .../ts72xx/ep93xx-timer-accuracy.diff | 59 + .../linux/linux-2.6.22+2.6.23-rc5/ts72xx/series | 12 + .../ts72xx/ts72xx-machine-id-fix.patch | 17 + .../ts72xx/ts72xx-nfbit-fix.patch | 18 + .../ts72xx/ts72xx-use-cpld-reset.patch | 41 + .../ts72xx/ts72xx-watchdog.patch | 430 +++++++ packages/linux/linux-2.6.22.6/.mtn2git_empty | 0 .../linux/linux-2.6.22.6/ts72xx/.mtn2git_empty | 0 .../ts72xx/ep93xx-gpio-interrupt-debounce.diff | 87 ++ .../linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff | 220 ++++ .../linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff | 110 ++ .../linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff | 181 +++ .../ts72xx/ep93xx-maverick-uniqid.patch | 38 + .../ts72xx/ep93xx-serial-clocks.diff | 42 + .../ts72xx/ep93xx-serial-uartbaud.diff | 66 ++ .../ts72xx/ep93xx-timer-accuracy.diff | 59 + packages/linux/linux-2.6.22.6/ts72xx/series | 12 + .../ts72xx/ts72xx-machine-id-fix.patch | 17 + .../linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch | 15 + .../ts72xx/ts72xx-use-cpld-reset.patch | 41 + .../linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch | 430 +++++++ packages/linux/linux/ts72xx/.mtn2git_empty | 0 packages/linux/linux/ts72xx/defconfig | 1184 ++++++++++++++++++++ packages/linux/linux_2.6.22+2.6.23-rc5.bb | 34 + packages/linux/linux_2.6.22.6.bb | 28 + 34 files changed, 3885 insertions(+) create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-leds.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-maverick-uniqid.patch create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-clocks.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-serial-uartbaud.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-timer-accuracy.diff create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/series create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-machine-id-fix.patch create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-nfbit-fix.patch create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-use-cpld-reset.patch create mode 100644 packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ts72xx-watchdog.patch create mode 100644 packages/linux/linux-2.6.22.6/.mtn2git_empty create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/.mtn2git_empty create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/series create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch create mode 100644 packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch create mode 100644 packages/linux/linux/ts72xx/.mtn2git_empty create mode 100644 packages/linux/linux/ts72xx/defconfig create mode 100644 packages/linux/linux_2.6.22+2.6.23-rc5.bb create mode 100644 packages/linux/linux_2.6.22.6.bb diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty b/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff new file mode 100644 index 0000000000..dbd2856e87 --- /dev/null +++ b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-gpio-interrupt-debounce.diff @@ -0,0 +1,87 @@ + +Implement GPIO interrupt debouncing on ep93xx. + +Signed-off-by: Lennert Buytenhek + +Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c +=================================================================== +--- linux-2.6.23-rc5.orig/arch/arm/mach-ep93xx/core.c 2007-09-04 02:22:19.000000000 +0200 ++++ linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c 2007-09-04 02:28:19.000000000 +0200 +@@ -154,6 +154,7 @@ + *************************************************************************/ + static unsigned char gpio_int_unmasked[3]; + static unsigned char gpio_int_enabled[3]; ++static unsigned char gpio_int_debounce[3]; + static unsigned char gpio_int_type1[3]; + static unsigned char gpio_int_type2[3]; + +@@ -161,16 +162,19 @@ + { + if (abf == 0) { + __raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE); ++ __raw_writeb(gpio_int_debounce[0], EP93XX_GPIO_A_INT_DEBOUNCE); + __raw_writeb(gpio_int_type2[0], EP93XX_GPIO_A_INT_TYPE2); + __raw_writeb(gpio_int_type1[0], EP93XX_GPIO_A_INT_TYPE1); + __raw_writeb(gpio_int_unmasked[0] & gpio_int_enabled[0], EP93XX_GPIO_A_INT_ENABLE); + } else if (abf == 1) { + __raw_writeb(0, EP93XX_GPIO_B_INT_ENABLE); ++ __raw_writeb(gpio_int_debounce[1], EP93XX_GPIO_B_INT_DEBOUNCE); + __raw_writeb(gpio_int_type2[1], EP93XX_GPIO_B_INT_TYPE2); + __raw_writeb(gpio_int_type1[1], EP93XX_GPIO_B_INT_TYPE1); + __raw_writeb(gpio_int_unmasked[1] & gpio_int_enabled[1], EP93XX_GPIO_B_INT_ENABLE); + } else if (abf == 2) { + __raw_writeb(0, EP93XX_GPIO_F_INT_ENABLE); ++ __raw_writeb(gpio_int_debounce[2], EP93XX_GPIO_F_INT_DEBOUNCE); + __raw_writeb(gpio_int_type2[2], EP93XX_GPIO_F_INT_TYPE2); + __raw_writeb(gpio_int_type1[2], EP93XX_GPIO_F_INT_TYPE1); + __raw_writeb(gpio_int_unmasked[2] & gpio_int_enabled[2], EP93XX_GPIO_F_INT_ENABLE); +@@ -361,6 +365,13 @@ + } else { + gpio_int_enabled[port] &= ~(1 << line); + } ++ ++ if (type & IRQ_TYPE_DEBOUNCE) { ++ gpio_int_debounce[port] |= 1 << line; ++ } else { ++ gpio_int_debounce[port] &= ~(1 << line); ++ } ++ + update_gpio_int_params(port); + + return 0; +Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h +=================================================================== +--- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-04 02:22:19.000000000 +0200 ++++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-04 02:28:19.000000000 +0200 +@@ -78,16 +78,19 @@ + #define EP93XX_GPIO_F_INT_ACK EP93XX_GPIO_REG(0x54) + #define EP93XX_GPIO_F_INT_ENABLE EP93XX_GPIO_REG(0x58) + #define EP93XX_GPIO_F_INT_STATUS EP93XX_GPIO_REG(0x5c) ++#define EP93XX_GPIO_F_INT_DEBOUNCE EP93XX_GPIO_REG(0x64) + #define EP93XX_GPIO_A_INT_TYPE1 EP93XX_GPIO_REG(0x90) + #define EP93XX_GPIO_A_INT_TYPE2 EP93XX_GPIO_REG(0x94) + #define EP93XX_GPIO_A_INT_ACK EP93XX_GPIO_REG(0x98) + #define EP93XX_GPIO_A_INT_ENABLE EP93XX_GPIO_REG(0x9c) + #define EP93XX_GPIO_A_INT_STATUS EP93XX_GPIO_REG(0xa0) ++#define EP93XX_GPIO_A_INT_DEBOUNCE EP93XX_GPIO_REG(0xa8) + #define EP93XX_GPIO_B_INT_TYPE1 EP93XX_GPIO_REG(0xac) + #define EP93XX_GPIO_B_INT_TYPE2 EP93XX_GPIO_REG(0xb0) + #define EP93XX_GPIO_B_INT_ACK EP93XX_GPIO_REG(0xb4) + #define EP93XX_GPIO_B_INT_ENABLE EP93XX_GPIO_REG(0xb8) + #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) ++#define EP93XX_GPIO_B_INT_DEBOUNCE EP93XX_GPIO_REG(0xc4) + + #define EP93XX_AAC_BASE (EP93XX_APB_VIRT_BASE + 0x00080000) + +Index: linux-2.6.23-rc5/include/linux/irq.h +=================================================================== +--- linux-2.6.23-rc5.orig/include/linux/irq.h 2007-09-04 02:24:58.000000000 +0200 ++++ linux-2.6.23-rc5/include/linux/irq.h 2007-09-04 02:25:01.000000000 +0200 +@@ -44,6 +44,7 @@ + #define IRQ_TYPE_LEVEL_LOW 0x00000008 /* Level low type */ + #define IRQ_TYPE_SENSE_MASK 0x0000000f /* Mask of the above */ + #define IRQ_TYPE_PROBE 0x00000010 /* Probing in progress */ ++#define IRQ_TYPE_DEBOUNCE 0x00000020 /* Enable HW debounce */ + + /* Internal flags */ + #define IRQ_INPROGRESS 0x00000100 /* IRQ handler active - do not enter! */ diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff new file mode 100644 index 0000000000..efdbf42a45 --- /dev/null +++ b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c-bus.diff @@ -0,0 +1,220 @@ + +I2C bus driver using ep93xx GPIOs. + +Signed-off-by: Lennert Buytenhek + +Index: linux-2.6.23-rc5/drivers/i2c/busses/Kconfig +=================================================================== +--- linux-2.6.23-rc5.orig/drivers/i2c/busses/Kconfig 2007-09-04 02:25:36.000000000 +0200 ++++ linux-2.6.23-rc5/drivers/i2c/busses/Kconfig 2007-09-04 02:26:20.000000000 +0200 +@@ -654,4 +654,16 @@ + This driver can also be built as module. If so, the module + will be called i2c-pmcmsp. + ++config I2C_EP93XX ++ tristate "Cirrus Logic EP93XX GPIO-based I2C interface" ++ depends on I2C && ARCH_EP93XX ++ select I2C_ALGOBIT ++ help ++ Say Y here if you have an Cirrus Logic EP93XX based ++ system and are using GPIO lines for an I2C bus. ++ ++ This support is also available as a module. If so, the module ++ will be called i2c-ep93xx. ++ ++ + endmenu +Index: linux-2.6.23-rc5/drivers/i2c/busses/Makefile +=================================================================== +--- linux-2.6.23-rc5.orig/drivers/i2c/busses/Makefile 2007-09-04 02:25:36.000000000 +0200 ++++ linux-2.6.23-rc5/drivers/i2c/busses/Makefile 2007-09-04 02:26:20.000000000 +0200 +@@ -52,6 +52,7 @@ + obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o + obj-$(CONFIG_SCx200_ACB) += scx200_acb.o + obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o ++obj-$(CONFIG_I2C_EP93XX) += i2c-ep93xx.o + + ifeq ($(CONFIG_I2C_DEBUG_BUS),y) + EXTRA_CFLAGS += -DDEBUG +Index: linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.23-rc5/drivers/i2c/busses/i2c-ep93xx.c 2007-09-04 02:26:20.000000000 +0200 +@@ -0,0 +1,159 @@ ++/* ++ * EP93XX I2C bus driver. ++ * Copyright (C) 2007 Lennert Buytenhek ++ * ++ * An I2C bus driver for the Cirrus Logic EP93xx SoC. ++ * ++ * Based on an earlier version by Alessandro Zummo. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct ep93xx_i2c_priv { ++ struct ep93xx_i2c_data *data; ++ struct i2c_adapter adapter; ++ struct i2c_algo_bit_data algo_data; ++ int sda; ++ int scl; ++}; ++ ++ ++static void ep93xx_bit_setsda(void *cookie, int val) ++{ ++ struct ep93xx_i2c_priv *priv = cookie; ++ ++ if (val) { ++ gpio_line_config(priv->data->sda_pin, GPIO_IN); ++ if (priv->scl && !priv->sda && priv->data->stop != NULL) ++ priv->data->stop(priv->data->cookie); ++ priv->sda = 1; ++ } else { ++ if (priv->scl && priv->sda && priv->data->start != NULL) ++ priv->data->start(priv->data->cookie); ++ gpio_line_config(priv->data->sda_pin, GPIO_OUT); ++ gpio_line_set(priv->data->sda_pin, 0); ++ priv->sda = 0; ++ } ++} ++ ++static void ep93xx_bit_setscl(void *cookie, int val) ++{ ++ struct ep93xx_i2c_priv *priv = cookie; ++ ++ if (val) { ++ gpio_line_config(priv->data->scl_pin, GPIO_IN); ++ priv->scl = 1; ++ } else { ++ gpio_line_config(priv->data->scl_pin, GPIO_OUT); ++ gpio_line_set(priv->data->scl_pin, 0); ++ priv->scl = 0; ++ } ++} ++ ++static int ep93xx_bit_getsda(void *cookie) ++{ ++ struct ep93xx_i2c_priv *priv = cookie; ++ ++ if (priv->sda == 0) ++ BUG(); ++ ++ return gpio_line_get(priv->data->sda_pin); ++} ++ ++static int ep93xx_bit_getscl(void *cookie) ++{ ++ struct ep93xx_i2c_priv *priv = cookie; ++ ++ if (priv->scl == 0) ++ BUG(); ++ ++ return gpio_line_get(priv->data->scl_pin); ++} ++ ++ ++static int ep93xx_i2c_probe(struct platform_device *pdev) ++{ ++ struct ep93xx_i2c_priv *priv; ++ int err; ++ ++ priv = kzalloc(sizeof(struct ep93xx_i2c_priv), GFP_KERNEL); ++ if (priv == NULL) ++ return -ENOMEM; ++ ++ priv->data = pdev->dev.platform_data; ++ ++ strlcpy(priv->adapter.name, pdev->dev.driver->name, I2C_NAME_SIZE); ++ priv->adapter.algo_data = &priv->algo_data; ++ priv->adapter.class = I2C_CLASS_ALL; ++ priv->adapter.dev.parent = &pdev->dev; ++ ++ priv->algo_data.data = priv; ++ priv->algo_data.setsda = ep93xx_bit_setsda; ++ priv->algo_data.setscl = ep93xx_bit_setscl; ++ priv->algo_data.getsda = ep93xx_bit_getsda; ++ priv->algo_data.getscl = ep93xx_bit_getscl; ++ priv->algo_data.udelay = 10; ++ priv->algo_data.timeout = 100; ++ ++ priv->sda = 1; ++ gpio_line_config(priv->data->sda_pin, GPIO_IN); ++ ++ priv->scl = 1; ++ gpio_line_config(priv->data->scl_pin, GPIO_IN); ++ ++ err = i2c_bit_add_bus(&priv->adapter); ++ if (err) { ++ printk(KERN_ERR "ERROR: Could not install %s\n", ++ pdev->dev.bus_id); ++ kfree(priv); ++ return err; ++ } ++ ++ platform_set_drvdata(pdev, priv); ++ ++ return 0; ++} ++ ++static int ep93xx_i2c_remove(struct platform_device *pdev) ++{ ++ struct ep93xx_i2c_priv *priv; ++ ++ priv = platform_get_drvdata(pdev); ++ i2c_del_adapter(&priv->adapter); ++ platform_set_drvdata(pdev, NULL); ++ kfree(priv); ++ ++ return 0; ++} ++ ++static struct platform_driver ep93xx_i2c_driver = { ++ .probe = ep93xx_i2c_probe, ++ .remove = ep93xx_i2c_remove, ++ .driver = { ++ .name = "ep93xx-i2c", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init ep93xx_i2c_init(void) ++{ ++ return platform_driver_register(&ep93xx_i2c_driver); ++} ++ ++static void __exit ep93xx_i2c_exit(void) ++{ ++ platform_driver_unregister(&ep93xx_i2c_driver); ++} ++ ++module_init(ep93xx_i2c_init); ++module_exit(ep93xx_i2c_exit); ++ ++MODULE_AUTHOR("Lennert Buytenhek "); ++MODULE_DESCRIPTION("GPIO-based I2C adapter for EP93XX systems"); ++MODULE_LICENSE("GPL"); +Index: linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h +=================================================================== +--- linux-2.6.23-rc5.orig/include/asm-arm/arch-ep93xx/platform.h 2007-09-04 02:25:36.000000000 +0200 ++++ linux-2.6.23-rc5/include/asm-arm/arch-ep93xx/platform.h 2007-09-04 02:28:19.000000000 +0200 +@@ -16,5 +16,13 @@ + unsigned char phy_id; + }; + ++struct ep93xx_i2c_data { ++ int sda_pin; ++ int scl_pin; ++ void *cookie; ++ void (*start)(void *); ++ void (*stop)(void *); ++}; ++ + + #endif diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff new file mode 100644 index 0000000000..bf4622b1db --- /dev/null +++ b/packages/linux/linux-2.6.22+2.6.23-rc5/ts72xx/ep93xx-i2c.diff @@ -0,0 +1,110 @@ + +Instantiate the ep93xx gpio i2c bus driver in the generic ep93xx +code. + +Signed-off-by: Lennert Buytenhek + +Index: linux-2.6.23-rc5/arch/arm/mach-ep93xx/core.c +=================================================================== +--- linux-2.6.23-rc5.orig/arch