Skip to contentSkip to conversation

Moving openmoko recipes and classes to obsolete

PATCH In review Martin Jansa 4 participants 21 messages Oct 19, 2010

lore
Share & tools
lore
#0 lore raw

I was asked few times to cleanup old openmoko recipes.

Openmoko as distribution was obsoleted on Aug 10 2010 and SHR is marked as successor in that distro config.

Yesterday khem asked me to fix libmokoui2 or obsolete it. We don't use libmokoui2 in SHR and seems like nobody else does
http://tinderbox.openembedded.org/packages/libmokoui2/

So I started to obsolete it and recipes depending on it.. and when it started to fall apart I've moved last remaining parts to obsolete too.

Please check this patch serie if you found something usefull for you and if yes, then became maintainer for it (as nobody seems to care now).

BTW: I have nothing against openmoko company/distro/recipes/machines :).

#1 lore raw

PATCH 1/13 fso-image: remove obsoleted openmoko stuff

---
 recipes/images/fso-image.inc |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
recipes/images/fso-image.inc +0 -10
index 4b1c8b2..5311f84 100644
@@ -43,7 +43,6 @@ AUDIO_INSTALL = "\
 GTK_INSTALL = "\
   hicolor-icon-theme \
   tango-icon-theme \
-  openmoko-calculator2 \
   vala-terminal \
   gpe-scap \
   tangogps \
@@ -53,15 +52,6 @@ GAMES_INSTALL = "\
   numptyphysics \
 "
 
-# FIXME these should rather be part of alsa-state,
-# once Om stabilizes them...
-AUDIO_INSTALL_append_om-gta01 = "\
-  openmoko-alsa-scenarios \
-"
-AUDIO_INSTALL_append_om-gta02 = "\
-  openmoko-alsa-scenarios \
-"
-
 # python
 PYTHON_INSTALL = "\
   task-python-efl \
Signature · 1 line
1.7.3.1
#2 lore raw

PATCH 2/13 meta-angstrom-2007: remove openmoko-browser2 which was moved to obsoleted

In reply to Martin Jansa
---
 recipes/meta/meta-angstrom-2007.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
recipes/meta/meta-angstrom-2007.bb +0 -1
index fbd7f0b..32683d0 100644
@@ -17,7 +17,6 @@ RDEPENDS_${PN} += " \
 RDEPENDS_${PN} += " \
          midori \
 	 minimo \
-         openmoko-browser2 \
 	 webkit-gtklauncher \
          "
 
Signature · 1 line
1.7.3.1
Acked-by on v1 2/13
#3 lore raw

Re: [PATCH 02/13] meta-angstrom-2007: remove openmoko-browser2 which was moved to obsoleted

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Martin Jansa
Quoted 9 lines
---
 recipes/meta/meta-angstrom-2007.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
recipes/meta/meta-angstrom-2007.bb +0 -0
index fbd7f0b..32683d0 100644

recipes/meta/meta-angstrom-2007.bb RDEPENDS_${PN} += " \ · line 22

Quoted 7 lines
recipes/meta/meta-angstrom-2007.bb +0 -1
@@ -17,7 +17,6 @@ RDEPENDS_${PN} += " \
 RDEPENDS_${PN} += " \
          midori \
 	 minimo \
-         openmoko-browser2 \
 	 webkit-gtklauncher \
          "
 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMvX0XMkyGM64RGpERAjcDAJ46jjoNzi0en9t+qWfh1pkWzxoq7ACgnooH FvaZvgYaqnTOvSgx2OM+LIM=
=ZmcW
-----END PGP SIGNATURE-----

#4 lore raw

PATCH 3/13 angstrom/sort.sh: remove om-3d7k as it was canceled long time ago

In reply to Martin Jansa
---
 contrib/angstrom/sort.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
contrib/angstrom/sort.sh +1 -1
index 6308486..f00d87b 100755
@@ -56,7 +56,7 @@ case "$arch" in
 	"armv5teb")
 			machines="fsg3be ixp4xxbe nslu2be" ;;
 	"armv6")
-			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 om-3d7k omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;;
+			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;;
 	"armv6-novfp")
 			machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
 	"armv7a")
Signature · 1 line
1.7.3.1
Acked-by on v1 3/13
#5 lore raw

Re: [PATCH 03/13] angstrom/sort.sh: remove om-3d7k as it was canceled long time ago

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Martin Jansa
Quoted 9 lines
---
 contrib/angstrom/sort.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
contrib/angstrom/sort.sh +0 -0
index 6308486..f00d87b 100755

contrib/angstrom/sort.sh case "$arch" in · line 62

Quoted 8 lines
contrib/angstrom/sort.sh +1 -1
@@ -56,7 +56,7 @@ case "$arch" in
 	"armv5teb")
 			machines="fsg3be ixp4xxbe nslu2be" ;;
 	"armv6")
-			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 om-3d7k omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;;
+			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;;
 	"armv6-novfp")
 			machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
 	"armv7a")

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMvXzrMkyGM64RGpERAkJxAKCKgiWyGaph7HzRoxeNWmNYKT4eYgCfT5z/ HtKfBE3mQMAtwPdeH5JsHKA=
=B6oM
-----END PGP SIGNATURE-----

#6 lore raw

PATCH 4/13 angstrom/build-feeds: remove openmoko targets

In reply to Martin Jansa
---
 contrib/angstrom/build-feeds.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
contrib/angstrom/build-feeds.sh +0 -4
index e28d810..89df1ed 100755
@@ -269,7 +269,6 @@ do
                       openbox \
                       opencv \
                       opencv-samples \
-                      openmoko-browser2 \
                       openredalert \
                       openvpn \
                       opie-notes \
@@ -337,8 +336,6 @@ do
                       systray \
                       task-beagleboard-demo \
                       task-gpe-pim \
-                      task-openmoko-feed \
-                      task-openmoko-games \
                       task-opie-apps \
                       task-opie-games \
                       task-proper-tools \
@@ -439,7 +436,6 @@ do
             BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
         BUILD_TARGETS="task-base task-boot \
                        task-opie task-opie-all \
-                       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
                        angstrom-x11-base-depends angstrom-gpe-task-settings \
                        xserver-xorg-conf \ 
                        "
Signature · 1 line
1.7.3.1
Acked-by on v1 4/13
#7 lore raw

Re: [PATCH 04/13] angstrom/build-feeds: remove openmoko targets

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 3 lines · Martin Jansa
---
 contrib/angstrom/build-feeds.sh |    4 ----
Quoted 24 lines
 1 files changed, 0 insertions(+), 4 deletions(-)
contrib/angstrom/build-feeds.sh +0 -3
index e28d810..89df1ed 100755
@@ -269,7 +269,6 @@ do
                       openbox \
                       opencv \
                       opencv-samples \
-                      openmoko-browser2 \
                       openredalert \
                       openvpn \
                       opie-notes \
@@ -337,8 +336,6 @@ do
                       systray \
                       task-beagleboard-demo \
                       task-gpe-pim \
-                      task-openmoko-feed \
-                      task-openmoko-games \
                       task-opie-apps \
                       task-opie-games \
                       task-proper-tools \

contrib/angstrom/build-feeds.sh do · line 441

Quoted 7 lines
contrib/angstrom/build-feeds.sh +0 -1
@@ -439,7 +436,6 @@ do
             BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
         BUILD_TARGETS="task-base task-boot \
                        task-opie task-opie-all \
-                       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
                        angstrom-x11-base-depends angstrom-gpe-task-settings \
                        xserver-xorg-conf \ 
                        "

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMvX0iMkyGM64RGpERAtPjAKCnl02auhnfCV4kRrYfWG/M+eHSZACdES4q r+dC5BG8mmBKQTs7X+UmkXM=
=T2ua
-----END PGP SIGNATURE-----

#8 lore raw

PATCH 5/13 libmokoui2, openmoko-apps: move to obsolete as libmokoui2 doesn't build for a while and nobody cares to fix it

In reply to Martin Jansa
---
 .../obsolete/openmoko2/libmokoui2/configure.patch  |   10 ++
 .../openmoko2/libmokoui2/makefile.am.patch         |   19 ++++
 recipes/obsolete/openmoko2/libmokoui2_svn.bb       |   24 +++++
 .../obsolete/openmoko2/openmoko-appearance_svn.bb  |    9 ++
 .../obsolete/openmoko2/openmoko-appmanager2_svn.bb |   10 ++
 .../openmoko2/openmoko-browser2/fingerscroll.diff  |   13 +++
 .../openmoko-browser2/webkit-update.patch          |   99 ++++++++++++++++++++
 .../obsolete/openmoko2/openmoko-browser2_svn.bb    |   18 ++++
 .../openmoko-calculator2/openmoko-calculator.png   |  Bin 0 -> 14278 bytes
 .../obsolete/openmoko2/openmoko-calculator2_svn.bb |   15 +++
 .../openmoko-dialer2/om-gta01/kernel-2.6.24.patch  |   13 +++
 .../openmoko-dialer2/om-gta02/kernel-2.6.24.patch  |   15 +++
 recipes/obsolete/openmoko2/openmoko-dialer2_svn.bb |   16 +++
 .../obsolete/openmoko2/openmoko-feedreader2_svn.bb |    8 ++
 .../obsolete/openmoko2/openmoko-firststart2_svn.bb |   10 ++
 .../openmoko2/openmoko-mediaplayer2_svn.bb         |   26 +++++
 .../obsolete/openmoko2/openmoko-messages2_svn.bb   |   12 +++
 recipes/obsolete/openmoko2/openmoko-sample2_svn.bb |   25 +++++
 .../openmoko2/openmoko-today2-folders_svn.bb       |   10 ++
 recipes/obsolete/openmoko2/openmoko-today2_svn.bb  |    9 ++
 .../obsolete/openmoko2/openmoko-worldclock2_svn.bb |    7 ++
 recipes/openmoko2/libmokoui2/configure.patch       |   10 --
 recipes/openmoko2/libmokoui2/makefile.am.patch     |   19 ----
 recipes/openmoko2/libmokoui2_svn.bb                |   24 -----
 recipes/openmoko2/openmoko-appearance_svn.bb       |    9 --
 recipes/openmoko2/openmoko-appmanager2_svn.bb      |   10 --
 .../openmoko2/openmoko-browser2/fingerscroll.diff  |   13 ---
 .../openmoko-browser2/webkit-update.patch          |   99 --------------------
 recipes/openmoko2/openmoko-browser2_svn.bb         |   18 ----
 .../openmoko-calculator2/openmoko-calculator.png   |  Bin 14278 -> 0 bytes
 recipes/openmoko2/openmoko-calculator2_svn.bb      |   15 ---
 .../openmoko-dialer2/om-gta01/kernel-2.6.24.patch  |   13 ---
 .../openmoko-dialer2/om-gta02/kernel-2.6.24.patch  |   15 ---
 recipes/openmoko2/openmoko-dialer2_svn.bb          |   16 ---
 recipes/openmoko2/openmoko-feedreader2_svn.bb      |    8 --
 recipes/openmoko2/openmoko-firststart2_svn.bb      |   10 --
 recipes/openmoko2/openmoko-mediaplayer2_svn.bb     |   26 -----
 recipes/openmoko2/openmoko-messages2_svn.bb        |   12 ---
 recipes/openmoko2/openmoko-sample2_svn.bb          |   25 -----
 recipes/openmoko2/openmoko-today2-folders_svn.bb   |   10 --
 recipes/openmoko2/openmoko-today2_svn.bb           |    9 --
 recipes/openmoko2/openmoko-worldclock2_svn.bb      |    7 --
 42 files changed, 368 insertions(+), 368 deletions(-)
 create mode 100644 recipes/obsolete/openmoko2/libmokoui2/configure.patch
 create mode 100644 recipes/obsolete/openmoko2/libmokoui2/makefile.am.patch
 create mode 100644 recipes/obsolete/openmoko2/libmokoui2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-appearance_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-appmanager2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-browser2/fingerscroll.diff
 create mode 100644 recipes/obsolete/openmoko2/openmoko-browser2/webkit-update.patch
 create mode 100644 recipes/obsolete/openmoko2/openmoko-browser2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-calculator2/openmoko-calculator.png
 create mode 100644 recipes/obsolete/openmoko2/openmoko-calculator2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
 create mode 100644 recipes/obsolete/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
 create mode 100644 recipes/obsolete/openmoko2/openmoko-dialer2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-feedreader2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-firststart2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-mediaplayer2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-messages2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-sample2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-today2-folders_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-today2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-worldclock2_svn.bb
 delete mode 100644 recipes/openmoko2/libmokoui2/configure.patch
 delete mode 100644 recipes/openmoko2/libmokoui2/makefile.am.patch
 delete mode 100644 recipes/openmoko2/libmokoui2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-appearance_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-appmanager2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-browser2/fingerscroll.diff
 delete mode 100644 recipes/openmoko2/openmoko-browser2/webkit-update.patch
 delete mode 100644 recipes/openmoko2/openmoko-browser2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-calculator2/openmoko-calculator.png
 delete mode 100644 recipes/openmoko2/openmoko-calculator2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
 delete mode 100644 recipes/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
 delete mode 100644 recipes/openmoko2/openmoko-dialer2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-feedreader2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-firststart2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-mediaplayer2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-messages2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-sample2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-today2-folders_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-today2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-worldclock2_svn.bb
recipes/obsolete/openmoko2/libmokoui2/configure.patch new file +10 -0
new file mode 100644
index 0000000..174c598
@@ -0,0 +1,10 @@
+--- libmokoui.old/configure.ac	2009-06-10 12:42:32.000000000 +0200
++++ libmokoui2/configure.ac	2009-06-10 12:42:43.000000000 +0200
+@@ -28,7 +28,6 @@
+ 
+ if test $enable_python != no ; then
+     AM_PATH_PYTHON(2.3.5)
+-    PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00)
+     AC_SUBST(PYGDK_CFLAGS)
+     AC_SUBST(PYGDK_LIBS)
+ 
recipes/obsolete/openmoko2/libmokoui2/makefile.am.patch new file +19 -0
new file mode 100644
index 0000000..79f0a48
@@ -0,0 +1,19 @@
+--- libmokoui.old/bindings/python/Makefile.am	2009-06-10 12:42:32.000000000 +0200
++++ libmokoui2/bindings/python/Makefile.am	2009-06-10 12:51:45.000000000 +0200
+@@ -1,13 +1,12 @@
+-
+-PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
+-PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION}
++PY_DEFS=${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=defsdir pygtk-2.0`
++PYTHON_INCLUDES=-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/python${PYTHON_VERSION}
+ 
+ CLEANFILES = \
+ 	mokoui.defs \
+ 	mokoui.c
+ 
+ mokoui.defs: ../../libmokoui/moko-finger-scroll.h
+-	python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs
++	python ${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=codegendir pygtk-2.0`/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs
+ 
+ mokoui.c: mokoui.defs mokoui.override
+ 	pygtk-codegen-2.0 --prefix mokoui \
recipes/obsolete/openmoko2/libmokoui2_svn.bb new file +24 -0
new file mode 100644
index 0000000..0b71da0
@@ -0,0 +1,24 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+ python-pygtk"
+
+SRCREV = "4695"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r5"
+
+inherit openmoko2 python-dir
+
+SRC_URI += "\
+	file://configure.patch \
+	file://makefile.am.patch \
+	"
+LICENSE = "LGPL"
+
+EXTRA_OECONF += " --enable-python"
+
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/mokoui.*"
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
+FILES_${PN}-dev += "/usr/share/vala/vapi/"
recipes/obsolete/openmoko2/openmoko-appearance_svn.bb new file +9 -0
new file mode 100644
index 0000000..33d946f
@@ -0,0 +1,9 @@
+DESCRIPTION = "The Openmoko Appearance Editor"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 gconf gtk+"
+RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders"
+SRCREV = "3262"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko2 gtk-icon-cache 
recipes/obsolete/openmoko2/openmoko-appmanager2_svn.bb new file +10 -0
new file mode 100644
index 0000000..86d00ad
@@ -0,0 +1,10 @@
+DESCRIPTION = "The Openmoko Application Manager"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg"
+SRCREV = "4530"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2 
+
+FILES_${PN} += "/usr/share/openmoko-appmanager"
recipes/obsolete/openmoko2/openmoko-browser2/fingerscroll.diff new file +13 -0
new file mode 100644
index 0000000..89f7949
@@ -0,0 +1,13 @@
+Index: src/current-page.c
+===================================================================
+--- openmoko-browser2/src/current-page.c	(revision 3249)
++++ openmoko-browser2/src/current-page.c	(working copy)
+@@ -129,7 +129,7 @@
+     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
+ 
+ 
+-    data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
++    data->currentFingerScroll = moko_finger_scroll_new ();
+     gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
+ }
+ 
recipes/obsolete/openmoko2/openmoko-browser2/webkit-update.patch new file +99 -0

99 lines not on this page · raw message

recipes/obsolete/openmoko2/openmoko-browser2_svn.bb new file +18 -0
new file mode 100644
index 0000000..4fb5699
@@ -0,0 +1,18 @@
+DESCRIPTION = "Om Webbrowser using webkit."
+SECTION = "openmoko/apps"
+DEPENDS += "intltool libmokoui2 check webkit-gtk"
+SRCREV = "4172"
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2
+LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
+
+SRC_URI += "file://webkit-update.patch;minrev=3646;maxrev=4171"
+
+#SRC_URI += "file://fingerscroll.diff"
+
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
+}
+
recipes/obsolete/openmoko2/openmoko-calculator2/openmoko-calculator.png new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..2811364f8322db593fa410756dccee0137d7e6bd
GIT binary patch
recipes/obsolete/openmoko2/openmoko-calculator2_svn.bb new file +15 -0
new file mode 100644
index 0000000..f52bbe3
@@ -0,0 +1,15 @@
+DESCRIPTION = "Legacy Om calculator application."
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+SRCREV = "3655"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko2
+LICENSE = "GPL"
+SRC_URI += " file://openmoko-calculator.png "
+
+do_install_append_openmoko() {
+        install -d ${D}/${datadir}/pixmaps/
+        install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
+}
recipes/obsolete/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch new file +13 -0
new file mode 100644
index 0000000..c6f34f4
@@ -0,0 +1,13 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
+@@ -38,7 +38,7 @@
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+ #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
recipes/obsolete/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch new file +15 -0
new file mode 100644
index 0000000..72c516f
@@ -0,0 +1,15 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
+@@ -37,8 +37,8 @@
+         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
recipes/obsolete/openmoko2/openmoko-dialer2_svn.bb new file +16 -0
new file mode 100644
index 0000000..33b90ff
@@ -0,0 +1,16 @@
+DESCRIPTION = "Legacy Om dialer."
+SECTION = "openmoko/pim"
+DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
+SRCREV = "4364"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r9"
+PE = "1"
+
+inherit openmoko2
+
+SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch"
+SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch"
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
recipes/obsolete/openmoko2/openmoko-feedreader2_svn.bb new file +8 -0
new file mode 100644
index 0000000..550832e
@@ -0,0 +1,8 @@
+DESCRIPTION = "The Openmoko Feed Reader"
+SECTION = "openmoko/apps"
+DEPENDS += "libmokoui2 libmrss check webkit-gtk"
+SRCREV = "3645"
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko2
recipes/obsolete/openmoko2/openmoko-firststart2_svn.bb new file +10 -0
new file mode 100644
index 0000000..68c2110
@@ -0,0 +1,10 @@
+DESCRIPTION = "The Openmoko First Start Wizard"
+SECTION = "openmoko/apps"
+DEPENDS += "libmokoui2 libglade"
+SRCREV = "3158"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}"
recipes/obsolete/openmoko2/openmoko-mediaplayer2_svn.bb new file +26 -0
new file mode 100644
index 0000000..897483a
@@ -0,0 +1,26 @@
+DESCRIPTION = "Om application for playing media files."
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
+RDEPENDS_${PN} = "gst-meta-audio gconf gst-plugin-alsa"
+SRCREV = "4750"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r7"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}/openmoko-mediaplayer"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/gconf/schemas
+	install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
+}
+
+pkg_postinst_openmoko-mediaplayer2 () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
+}
recipes/obsolete/openmoko2/openmoko-messages2_svn.bb new file +12 -0
new file mode 100644
index 0000000..81a0d8d
@@ -0,0 +1,12 @@
+DESCRIPTION = "Legacy Om application for sms."
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
+SRCREV = "4340"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
recipes/obsolete/openmoko2/openmoko-sample2_svn.bb new file +25 -0
new file mode 100644
index 0000000..d5eb61d
@@ -0,0 +1,25 @@
+DESCRIPTION = "The Openmoko Sample Project"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 intltool gconf"
+SRCREV = "3537"
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "${PN}-src"
+# path should match the toolchain path
+FILES_${PN}-src = "/usr/local/openmoko"
+PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
+
+do_configure_prepend() {
+	install -d ${WORKDIR}/source
+	cp -pPR ${S} ${WORKDIR}/source/
+	find ${WORKDIR}/source -name ".svn"|xargs rm -rf
+}
+
+do_install_append() {
+	install -d ${D}/usr/local/openmoko/source/
+	cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
+}
+
recipes/obsolete/openmoko2/openmoko-today2-folders_svn.bb new file +10 -0
new file mode 100644
index 0000000..d2badfb
@@ -0,0 +1,10 @@
+DESCRIPTION = "The Openmoko Today2 vfolder files"
+SECTION = "openmoko/misc"
+SRCREV = "3704"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r3"
+RCONFLICTS_${PN} = "matchbox-common"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}"
recipes/obsolete/openmoko2/openmoko-today2_svn.bb new file +9 -0
new file mode 100644
index 0000000..6feee46
@@ -0,0 +1,9 @@
+DESCRIPTION = "The Openmoko Application Launcher"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
+RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders"
+SRCREV = "4168"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r3"
+
+inherit openmoko2 gtk-icon-cache 
recipes/obsolete/openmoko2/openmoko-worldclock2_svn.bb new file +7 -0
new file mode 100644
index 0000000..fad55a9
@@ -0,0 +1,7 @@
+DESCRIPTION = "A World-Clock for Openmoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 libjana"
+SRCREV = "3365"
+PV = "0.1.0+svnr${SRCPV}"
+
+inherit openmoko2
recipes/openmoko2/libmokoui2/configure.patch deleted +0 -10
deleted file mode 100644
index 174c598..0000000
@@ -1,10 +0,0 @@
---- libmokoui.old/configure.ac	2009-06-10 12:42:32.000000000 +0200
-+++ libmokoui2/configure.ac	2009-06-10 12:42:43.000000000 +0200
-@@ -28,7 +28,6 @@
- 
- if test $enable_python != no ; then
-     AM_PATH_PYTHON(2.3.5)
--    PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00)
-     AC_SUBST(PYGDK_CFLAGS)
-     AC_SUBST(PYGDK_LIBS)
- 
recipes/openmoko2/libmokoui2/makefile.am.patch deleted +0 -19
deleted file mode 100644
index 79f0a48..0000000
@@ -1,19 +0,0 @@
---- libmokoui.old/bindings/python/Makefile.am	2009-06-10 12:42:32.000000000 +0200
-+++ libmokoui2/bindings/python/Makefile.am	2009-06-10 12:51:45.000000000 +0200
-@@ -1,13 +1,12 @@
--
--PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
--PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION}
-+PY_DEFS=${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=defsdir pygtk-2.0`
-+PYTHON_INCLUDES=-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/python${PYTHON_VERSION}
- 
- CLEANFILES = \
- 	mokoui.defs \
- 	mokoui.c
- 
- mokoui.defs: ../../libmokoui/moko-finger-scroll.h
--	python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs
-+	python ${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=codegendir pygtk-2.0`/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs
- 
- mokoui.c: mokoui.defs mokoui.override
- 	pygtk-codegen-2.0 --prefix mokoui \
recipes/openmoko2/libmokoui2_svn.bb deleted +0 -24
deleted file mode 100644
index 0b71da0..0000000
@@ -1,24 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+ python-pygtk"
-
-SRCREV = "4695"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r5"
-
-inherit openmoko2 python-dir
-
-SRC_URI += "\
-	file://configure.patch \
-	file://makefile.am.patch \
-	"
-LICENSE = "LGPL"
-
-EXTRA_OECONF += " --enable-python"
-
-do_configure_prepend() {
-        touch gtk-doc.make
-}
-
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/mokoui.*"
-FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
-FILES_${PN}-dev += "/usr/share/vala/vapi/"
recipes/openmoko2/openmoko-appearance_svn.bb deleted +0 -9
deleted file mode 100644
index 33d946f..0000000
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Appearance Editor"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 gconf gtk+"
-RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders"
-SRCREV = "3262"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko2 gtk-icon-cache 
recipes/openmoko2/openmoko-appmanager2_svn.bb deleted +0 -10
deleted file mode 100644
index 86d00ad..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "The Openmoko Application Manager"
-SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg"
-SRCREV = "4530"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2 
-
-FILES_${PN} += "/usr/share/openmoko-appmanager"
recipes/openmoko2/openmoko-browser2/fingerscroll.diff deleted +0 -13
deleted file mode 100644
index 89f7949..0000000
@@ -1,13 +0,0 @@
-Index: src/current-page.c
-===================================================================
---- openmoko-browser2/src/current-page.c	(revision 3249)
-+++ openmoko-browser2/src/current-page.c	(working copy)
-@@ -129,7 +129,7 @@
-     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
- 
- 
--    data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
-+    data->currentFingerScroll = moko_finger_scroll_new ();
-     gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
- }
- 
recipes/openmoko2/openmoko-browser2/webkit-update.patch deleted +0 -99

99 lines not on this page · raw message

recipes/openmoko2/openmoko-browser2_svn.bb deleted +0 -18
deleted file mode 100644
index 4fb5699..0000000
@@ -1,18 +0,0 @@
-DESCRIPTION = "Om Webbrowser using webkit."
-SECTION = "openmoko/apps"
-DEPENDS += "intltool libmokoui2 check webkit-gtk"
-SRCREV = "4172"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2
-LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
-
-SRC_URI += "file://webkit-update.patch;minrev=3646;maxrev=4171"
-
-#SRC_URI += "file://fingerscroll.diff"
-
-do_compile_prepend() {
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
-}
-
recipes/openmoko2/openmoko-calculator2/openmoko-calculator.png deleted binary +0 -0
deleted file mode 100644
index 2811364f8322db593fa410756dccee0137d7e6bd..0000000000000000000000000000000000000000
GIT binary patch
recipes/openmoko2/openmoko-calculator2_svn.bb deleted +0 -15
deleted file mode 100644
index f52bbe3..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "Legacy Om calculator application."
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2"
-SRCREV = "3655"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko2
-LICENSE = "GPL"
-SRC_URI += " file://openmoko-calculator.png "
-
-do_install_append_openmoko() {
-        install -d ${D}/${datadir}/pixmaps/
-        install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
-}
recipes/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch deleted +0 -13
deleted file mode 100644
index c6f34f4..0000000
@@ -1,13 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
-@@ -38,7 +38,7 @@
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
- #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
recipes/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch deleted +0 -15
deleted file mode 100644
index 72c516f..0000000
@@ -1,15 +0,0 @@
-Index: openmoko-dialer2/src/phone-kit/moko-notify.c
-===================================================================
---- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
-+++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
-@@ -37,8 +37,8 @@
-         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
- 
- #define DEFAULT_RINGTONE "/default_ringtone.ogg"
--#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
--#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
-+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
-+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
- 
- struct _MokoNotifyPrivate
- {
recipes/openmoko2/openmoko-dialer2_svn.bb deleted +0 -16
deleted file mode 100644
index 33b90ff..0000000
@@ -1,16 +0,0 @@
-DESCRIPTION = "Legacy Om dialer."
-SECTION = "openmoko/pim"
-DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
-SRCREV = "4364"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r9"
-PE = "1"
-
-inherit openmoko2
-
-SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch"
-SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch"
-
-EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
-
-FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
recipes/openmoko2/openmoko-feedreader2_svn.bb deleted +0 -8
deleted file mode 100644
index 550832e..0000000
@@ -1,8 +0,0 @@
-DESCRIPTION = "The Openmoko Feed Reader"
-SECTION = "openmoko/apps"
-DEPENDS += "libmokoui2 libmrss check webkit-gtk"
-SRCREV = "3645"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko2
recipes/openmoko2/openmoko-firststart2_svn.bb deleted +0 -10
deleted file mode 100644
index 68c2110..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "The Openmoko First Start Wizard"
-SECTION = "openmoko/apps"
-DEPENDS += "libmokoui2 libglade"
-SRCREV = "3158"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko2
-
-FILES_${PN} += "${datadir}"
recipes/openmoko2/openmoko-mediaplayer2_svn.bb deleted +0 -26
deleted file mode 100644
index 897483a..0000000
@@ -1,26 +0,0 @@
-DESCRIPTION = "Om application for playing media files."
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
-RDEPENDS_${PN} = "gst-meta-audio gconf gst-plugin-alsa"
-SRCREV = "4750"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r7"
-
-inherit openmoko2
-
-FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/gconf/schemas
-	install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
-}
-
-pkg_postinst_openmoko-mediaplayer2 () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
-}
recipes/openmoko2/openmoko-messages2_svn.bb deleted +0 -12
deleted file mode 100644
index 81a0d8d..0000000
@@ -1,12 +0,0 @@
-DESCRIPTION = "Legacy Om application for sms."
-SECTION = "openmoko/pim"
-DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
-SRCREV = "4340"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2
-
-EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
-
-FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
recipes/openmoko2/openmoko-sample2_svn.bb deleted +0 -25
deleted file mode 100644
index d5eb61d..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "The Openmoko Sample Project"
-SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 intltool gconf"
-SRCREV = "3537"
-PV = "0.0.1+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko2
-
-PACKAGES += "${PN}-src"
-# path should match the toolchain path
-FILES_${PN}-src = "/usr/local/openmoko"
-PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
-
-do_configure_prepend() {
-	install -d ${WORKDIR}/source
-	cp -pPR ${S} ${WORKDIR}/source/
-	find ${WORKDIR}/source -name ".svn"|xargs rm -rf
-}
-
-do_install_append() {
-	install -d ${D}/usr/local/openmoko/source/
-	cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
-}
-
recipes/openmoko2/openmoko-today2-folders_svn.bb deleted +0 -10
deleted file mode 100644
index d2badfb..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "The Openmoko Today2 vfolder files"
-SECTION = "openmoko/misc"
-SRCREV = "3704"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r3"
-RCONFLICTS_${PN} = "matchbox-common"
-
-inherit openmoko2
-
-FILES_${PN} += "${datadir}"
recipes/openmoko2/openmoko-today2_svn.bb deleted +0 -9
deleted file mode 100644
index 6feee46..0000000
@@ -1,9 +0,0 @@
-DESCRIPTION = "The Openmoko Application Launcher"
-SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
-RDEPENDS_${PN} = "libedata-cal openmoko-today2-folders"
-SRCREV = "4168"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r3"
-
-inherit openmoko2 gtk-icon-cache 
recipes/openmoko2/openmoko-worldclock2_svn.bb deleted +0 -7
deleted file mode 100644
index fad55a9..0000000
@@ -1,7 +0,0 @@
-DESCRIPTION = "A World-Clock for Openmoko"
-SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 libjana"
-SRCREV = "3365"
-PV = "0.1.0+svnr${SRCPV}"
-
-inherit openmoko2
Signature · 1 line
1.7.3.1
#9 lore raw

PATCH 6/13 openmoko: obsolete tasks and images, openmoko as distribution was obsoleted on Aug 10, 2010.

In reply to Martin Jansa
---
 classes/openmoko-panel-plugin.bbclass              |    6 -
 recipes/images/minimal-openmoko-image.bb           |   21 ---
 recipes/images/openmoko-devel-image.bb             |    3 -
 recipes/images/openmoko-image.bb                   |   21 ---
 recipes/images/openmoko-minimal-image.bb           |   21 ---
 recipes/images/openmoko-python-devel-image.bb      |    7 -
 recipes/images/openmoko-sdk-image.bb               |    3 -
 recipes/meta/meta-toolchain-openmoko.bb            |    7 -
 recipes/meta/openmoko-feed.bb                      |   10 --
 .../obsolete/classes/openmoko-panel-plugin.bbclass |    6 +
 recipes/obsolete/images/minimal-openmoko-image.bb  |   21 +++
 recipes/obsolete/images/openmoko-devel-image.bb    |    3 +
 recipes/obsolete/images/openmoko-image.bb          |   21 +++
 recipes/obsolete/images/openmoko-minimal-image.bb  |   21 +++
 .../obsolete/images/openmoko-python-devel-image.bb |    7 +
 recipes/obsolete/images/openmoko-sdk-image.bb      |    3 +
 recipes/obsolete/meta/meta-toolchain-openmoko.bb   |    7 +
 recipes/obsolete/meta/openmoko-feed.bb             |   10 ++
 .../openmoko-base/openmoko-session/session         |   24 +++
 .../obsolete/openmoko-base/openmoko-session_svn.bb |   32 ++++
 .../openmoko-panel-battery_svn.bb                  |    7 +
 .../openmoko-panel-bt_svn.bb                       |    8 +
 .../openmoko-panel-clock_svn.bb                    |    6 +
 .../openmoko-panel-gps_svn.bb                      |    7 +
 .../openmoko-panel-gsm_svn.bb                      |    7 +
 .../openmoko-panel-mainmenu_svn.bb                 |    8 +
 .../openmoko-panel-memory_svn.bb                   |    8 +
 .../openmoko-panel-usb_svn.bb                      |    6 +
 .../openmoko-panel-wifi_svn.bb                     |    7 +
 recipes/obsolete/openmoko2/openmoko-session2.bb    |   53 +++++++
 .../openmoko-session2/etc/matchbox/session         |   12 ++
 .../openmoko2/openmoko-session2/matchbox-session   |   24 +++
 recipes/obsolete/tasks/task-openmoko-base.bb       |   31 ++++
 recipes/obsolete/tasks/task-openmoko-debug.bb      |   38 +++++
 recipes/obsolete/tasks/task-openmoko-examples.bb   |    6 +
 recipes/obsolete/tasks/task-openmoko-feed.bb       |  157 ++++++++++++++++++++
 recipes/obsolete/tasks/task-openmoko-games.bb      |   15 ++
 recipes/obsolete/tasks/task-openmoko-linux.bb      |   19 +++
 recipes/obsolete/tasks/task-openmoko-native-sdk.bb |   41 +++++
 recipes/obsolete/tasks/task-openmoko-net.bb        |   15 ++
 recipes/obsolete/tasks/task-openmoko-phone.bb      |   19 +++
 recipes/obsolete/tasks/task-openmoko-pim.bb        |   23 +++
 .../obsolete/tasks/task-openmoko-python-devel.bb   |   11 ++
 .../obsolete/tasks/task-openmoko-toolchain-host.bb |   15 ++
 .../tasks/task-openmoko-toolchain-target.bb        |   23 +++
 recipes/obsolete/tasks/task-openmoko-ui.bb         |   58 +++++++
 recipes/obsolete/tasks/task-openmoko.bb            |   31 ++++
 recipes/openmoko-base/openmoko-session/session     |   24 ---
 recipes/openmoko-base/openmoko-session_svn.bb      |   32 ----
 .../openmoko-panel-battery_svn.bb                  |    7 -
 .../openmoko-panel-bt_svn.bb                       |    8 -
 .../openmoko-panel-clock_svn.bb                    |    6 -
 .../openmoko-panel-gps_svn.bb                      |    7 -
 .../openmoko-panel-gsm_svn.bb                      |    7 -
 .../openmoko-panel-mainmenu_svn.bb                 |    8 -
 .../openmoko-panel-memory_svn.bb                   |    8 -
 .../openmoko-panel-usb_svn.bb                      |    6 -
 .../openmoko-panel-wifi_svn.bb                     |    7 -
 recipes/openmoko2/openmoko-session2.bb             |   53 -------
 .../openmoko-session2/etc/matchbox/session         |   12 --
 .../openmoko2/openmoko-session2/matchbox-session   |   24 ---
 recipes/tasks/task-openmoko-base.bb                |   31 ----
 recipes/tasks/task-openmoko-debug.bb               |   38 -----
 recipes/tasks/task-openmoko-examples.bb            |    6 -
 recipes/tasks/task-openmoko-feed.bb                |  157 --------------------
 recipes/tasks/task-openmoko-games.bb               |   15 --
 recipes/tasks/task-openmoko-linux.bb               |   19 ---
 recipes/tasks/task-openmoko-native-sdk.bb          |   41 -----
 recipes/tasks/task-openmoko-net.bb                 |   15 --
 recipes/tasks/task-openmoko-phone.bb               |   19 ---
 recipes/tasks/task-openmoko-pim.bb                 |   23 ---
 recipes/tasks/task-openmoko-python-devel.bb        |   11 --
 recipes/tasks/task-openmoko-toolchain-host.bb      |   15 --
 recipes/tasks/task-openmoko-toolchain-target.bb    |   23 ---
 recipes/tasks/task-openmoko-ui.bb                  |   58 -------
 recipes/tasks/task-openmoko.bb                     |   31 ----
 76 files changed, 810 insertions(+), 810 deletions(-)
 delete mode 100644 classes/openmoko-panel-plugin.bbclass
 delete mode 100644 recipes/images/minimal-openmoko-image.bb
 delete mode 100644 recipes/images/openmoko-devel-image.bb
 delete mode 100644 recipes/images/openmoko-image.bb
 delete mode 100644 recipes/images/openmoko-minimal-image.bb
 delete mode 100644 recipes/images/openmoko-python-devel-image.bb
 delete mode 100644 recipes/images/openmoko-sdk-image.bb
 delete mode 100644 recipes/meta/meta-toolchain-openmoko.bb
 delete mode 100644 recipes/meta/openmoko-feed.bb
 create mode 100644 recipes/obsolete/classes/openmoko-panel-plugin.bbclass
 create mode 100644 recipes/obsolete/images/minimal-openmoko-image.bb
 create mode 100644 recipes/obsolete/images/openmoko-devel-image.bb
 create mode 100644 recipes/obsolete/images/openmoko-image.bb
 create mode 100644 recipes/obsolete/images/openmoko-minimal-image.bb
 create mode 100644 recipes/obsolete/images/openmoko-python-devel-image.bb
 create mode 100644 recipes/obsolete/images/openmoko-sdk-image.bb
 create mode 100644 recipes/obsolete/meta/meta-toolchain-openmoko.bb
 create mode 100644 recipes/obsolete/meta/openmoko-feed.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-session/session
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-session_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
 create mode 100644 recipes/obsolete/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-session2.bb
 create mode 100755 recipes/obsolete/openmoko2/openmoko-session2/etc/matchbox/session
 create mode 100755 recipes/obsolete/openmoko2/openmoko-session2/matchbox-session
 create mode 100644 recipes/obsolete/tasks/task-openmoko-base.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-debug.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-examples.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-feed.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-games.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-linux.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-native-sdk.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-net.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-phone.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-pim.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-python-devel.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-toolchain-host.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-toolchain-target.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko-ui.bb
 create mode 100644 recipes/obsolete/tasks/task-openmoko.bb
 delete mode 100644 recipes/openmoko-base/openmoko-session/session
 delete mode 100644 recipes/openmoko-base/openmoko-session_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
 delete mode 100644 recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-session2.bb
 delete mode 100755 recipes/openmoko2/openmoko-session2/etc/matchbox/session
 delete mode 100755 recipes/openmoko2/openmoko-session2/matchbox-session
 delete mode 100644 recipes/tasks/task-openmoko-base.bb
 delete mode 100644 recipes/tasks/task-openmoko-debug.bb
 delete mode 100644 recipes/tasks/task-openmoko-examples.bb
 delete mode 100644 recipes/tasks/task-openmoko-feed.bb
 delete mode 100644 recipes/tasks/task-openmoko-games.bb
 delete mode 100644 recipes/tasks/task-openmoko-linux.bb
 delete mode 100644 recipes/tasks/task-openmoko-native-sdk.bb
 delete mode 100644 recipes/tasks/task-openmoko-net.bb
 delete mode 100644 recipes/tasks/task-openmoko-phone.bb
 delete mode 100644 recipes/tasks/task-openmoko-pim.bb
 delete mode 100644 recipes/tasks/task-openmoko-python-devel.bb
 delete mode 100644 recipes/tasks/task-openmoko-toolchain-host.bb
 delete mode 100644 recipes/tasks/task-openmoko-toolchain-target.bb
 delete mode 100644 recipes/tasks/task-openmoko-ui.bb
 delete mode 100644 recipes/tasks/task-openmoko.bb
classes/openmoko-panel-plugin.bbclass deleted +0 -6
deleted file mode 100644
index 6a22a92..0000000
@@ -1,6 +0,0 @@
-SECTION = "openmoko/panel-plugin"
-DEPENDS += "matchbox-panel-2 libmokopanelui2"
-
-inherit openmoko2
-
-FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
recipes/images/minimal-openmoko-image.bb deleted +0 -21
deleted file mode 100644
index 70658fd..0000000
@@ -1,21 +0,0 @@
-#------------------------------------------------------
-# Minimal Openmoko Image Recipe
-# This should only have the base system + dialer
-# #------------------------------------------------------
-
-IMAGE_LINGUAS = ""
-ANGSTROM_EXTRA_INSTALL ?= ""
-
-IMAGE_INSTALL = "\
-  task-base \
-  ${ANGSTROM_EXTRA_INSTALL} \
-  task-openmoko-linux \
-  task-openmoko-net \
-  task-openmoko-ui \
-  task-openmoko-base \
-  task-openmoko-phone \
-  "
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
recipes/images/openmoko-devel-image.bb deleted +0 -3
deleted file mode 100644
index 3b2111e..0000000
@@ -1,3 +0,0 @@
-require openmoko-image.bb
-
-IMAGE_INSTALL += "task-openmoko-debug"
recipes/images/openmoko-image.bb deleted +0 -21
deleted file mode 100644
index 48b0d7d..0000000
@@ -1,21 +0,0 @@
-#------------------------------------------------------
-# Openmoko Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-IMAGE_INSTALL += "\
-  task-openmoko-net \
-  task-openmoko-ui \
-  task-openmoko-base \
-  task-openmoko-phone \
-  task-openmoko-games \
-  task-openmoko-pim \
-  "
-
-DEPENDS += "\
-  task-openmoko \
-  "
-
-inherit image
-
recipes/images/openmoko-minimal-image.bb deleted +0 -21
deleted file mode 100644
index 678400f..0000000
@@ -1,21 +0,0 @@
-#------------------------------------------------------
-# Openmoko Minimal Image Recipe
-# other openmoko images should include this.
-# -----------------------------------------------------
-
-IMAGE_LINGUAS = ""
-
-IMAGE_INSTALL = "\
-  ${MACHINE_TASK_PROVIDER} \
-  task-openmoko-linux \
-  "
-
-DEPENDS = "\
-  ${MACHINE_TASK_PROVIDER} \
-  task-openmoko-linux \
-  "
-
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp;"
recipes/images/openmoko-python-devel-image.bb deleted +0 -7
deleted file mode 100644
index 615042f..0000000
@@ -1,7 +0,0 @@
-require openmoko-image.bb
-
-IMAGE_INSTALL += "\
-  task-openmoko-python-devel \
-  task-python-efl-examples \
-  edje-viewer \
-"
recipes/images/openmoko-sdk-image.bb deleted +0 -3
deleted file mode 100644
index 8595808..0000000
@@ -1,3 +0,0 @@
-require openmoko-devel-image.bb
-
-IMAGE_INSTALL += "task-openmoko-native-sdk"
recipes/meta/meta-toolchain-openmoko.bb deleted +0 -7
deleted file mode 100644
index b265615..0000000
@@ -1,7 +0,0 @@
-PR = "r2"
-
-TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
-TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
-
-require meta-toolchain.bb
-SDK_SUFFIX = "toolchain-openmoko"
recipes/meta/openmoko-feed.bb deleted +0 -10
deleted file mode 100644
index 21bdbc6..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "Meta-package for Openmoko Misc. Feed Items"
-LICENSE = "MIT"
-
-RDEPENDS_${PN} = "\
-  task-openmoko-debug \
-  task-openmoko-native-sdk \
-  task-openmoko-feed \
-"
-
-inherit meta
recipes/obsolete/classes/openmoko-panel-plugin.bbclass new file +6 -0
new file mode 100644
index 0000000..6a22a92
@@ -0,0 +1,6 @@
+SECTION = "openmoko/panel-plugin"
+DEPENDS += "matchbox-panel-2 libmokopanelui2"
+
+inherit openmoko2
+
+FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
recipes/obsolete/images/minimal-openmoko-image.bb new file +21 -0
new file mode 100644
index 0000000..70658fd
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# Minimal Openmoko Image Recipe
+# This should only have the base system + dialer
+# #------------------------------------------------------
+
+IMAGE_LINGUAS = ""
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+IMAGE_INSTALL = "\
+  task-base \
+  ${ANGSTROM_EXTRA_INSTALL} \
+  task-openmoko-linux \
+  task-openmoko-net \
+  task-openmoko-ui \
+  task-openmoko-base \
+  task-openmoko-phone \
+  "
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
recipes/obsolete/images/openmoko-devel-image.bb new file +3 -0
new file mode 100644
index 0000000..3b2111e
@@ -0,0 +1,3 @@
+require openmoko-image.bb
+
+IMAGE_INSTALL += "task-openmoko-debug"
recipes/obsolete/images/openmoko-image.bb new file +21 -0
new file mode 100644
index 0000000..48b0d7d
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# Openmoko Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "\
+  task-openmoko-net \
+  task-openmoko-ui \
+  task-openmoko-base \
+  task-openmoko-phone \
+  task-openmoko-games \
+  task-openmoko-pim \
+  "
+
+DEPENDS += "\
+  task-openmoko \
+  "
+
+inherit image
+
recipes/obsolete/images/openmoko-minimal-image.bb new file +21 -0
new file mode 100644
index 0000000..678400f
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# Openmoko Minimal Image Recipe
+# other openmoko images should include this.
+# -----------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+  ${MACHINE_TASK_PROVIDER} \
+  task-openmoko-linux \
+  "
+
+DEPENDS = "\
+  ${MACHINE_TASK_PROVIDER} \
+  task-openmoko-linux \
+  "
+
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp;"
recipes/obsolete/images/openmoko-python-devel-image.bb new file +7 -0
new file mode 100644
index 0000000..615042f
@@ -0,0 +1,7 @@
+require openmoko-image.bb
+
+IMAGE_INSTALL += "\
+  task-openmoko-python-devel \
+  task-python-efl-examples \
+  edje-viewer \
+"
recipes/obsolete/images/openmoko-sdk-image.bb new file +3 -0
new file mode 100644
index 0000000..8595808
@@ -0,0 +1,3 @@
+require openmoko-devel-image.bb
+
+IMAGE_INSTALL += "task-openmoko-native-sdk"
recipes/obsolete/meta/meta-toolchain-openmoko.bb new file +7 -0
new file mode 100644
index 0000000..b265615
@@ -0,0 +1,7 @@
+PR = "r2"
+
+TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target"
+TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
+
+require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-openmoko"
recipes/obsolete/meta/openmoko-feed.bb new file +10 -0
new file mode 100644
index 0000000..21bdbc6
@@ -0,0 +1,10 @@
+DESCRIPTION = "Meta-package for Openmoko Misc. Feed Items"
+LICENSE = "MIT"
+
+RDEPENDS_${PN} = "\
+  task-openmoko-debug \
+  task-openmoko-native-sdk \
+  task-openmoko-feed \
+"
+
+inherit meta
recipes/obsolete/openmoko-base/openmoko-session/session new file +24 -0
new file mode 100644
index 0000000..c7a773e
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+export GTK_MODULES="libgtkstylus.so libgtkinput.so"
+SHOWCURSOR="no"
+
+matchbox-panel-2 \
+	--start-applets=openmoko-panel-mainmenu,systray,startup \
+	--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock &
+
+# start old-style panel plugin to get a keyboard
+mbinputmgr &
+
+# set default alsa configuration
+alsactl restore 0 -f /etc/alsa/stereoout.state
+
+# start UI and dialer
+openmoko-footer &
+openmoko-today --desktop &
+openmoko-dialer &
+
+sleep 1
+
+exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
+
recipes/obsolete/openmoko-base/openmoko-session_svn.bb new file +32 -0
new file mode 100644
index 0000000..05625a1
@@ -0,0 +1,32 @@
+DESCRIPTION = "Matchbox session files for Openmoko"
+SECTION = "openmoko/base"
+RDEPENDS_${PN} = "matchbox-panel-2 matchbox-wm openmoko-today2 gconf"
+PV = "0.1+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-base
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=http \
+           file://session"
+S = "${WORKDIR}"
+
+do_install() {
+	cp -R ${S}/etc ${D}/${sysconfdir}
+	rm -fR ${D}/${sysconfdir}/.svn
+	rm -fR ${D}/${sysconfdir}/matchbox/.svn
+	chmod -R 755 ${D}/${sysconfdir}
+    # DEMO only. Need to handle this differently in actual production images
+	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session
+}
+
+pkg_postinst_openmoko-session () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard
+}
+
+PACKAGE_ARCH = "all"
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-battery_svn.bb new file +7 -0
new file mode 100644
index 0000000..b4926af
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows the battery/AC status in the Openmoko panel"
+DEPENDS = "apmd libnotify"
+SRCREV = "3360"
+PV = "0.1.1+svnr${SRCPV}"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-bt_svn.bb new file +8 -0
new file mode 100644
index 0000000..b9015a3
@@ -0,0 +1,8 @@
+DESCRIPTION = "Shows the bluetooth status in the Openmoko panel"
+DEPENDS = "bluez-libs libnotify"
+SRCREV = "4331"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-clock_svn.bb new file +6 -0
new file mode 100644
index 0000000..90e5e92
@@ -0,0 +1,6 @@
+DESCRIPTION = "Shows the current time in the Openmoko panel"
+SRCREV = "2567"
+PV = "0.1.0+svnr${SRCPV}"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-gps_svn.bb new file +7 -0
new file mode 100644
index 0000000..928a993
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows the GPS status in the Openmoko panel"
+DEPENDS = "gpsd"
+SRCREV = "4330"
+PV = "0.1.0+svnr${SRCPV}"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb new file +7 -0
new file mode 100644
index 0000000..1ce27a6
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
+DEPENDS = "libmokogsmd2 libnotify"
+SRCREV = "4335"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko-panel-plugin
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb new file +8 -0
new file mode 100644
index 0000000..ebc0416
@@ -0,0 +1,8 @@
+DESCRIPTION = "Main menu applet for the Openmoko panel"
+DEPENDS += "pulseaudio startup-notification"
+SRCREV = "2567"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-memory_svn.bb new file +8 -0
new file mode 100644
index 0000000..767546f
@@ -0,0 +1,8 @@
+DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel"
+DEPENDS = "libnotify"
+RDEPENDS_${PN} = "openmoko-dialer2"
+SRCREV = "3903"
+PV = "0.0.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-panel-plugin
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-usb_svn.bb new file +6 -0
new file mode 100644
index 0000000..272df4c
@@ -0,0 +1,6 @@
+DESCRIPTION = "USB applet for the Openmoko panel"
+SRCREV = "3360"
+PV = "0.1.0+svnr${SRCPV}"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb new file +7 -0
new file mode 100644
index 0000000..ae8a697
@@ -0,0 +1,7 @@
+DESCRIPTION = "Shows the wifi status in the Openmoko panel"
+DEPENDS = "libmokopanelui2"
+SRCREV = "4344"
+PV = "0.0.0+svnr${SRCPV}"
+
+inherit openmoko-panel-plugin
+
recipes/obsolete/openmoko2/openmoko-session2.bb new file +53 -0

53 lines not on this page · raw message

recipes/obsolete/openmoko2/openmoko-session2/etc/matchbox/session new file +12 -0
new file mode 100755
index 0000000..732cce9
@@ -0,0 +1,12 @@
+#!/bin/sh
+SHOWCURSOR="no"
+
+openmoko-today &
+phone-kit &
+
+matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -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-memory,openmoko-panel-wifi --titlebar &
+
+exec neod
recipes/obsolete/openmoko2/openmoko-session2/matchbox-session new file +24 -0
new file mode 100755
index 0000000..65f1ce7
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1 
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist. 
+
+matchbox-desktop &
+matchbox-panel  --orientation south &
+exec matchbox-window-manager $@
recipes/obsolete/tasks/task-openmoko-base.bb new file +31 -0
new file mode 100644
index 0000000..3c46c56
@@ -0,0 +1,31 @@
+DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r74"
+
+inherit task
+
+#
+# task-openmoko-base
+#
+DESCRIPTION_task-openmoko-base = "Openmoko: Top Panel, Application Launcher, Application Manager"
+RDEPENDS_task-openmoko-base = "\
+  matchbox-panel-2 \
+#  matchbox-panel-2-applets \
+#  matchbox-keyboard-inputmethod \
+#  matchbox-keyboard-im \
+#  matchbox-keyboard-applet \
+  matchbox-stroke \
+  multitap-pad \
+  vala-terminal \
+#  openmoko-keyboard \
+  openmoko-panel-battery \
+  openmoko-panel-clock \
+  openmoko-panel-usb \
+  ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'openmoko-panel-bt', '', d)} \
+  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '', d)} \
+  ${@base_contains('MACHINE_FEATURES', 'wifi', 'openmoko-panel-wifi', '', d)} \
+  \
+  openmoko-today2 \
+#  openmoko-appmanager \
+"
recipes/obsolete/tasks/task-openmoko-debug.bb new file +38 -0
new file mode 100644
index 0000000..f30a024
@@ -0,0 +1,38 @@
+DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r59.01"
+
+inherit task
+
+RDEPENDS_task-openmoko-debug = "\
+  alsa-utils-amixer \
+  alsa-utils-aplay \
+  alsa-utils-aconnect \
+  alsa-utils-alsamixer \
+  alsa-utils-speakertest \
+  bonnie++ \
+  cu \
+  dbench \
+  fbgrab \
+  fbset \
+  fstests \
+  gdb \
+  gdbserver \
+  lrzsz \
+  lsof \
+  ltrace \
+  memtester \
+#  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
+  strace \
+  tcpdump \
+  tslib-calibrate \
+  tslib-tests \
+  udev-utils \
+  usbutils \
+  uucp \
+  vorbis-tools \
+  x11perf \
+  xev \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'madplay', d)} \
+"
recipes/obsolete/tasks/task-openmoko-examples.bb new file +6 -0
new file mode 100644
index 0000000..7ebe32d
@@ -0,0 +1,6 @@
+DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
recipes/obsolete/tasks/task-openmoko-feed.bb new file +157 -0

157 lines not on this page · raw message

recipes/obsolete/tasks/task-openmoko-games.bb new file +15 -0
new file mode 100644
index 0000000..c4aaa70
@@ -0,0 +1,15 @@
+DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r72"
+
+inherit task
+
+#
+# task-openmoko-games
+#
+DESCRIPTION_task-openmoko-games = "Openmoko: Games"
+RDEPENDS_task-openmoko-games = "\
+  oh-puzzles \
+  kobodeluxe \
+"
recipes/obsolete/tasks/task-openmoko-linux.bb new file +19 -0
new file mode 100644
index 0000000..dbd3a72
@@ -0,0 +1,19 @@
+DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r72"
+
+inherit task
+
+#
+# task-openmoko-core
+#
+DESCRIPTION_task-openmoko-linux = "Openmoko: Linux Core Services"
+RDEPENDS_task-openmoko-linux = "\
+  task-base \
+  udev-static-devices \
+  rsync \
+  screen \
+  fbset \
+  fbset-modes \
+"
recipes/obsolete/tasks/task-openmoko-native-sdk.bb new file +41 -0

41 lines not on this page · raw message

recipes/obsolete/tasks/task-openmoko-net.bb new file +15 -0
new file mode 100644
index 0000000..d58b05a
@@ -0,0 +1,15 @@
+DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-net
+#
+DESCRIPTION_task-openmoko-net = "Openmoko: Linux Advanced Networking"
+RDEPENDS_task-openmoko-net = "\
+  bluez-utils \
+  bridge-utils \
+"
recipes/obsolete/tasks/task-openmoko-phone.bb new file +19 -0
new file mode 100644
index 0000000..306ff05
@@ -0,0 +1,19 @@
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r73"
+
+inherit task
+
+#
+# task-openmoko-phone
+#
+DESCRIPTION_task-openmoko-phone = "Openmoko: GSM and GPRS Phone Services"
+RDEPENDS_task-openmoko-phone = "\
+  gsmd \
+  libgsmd-tools \
+  openmoko-dialer2 \
+  openmoko-panel-gsm \
+  openmoko-panel-memory \
+#  ppp \
+"
recipes/obsolete/tasks/task-openmoko-pim.bb new file +23 -0
new file mode 100644
index 0000000..ba2ced5
@@ -0,0 +1,23 @@
+DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r72"
+
+inherit task
+
+#
+# task-openmoko-pim
+#
+DESCRIPTION_task-openmoko-pim = "Openmoko: Personal Information Management Suite"
+RDEPENDS_task-openmoko-pim = "\
+  eds-dbus \
+  openmoko-calculator2 \
+#  openmoko-contacts2 \
+#  openmoko-dates2 \
+#  openmoko-feedreader2 \
+  openmoko-browser2 \
+  openmoko-appmanager2 \
+#  openmoko-tasks2 \
+  openmoko-mediaplayer2 \
+  openmoko-messages2 \
+"
recipes/obsolete/tasks/task-openmoko-python-devel.bb new file +11 -0
new file mode 100644
index 0000000..7b375c0
@@ -0,0 +1,11 @@
+DESCRIPTION = "Openmoko: Python Development Tools"
+SECTION = "openmoko/devel"
+LICENSE = "MIT"
+PR = "r3"
+
+inherit task
+
+RDEPENDS_task-openmoko-python-devel = "\
+  task-python-efl \
+  python-pygtk \
+"
recipes/obsolete/tasks/task-openmoko-toolchain-host.bb new file +15 -0
new file mode 100644
index 0000000..7d4398b
@@ -0,0 +1,15 @@
+require task-sdk-host.bb
+
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r2"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} += "\
+    openmoko-sample2-src \
+    openmoko-toolchain-scripts \
+    edje-sdk \
+"
recipes/obsolete/tasks/task-openmoko-toolchain-target.bb new file +23 -0
new file mode 100644
index 0000000..6d4ee62
@@ -0,0 +1,23 @@
+DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+PR = "r3"
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    glibc \
+    glibc-dbg \
+    glibc-dev \
+    glibc-utils \
+    libsegfault \
+    glibc-thread-db \
+    glibc-localedata-i18n \
+    glibc-gconv-ibm850 \
+    glibc-gconv-cp1252 \
+    glibc-gconv-iso8859-1 \
+    glibc-gconv-iso8859-15 \
+    libgcc \
+    libstdc++ \
+"
recipes/obsolete/tasks/task-openmoko-ui.bb new file +58 -0

58 lines not on this page · raw message

recipes/obsolete/tasks/task-openmoko.bb new file +31 -0
new file mode 100644
index 0000000..6c195ba
@@ -0,0 +1,31 @@
+DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PROVIDES = "task-openmoko-everything"
+PR = "r71"
+
+inherit task
+
+PACKAGES += "\
+        task-openmoko-everything \
+"
+
+RDEPENDS_task-openmoko-everything := "\
+  task-openmoko-linux \
+  task-openmoko-ui \
+  task-openmoko-base \
+  task-openmoko-phone \
+  task-openmoko-pim \
+  task-openmoko-net \
+  task-openmoko-games \
+  task-openmoko-examples \
+  task-openmoko-debug \
+  task-openmoko-native-sdk \
+"
+
+
+
+
+
+
+
recipes/openmoko-base/openmoko-session/session deleted +0 -24
deleted file mode 100644
index c7a773e..0000000
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-export GTK_MODULES="libgtkstylus.so libgtkinput.so"
-SHOWCURSOR="no"
-
-matchbox-panel-2 \
-	--start-applets=openmoko-panel-mainmenu,systray,startup \
-	--end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock &
-
-# start old-style panel plugin to get a keyboard
-mbinputmgr &
-
-# set default alsa configuration
-alsactl restore 0 -f /etc/alsa/stereoout.state
-
-# start UI and dialer
-openmoko-footer &
-openmoko-today --desktop &
-openmoko-dialer &
-
-sleep 1
-
-exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
-
recipes/openmoko-base/openmoko-session_svn.bb deleted +0 -32
deleted file mode 100644
index 05625a1..0000000
@@ -1,32 +0,0 @@
-DESCRIPTION = "Matchbox session files for Openmoko"
-SECTION = "openmoko/base"
-RDEPENDS_${PN} = "matchbox-panel-2 matchbox-wm openmoko-today2 gconf"
-PV = "0.1+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-base
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=http \
-           file://session"
-S = "${WORKDIR}"
-
-do_install() {
-	cp -R ${S}/etc ${D}/${sysconfdir}
-	rm -fR ${D}/${sysconfdir}/.svn
-	rm -fR ${D}/${sysconfdir}/matchbox/.svn
-	chmod -R 755 ${D}/${sysconfdir}
-    # DEMO only. Need to handle this differently in actual production images
-	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session
-}
-
-pkg_postinst_openmoko-session () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme openmoko-standard
-}
-
-PACKAGE_ARCH = "all"
-
recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb deleted +0 -7
deleted file mode 100644
index b4926af..0000000
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows the battery/AC status in the Openmoko panel"
-DEPENDS = "apmd libnotify"
-SRCREV = "3360"
-PV = "0.1.1+svnr${SRCPV}"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb deleted +0 -8
deleted file mode 100644
index b9015a3..0000000
@@ -1,8 +0,0 @@
-DESCRIPTION = "Shows the bluetooth status in the Openmoko panel"
-DEPENDS = "bluez-libs libnotify"
-SRCREV = "4331"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb deleted +0 -6
deleted file mode 100644
index 90e5e92..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "Shows the current time in the Openmoko panel"
-SRCREV = "2567"
-PV = "0.1.0+svnr${SRCPV}"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb deleted +0 -7
deleted file mode 100644
index 928a993..0000000
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows the GPS status in the Openmoko panel"
-DEPENDS = "gpsd"
-SRCREV = "4330"
-PV = "0.1.0+svnr${SRCPV}"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb deleted +0 -7
deleted file mode 100644
index 1ce27a6..0000000
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel"
-DEPENDS = "libmokogsmd2 libnotify"
-SRCREV = "4335"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko-panel-plugin
recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb deleted +0 -8
deleted file mode 100644
index ebc0416..0000000
@@ -1,8 +0,0 @@
-DESCRIPTION = "Main menu applet for the Openmoko panel"
-DEPENDS += "pulseaudio startup-notification"
-SRCREV = "2567"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb deleted +0 -8
deleted file mode 100644
index 767546f..0000000
@@ -1,8 +0,0 @@
-DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel"
-DEPENDS = "libnotify"
-RDEPENDS_${PN} = "openmoko-dialer2"
-SRCREV = "3903"
-PV = "0.0.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-panel-plugin
recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb deleted +0 -6
deleted file mode 100644
index 272df4c..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "USB applet for the Openmoko panel"
-SRCREV = "3360"
-PV = "0.1.0+svnr${SRCPV}"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb deleted +0 -7
deleted file mode 100644
index ae8a697..0000000
@@ -1,7 +0,0 @@
-DESCRIPTION = "Shows the wifi status in the Openmoko panel"
-DEPENDS = "libmokopanelui2"
-SRCREV = "4344"
-PV = "0.0.0+svnr${SRCPV}"
-
-inherit openmoko-panel-plugin
-
recipes/openmoko2/openmoko-session2.bb deleted +0 -53

53 lines not on this page · raw message

recipes/openmoko2/openmoko-session2/etc/matchbox/session deleted +0 -12
deleted file mode 100755
index 732cce9..0000000
@@ -1,12 +0,0 @@
-#!/bin/sh
-SHOWCURSOR="no"
-
-openmoko-today &
-phone-kit &
-
-matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -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-memory,openmoko-panel-wifi --titlebar &
-
-exec neod
recipes/openmoko2/openmoko-session2/matchbox-session deleted +0 -24
deleted file mode 100755
index 65f1ce7..0000000
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1 
-
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-
-matchbox-desktop &
-matchbox-panel  --orientation south &
-exec matchbox-window-manager $@
recipes/tasks/task-openmoko-base.bb deleted +0 -31
deleted file mode 100644
index 3c46c56..0000000
@@ -1,31 +0,0 @@
-DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r74"
-
-inherit task
-
-#
-# task-openmoko-base
-#
-DESCRIPTION_task-openmoko-base = "Openmoko: Top Panel, Application Launcher, Application Manager"
-RDEPENDS_task-openmoko-base = "\
-  matchbox-panel-2 \
-#  matchbox-panel-2-applets \
-#  matchbox-keyboard-inputmethod \
-#  matchbox-keyboard-im \
-#  matchbox-keyboard-applet \
-  matchbox-stroke \
-  multitap-pad \
-  vala-terminal \
-#  openmoko-keyboard \
-  openmoko-panel-battery \
-  openmoko-panel-clock \
-  openmoko-panel-usb \
-  ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'openmoko-panel-bt', '', d)} \
-  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '', d)} \
-  ${@base_contains('MACHINE_FEATURES', 'wifi', 'openmoko-panel-wifi', '', d)} \
-  \
-  openmoko-today2 \
-#  openmoko-appmanager \
-"
recipes/tasks/task-openmoko-debug.bb deleted +0 -38
deleted file mode 100644
index f30a024..0000000
@@ -1,38 +0,0 @@
-DESCRIPTION = "Openmoko: Debugging and Benchmarking Tools"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r59.01"
-
-inherit task
-
-RDEPENDS_task-openmoko-debug = "\
-  alsa-utils-amixer \
-  alsa-utils-aplay \
-  alsa-utils-aconnect \
-  alsa-utils-alsamixer \
-  alsa-utils-speakertest \
-  bonnie++ \
-  cu \
-  dbench \
-  fbgrab \
-  fbset \
-  fstests \
-  gdb \
-  gdbserver \
-  lrzsz \
-  lsof \
-  ltrace \
-  memtester \
-#  sensors-i2cdetect sensors-i2cdump sensors-i2cset \
-  strace \
-  tcpdump \
-  tslib-calibrate \
-  tslib-tests \
-  udev-utils \
-  usbutils \
-  uucp \
-  vorbis-tools \
-  x11perf \
-  xev \
-  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'madplay', d)} \
-"
recipes/tasks/task-openmoko-examples.bb deleted +0 -6
deleted file mode 100644
index 7ebe32d..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "Openmoko: Examples for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r71"
-
-inherit task
recipes/tasks/task-openmoko-feed.bb deleted +0 -157

157 lines not on this page · raw message

recipes/tasks/task-openmoko-games.bb deleted +0 -15
deleted file mode 100644
index c4aaa70..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "Openmoko: Games for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r72"
-
-inherit task
-
-#
-# task-openmoko-games
-#
-DESCRIPTION_task-openmoko-games = "Openmoko: Games"
-RDEPENDS_task-openmoko-games = "\
-  oh-puzzles \
-  kobodeluxe \
-"
recipes/tasks/task-openmoko-linux.bb deleted +0 -19
deleted file mode 100644
index dbd3a72..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "Openmoko: Core system for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r72"
-
-inherit task
-
-#
-# task-openmoko-core
-#
-DESCRIPTION_task-openmoko-linux = "Openmoko: Linux Core Services"
-RDEPENDS_task-openmoko-linux = "\
-  task-base \
-  udev-static-devices \
-  rsync \
-  screen \
-  fbset \
-  fbset-modes \
-"
recipes/tasks/task-openmoko-native-sdk.bb deleted +0 -41

41 lines not on this page · raw message

recipes/tasks/task-openmoko-net.bb deleted +0 -15
deleted file mode 100644
index d58b05a..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "Openmoko: Networking for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r71"
-
-inherit task
-
-#
-# task-openmoko-net
-#
-DESCRIPTION_task-openmoko-net = "Openmoko: Linux Advanced Networking"
-RDEPENDS_task-openmoko-net = "\
-  bluez-utils \
-  bridge-utils \
-"
recipes/tasks/task-openmoko-phone.bb deleted +0 -19
deleted file mode 100644
index 306ff05..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r73"
-
-inherit task
-
-#
-# task-openmoko-phone
-#
-DESCRIPTION_task-openmoko-phone = "Openmoko: GSM and GPRS Phone Services"
-RDEPENDS_task-openmoko-phone = "\
-  gsmd \
-  libgsmd-tools \
-  openmoko-dialer2 \
-  openmoko-panel-gsm \
-  openmoko-panel-memory \
-#  ppp \
-"
recipes/tasks/task-openmoko-pim.bb deleted +0 -23
deleted file mode 100644
index ba2ced5..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "Openmoko: PIM for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r72"
-
-inherit task
-
-#
-# task-openmoko-pim
-#
-DESCRIPTION_task-openmoko-pim = "Openmoko: Personal Information Management Suite"
-RDEPENDS_task-openmoko-pim = "\
-  eds-dbus \
-  openmoko-calculator2 \
-#  openmoko-contacts2 \
-#  openmoko-dates2 \
-#  openmoko-feedreader2 \
-  openmoko-browser2 \
-  openmoko-appmanager2 \
-#  openmoko-tasks2 \
-  openmoko-mediaplayer2 \
-  openmoko-messages2 \
-"
recipes/tasks/task-openmoko-python-devel.bb deleted +0 -11
deleted file mode 100644
index 7b375c0..0000000
@@ -1,11 +0,0 @@
-DESCRIPTION = "Openmoko: Python Development Tools"
-SECTION = "openmoko/devel"
-LICENSE = "MIT"
-PR = "r3"
-
-inherit task
-
-RDEPENDS_task-openmoko-python-devel = "\
-  task-python-efl \
-  python-pygtk \
-"
recipes/tasks/task-openmoko-toolchain-host.bb deleted +0 -15
deleted file mode 100644
index 7d4398b..0000000
@@ -1,15 +0,0 @@
-require task-sdk-host.bb
-
-DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PR = "r2"
-
-PACKAGES = "${PN}"
-
-RDEPENDS_${PN} += "\
-    openmoko-sample2-src \
-    openmoko-toolchain-scripts \
-    edje-sdk \
-"
recipes/tasks/task-openmoko-toolchain-target.bb deleted +0 -23
deleted file mode 100644
index 6d4ee62..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "Packages for a standalone Openmoko SDK or external toolchain"
-LICENSE = "MIT"
-ALLOW_EMPTY = "1"
-
-PR = "r3"
-
-PACKAGES = "${PN}"
-
-RDEPENDS_${PN} = "\
-    glibc \
-    glibc-dbg \
-    glibc-dev \
-    glibc-utils \
-    libsegfault \
-    glibc-thread-db \
-    glibc-localedata-i18n \
-    glibc-gconv-ibm850 \
-    glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-1 \
-    glibc-gconv-iso8859-15 \
-    libgcc \
-    libstdc++ \
-"
recipes/tasks/task-openmoko-ui.bb deleted +0 -58

58 lines not on this page · raw message

recipes/tasks/task-openmoko.bb deleted +0 -31
deleted file mode 100644
index 6c195ba..0000000
@@ -1,31 +0,0 @@
-DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PROVIDES = "task-openmoko-everything"
-PR = "r71"
-
-inherit task
-
-PACKAGES += "\
-        task-openmoko-everything \
-"
-
-RDEPENDS_task-openmoko-everything := "\
-  task-openmoko-linux \
-  task-openmoko-ui \
-  task-openmoko-base \
-  task-openmoko-phone \
-  task-openmoko-pim \
-  task-openmoko-net \
-  task-openmoko-games \
-  task-openmoko-examples \
-  task-openmoko-debug \
-  task-openmoko-native-sdk \
-"
-
-
-
-
-
-
-
Signature · 1 line
1.7.3.1
#10 lore raw

PATCH 7/13 openmoko: obsolete old openmoko classes and recipes using those

In reply to Martin Jansa
---
 classes/openmoko-base.bbclass                      |   22 --------
 classes/openmoko.bbclass                           |    3 -
 classes/openmoko2.bbclass                          |   37 -------------
 recipes/obsolete/classes/openmoko-base.bbclass     |   22 ++++++++
 recipes/obsolete/classes/openmoko.bbclass          |    3 +
 recipes/obsolete/classes/openmoko2.bbclass         |   37 +++++++++++++
 .../obsolete/openmoko-base/openmoko-common_svn.bb  |   21 +++++++
 .../openmoko-icon-theme-standard_svn.bb            |   19 +++++++
 .../obsolete/openmoko-base/openmoko-libs_svn.bb    |   32 +++++++++++
 .../openmoko-base/openmoko-sound-system/pulseaudio |   46 ++++++++++++++++
 .../openmoko-base/openmoko-sound-system/session    |   28 ++++++++++
 .../openmoko-base/openmoko-sound-system_0.1.0.bb   |   31 +++++++++++
 .../openmoko-sound-theme-standard_svn.bb           |   23 ++++++++
 .../openmoko-theme-standard-qvga_svn.bb            |   25 +++++++++
 .../openmoko-base/openmoko-theme-standard_svn.bb   |   27 +++++++++
 .../openmoko-examples/openmoko-finger-demo_svn.bb  |    6 ++
 .../openmoko-panel-demo-simple_svn.bb              |   20 +++++++
 .../openmoko-examples/openmoko-panel-demo_svn.bb   |   10 ++++
 .../openmoko-stylus-demo-simple_svn.bb             |    6 ++
 .../openmoko-examples/openmoko-stylus-demo_svn.bb  |    6 ++
 .../diversity-daemon/no-xmmp.patch                 |   24 ++++++++
 .../openmoko-projects/diversity-daemon_svn.bb      |   20 +++++++
 .../openmoko-projects/diversity-radar_svn.bb       |   17 ++++++
 recipes/obsolete/openmoko2/libjana_svn.bb          |   29 ++++++++++
 recipes/obsolete/openmoko2/libmokogsmd2_svn.bb     |    8 +++
 recipes/obsolete/openmoko2/libmokojournal2_svn.bb  |   12 ++++
 recipes/obsolete/openmoko2/libmokopanelui2_svn.bb  |    8 +++
 recipes/obsolete/openmoko2/moko-gtk-engine_svn.bb  |   15 +++++
 recipes/obsolete/openmoko2/neod/htc.patch          |   32 +++++++++++
 recipes/obsolete/openmoko2/neod/ipaq.patch         |   32 +++++++++++
 recipes/obsolete/openmoko2/neod_svn.bb             |   28 ++++++++++
 .../openmoko2/openmoko-asu-om20072-support.bb      |   27 +++++++++
 recipes/obsolete/openmoko2/openmoko-common2_svn.bb |   27 +++++++++
 .../openmoko-icon-theme-standard2-qvga_svn.bb      |   58 ++++++++++++++++++++
 .../openmoko2/openmoko-icon-theme-standard2_svn.bb |   24 ++++++++
 .../openmoko2/openmoko-sound-system2/pulseaudio    |   50 +++++++++++++++++
 .../openmoko2/openmoko-sound-system2/session       |   27 +++++++++
 .../openmoko2/openmoko-sound-system2_0.1.0.bb      |   34 ++++++++++++
 .../openmoko-sound-theme-standard2_svn.bb          |   26 +++++++++
 .../openmoko2/openmoko-theme-standard2-qvga_svn.bb |   27 +++++++++
 .../openmoko2/openmoko-theme-standard2_svn.bb      |   22 ++++++++
 recipes/openmoko-base/openmoko-common_svn.bb       |   21 -------
 .../openmoko-icon-theme-standard_svn.bb            |   19 -------
 recipes/openmoko-base/openmoko-libs_svn.bb         |   32 -----------
 .../openmoko-base/openmoko-sound-system/pulseaudio |   46 ----------------
 .../openmoko-base/openmoko-sound-system/session    |   28 ----------
 .../openmoko-base/openmoko-sound-system_0.1.0.bb   |   31 -----------
 .../openmoko-sound-theme-standard_svn.bb           |   23 --------
 .../openmoko-theme-standard-qvga_svn.bb            |   25 ---------
 .../openmoko-base/openmoko-theme-standard_svn.bb   |   27 ---------
 .../openmoko-examples/openmoko-finger-demo_svn.bb  |    6 --
 .../openmoko-panel-demo-simple_svn.bb              |   20 -------
 .../openmoko-examples/openmoko-panel-demo_svn.bb   |   10 ----
 .../openmoko-stylus-demo-simple_svn.bb             |    6 --
 .../openmoko-examples/openmoko-stylus-demo_svn.bb  |    6 --
 .../diversity-daemon/no-xmmp.patch                 |   24 --------
 recipes/openmoko-projects/diversity-daemon_svn.bb  |   20 -------
 recipes/openmoko-projects/diversity-radar_svn.bb   |   17 ------
 recipes/openmoko2/libjana_svn.bb                   |   29 ----------
 recipes/openmoko2/libmokogsmd2_svn.bb              |    8 ---
 recipes/openmoko2/libmokojournal2_svn.bb           |   12 ----
 recipes/openmoko2/libmokopanelui2_svn.bb           |    8 ---
 recipes/openmoko2/moko-gtk-engine_svn.bb           |   15 -----
 recipes/openmoko2/neod/htc.patch                   |   32 -----------
 recipes/openmoko2/neod/ipaq.patch                  |   32 -----------
 recipes/openmoko2/neod_svn.bb                      |   28 ----------
 recipes/openmoko2/openmoko-asu-om20072-support.bb  |   27 ---------
 recipes/openmoko2/openmoko-common2_svn.bb          |   27 ---------
 .../openmoko-icon-theme-standard2-qvga_svn.bb      |   58 --------------------
 .../openmoko2/openmoko-icon-theme-standard2_svn.bb |   24 --------
 .../openmoko2/openmoko-sound-system2/pulseaudio    |   50 -----------------
 recipes/openmoko2/openmoko-sound-system2/session   |   27 ---------
 recipes/openmoko2/openmoko-sound-system2_0.1.0.bb  |   34 ------------
 .../openmoko-sound-theme-standard2_svn.bb          |   26 ---------
 .../openmoko2/openmoko-theme-standard2-qvga_svn.bb |   27 ---------
 recipes/openmoko2/openmoko-theme-standard2_svn.bb  |   22 --------
 76 files changed, 909 insertions(+), 909 deletions(-)
 delete mode 100644 classes/openmoko-base.bbclass
 delete mode 100644 classes/openmoko.bbclass
 delete mode 100644 classes/openmoko2.bbclass
 create mode 100644 recipes/obsolete/classes/openmoko-base.bbclass
 create mode 100644 recipes/obsolete/classes/openmoko.bbclass
 create mode 100644 recipes/obsolete/classes/openmoko2.bbclass
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-common_svn.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-icon-theme-standard_svn.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-libs_svn.bb
 create mode 100755 recipes/obsolete/openmoko-base/openmoko-sound-system/pulseaudio
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-sound-system/session
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-sound-system_0.1.0.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-sound-theme-standard_svn.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-theme-standard-qvga_svn.bb
 create mode 100644 recipes/obsolete/openmoko-base/openmoko-theme-standard_svn.bb
 create mode 100644 recipes/obsolete/openmoko-examples/openmoko-finger-demo_svn.bb
 create mode 100644 recipes/obsolete/openmoko-examples/openmoko-panel-demo-simple_svn.bb
 create mode 100644 recipes/obsolete/openmoko-examples/openmoko-panel-demo_svn.bb
 create mode 100644 recipes/obsolete/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
 create mode 100644 recipes/obsolete/openmoko-examples/openmoko-stylus-demo_svn.bb
 create mode 100644 recipes/obsolete/openmoko-projects/diversity-daemon/no-xmmp.patch
 create mode 100644 recipes/obsolete/openmoko-projects/diversity-daemon_svn.bb
 create mode 100644 recipes/obsolete/openmoko-projects/diversity-radar_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/libjana_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/libmokogsmd2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/libmokojournal2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/libmokopanelui2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/moko-gtk-engine_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/neod/htc.patch
 create mode 100644 recipes/obsolete/openmoko2/neod/ipaq.patch
 create mode 100644 recipes/obsolete/openmoko2/neod_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-asu-om20072-support.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-common2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-icon-theme-standard2_svn.bb
 create mode 100755 recipes/obsolete/openmoko2/openmoko-sound-system2/pulseaudio
 create mode 100644 recipes/obsolete/openmoko2/openmoko-sound-system2/session
 create mode 100644 recipes/obsolete/openmoko2/openmoko-sound-system2_0.1.0.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-sound-theme-standard2_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-theme-standard2-qvga_svn.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-theme-standard2_svn.bb
 delete mode 100644 recipes/openmoko-base/openmoko-common_svn.bb
 delete mode 100644 recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb
 delete mode 100644 recipes/openmoko-base/openmoko-libs_svn.bb
 delete mode 100755 recipes/openmoko-base/openmoko-sound-system/pulseaudio
 delete mode 100644 recipes/openmoko-base/openmoko-sound-system/session
 delete mode 100644 recipes/openmoko-base/openmoko-sound-system_0.1.0.bb
 delete mode 100644 recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb
 delete mode 100644 recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb
 delete mode 100644 recipes/openmoko-base/openmoko-theme-standard_svn.bb
 delete mode 100644 recipes/openmoko-examples/openmoko-finger-demo_svn.bb
 delete mode 100644 recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb
 delete mode 100644 recipes/openmoko-examples/openmoko-panel-demo_svn.bb
 delete mode 100644 recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb
 delete mode 100644 recipes/openmoko-examples/openmoko-stylus-demo_svn.bb
 delete mode 100644 recipes/openmoko-projects/diversity-daemon/no-xmmp.patch
 delete mode 100644 recipes/openmoko-projects/diversity-daemon_svn.bb
 delete mode 100644 recipes/openmoko-projects/diversity-radar_svn.bb
 delete mode 100644 recipes/openmoko2/libjana_svn.bb
 delete mode 100644 recipes/openmoko2/libmokogsmd2_svn.bb
 delete mode 100644 recipes/openmoko2/libmokojournal2_svn.bb
 delete mode 100644 recipes/openmoko2/libmokopanelui2_svn.bb
 delete mode 100644 recipes/openmoko2/moko-gtk-engine_svn.bb
 delete mode 100644 recipes/openmoko2/neod/htc.patch
 delete mode 100644 recipes/openmoko2/neod/ipaq.patch
 delete mode 100644 recipes/openmoko2/neod_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-asu-om20072-support.bb
 delete mode 100644 recipes/openmoko2/openmoko-common2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb
 delete mode 100755 recipes/openmoko2/openmoko-sound-system2/pulseaudio
 delete mode 100644 recipes/openmoko2/openmoko-sound-system2/session
 delete mode 100644 recipes/openmoko2/openmoko-sound-system2_0.1.0.bb
 delete mode 100644 recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-theme-standard2_svn.bb
classes/openmoko-base.bbclass deleted +0 -22
deleted file mode 100644
index b5459d5..0000000
@@ -1,22 +0,0 @@
-HOMEPAGE = "http://www.openmoko.org"
-LICENSE ?= "GPL"
-OPENMOKO_RELEASE ?= "OM-2007.2"
-OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
-
-def openmoko_base_get_subdir(d):
-    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
-        openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
-    else:
-        section = bb.data.getVar('SECTION', d, 1)
-    if section == 'base' or section == 'libs': return ""
-    elif section in 'apps tools pim'.split(): return "applications"
-    elif section == "panel-plugin": return "panel-plugins"
-    elif section == "inputmethods": return "inputmethods"
-    else: return section
-
-SUBDIR = "${@openmoko_base_get_subdir(d)}"
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
-S = "${WORKDIR}/${PN}"
-
-FILES_${PN} += "${datadir}/icons"
classes/openmoko.bbclass deleted +0 -3
deleted file mode 100644
index 808ab8f..0000000
@@ -1,3 +0,0 @@
-inherit openmoko-base autotools pkgconfig
-
-DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}"
classes/openmoko2.bbclass deleted +0 -37
deleted file mode 100644
index 25dea82..0000000
@@ -1,37 +0,0 @@
-inherit autotools pkgconfig
-
-HOMEPAGE = "http://www.openmoko.org"
-OPENMOKO_RELEASE ?= "OM-2007.2"
-OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
-
-def openmoko_two_get_license(d):
-    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
-    	openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
-    else:
-        section = bb.data.getVar('SECTION', d, 1)	
-    return "LGPL GPL".split()[section != "libs"]
-
-def openmoko_two_get_subdir(d):
-    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
-        openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
-    else:
-        section = bb.data.getVar('SECTION', d, 1)
-    if section == 'base': return ""
-    elif section == 'libs': return "libraries"
-    elif section in 'apps tools pim'.split(): return "applications"
-    elif section == "panel-plugin": return "panel-plugins"
-    elif section == "inputmethods": return "inputmethods"
-    elif section == "daemons": return "daemons"
-    elif section == "misc": return "misc"
-    else: return section
-
-LICENSE = "${@openmoko_two_get_license(d)}"
-SUBDIR = "${@openmoko_two_get_subdir(d)}"
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
-S = "${WORKDIR}/${PN}"
-
-FILES_${PN} += "${datadir}/icons"
-
-SVNREV = "r${SRCREV}"
-#SVNREV = "${SRCDATE}"
recipes/obsolete/classes/openmoko-base.bbclass new file +22 -0
new file mode 100644
index 0000000..b5459d5
@@ -0,0 +1,22 @@
+HOMEPAGE = "http://www.openmoko.org"
+LICENSE ?= "GPL"
+OPENMOKO_RELEASE ?= "OM-2007.2"
+OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
+
+def openmoko_base_get_subdir(d):
+    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
+        openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    else:
+        section = bb.data.getVar('SECTION', d, 1)
+    if section == 'base' or section == 'libs': return ""
+    elif section in 'apps tools pim'.split(): return "applications"
+    elif section == "panel-plugin": return "panel-plugins"
+    elif section == "inputmethods": return "inputmethods"
+    else: return section
+
+SUBDIR = "${@openmoko_base_get_subdir(d)}"
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += "${datadir}/icons"
recipes/obsolete/classes/openmoko.bbclass new file +3 -0
new file mode 100644
index 0000000..808ab8f
@@ -0,0 +1,3 @@
+inherit openmoko-base autotools pkgconfig
+
+DEPENDS_prepend = "${@["openmoko-libs ", ""][(bb.data.getVar('PN', d, 1) == 'openmoko-libs')]}"
recipes/obsolete/classes/openmoko2.bbclass new file +37 -0
new file mode 100644
index 0000000..25dea82
@@ -0,0 +1,37 @@
+inherit autotools pkgconfig
+
+HOMEPAGE = "http://www.openmoko.org"
+OPENMOKO_RELEASE ?= "OM-2007.2"
+OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
+
+def openmoko_two_get_license(d):
+    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
+    	openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    else:
+        section = bb.data.getVar('SECTION', d, 1)	
+    return "LGPL GPL".split()[section != "libs"]
+
+def openmoko_two_get_subdir(d):
+    if bb.data.getVar('SECTION', d, 1).find("/") != -1:
+        openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    else:
+        section = bb.data.getVar('SECTION', d, 1)
+    if section == 'base': return ""
+    elif section == 'libs': return "libraries"
+    elif section in 'apps tools pim'.split(): return "applications"
+    elif section == "panel-plugin": return "panel-plugins"
+    elif section == "inputmethods": return "inputmethods"
+    elif section == "daemons": return "daemons"
+    elif section == "misc": return "misc"
+    else: return section
+
+LICENSE = "${@openmoko_two_get_license(d)}"
+SUBDIR = "${@openmoko_two_get_subdir(d)}"
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += "${datadir}/icons"
+
+SVNREV = "r${SRCREV}"
+#SVNREV = "${SRCDATE}"
recipes/obsolete/openmoko-base/openmoko-common_svn.bb new file +21 -0
new file mode 100644
index 0000000..7f1be74
@@ -0,0 +1,21 @@
+DESCRIPTION = "Common files for the Openmoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-base
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=images;proto=http"
+S = "${WORKDIR}"
+
+dirs = "images/pixmaps"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/openmoko/
+	for i in ${dirs}; do
+		cp -fpPR ${S}/$i ${D}${datadir}/openmoko/
+	done
+}
+
+FILES_${PN} = "${datadir}"
recipes/obsolete/openmoko-base/openmoko-icon-theme-standard_svn.bb new file +19 -0
new file mode 100644
index 0000000..0d8a627
@@ -0,0 +1,19 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svnr${SRCPV}"
+PR = "r1"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+pkg_postinst_openmoko-icon-theme-standard () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+gtk-update-icon-cache ${datadir}/icons/openmoko-standard/
+}
+
+PACKAGE_ARCH = "all"
recipes/obsolete/openmoko-base/openmoko-libs_svn.bb new file +32 -0
new file mode 100644
index 0000000..42d6b8f
@@ -0,0 +1,32 @@
+DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
+SECTION = "openmoko/libs"
+LICENSE = "LGPL"
+DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
+PV = "0.4+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko
+
+PACKAGES =+ "\
+  libmokojournal libmokojournal-dev libmokojournal-dbg \
+  libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
+  libmokocore libmokocore-dev libmokocore-dbg \
+  libmokoui libmokoui-dev libmokoui-dbg \
+"
+
+FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
+FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
+FILES_libmokojournal-dbg += "${libdir}/.debug/libmokojournal.so.*"
+
+FILES_libmokogsmd = "${libdir}/libmokogsmd.so.*"
+FILES_libmokogsmd-dev = "${libdir}/libmokogsmd.so ${libdir}/libmokogsmd.*a ${includedir}/${PN}/libmokogsmd"
+FILES_libmokogsmd-dbg += "${libdir}/.debug/libmokogsmd.so.*"
+
+FILES_libmokocore = "${libdir}/libmokocore.so.*"
+FILES_libmokocore-dev = "${libdir}/libmokocore.so ${libdir}/libmokocore.*a ${includedir}/${PN}/libmokocore"
+FILES_libmokocore-dbg += "${libdir}/.debug/libmokocore.so.*"
+ 	 
+FILES_libmokoui = "${libdir}/libmokoui.so.*"
+FILES_libmokoui-dev = "${libdir}/libmokoui.so ${libdir}/libmokoui.*a ${includedir}/${PN}/libmokoui"
+FILES_libmokoui-dbg += "${libdir}/.debug/libmokoui.so.*"
+  	 
recipes/obsolete/openmoko-base/openmoko-sound-system/pulseaudio new file +46 -0

46 lines not on this page · raw message

recipes/obsolete/openmoko-base/openmoko-sound-system/session new file +28 -0
new file mode 100644
index 0000000..ed2346d
@@ -0,0 +1,28 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+load-module module-x11-bell sample=x11-bell
+
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
recipes/obsolete/openmoko-base/openmoko-sound-system_0.1.0.bb new file +31 -0
new file mode 100644
index 0000000..2ada84f
@@ -0,0 +1,31 @@
+DESCRIPTION = "Openmoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS_${PN} = "\
+  pulseaudio-server \
+  pulseaudio-module-alsa-sink \
+  pulseaudio-module-alsa-source \
+  pulseaudio-module-cli \
+  pulseaudio-module-esound-protocol-unix \
+  pulseaudio-module-simple-protocol-tcp \
+  pulseaudio-module-native-protocol-unix \
+  pulseaudio-module-cli-protocol-unix \
+"
+PR = "r7"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+           file://session"
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+    install -d ${D}/${sysconfdir}/pulse
+	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
recipes/obsolete/openmoko-base/openmoko-sound-theme-standard_svn.bb new file +23 -0
new file mode 100644
index 0000000..2c61036
@@ -0,0 +1,23 @@
+DESCRIPTION = "Standard sound theme for the Openmoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko-base autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+        find ${WORKDIR} -name ".svn" | xargs rm -rf
+        install -d ${D}${datadir}/openmoko/sounds
+        for i in *.mp3; do
+                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
+                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+}
+
+FILES_${PN} = "${datadir}"
+
recipes/obsolete/openmoko-base/openmoko-theme-standard-qvga_svn.bb new file +25 -0
new file mode 100644
index 0000000..c7256a9
@@ -0,0 +1,25 @@
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version"
+SECTION = "openmoko/base"
+PV = "0.0+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko-base
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
+S = "${WORKDIR}"
+
+dirs = "themes/openmoko-standard-qvga"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/themes/
+	for i in ${dirs}; do
+		cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/
+	done
+	
+	install -d ${D}${sysconfdir}/gtk-2.0
+	echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/obsolete/openmoko-base/openmoko-theme-standard_svn.bb new file +27 -0
new file mode 100644
index 0000000..606d6a03
@@ -0,0 +1,27 @@
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution"
+SECTION = "openmoko/base"
+PV = "0.0+svnr${SRCPV}"
+PR = "r5"
+
+inherit openmoko-base
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
+S = "${WORKDIR}"
+
+dirs = "themes/openmoko-standard"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/themes/
+	for i in ${dirs}; do
+		cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/
+	done
+	
+	install -d ${D}${sysconfdir}/gtk-2.0
+	echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/obsolete/openmoko-examples/openmoko-finger-demo_svn.bb new file +6 -0
new file mode 100644
index 0000000..a5c7c62
@@ -0,0 +1,6 @@
+DESCRIPTION = "An example finger application for Openmoko"
+SECTION = "openmoko/examples"
+PV = "0.0.1+svnr${SRCPV}"
+
+inherit openmoko
+
recipes/obsolete/openmoko-examples/openmoko-panel-demo-simple_svn.bb new file +20 -0
new file mode 100644
index 0000000..82e5c61
@@ -0,0 +1,20 @@
+DESCRIPTION = "A simple example panel plugin for Openmoko"
+SECTION = "openmoko/examples"
+DEPENDS += "libmatchbox"
+SRCREV = "1328"
+PV = "0.0.1+svnr${SRCPV}"
+
+PR = "r1"
+
+inherit openmoko
+
+do_configure_prepend() {
+	sed -i -e s:-Werror::g src/Makefile.am
+}	
+
+
+FILES_${PN} += "${libdir}/matchbox-panel/*.so.*"
+FILES_${PN}-dev += "${libdir}/matchbox-panel/*.so \
+                    ${libdir}/matchbox-panel/*.la"
+FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
+
recipes/obsolete/openmoko-examples/openmoko-panel-demo_svn.bb new file +10 -0
new file mode 100644
index 0000000..8e9a501
@@ -0,0 +1,10 @@
+DESCRIPTION = "An example panel plugin for Openmoko"
+SECTION = "openmoko/examples"
+DEPENDS += "libmatchbox"
+SRCREV = "1622"
+PV = "0.0.1+svnr${SRCPV}"
+
+inherit openmoko
+
+PARALLEL_MAKE = ""
+
recipes/obsolete/openmoko-examples/openmoko-stylus-demo-simple_svn.bb new file +6 -0
new file mode 100644
index 0000000..08b72f8
@@ -0,0 +1,6 @@
+DESCRIPTION = "A simple stylus application example for Openmoko"
+SECTION = "openmoko/examples"
+PV = "0.0.1+svnr${SRCPV}"
+
+inherit openmoko
+
recipes/obsolete/openmoko-examples/openmoko-stylus-demo_svn.bb new file +6 -0
new file mode 100644
index 0000000..550324a
@@ -0,0 +1,6 @@
+DESCRIPTION = "An example stylus application for Openmoko"
+SECTION = "openmoko/examples"
+PV = "0.0.1+svnr${SRCPV}"
+
+inherit openmoko
+
recipes/obsolete/openmoko-projects/diversity-daemon/no-xmmp.patch new file +24 -0
new file mode 100644
index 0000000..2065e97
@@ -0,0 +1,24 @@
+Index: diversity-xmpp-backend/Makefile.am
+===================================================================
+--- a/diversity-xmpp-backend/Makefile.am	(revision 276)
++++ a/diversity-xmpp-backend/Makefile.am	(working copy)
+@@ -1,3 +1,4 @@
++if HAVE_XMPP
+ INCLUDES = -I${top_srcdir}/include
+ 
+ AM_CPPFLAGS =			\
+@@ -4,9 +5,7 @@
+ 	$(GLIB_CFLAGS)		\
+ 	$(LM_CFLAGS)
+ 
+-if HAVE_XMPP
+ noinst_LTLIBRARIES = libdiversity-xmpp-backend.la
+-endif
+ 
+ noinst_HEADERS = diversity-xmpp-backend.h
+ 
+@@ -48,3 +47,4 @@
+ 
+ xmpp-marshal.h: xmpp-marshal.list
+ 	$(GLIB_GENMARSHAL) --prefix xmpp_marshal --header $< > $@
++endif
recipes/obsolete/openmoko-projects/diversity-daemon_svn.bb new file +20 -0
new file mode 100644
index 0000000..ab06fde
@@ -0,0 +1,20 @@
+DESCRIPTION = "Diversity Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "network/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS_${PN} = "eds-dbus"
+SRCREV = "571"
+PV = "0.0+svnr${SRCPV}"
+PR = "r3"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=http \
+           file://no-xmmp.patch;minrev=276;maxrev=568"
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"
recipes/obsolete/openmoko-projects/diversity-radar_svn.bb new file +17 -0
new file mode 100644
index 0000000..b5f4e77
@@ -0,0 +1,17 @@
+DESCRIPTION = "Diversity Radar is a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus"
+RDEPENDS_${PN} = "diversity-daemon"
+SRCREV = "510"
+PV = "0.0.4+svnr${SRCPV}"
+PR = "r0.02"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit setuptools
+
+FILES_${PN} += "${prefix}/share/*"
recipes/obsolete/openmoko2/libjana_svn.bb new file +29 -0
new file mode 100644
index 0000000..c73a319
@@ -0,0 +1,29 @@
+DESCRIPTION = "O-Hand Jana Library"
+DEPENDS = "libmokojournal2"
+DEPENDS = "gtk+ eds-dbus gconf" 
+SRCREV = "749"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r5"
+
+inherit autotools pkgconfig lib_package
+
+SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk/"
+
+EXTRA_OECONF = "--enable-examples "
+
+do_configure_prepend() {
+	touch gtk-doc.make
+}
+
+PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
+             libjana-gtk libjana-gtk-dbg \ 
+            "
+
+LEAD_SONAME = "libjana.so"
+
+FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
+FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
+FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
+FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
+FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
recipes/obsolete/openmoko2/libmokogsmd2_svn.bb new file +8 -0
new file mode 100644
index 0000000..3fa20e9
@@ -0,0 +1,8 @@
+SECTION = "openmoko/libs"
+DEPENDS = "libgsmd glib-2.0"
+SRCREV = "4334"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2
+
recipes/obsolete/openmoko2/libmokojournal2_svn.bb new file +12 -0
new file mode 100644
index 0000000..ea56046
@@ -0,0 +1,12 @@
+SECTION = "openmoko/libs"
+DEPENDS = "eds-dbus"
+SRCREV = "3473"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2 lib_package
+
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
recipes/obsolete/openmoko2/libmokopanelui2_svn.bb new file +8 -0
new file mode 100644
index 0000000..2a3a1c5
@@ -0,0 +1,8 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+ matchbox-panel-2"
+SRCREV = "4568"
+PV = "0.3.0+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko2
+
recipes/obsolete/openmoko2/moko-gtk-engine_svn.bb new file +15 -0
new file mode 100644
index 0000000..72c0c23
@@ -0,0 +1,15 @@
+DESCRIPTION = "Moko GTK+ theme engine"
+SECTION = "openmoko/libs"
+SRCREV = "4734"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "moko-gtk-theme"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_moko-gtk-theme = "${datadir}/themes"
+RDEPENDS_${PN} = "moko-gtk-theme"
+
recipes/obsolete/openmoko2/neod/htc.patch new file +32 -0
new file mode 100644
index 0000000..0ced894
@@ -0,0 +1,32 @@
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-15 23:01:30.000000000 +0200
++++ neod/configure.ac	2007-09-15 23:02:01.000000000 +0200
+@@ -32,6 +32,10 @@
+         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
+ fi
+ 
++if test x"$neod_platform" = x"htc"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-15 23:02:15.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-15 23:04:16.000000000 +0200
+@@ -63,6 +63,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_HTC
++    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
++    #define POWER_BUTTON_KEYCODE 0x74 /* power */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
recipes/obsolete/openmoko2/neod/ipaq.patch new file +32 -0
new file mode 100644
index 0000000..19b61ab
@@ -0,0 +1,32 @@
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-29 17:24:43.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-29 17:24:49.000000000 +0200
+@@ -69,6 +69,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_IPAQ
++    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
++    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-29 17:25:12.000000000 +0200
++++ neod/configure.ac	2007-09-29 17:25:48.000000000 +0200
+@@ -36,6 +36,10 @@
+ 	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
+ fi
+ 
++if test x"$neod_platform" = x"ipaq"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
recipes/obsolete/openmoko2/neod_svn.bb new file +28 -0
new file mode 100644
index 0000000..d3e4cd9
@@ -0,0 +1,28 @@
+DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
+SECTION = "openmoko/daemons"
+
+DISTRO_APM ?= "apm"
+DEPENDS = "gtk+ pulseaudio apmd"
+RDEPENDS_${PN} = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_APM} dbus"
+SRCREV = "4617"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r8"
+
+inherit openmoko2 gconf
+
+SRC_URI += "file://htc.patch;maxrev=3348 \
+            file://ipaq.patch;maxrev=3348"
+
+EXTRA_OECONF_om-gta01 = "--with-platform=neo1973"
+EXTRA_OECONF_om-gta02 = "--with-platform=neo1973"
+EXTRA_OECONF_a780      = "--with-platform=ezx"
+EXTRA_OECONF_a1200     = "--with-platform=ezx"
+EXTRA_OECONF_e680      = "--with-platform=ezx"
+EXTRA_OECONF_rokre2    = "--with-platform=ezx"
+EXTRA_OECONF_rokre6    = "--with-platform=ezx"
+EXTRA_OECONF_magician  = "--with-platform=htc"
+EXTRA_OECONF_hx4700    = "--with-platform=ipaq"
+EXTRA_OECONF_htcuniversal = "--with-platform=htc"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
recipes/obsolete/openmoko2/openmoko-asu-om20072-support.bb new file +27 -0
new file mode 100644
index 0000000..9b0847f
@@ -0,0 +1,27 @@
+DESCRIPTION = "Theme support and defaults to integrate OM2007.2 in the April Software Update"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "openmoko-common2"
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_ARCH = "all"
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
+# gstreamer audio settings
+#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
+#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
+
+}
+
recipes/obsolete/openmoko2/openmoko-common2_svn.bb new file +27 -0
new file mode 100644
index 0000000..5558e4f
@@ -0,0 +1,27 @@
+DESCRIPTION = "Common files for the Openmoko framework"
+SECTION = "openmoko/base"
+SRCREV = "3259"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
+S = "${WORKDIR}"
+
+ALLOW_EMPTY = "1"
+
+dirs = "pixmaps"
+
+do_install() {
+	find . -name .svn | xargs rm -rf
+	install -d ${D}${datadir}
+	for i in ${dirs}; do
+		cp -fR $i ${D}${datadir}/$i;
+	done
+	# moved to xserver-kdrive-common
+	rm -f ${D}${datadir}/pixmaps/xsplash*
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
recipes/obsolete/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb new file +58 -0

58 lines not on this page · raw message

recipes/obsolete/openmoko2/openmoko-icon-theme-standard2_svn.bb new file +24 -0
new file mode 100644
index 0000000..c184445
@@ -0,0 +1,24 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
+HOMEPAGE = "http://www.openmoko.org"
+SECTION = "openmoko/base"
+LICENSE = "GPL"
+
+SRCREV = "4232"
+PV = "0.1.0+svnr${SRCPV}"
+PR = "r3"
+
+inherit autotools pkgconfig
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+FILES_${PN} += "${datadir}/icons"
+
+pkg_postinst_${PN} () {
+    if [ "x$D" != "x" ]; then
+        exit 1
+    fi
+    gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
+}
+
+PACKAGE_ARCH = "all"
recipes/obsolete/openmoko2/openmoko-sound-system2/pulseaudio new file +50 -0

50 lines not on this page · raw message

recipes/obsolete/openmoko2/openmoko-sound-system2/session new file +27 -0
new file mode 100644
index 0000000..7cc4d49
@@ -0,0 +1,27 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+load-module module-x11-bell sample=x11-bell
+
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
recipes/obsolete/openmoko2/openmoko-sound-system2_0.1.0.bb new file +34 -0
new file mode 100644
index 0000000..c947e32
@@ -0,0 +1,34 @@
+DESCRIPTION = "Openmoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS_${PN} = "\
+  pulseaudio-server \
+  pulseaudio-module-alsa-sink \
+  pulseaudio-module-alsa-source \
+  pulseaudio-module-cli \
+  pulseaudio-module-esound-protocol-unix \
+  pulseaudio-module-simple-protocol-tcp \
+  pulseaudio-module-native-protocol-unix \
+  pulseaudio-module-cli-protocol-unix \
+  gst-plugin-pulse \
+"
+RREPLACES_${PN} = "openmoko-sound-system"
+RPROVIDES_${PN} = "openmoko-sound-system"
+PR = "r6"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+           file://session"
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+    install -d ${D}/${sysconfdir}/pulse
+    install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
recipes/obsolete/openmoko2/openmoko-sound-theme-standard2_svn.bb new file +26 -0
new file mode 100644
index 0000000..a7687d8
@@ -0,0 +1,26 @@
+DESCRIPTION = "Standard sound theme for the Openmoko framework"
+SECTION = "openmoko/base"
+RREPLACES_${PN} = "openmoko-sound-theme-standard"
+RPROVIDES_${PN} = "openmoko-sound-theme-standard"
+SRCREV = "4271"
+PV = "0.1+svnr${SRCPV}"
+PR = "r4"
+
+inherit openmoko2 autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+        find ${WORKDIR} -name ".svn" | xargs rm -rf
+        install -d ${D}${datadir}/openmoko/sounds
+        for i in *.mp3; do
+                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
+                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+}
+
+FILES_${PN} = "${datadir}"
+
recipes/obsolete/openmoko2/openmoko-theme-standard2-qvga_svn.bb new file +27 -0
new file mode 100644
index 0000000..a4e13b4
@@ -0,0 +1,27 @@
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition"
+SECTION = "openmoko/base"
+RCONFLICTS_${PN} = "openmoko-theme-standard"
+RPROVIDES_${PN} = "openmoko-theme-standard-2"
+SRCREV = "3425"
+PV = "0.1.1+svnr${SRCPV}"
+PR = "r2"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http"
+S = "${WORKDIR}/openmoko-standard-2-qvga"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
+	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
+	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
+	
+	install -d ${D}${sysconfdir}/gtk-2.0
+	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
+}
+
+CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/obsolete/openmoko2/openmoko-theme-standard2_svn.bb new file +22 -0
new file mode 100644
index 0000000..cff0bbc
@@ -0,0 +1,22 @@
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
+SECTION = "openmoko/base"
+RCONFLICTS_${PN} = "openmoko-theme-standard"
+SRCREV = "4338"
+PV = "0.1.1+svnr${SRCPV}"
+PR = "r6"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
+S = "${WORKDIR}/openmoko-standard-2"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
+	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
+	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
+	
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${datadir}"
recipes/openmoko-base/openmoko-common_svn.bb deleted +0 -21
deleted file mode 100644
index 7f1be74..0000000
@@ -1,21 +0,0 @@
-DESCRIPTION = "Common files for the Openmoko distribution"
-SECTION = "openmoko/base"
-PV = "0.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-base
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=images;proto=http"
-S = "${WORKDIR}"
-
-dirs = "images/pixmaps"
-
-do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}/openmoko/
-	for i in ${dirs}; do
-		cp -fpPR ${S}/$i ${D}${datadir}/openmoko/
-	done
-}
-
-FILES_${PN} = "${datadir}"
recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb deleted +0 -19
deleted file mode 100644
index 0d8a627..0000000
@@ -1,19 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution"
-SECTION = "openmoko/base"
-PV = "0.1+svnr${SRCPV}"
-PR = "r1"
-
-inherit openmoko-base autotools
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-
-pkg_postinst_openmoko-icon-theme-standard () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-gtk-update-icon-cache ${datadir}/icons/openmoko-standard/
-}
-
-PACKAGE_ARCH = "all"
recipes/openmoko-base/openmoko-libs_svn.bb deleted +0 -32
deleted file mode 100644
index 42d6b8f..0000000
@@ -1,32 +0,0 @@
-DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
-SECTION = "openmoko/libs"
-LICENSE = "LGPL"
-DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
-PV = "0.4+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko
-
-PACKAGES =+ "\
-  libmokojournal libmokojournal-dev libmokojournal-dbg \
-  libmokogsmd libmokogsmd-dev libmokogsmd-dbg \
-  libmokocore libmokocore-dev libmokocore-dbg \
-  libmokoui libmokoui-dev libmokoui-dbg \
-"
-
-FILES_libmokojournal = "${libdir}/libmokojournal.so.*"
-FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal"
-FILES_libmokojournal-dbg += "${libdir}/.debug/libmokojournal.so.*"
-
-FILES_libmokogsmd = "${libdir}/libmokogsmd.so.*"
-FILES_libmokogsmd-dev = "${libdir}/libmokogsmd.so ${libdir}/libmokogsmd.*a ${includedir}/${PN}/libmokogsmd"
-FILES_libmokogsmd-dbg += "${libdir}/.debug/libmokogsmd.so.*"
-
-FILES_libmokocore = "${libdir}/libmokocore.so.*"
-FILES_libmokocore-dev = "${libdir}/libmokocore.so ${libdir}/libmokocore.*a ${includedir}/${PN}/libmokocore"
-FILES_libmokocore-dbg += "${libdir}/.debug/libmokocore.so.*"
- 	 
-FILES_libmokoui = "${libdir}/libmokoui.so.*"
-FILES_libmokoui-dev = "${libdir}/libmokoui.so ${libdir}/libmokoui.*a ${includedir}/${PN}/libmokoui"
-FILES_libmokoui-dbg += "${libdir}/.debug/libmokoui.so.*"
-  	 
recipes/openmoko-base/openmoko-sound-system/pulseaudio deleted +0 -46

46 lines not on this page · raw message

recipes/openmoko-base/openmoko-sound-system/session deleted +0 -28
deleted file mode 100644
index ed2346d..0000000
@@ -1,28 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-
-# Create autoload entries for the device drivers
-add-autoload-sink output module-alsa-sink fragment_size=2048 sink_name=output
-add-autoload-source input module-alsa-source source_name=input
-
-# Load several protocols
-load-module module-esound-protocol-unix
-load-module module-simple-protocol-tcp
-load-module module-native-protocol-unix
-load-module module-cli-protocol-unix
-
-# Make some devices default
-set-default-sink output
-set-default-source input
-
-# Don't fail if the audio files referred to below don't exist
-.nofail
-
-# Load an audio to the sample cache for usage with module-x11-bell
-load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
-load-module module-x11-bell sample=x11-bell
-
-# Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
-load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
-load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
-
recipes/openmoko-base/openmoko-sound-system_0.1.0.bb deleted +0 -31
deleted file mode 100644
index 2ada84f..0000000
@@ -1,31 +0,0 @@
-DESCRIPTION = "Openmoko Sound System"
-SECTION = "openmoko/base"
-RDEPENDS_${PN} = "\
-  pulseaudio-server \
-  pulseaudio-module-alsa-sink \
-  pulseaudio-module-alsa-source \
-  pulseaudio-module-cli \
-  pulseaudio-module-esound-protocol-unix \
-  pulseaudio-module-simple-protocol-tcp \
-  pulseaudio-module-native-protocol-unix \
-  pulseaudio-module-cli-protocol-unix \
-"
-PR = "r7"
-
-inherit openmoko-base update-rc.d
-
-INITSCRIPT_NAME = "pulseaudio"
-INITSCRIPT_PARAMS = "defaults 35"
-
-SRC_URI = "file://pulseaudio \
-           file://session"
-S = "${WORKDIR}"
-
-do_install() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/pulse
-	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
-}
-
-PACKAGE_ARCH = "all"
recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb deleted +0 -23
deleted file mode 100644
index 2c61036..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "Standard sound theme for the Openmoko distribution"
-SECTION = "openmoko/base"
-PV = "0.1+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko-base autotools
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
-S = "${WORKDIR}/sounds"
-
-do_install() {
-        find ${WORKDIR} -name ".svn" | xargs rm -rf
-        install -d ${D}${datadir}/openmoko/sounds
-        for i in *.mp3; do
-                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
-                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-}
-
-FILES_${PN} = "${datadir}"
-
recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb deleted +0 -25
deleted file mode 100644
index c7256a9..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version"
-SECTION = "openmoko/base"
-PV = "0.0+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko-base
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
-S = "${WORKDIR}"
-
-dirs = "themes/openmoko-standard-qvga"
-
-do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}/themes/
-	for i in ${dirs}; do
-		cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/
-	done
-	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard-qvga/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
-}
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/openmoko-base/openmoko-theme-standard_svn.bb deleted +0 -27
deleted file mode 100644
index 606d6a03..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution"
-SECTION = "openmoko/base"
-PV = "0.0+svnr${SRCPV}"
-PR = "r5"
-
-inherit openmoko-base
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
-S = "${WORKDIR}"
-
-dirs = "themes/openmoko-standard"
-
-do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}/themes/
-	for i in ${dirs}; do
-		cp -fpPR ${WORKDIR}/$i ${D}${datadir}/themes/
-	done
-	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
-}
-
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/openmoko-examples/openmoko-finger-demo_svn.bb deleted +0 -6
deleted file mode 100644
index a5c7c62..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "An example finger application for Openmoko"
-SECTION = "openmoko/examples"
-PV = "0.0.1+svnr${SRCPV}"
-
-inherit openmoko
-
recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb deleted +0 -20
deleted file mode 100644
index 82e5c61..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "A simple example panel plugin for Openmoko"
-SECTION = "openmoko/examples"
-DEPENDS += "libmatchbox"
-SRCREV = "1328"
-PV = "0.0.1+svnr${SRCPV}"
-
-PR = "r1"
-
-inherit openmoko
-
-do_configure_prepend() {
-	sed -i -e s:-Werror::g src/Makefile.am
-}	
-
-
-FILES_${PN} += "${libdir}/matchbox-panel/*.so.*"
-FILES_${PN}-dev += "${libdir}/matchbox-panel/*.so \
-                    ${libdir}/matchbox-panel/*.la"
-FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
-
recipes/openmoko-examples/openmoko-panel-demo_svn.bb deleted +0 -10
deleted file mode 100644
index 8e9a501..0000000
@@ -1,10 +0,0 @@
-DESCRIPTION = "An example panel plugin for Openmoko"
-SECTION = "openmoko/examples"
-DEPENDS += "libmatchbox"
-SRCREV = "1622"
-PV = "0.0.1+svnr${SRCPV}"
-
-inherit openmoko
-
-PARALLEL_MAKE = ""
-
recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb deleted +0 -6
deleted file mode 100644
index 08b72f8..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "A simple stylus application example for Openmoko"
-SECTION = "openmoko/examples"
-PV = "0.0.1+svnr${SRCPV}"
-
-inherit openmoko
-
recipes/openmoko-examples/openmoko-stylus-demo_svn.bb deleted +0 -6
deleted file mode 100644
index 550324a..0000000
@@ -1,6 +0,0 @@
-DESCRIPTION = "An example stylus application for Openmoko"
-SECTION = "openmoko/examples"
-PV = "0.0.1+svnr${SRCPV}"
-
-inherit openmoko
-
recipes/openmoko-projects/diversity-daemon/no-xmmp.patch deleted +0 -24
deleted file mode 100644
index 2065e97..0000000
@@ -1,24 +0,0 @@
-Index: diversity-xmpp-backend/Makefile.am
-===================================================================
---- a/diversity-xmpp-backend/Makefile.am	(revision 276)
-+++ a/diversity-xmpp-backend/Makefile.am	(working copy)
-@@ -1,3 +1,4 @@
-+if HAVE_XMPP
- INCLUDES = -I${top_srcdir}/include
- 
- AM_CPPFLAGS =			\
-@@ -4,9 +5,7 @@
- 	$(GLIB_CFLAGS)		\
- 	$(LM_CFLAGS)
- 
--if HAVE_XMPP
- noinst_LTLIBRARIES = libdiversity-xmpp-backend.la
--endif
- 
- noinst_HEADERS = diversity-xmpp-backend.h
- 
-@@ -48,3 +47,4 @@
- 
- xmpp-marshal.h: xmpp-marshal.list
- 	$(GLIB_GENMARSHAL) --prefix xmpp_marshal --header $< > $@
-+endif
recipes/openmoko-projects/diversity-daemon_svn.bb deleted +0 -20
deleted file mode 100644
index ab06fde..0000000
@@ -1,20 +0,0 @@
-DESCRIPTION = "Diversity Daemon"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "network/misc"
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
-RDEPENDS_${PN} = "eds-dbus"
-SRCREV = "571"
-PV = "0.0+svnr${SRCPV}"
-PR = "r3"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=http \
-           file://no-xmmp.patch;minrev=276;maxrev=568"
-S = "${WORKDIR}/diversity-daemon"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
-
-FILES_${PN} += "${datadir}/dbus-1/"
-FILES_${PN} += "${sysconfdir}/dbus-1/"
recipes/openmoko-projects/diversity-radar_svn.bb deleted +0 -17
deleted file mode 100644
index b5f4e77..0000000
@@ -1,17 +0,0 @@
-DESCRIPTION = "Diversity Radar is a GPS location based communicative application"
-HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "openmoko/applications"
-LICENSE = "GPL"
-DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus"
-RDEPENDS_${PN} = "diversity-daemon"
-SRCREV = "510"
-PV = "0.0.4+svnr${SRCPV}"
-PR = "r0.02"
-
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http"
-
-S = "${WORKDIR}/${PN}"
-
-inherit setuptools
-
-FILES_${PN} += "${prefix}/share/*"
recipes/openmoko2/libjana_svn.bb deleted +0 -29
deleted file mode 100644
index c73a319..0000000
@@ -1,29 +0,0 @@
-DESCRIPTION = "O-Hand Jana Library"
-DEPENDS = "libmokojournal2"
-DEPENDS = "gtk+ eds-dbus gconf" 
-SRCREV = "749"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r5"
-
-inherit autotools pkgconfig lib_package
-
-SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http"
-S = "${WORKDIR}/trunk/"
-
-EXTRA_OECONF = "--enable-examples "
-
-do_configure_prepend() {
-	touch gtk-doc.make
-}
-
-PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
-             libjana-gtk libjana-gtk-dbg \ 
-            "
-
-LEAD_SONAME = "libjana.so"
-
-FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
-FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
-FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
-FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
-FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
recipes/openmoko2/libmokogsmd2_svn.bb deleted +0 -8
deleted file mode 100644
index 3fa20e9..0000000
@@ -1,8 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "libgsmd glib-2.0"
-SRCREV = "4334"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2
-
recipes/openmoko2/libmokojournal2_svn.bb deleted +0 -12
deleted file mode 100644
index ea56046..0000000
@@ -1,12 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "eds-dbus"
-SRCREV = "3473"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2 lib_package
-
-do_configure_prepend() {
-        touch gtk-doc.make
-}
-
recipes/openmoko2/libmokopanelui2_svn.bb deleted +0 -8
deleted file mode 100644
index 2a3a1c5..0000000
@@ -1,8 +0,0 @@
-SECTION = "openmoko/libs"
-DEPENDS = "gtk+ matchbox-panel-2"
-SRCREV = "4568"
-PV = "0.3.0+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko2
-
recipes/openmoko2/moko-gtk-engine_svn.bb deleted +0 -15
deleted file mode 100644
index 72c0c23..0000000
@@ -1,15 +0,0 @@
-DESCRIPTION = "Moko GTK+ theme engine"
-SECTION = "openmoko/libs"
-SRCREV = "4734"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko2
-
-PACKAGES += "moko-gtk-theme"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_moko-gtk-theme = "${datadir}/themes"
-RDEPENDS_${PN} = "moko-gtk-theme"
-
recipes/openmoko2/neod/htc.patch deleted +0 -32
deleted file mode 100644
index 0ced894..0000000
@@ -1,32 +0,0 @@
-Index: neod/configure.ac
-===================================================================
---- neod.orig/configure.ac	2007-09-15 23:01:30.000000000 +0200
-+++ neod/configure.ac	2007-09-15 23:02:01.000000000 +0200
-@@ -32,6 +32,10 @@
-         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
- fi
- 
-+if test x"$neod_platform" = x"htc"; then
-+	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
- 
- AC_OUTPUT([
-Index: neod/src/buttonactions.c
-===================================================================
---- neod.orig/src/buttonactions.c	2007-09-15 23:02:15.000000000 +0200
-+++ neod/src/buttonactions.c	2007-09-15 23:04:16.000000000 +0200
-@@ -63,6 +63,12 @@
-     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
- 
-+#ifdef NEOD_PLATFORM_HTC
-+    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
-+    #define POWER_BUTTON_KEYCODE 0x74 /* power */
-+    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
- 
- GPollFD input_fd[10];
recipes/openmoko2/neod/ipaq.patch deleted +0 -32
deleted file mode 100644
index 19b61ab..0000000
@@ -1,32 +0,0 @@
-Index: neod/src/buttonactions.c
-===================================================================
---- neod.orig/src/buttonactions.c	2007-09-29 17:24:43.000000000 +0200
-+++ neod/src/buttonactions.c	2007-09-29 17:24:49.000000000 +0200
-@@ -69,6 +69,12 @@
-     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
- #endif
- 
-+#ifdef NEOD_PLATFORM_IPAQ
-+    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
-+    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
-+    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
-+#endif
-+
- #define HEADPHONE_INSERTION_SWITCHCODE 0x02
- 
- GPollFD input_fd[10];
-Index: neod/configure.ac
-===================================================================
---- neod.orig/configure.ac	2007-09-29 17:25:12.000000000 +0200
-+++ neod/configure.ac	2007-09-29 17:25:48.000000000 +0200
-@@ -36,6 +36,10 @@
- 	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
- fi
- 
-+if test x"$neod_platform" = x"ipaq"; then
-+	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
-+fi
-+
- CFLAGS=$NEOD_CFLAGS
- 
- AC_OUTPUT([
recipes/openmoko2/neod_svn.bb deleted +0 -28
deleted file mode 100644
index d3e4cd9..0000000
@@ -1,28 +0,0 @@
-DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
-SECTION = "openmoko/daemons"
-
-DISTRO_APM ?= "apm"
-DEPENDS = "gtk+ pulseaudio apmd"
-RDEPENDS_${PN} = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_APM} dbus"
-SRCREV = "4617"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r8"
-
-inherit openmoko2 gconf
-
-SRC_URI += "file://htc.patch;maxrev=3348 \
-            file://ipaq.patch;maxrev=3348"
-
-EXTRA_OECONF_om-gta01 = "--with-platform=neo1973"
-EXTRA_OECONF_om-gta02 = "--with-platform=neo1973"
-EXTRA_OECONF_a780      = "--with-platform=ezx"
-EXTRA_OECONF_a1200     = "--with-platform=ezx"
-EXTRA_OECONF_e680      = "--with-platform=ezx"
-EXTRA_OECONF_rokre2    = "--with-platform=ezx"
-EXTRA_OECONF_rokre6    = "--with-platform=ezx"
-EXTRA_OECONF_magician  = "--with-platform=htc"
-EXTRA_OECONF_hx4700    = "--with-platform=ipaq"
-EXTRA_OECONF_htcuniversal = "--with-platform=htc"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
recipes/openmoko2/openmoko-asu-om20072-support.bb deleted +0 -27
deleted file mode 100644
index 9b0847f..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "Theme support and defaults to integrate OM2007.2 in the April Software Update"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "openmoko-common2"
-
-ALLOW_EMPTY_${PN} = "1"
-PACKAGE_ARCH = "all"
-
-pkg_postinst_${PN} () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
-# gstreamer audio settings
-#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
-#gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
-
-}
-
recipes/openmoko2/openmoko-common2_svn.bb deleted +0 -27
deleted file mode 100644
index 5558e4f..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "Common files for the Openmoko framework"
-SECTION = "openmoko/base"
-SRCREV = "3259"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r0"
-
-inherit openmoko2
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
-S = "${WORKDIR}"
-
-ALLOW_EMPTY = "1"
-
-dirs = "pixmaps"
-
-do_install() {
-	find . -name .svn | xargs rm -rf
-	install -d ${D}${datadir}
-	for i in ${dirs}; do
-		cp -fR $i ${D}${datadir}/$i;
-	done
-	# moved to xserver-kdrive-common
-	rm -f ${D}${datadir}/pixmaps/xsplash*
-}
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}"
recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb deleted +0 -58

58 lines not on this page · raw message

recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb deleted +0 -24
deleted file mode 100644
index c184445..0000000
@@ -1,24 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
-HOMEPAGE = "http://www.openmoko.org"
-SECTION = "openmoko/base"
-LICENSE = "GPL"
-
-SRCREV = "4232"
-PV = "0.1.0+svnr${SRCPV}"
-PR = "r3"
-
-inherit autotools pkgconfig
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-
-FILES_${PN} += "${datadir}/icons"
-
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ]; then
-        exit 1
-    fi
-    gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
-}
-
-PACKAGE_ARCH = "all"
recipes/openmoko2/openmoko-sound-system2/pulseaudio deleted +0 -50

50 lines not on this page · raw message

recipes/openmoko2/openmoko-sound-system2/session deleted +0 -27
deleted file mode 100644
index 7cc4d49..0000000
@@ -1,27 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-
-# Create autoload entries for the device drivers
-add-autoload-sink output module-alsa-sink sink_name=output
-add-autoload-source input module-alsa-source source_name=input
-
-# Load several protocols
-load-module module-esound-protocol-unix
-load-module module-native-protocol-unix
-load-module module-cli-protocol-unix
-
-# Make some devices default
-set-default-sink output
-set-default-source input
-
-# Don't fail if the audio files referred to below don't exist
-.nofail
-
-# Load an audio to the sample cache for usage with module-x11-bell
-load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
-load-module module-x11-bell sample=x11-bell
-
-# Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
-load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
-load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
-
recipes/openmoko2/openmoko-sound-system2_0.1.0.bb deleted +0 -34
deleted file mode 100644
index c947e32..0000000
@@ -1,34 +0,0 @@
-DESCRIPTION = "Openmoko Sound System"
-SECTION = "openmoko/base"
-RDEPENDS_${PN} = "\
-  pulseaudio-server \
-  pulseaudio-module-alsa-sink \
-  pulseaudio-module-alsa-source \
-  pulseaudio-module-cli \
-  pulseaudio-module-esound-protocol-unix \
-  pulseaudio-module-simple-protocol-tcp \
-  pulseaudio-module-native-protocol-unix \
-  pulseaudio-module-cli-protocol-unix \
-  gst-plugin-pulse \
-"
-RREPLACES_${PN} = "openmoko-sound-system"
-RPROVIDES_${PN} = "openmoko-sound-system"
-PR = "r6"
-
-inherit openmoko-base update-rc.d
-
-INITSCRIPT_NAME = "pulseaudio"
-INITSCRIPT_PARAMS = "defaults 35"
-
-SRC_URI = "file://pulseaudio \
-           file://session"
-S = "${WORKDIR}"
-
-do_install() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
-    install -d ${D}/${sysconfdir}/pulse
-    install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
-}
-
-PACKAGE_ARCH = "all"
recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb deleted +0 -26
deleted file mode 100644
index a7687d8..0000000
@@ -1,26 +0,0 @@
-DESCRIPTION = "Standard sound theme for the Openmoko framework"
-SECTION = "openmoko/base"
-RREPLACES_${PN} = "openmoko-sound-theme-standard"
-RPROVIDES_${PN} = "openmoko-sound-theme-standard"
-SRCREV = "4271"
-PV = "0.1+svnr${SRCPV}"
-PR = "r4"
-
-inherit openmoko2 autotools
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
-S = "${WORKDIR}/sounds"
-
-do_install() {
-        find ${WORKDIR} -name ".svn" | xargs rm -rf
-        install -d ${D}${datadir}/openmoko/sounds
-        for i in *.mp3; do
-                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
-                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
-        done
-}
-
-FILES_${PN} = "${datadir}"
-
recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb deleted +0 -27
deleted file mode 100644
index a4e13b4..0000000
@@ -1,27 +0,0 @@
-DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition"
-SECTION = "openmoko/base"
-RCONFLICTS_${PN} = "openmoko-theme-standard"
-RPROVIDES_${PN} = "openmoko-theme-standard-2"
-SRCREV = "3425"
-PV = "0.1.1+svnr${SRCPV}"
-PR = "r2"
-
-inherit openmoko2
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http"
-S = "${WORKDIR}/openmoko-standard-2-qvga"
-
-do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
-	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
-	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
-	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
-}
-
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir} ${sysconfdir}"
recipes/openmoko2/openmoko-theme-standard2_svn.bb deleted +0 -22
deleted file mode 100644
index cff0bbc..0000000
@@ -1,22 +0,0 @@
-DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
-SECTION = "openmoko/base"
-RCONFLICTS_${PN} = "openmoko-theme-standard"
-SRCREV = "4338"
-PV = "0.1.1+svnr${SRCPV}"
-PR = "r6"
-
-inherit openmoko2
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
-S = "${WORKDIR}/openmoko-standard-2"
-
-do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
-	install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
-	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
-	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
-	
-}
-
-PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir}"
Signature · 1 line
1.7.3.1
#11 lore raw

PATCH 8/13 om-3d7k: remove machine definition, because it was canceled long time ago

In reply to Martin Jansa
---
 conf/machine/om-3d7k.conf |   39 ---------------------------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
 delete mode 100644 conf/machine/om-3d7k.conf
conf/machine/om-3d7k.conf deleted +0 -39
deleted file mode 100644
index 0ebd2a0..0000000
@@ -1,39 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Machine
-#@NAME: Openmoko 3D7K
-#@DESCRIPTION: Machine configuration for the Openmoko 3D7K GSM phone
-#-----------------------------------------------------------------------------
-
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
-MACHINE_DISPLAY_WIDTH_PIXELS = "480"
-MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-MACHINE_DISPLAY_ORIENTATION = "0"
-MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-xorg"
-
-# package machine specific modules
-MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-modules \
-"
-
-# device has 4 UARTS:
-# ttySAC0: mc75 GSM modem
-# ttySAC1: NC
-# ttySAC2: NC
-# ttySAC3: serial console
-SERIAL_CONSOLE = "115200 ttySAC3"
-USE_VT = "0"
-
-# used by some images
-ROOT_FLASH_SIZE = "256"
-
-# boots only from SD
-IMAGE_FSTYPES = "tar.bz2"
-
-# tune for S3C6410
-include conf/machine/include/tune-arm1176jzf-s.inc
Signature · 1 line
1.7.3.1
#12 lore raw

PATCH 9/13 linux-openmoko: obsolete 2.6.24 and 2.6.28

In reply to Martin Jansa
---
 .../0001-squashfs-with-lzma.patch                  | 5342 ----
 .../0002-squashfs-initrd.patch                     |   55 -
 .../0003-squashfs-force-O2.patch                   |   17 -
 .../0004-squashfs-Kconfig.patch                    |   61 -
 .../0005-squashfs-Makefile.patch                   |   12 -
 .../linux/linux-openmoko-2.6.24/defconfig-2.6.22.5 | 1827 --
 recipes/linux/linux-openmoko-2.6.24/defconfig-oe   | 1774 --
 .../gta01-fix-battery-class-name.patch             |   13 -
 .../linux-openmoko-2.6.24/logo_linux_clut224.ppm   |31723 --------------------
 .../openwrt-ledtrig-netdev.patch                   |  473 -
 recipes/linux/linux-openmoko-2.6.24_git.bb         |   26 -
 .../linux/linux-openmoko-2.6.28/defconfig-oe.patch |   12 -
 recipes/linux/linux-openmoko-2.6.28_git.bb         |   26 -
 .../0001-squashfs-with-lzma.patch                  | 5342 ++++
 .../0002-squashfs-initrd.patch                     |   55 +
 .../0003-squashfs-force-O2.patch                   |   17 +
 .../0004-squashfs-Kconfig.patch                    |   61 +
 .../0005-squashfs-Makefile.patch                   |   12 +
 .../linux/linux-openmoko-2.6.24/defconfig-2.6.22.5 | 1827 ++
 .../linux/linux-openmoko-2.6.24/defconfig-oe       | 1774 ++
 .../gta01-fix-battery-class-name.patch             |   13 +
 .../linux-openmoko-2.6.24/logo_linux_clut224.ppm   |31723 ++++++++++++++++++++
 .../openwrt-ledtrig-netdev.patch                   |  473 +
 .../obsolete/linux/linux-openmoko-2.6.24_git.bb    |   26 +
 .../linux/linux-openmoko-2.6.28/defconfig-oe.patch |   12 +
 .../obsolete/linux/linux-openmoko-2.6.28_git.bb    |   26 +
 26 files changed, 41361 insertions(+), 41361 deletions(-)
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-oe
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24_git.bb
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28/defconfig-oe.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-oe
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28/defconfig-oe.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28_git.bb
recipes/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch deleted +0 -5342
deleted file mode 100644
index 04d47fe..0000000
@@ -1,5342 +0,0 @@
-
-diff -urN linux-2.6.23/fs/squashfs/LzmaDecode.c linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.c
---- linux-2.6.23/fs/squashfs/LzmaDecode.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.c	2007-11-13 19:45:12.000000000 -0500
-@@ -0,0 +1,584 @@
-+/*
-+  LzmaDecode.c
-+  LZMA Decoder (optimized for Speed version)
-+  
-+  LZMA SDK 4.40 Copyright (c) 1999-2006 Igor Pavlov (2006-05-01)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and 
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this Code, expressly permits you to 
-+  statically or dynamically link your Code (or bind by name) to the 
-+  interfaces of this file without subjecting your linked Code to the 
-+  terms of the CPL or GNU LGPL. Any modifications or additions 
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#include "LzmaDecode.h"
-+
-+#define kNumTopBits 24
-+#define kTopValue ((UInt32)1 << kNumTopBits)
-+
-+#define kNumBitModelTotalBits 11
-+#define kBitModelTotal (1 << kNumBitModelTotalBits)
-+#define kNumMoveBits 5
-+
-+#define RC_READ_BYTE (*Buffer++)
-+
-+#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \
-+  { int i; for(i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) | RC_READ_BYTE; }}
-+
-+#ifdef _LZMA_IN_CB
-+
-+#define RC_TEST { if (Buffer == BufferLim) \
-+  { SizeT size; int result = InCallback->Read(InCallback, &Buffer, &size); if (result != LZMA_RESULT_OK) return result; \
-+  BufferLim = Buffer + size; if (size == 0) return LZMA_RESULT_DATA_ERROR; }}
-+
-+#define RC_INIT Buffer = BufferLim = 0; RC_INIT2
-+
-+#else
-+
-+#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }
-+
-+#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2
-+ 
-+#endif
-+
-+#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }
-+
-+#define IfBit0(p) RC_NORMALIZE; bound = (Range >> kNumBitModelTotalBits) * *(p); if (Code < bound)
-+#define UpdateBit0(p) Range = bound; *(p) += (kBitModelTotal - *(p)) >> kNumMoveBits;
-+#define UpdateBit1(p) Range -= bound; Code -= bound; *(p) -= (*(p)) >> kNumMoveBits;
-+
-+#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \
-+  { UpdateBit0(p); mi <<= 1; A0; } else \
-+  { UpdateBit1(p); mi = (mi + mi) + 1; A1; } 
-+  
-+#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)               
-+
-+#define RangeDecoderBitTreeDecode(probs, numLevels, res) \
-+  { int i = numLevels; res = 1; \
-+  do { CProb *p = probs + res; RC_GET_BIT(p, res) } while(--i != 0); \
-+  res -= (1 << numLevels); }
-+
-+
-+#define kNumPosBitsMax 4
-+#define kNumPosStatesMax (1 << kNumPosBitsMax)
-+
-+#define kLenNumLowBits 3
-+#define kLenNumLowSymbols (1 << kLenNumLowBits)
-+#define kLenNumMidBits 3
-+#define kLenNumMidSymbols (1 << kLenNumMidBits)
-+#define kLenNumHighBits 8
-+#define kLenNumHighSymbols (1 << kLenNumHighBits)
-+
-+#define LenChoice 0
-+#define LenChoice2 (LenChoice + 1)
-+#define LenLow (LenChoice2 + 1)
-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))
-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))
-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 
-+
-+
-+#define kNumStates 12
-+#define kNumLitStates 7
-+
-+#define kStartPosModelIndex 4
-+#define kEndPosModelIndex 14
-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))
-+
-+#define kNumPosSlotBits 6
-+#define kNumLenToPosStates 4
-+
-+#define kNumAlignBits 4
-+#define kAlignTableSize (1 << kNumAlignBits)
-+
-+#define kMatchMinLen 2
-+
-+#define IsMatch 0
-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))
-+#define IsRepG0 (IsRep + kNumStates)
-+#define IsRepG1 (IsRepG0 + kNumStates)
-+#define IsRepG2 (IsRepG1 + kNumStates)
-+#define IsRep0Long (IsRepG2 + kNumStates)
-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))
-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))
-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)
-+#define LenCoder (Align + kAlignTableSize)
-+#define RepLenCoder (LenCoder + kNumLenProbs)
-+#define Literal (RepLenCoder + kNumLenProbs)
-+
-+#if Literal != LZMA_BASE_SIZE
-+StopCompilingDueBUG
-+#endif
-+
-+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size)
-+{
-+  unsigned char prop0;
-+  if (size < LZMA_PROPERTIES_SIZE)
-+    return LZMA_RESULT_DATA_ERROR;
-+  prop0 = propsData[0];
-+  if (prop0 >= (9 * 5 * 5))
-+    return LZMA_RESULT_DATA_ERROR;
-+  {
-+    for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5));
-+    for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9);
-+    propsRes->lc = prop0;
-+    /*
-+    unsigned char remainder = (unsigned char)(prop0 / 9);
-+    propsRes->lc = prop0 % 9;
-+    propsRes->pb = remainder / 5;
-+    propsRes->lp = remainder % 5;
-+    */
-+  }
-+
-+  #ifdef _LZMA_OUT_READ
-+  {
-+    int i;
-+    propsRes->DictionarySize = 0;
-+    for (i = 0; i < 4; i++)
-+      propsRes->DictionarySize += (UInt32)(propsData[1 + i]) << (i * 8);
-+    if (propsRes->DictionarySize == 0)
-+      propsRes->DictionarySize = 1;
-+  }
-+  #endif
-+  return LZMA_RESULT_OK;
-+}
-+
-+#define kLzmaStreamWasFinishedId (-1)
-+
-+int LzmaDecode(CLzmaDecoderState *vs,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *InCallback,
-+    #else
-+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
-+    #endif
-+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed)
-+{
-+  CProb *p = vs->Probs;
-+  SizeT nowPos = 0;
-+  Byte previousByte = 0;
-+  UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;
-+  UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;
-+  int lc = vs->Properties.lc;
-+
-+  #ifdef _LZMA_OUT_READ
-+  
-+  UInt32 Range = vs->Range;
-+  UInt32 Code = vs->Code;
-+  #ifdef _LZMA_IN_CB
-+  const Byte *Buffer = vs->Buffer;
-+  const Byte *BufferLim = vs->BufferLim;
-+  #else
-+  const Byte *Buffer = inStream;
-+  const Byte *BufferLim = inStream + inSize;
-+  #endif
-+  int state = vs->State;
-+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];
-+  int len = vs->RemainLen;
-+  UInt32 globalPos = vs->GlobalPos;
-+  UInt32 distanceLimit = vs->DistanceLimit;
-+
-+  Byte *dictionary = vs->Dictionary;
-+  UInt32 dictionarySize = vs->Properties.DictionarySize;
-+  UInt32 dictionaryPos = vs->DictionaryPos;
-+
-+  Byte tempDictionary[4];
-+
-+  #ifndef _LZMA_IN_CB
-+  *inSizeProcessed = 0;
-+  #endif
-+  *outSizeProcessed = 0;
-+  if (len == kLzmaStreamWasFinishedId)
-+    return LZMA_RESULT_OK;
-+
-+  if (dictionarySize == 0)
-+  {
-+    dictionary = tempDictionary;
-+    dictionarySize = 1;
-+    tempDictionary[0] = vs->TempDictionary[0];
-+  }
-+
-+  if (len == kLzmaNeedInitId)
-+  {
-+    {
-+      UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
-+      UInt32 i;
-+      for (i = 0; i < numProbs; i++)
-+        p[i] = kBitModelTotal >> 1; 
-+      rep0 = rep1 = rep2 = rep3 = 1;
-+      state = 0;
-+      globalPos = 0;
-+      distanceLimit = 0;
-+      dictionaryPos = 0;
-+      dictionary[dictionarySize - 1] = 0;
-+      #ifdef _LZMA_IN_CB
-+      RC_INIT;
-+      #else
-+      RC_INIT(inStream, inSize);
-+      #endif
-+    }
-+    len = 0;
-+  }
-+  while(len != 0 && nowPos < outSize)
-+  {
-+    UInt32 pos = dictionaryPos - rep0;
-+    if (pos >= dictionarySize)
-+      pos += dictionarySize;
-+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];
-+    if (++dictionaryPos == dictionarySize)
-+      dictionaryPos = 0;
-+    len--;
-+  }
-+  if (dictionaryPos == 0)
-+    previousByte = dictionary[dictionarySize - 1];
-+  else
-+    previousByte = dictionary[dictionaryPos - 1];
-+
-+  #else /* if !_LZMA_OUT_READ */
-+
-+  int state = 0;
-+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
-+  int len = 0;
-+  const Byte *Buffer;
-+  const Byte *BufferLim;
-+  UInt32 Range;
-+  UInt32 Code;
-+
-+  #ifndef _LZMA_IN_CB
-+  *inSizeProcessed = 0;
-+  #endif
-+  *outSizeProcessed = 0;
-+
-+  {
-+    UInt32 i;
-+    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));
-+    for (i = 0; i < numProbs; i++)
-+      p[i] = kBitModelTotal >> 1;
-+  }
-+  
-+  #ifdef _LZMA_IN_CB
-+  RC_INIT;
-+  #else
-+  RC_INIT(inStream, inSize);
-+  #endif
-+
-+  #endif /* _LZMA_OUT_READ */
-+
-+  while(nowPos < outSize)
-+  {
-+    CProb *prob;
-+    UInt32 bound;
-+    int posState = (int)(
-+        (nowPos 
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & posStateMask);
-+
-+    prob = p + IsMatch + (state << kNumPosBitsMax) + posState;
-+    IfBit0(prob)
-+    {
-+      int symbol = 1;
-+      UpdateBit0(prob)
-+      prob = p + Literal + (LZMA_LIT_SIZE * 
-+        (((
-+        (nowPos 
-+        #ifdef _LZMA_OUT_READ
-+        + globalPos
-+        #endif
-+        )
-+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));
-+
-+      if (state >= kNumLitStates)
-+      {
-+        int matchByte;
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        matchByte = dictionary[pos];
-+        #else
-+        matchByte = outStream[nowPos - rep0];
-+        #endif
-+        do
-+        {
-+          int bit;
-+          CProb *probLit;
-+          matchByte <<= 1;
-+          bit = (matchByte & 0x100);
-+          probLit = prob + 0x100 + bit + symbol;
-+          RC_GET_BIT2(probLit, symbol, if (bit != 0) break, if (bit == 0) break)
-+        }
-+        while (symbol < 0x100);
-+      }
-+      while (symbol < 0x100)
-+      {
-+        CProb *probLit = prob + symbol;
-+        RC_GET_BIT(probLit, symbol)
-+      }
-+      previousByte = (Byte)symbol;
-+
-+      outStream[nowPos++] = previousByte;
-+      #ifdef _LZMA_OUT_READ
-+      if (distanceLimit < dictionarySize)
-+        distanceLimit++;
-+
-+      dictionary[dictionaryPos] = previousByte;
-+      if (++dictionaryPos == dictionarySize)
-+        dictionaryPos = 0;
-+      #endif
-+      if (state < 4) state = 0;
-+      else if (state < 10) state -= 3;
-+      else state -= 6;
-+    }
-+    else             
-+    {
-+      UpdateBit1(prob);
-+      prob = p + IsRep + state;
-+      IfBit0(prob)
-+      {
-+        UpdateBit0(prob);
-+        rep3 = rep2;
-+        rep2 = rep1;
-+        rep1 = rep0;
-+        state = state < kNumLitStates ? 0 : 3;
-+        prob = p + LenCoder;
-+      }
-+      else
-+      {
-+        UpdateBit1(prob);
-+        prob = p + IsRepG0 + state;
-+        IfBit0(prob)
-+        {
-+          UpdateBit0(prob);
-+          prob = p + IsRep0Long + (state << kNumPosBitsMax) + posState;
-+          IfBit0(prob)
-+          {
-+            #ifdef _LZMA_OUT_READ
-+            UInt32 pos;
-+            #endif
-+            UpdateBit0(prob);
-+            
-+            #ifdef _LZMA_OUT_READ
-+            if (distanceLimit == 0)
-+            #else
-+            if (nowPos == 0)
-+            #endif
-+              return LZMA_RESULT_DATA_ERROR;
-+            
-+            state = state < kNumLitStates ? 9 : 11;
-+            #ifdef _LZMA_OUT_READ
-+            pos = dictionaryPos - rep0;
-+            if (pos >= dictionarySize)
-+              pos += dictionarySize;
-+            previousByte = dictionary[pos];
-+            dictionary[dictionaryPos] = previousByte;
-+            if (++dictionaryPos == dictionarySize)
-+              dictionaryPos = 0;
-+            #else
-+            previousByte = outStream[nowPos - rep0];
-+            #endif
-+            outStream[nowPos++] = previousByte;
-+            #ifdef _LZMA_OUT_READ
-+            if (distanceLimit < dictionarySize)
-+              distanceLimit++;
-+            #endif
-+
-+            continue;
-+          }
-+          else
-+          {
-+            UpdateBit1(prob);
-+          }
-+        }
-+        else
-+        {
-+          UInt32 distance;
-+          UpdateBit1(prob);
-+          prob = p + IsRepG1 + state;
-+          IfBit0(prob)
-+          {
-+            UpdateBit0(prob);
-+            distance = rep1;
-+          }
-+          else 
-+          {
-+            UpdateBit1(prob);
-+            prob = p + IsRepG2 + state;
-+            IfBit0(prob)
-+            {
-+              UpdateBit0(prob);
-+              distance = rep2;
-+            }
-+            else
-+            {
-+              UpdateBit1(prob);
-+              distance = rep3;
-+              rep3 = rep2;
-+            }
-+            rep2 = rep1;
-+          }
-+          rep1 = rep0;
-+          rep0 = distance;
-+        }
-+        state = state < kNumLitStates ? 8 : 11;
-+        prob = p + RepLenCoder;
-+      }
-+      {
-+        int numBits, offset;
-+        CProb *probLen = prob + LenChoice;
-+        IfBit0(probLen)
-+        {
-+          UpdateBit0(probLen);
-+          probLen = prob + LenLow + (posState << kLenNumLowBits);
-+          offset = 0;
-+          numBits = kLenNumLowBits;
-+        }
-+        else
-+        {
-+          UpdateBit1(probLen);
-+          probLen = prob + LenChoice2;
-+          IfBit0(probLen)
-+          {
-+            UpdateBit0(probLen);
-+            probLen = prob + LenMid + (posState << kLenNumMidBits);
-+            offset = kLenNumLowSymbols;
-+            numBits = kLenNumMidBits;
-+          }
-+          else
-+          {
-+            UpdateBit1(probLen);
-+            probLen = prob + LenHigh;
-+            offset = kLenNumLowSymbols + kLenNumMidSymbols;
-+            numBits = kLenNumHighBits;
-+          }
-+        }
-+        RangeDecoderBitTreeDecode(probLen, numBits, len);
-+        len += offset;
-+      }
-+
-+      if (state < 4)
-+      {
-+        int posSlot;
-+        state += kNumLitStates;
-+        prob = p + PosSlot +
-+            ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << 
-+            kNumPosSlotBits);
-+        RangeDecoderBitTreeDecode(prob, kNumPosSlotBits, posSlot);
-+        if (posSlot >= kStartPosModelIndex)
-+        {
-+          int numDirectBits = ((posSlot >> 1) - 1);
-+          rep0 = (2 | ((UInt32)posSlot & 1));
-+          if (posSlot < kEndPosModelIndex)
-+          {
-+            rep0 <<= numDirectBits;
-+            prob = p + SpecPos + rep0 - posSlot - 1;
-+          }
-+          else
-+          {
-+            numDirectBits -= kNumAlignBits;
-+            do
-+            {
-+              RC_NORMALIZE
-+              Range >>= 1;
-+              rep0 <<= 1;
-+              if (Code >= Range)
-+              {
-+                Code -= Range;
-+                rep0 |= 1;
-+              }
-+            }
-+            while (--numDirectBits != 0);
-+            prob = p + Align;
-+            rep0 <<= kNumAlignBits;
-+            numDirectBits = kNumAlignBits;
-+          }
-+          {
-+            int i = 1;
-+            int mi = 1;
-+            do
-+            {
-+              CProb *prob3 = prob + mi;
-+              RC_GET_BIT2(prob3, mi, ; , rep0 |= i);
-+              i <<= 1;
-+            }
-+            while(--numDirectBits != 0);
-+          }
-+        }
-+        else
-+          rep0 = posSlot;
-+        if (++rep0 == (UInt32)(0))
-+        {
-+          /* it's for stream version */
-+          len = kLzmaStreamWasFinishedId;
-+          break;
-+        }
-+      }
-+
-+      len += kMatchMinLen;
-+      #ifdef _LZMA_OUT_READ
-+      if (rep0 > distanceLimit) 
-+      #else
-+      if (rep0 > nowPos)
-+      #endif
-+        return LZMA_RESULT_DATA_ERROR;
-+
-+      #ifdef _LZMA_OUT_READ
-+      if (dictionarySize - distanceLimit > (UInt32)len)
-+        distanceLimit += len;
-+      else
-+        distanceLimit = dictionarySize;
-+      #endif
-+
-+      do
-+      {
-+        #ifdef _LZMA_OUT_READ
-+        UInt32 pos = dictionaryPos - rep0;
-+        if (pos >= dictionarySize)
-+          pos += dictionarySize;
-+        previousByte = dictionary[pos];
-+        dictionary[dictionaryPos] = previousByte;
-+        if (++dictionaryPos == dictionarySize)
-+          dictionaryPos = 0;
-+        #else
-+        previousByte = outStream[nowPos - rep0];
-+        #endif
-+        len--;
-+        outStream[nowPos++] = previousByte;
-+      }
-+      while(len != 0 && nowPos < outSize);
-+    }
-+  }
-+  RC_NORMALIZE;
-+
-+  #ifdef _LZMA_OUT_READ
-+  vs->Range = Range;
-+  vs->Code = Code;
-+  vs->DictionaryPos = dictionaryPos;
-+  vs->GlobalPos = globalPos + (UInt32)nowPos;
-+  vs->DistanceLimit = distanceLimit;
-+  vs->Reps[0] = rep0;
-+  vs->Reps[1] = rep1;
-+  vs->Reps[2] = rep2;
-+  vs->Reps[3] = rep3;
-+  vs->State = state;
-+  vs->RemainLen = len;
-+  vs->TempDictionary[0] = tempDictionary[0];
-+  #endif
-+
-+  #ifdef _LZMA_IN_CB
-+  vs->Buffer = Buffer;
-+  vs->BufferLim = BufferLim;
-+  #else
-+  *inSizeProcessed = (SizeT)(Buffer - inStream);
-+  #endif
-+  *outSizeProcessed = nowPos;
-+  return LZMA_RESULT_OK;
-+}
-diff -urN linux-2.6.23/fs/squashfs/LzmaDecode.h linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.h
---- linux-2.6.23/fs/squashfs/LzmaDecode.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.h	2007-11-13 19:45:12.000000000 -0500
-@@ -0,0 +1,113 @@
-+/* 
-+  LzmaDecode.h
-+  LZMA Decoder interface
-+
-+  LZMA SDK 4.40 Copyright (c) 1999-2006 Igor Pavlov (2006-05-01)
-+  http://www.7-zip.org/
-+
-+  LZMA SDK is licensed under two licenses:
-+  1) GNU Lesser General Public License (GNU LGPL)
-+  2) Common Public License (CPL)
-+  It means that you can select one of these two licenses and 
-+  follow rules of that license.
-+
-+  SPECIAL EXCEPTION:
-+  Igor Pavlov, as the author of this code, expressly permits you to 
-+  statically or dynamically link your code (or bind by name) to the 
-+  interfaces of this file without subjecting your linked code to the 
-+  terms of the CPL or GNU LGPL. Any modifications or additions 
-+  to this file, however, are subject to the LGPL or CPL terms.
-+*/
-+
-+#ifndef __LZMADECODE_H
-+#define __LZMADECODE_H
-+
-+#include "LzmaTypes.h"
-+
-+/* #define _LZMA_IN_CB */
-+/* Use callback for input data */
-+
-+/* #define _LZMA_OUT_READ */
-+/* Use read function for output data */
-+
-+/* #define _LZMA_PROB32 */
-+/* It can increase speed on some 32-bit CPUs, 
-+   but memory usage will be doubled in that case */
-+
-+/* #define _LZMA_LOC_OPT */
-+/* Enable local speed optimizations inside code */
-+
-+#ifdef _LZMA_PROB32
-+#define CProb UInt32
-+#else
-+#define CProb UInt16
-+#endif
-+
-+#define LZMA_RESULT_OK 0
-+#define LZMA_RESULT_DATA_ERROR 1
-+
-+#ifdef _LZMA_IN_CB
-+typedef struct _ILzmaInCallback
-+{
-+  int (*Read)(void *object, const unsigned char **buffer, SizeT *bufferSize);
-+} ILzmaInCallback;
-+#endif
-+
-+#define LZMA_BASE_SIZE 1846
-+#define LZMA_LIT_SIZE 768
-+
-+#define LZMA_PROPERTIES_SIZE 5
-+
-+typedef struct _CLzmaProperties
-+{
-+  int lc;
-+  int lp;
-+  int pb;
-+  #ifdef _LZMA_OUT_READ
-+  UInt32 DictionarySize;
-+  #endif
-+}CLzmaProperties;
-+
-+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size);
-+
-+#define LzmaGetNumProbs(Properties) (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << ((Properties)->lc + (Properties)->lp)))
-+
-+#define kLzmaNeedInitId (-2)
-+
-+typedef struct _CLzmaDecoderState
-+{
-+  CLzmaProperties Properties;
-+  CProb *Probs;
-+
-+  #ifdef _LZMA_IN_CB
-+  const unsigned char *Buffer;
-+  const unsigned char *BufferLim;
-+  #endif
-+
-+  #ifdef _LZMA_OUT_READ
-+  unsigned char *Dictionary;
-+  UInt32 Range;
-+  UInt32 Code;
-+  UInt32 DictionaryPos;
-+  UInt32 GlobalPos;
-+  UInt32 DistanceLimit;
-+  UInt32 Reps[4];
-+  int State;
-+  int RemainLen;
-+  unsigned char TempDictionary[4];
-+  #endif
-+} CLzmaDecoderState;
-+
-+#ifdef _LZMA_OUT_READ
-+#define LzmaDecoderInit(vs) { (vs)->RemainLen = kLzmaNeedInitId; }
-+#endif
-+
-+int LzmaDecode(CLzmaDecoderState *vs,
-+    #ifdef _LZMA_IN_CB
-+    ILzmaInCallback *inCallback,
-+    #else
-+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
-+    #endif
-+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
-+
-+#endif
-diff -urN linux-2.6.23/fs/squashfs/LzmaTypes.h linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaTypes.h
---- linux-2.6.23/fs/squashfs/LzmaTypes.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaTypes.h	2007-11-13 19:47:32.000000000 -0500
-@@ -0,0 +1,45 @@
-+/* 
-+LzmaTypes.h 
-+
-+Types for LZMA Decoder
-+
-+This file written and distributed to public domain by Igor Pavlov.
-+This file is part of LZMA SDK 4.40 (2006-05-01)
-+*/
-+
-+#ifndef __LZMATYPES_H
-+#define __LZMATYPES_H
-+
-+#ifndef _7ZIP_BYTE_DEFINED
-+#define _7ZIP_BYTE_DEFINED
-+typedef unsigned char Byte;
-+#endif 
-+
-+#ifndef _7ZIP_UINT16_DEFINED
-+#define _7ZIP_UINT16_DEFINED
-+typedef unsigned short UInt16;
-+#endif 
-+
-+#ifndef _7ZIP_UINT32_DEFINED
-+#define _7ZIP_UINT32_DEFINED
-+#ifdef _LZMA_UINT32_IS_ULONG
-+typedef unsigned long UInt32;
-+#else
-+typedef unsigned int UInt32;
-+#endif
-+#endif 
-+
-+/* #define _LZMA_NO_SYSTEM_SIZE_T */
-+/* You can use it, if you don't want <stddef.h> */
-+
-+#ifndef _7ZIP_SIZET_DEFINED
-+#define _7ZIP_SIZET_DEFINED
-+#ifdef _LZMA_NO_SYSTEM_SIZE_T
-+typedef UInt32 SizeT;
-+#else
-+#include <stddef.h>
-+typedef size_t SizeT;
-+#endif
-+#endif
-+
-+#endif
-diff -urN linux-2.6.23/fs/squashfs/Makefile linux-2.6.23.sqlzma-ng/fs/squashfs/Makefile
---- linux-2.6.23/fs/squashfs/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/Makefile	2007-11-13 19:52:56.000000000 -0500
-@@ -0,0 +1,10 @@
-+#
-+# Makefile for the linux squashfs routines.
-+#
-+
-+
-+obj-$(CONFIG_SQUASHFS) += unlzma.o sqlzma.o squashfs.o
-+unlzma-y += module.o
-+sqlzma-y += uncomp.o
-+squashfs-y += inode.o
-+squashfs-y += squashfs2_0.o
-diff -urN linux-2.6.23/fs/squashfs/inode.c linux-2.6.23.sqlzma-ng/fs/squashfs/inode.c
---- linux-2.6.23/fs/squashfs/inode.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/inode.c	2007-11-13 19:14:24.000000000 -0500
-@@ -0,0 +1,2312 @@
-+/*
-+ * Squashfs - a compressed read only filesystem for Linux
-+ *
-+ * Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007
-+ * Phillip Lougher <[email protected]>
-+ *
-+ * 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; either version 2,
-+ * or (at your option) any later version.
-+ *
-+ * 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.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * inode.c
-+ */
-+
-+#include <linux/squashfs_fs.h>
-+#include <linux/module.h>
-+#include <linux/zlib.h>
-+#include <linux/fs.h>
-+#include <linux/squashfs_fs_sb.h>
-+#include <linux/squashfs_fs_i.h>
-+#include <linux/buffer_head.h>
-+#include <linux/vfs.h>
-+#include <linux/vmalloc.h>
-+#include <linux/smp_lock.h>
-+#include <linux/sched.h>
-+#include <linux/exportfs.h>
-+
-+#include "squashfs.h"
-+#include "sqlzma.h"
-+
-+#undef KeepPreemptive
-+#if defined(CONFIG_PREEMPT) && !defined(UnsquashNoPreempt)
-+#define KeepPreemptive
-+#endif
-+
-+struct sqlzma {
-+#ifdef KeepPreemptive
-+	struct mutex mtx;
-+#endif
-+	unsigned char read_data[SQUASHFS_FILE_MAX_SIZE];
-+	struct sqlzma_un un;
-+};
-+static DEFINE_PER_CPU(struct sqlzma *, sqlzma);
-+
-+#define dpri(fmt, args...) /* printk("%s:%d: " fmt, __func__, __LINE__, ##args) */
-+#define dpri_un(un)	dpri("un{%d, {%d %p}, {%d %p}, {%d %p}}\n", \
-+			     (un)->un_lzma, (un)->un_a[0].sz, (un)->un_a[0].buf, \
-+			     (un)->un_a[1].sz, (un)->un_a[1].buf, \
-+			     (un)->un_a[2].sz, (un)->un_a[2].buf)
-+
-+static int squashfs_cached_blks;
-+
-+static void vfs_read_inode(struct inode *i);
-+static struct dentry *squashfs_get_parent(struct dentry *child);
-+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode);
-+static int squashfs_statfs(struct dentry *, struct kstatfs *);
-+static int squashfs_symlink_readpage(struct file *file, struct page *page);
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize);
-+static int squashfs_readpage(struct file *file, struct page *page);
-+static int squashfs_readdir(struct file *, void *, filldir_t);
-+static struct dentry *squashfs_lookup(struct inode *, struct dentry *,
-+				struct nameidata *);
-+static int squashfs_remount(struct super_block *s, int *flags, char *data);
-+static void squashfs_put_super(struct super_block *);
-+static int squashfs_get_sb(struct file_system_type *,int, const char *, void *,
-+				struct vfsmount *);
-+static struct inode *squashfs_alloc_inode(struct super_block *sb);
-+static void squashfs_destroy_inode(struct inode *inode);
-+static int init_inodecache(void);
-+static void destroy_inodecache(void);
-+
-+static struct file_system_type squashfs_fs_type = {
-+	.owner = THIS_MODULE,
-+	.name = "squashfs",
-+	.get_sb = squashfs_get_sb,
-+	.kill_sb = kill_block_super,
-+	.fs_flags = FS_REQUIRES_DEV
-+};
-+
-+static const unsigned char squashfs_filetype_table[] = {
-+	DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK
-+};
-+
-+static struct super_operations squashfs_super_ops = {
-+	.alloc_inode = squashfs_alloc_inode,
-+	.destroy_inode = squashfs_destroy_inode,
-+	.statfs = squashfs_statfs,
-+	.put_super = squashfs_put_super,
-+	.remount_fs = squashfs_remount
-+};
-+
-+static struct super_operations squashfs_export_super_ops = {
-+	.alloc_inode = squashfs_alloc_inode,
-+	.destroy_inode = squashfs_destroy_inode,
-+	.statfs = squashfs_statfs,
-+	.put_super = squashfs_put_super,
-+	.read_inode = vfs_read_inode
-+};
-+
-+static struct export_operations squashfs_export_ops = {
-+	.get_parent = squashfs_get_parent
-+};
-+
-+SQSH_EXTERN const struct address_space_operations squashfs_symlink_aops = {
-+	.readpage = squashfs_symlink_readpage
-+};
-+
-+SQSH_EXTERN const struct address_space_operations squashfs_aops = {
-+	.readpage = squashfs_readpage
-+};
-+
-+static const struct file_operations squashfs_dir_ops = {
-+	.read = generic_read_dir,
-+	.readdir = squashfs_readdir
-+};
-+
-+SQSH_EXTERN struct inode_operations squashfs_dir_inode_ops = {
-+	.lookup = squashfs_lookup
-+};
-+
-+
-+static struct buffer_head *get_block_length(struct super_block *s,
-+				int *cur_index, int *offset, int *c_byte)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned short temp;
-+	struct buffer_head *bh;
-+
-+	if (!(bh = sb_bread(s, *cur_index)))
-+		goto out;
-+
-+	if (msblk->devblksize - *offset == 1) {
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		else
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+		brelse(bh);
-+		if (!(bh = sb_bread(s, ++(*cur_index))))
-+			goto out;
-+		if (msblk->swap)
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				bh->b_data); 
-+		else
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				bh->b_data); 
-+		*c_byte = temp;
-+		*offset = 1;
-+	} else {
-+		if (msblk->swap) {
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset + 1)); 
-+		} else {
-+			((unsigned char *) &temp)[0] = *((unsigned char *)
-+				(bh->b_data + *offset));
-+			((unsigned char *) &temp)[1] = *((unsigned char *)
-+				(bh->b_data + *offset + 1)); 
-+		}
-+		*c_byte = temp;
-+		*offset += 2;
-+	}
-+
-+	if (SQUASHFS_CHECK_DATA(msblk->sblk.flags)) {
-+		if (*offset == msblk->devblksize) {
-+			brelse(bh);
-+			if (!(bh = sb_bread(s, ++(*cur_index))))
-+				goto out;
-+			*offset = 0;
-+		}
-+		if (*((unsigned char *) (bh->b_data + *offset)) !=
-+						SQUASHFS_MARKER_BYTE) {
-+			ERROR("Metadata block marker corrupt @ %x\n",
-+						*cur_index);
-+			brelse(bh);
-+			goto out;
-+		}
-+		(*offset)++;
-+	}
-+	return bh;
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+SQSH_EXTERN unsigned int squashfs_read_data(struct super_block *s, char *buffer,
-+			long long index, unsigned int length,
-+			long long *next_index, int srclength)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	struct buffer_head **bh;
-+	unsigned int offset = index & ((1 << msblk->devblksize_log2) - 1);
-+	unsigned int cur_index = index >> msblk->devblksize_log2;
-+	int bytes, avail_bytes, b = 0, k = 0;
-+	unsigned int compressed;
-+	unsigned int c_byte = length;
-+
-+	bh = kmalloc(((sblk->block_size >> msblk->devblksize_log2) + 1) *
-+								sizeof(struct buffer_head *), GFP_KERNEL);
-+	if (bh == NULL)
-+		goto read_failure;
-+
-+	if (c_byte) {
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte);
-+		c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d, src size %d\n", index,
-+					compressed ? "" : "un", (unsigned int) c_byte, srclength);
-+
-+		if (c_byte > srclength || index < 0 || (index + c_byte) > sblk->bytes_used)
-+			goto read_failure;
-+
-+		bh[0] = sb_getblk(s, cur_index);
-+		if (bh[0] == NULL)
-+			goto block_release;
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			bh[b] = sb_getblk(s, ++cur_index);
-+			if (bh[b] == NULL)
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b, bh);
-+	} else {
-+		if (index < 0 || (index + 2) > sblk->bytes_used)
-+			goto read_failure;
-+
-+		bh[0] = get_block_length(s, (int *)&cur_index, (int *)&offset,
-+					 (int *)&c_byte);
-+		if (bh[0] == NULL)
-+			goto read_failure;
-+
-+		bytes = msblk->devblksize - offset;
-+		compressed = SQUASHFS_COMPRESSED(c_byte);
-+		c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte);
-+
-+		TRACE("Block @ 0x%llx, %scompressed size %d\n", index, compressed
-+					? "" : "un", (unsigned int) c_byte);
-+
-+		if (c_byte > srclength || (index + c_byte) > sblk->bytes_used)
-+			goto read_failure;
-+
-+		for (b = 1; bytes < c_byte; b++) {
-+			bh[b] = sb_getblk(s, ++cur_index);
-+			if (bh[b] == NULL)
-+				goto block_release;
-+			bytes += msblk->devblksize;
-+		}
-+		ll_rw_block(READ, b - 1, bh + 1);
-+	}
-+
-+	if (compressed) {
-+		int zlib_err = Z_STREAM_END;
-+		int rest, start;
-+		enum {Src, Dst};
-+		struct sized_buf sbuf[2];
-+		struct sqlzma *percpu;
-+
-+		/*
-+	 	* uncompress block
-+	 	*/
-+
-+		for (k = 0; k < b; k++) {
-+			wait_on_buffer(bh[k]);
-+			if (!buffer_uptodate(bh[k]))
-+				goto block_release;
-+		}
-+
-+		avail_bytes = 0;
-+		for (k = 0; !avail_bytes && k < b; k++) {
-+			avail_bytes = msblk->devblksize - offset;
-+			if (c_byte < avail_bytes)
-+				avail_bytes = c_byte;
-+			if (avail_bytes)
-+				break;
-+			offset = 0;
-+			brelse(bh[k]);
-+		}
-+		bytes = 0;
-+		if (!avail_bytes)
-+			goto block_release; // nothing to be process
-+
-+		start = k;
-+		/* it disables preemption */
-+		percpu = get_cpu_var(sqlzma);
-+#ifdef KeepPreemptive
-+		put_cpu_var(sqlzma);
-+		mutex_lock(&percpu->mtx);
-+#endif
-+
-+		for (; k < b; k++) {
-+			memcpy(percpu->read_data + bytes, bh[k]->b_data + offset,
-+			       avail_bytes);
-+			bytes += avail_bytes;
-+			offset = 0;
-+			brelse(bh[k]);
-+			avail_bytes = msblk->devblksize - offset;
-+			rest = c_byte - bytes;
-+			if (rest < avail_bytes)
-+				avail_bytes = rest;
-+		}
-+
-+		sbuf[Src].buf = percpu->read_data;
-+		sbuf[Src].sz = bytes;
-+		sbuf[Dst].buf = buffer;
-+		sbuf[Dst].sz = srclength;
-+		dpri_un(&percpu->un);
-+		dpri("src %d %p, dst %d %p\n", sbuf[Src].sz, sbuf[Src].buf,
-+		     sbuf[Dst].sz, sbuf[Dst].buf);
-+		zlib_err = sqlzma_un(&percpu->un, sbuf + Src, sbuf + Dst);
-+		bytes = percpu->un.un_reslen;
-+
-+#ifdef KeepPreemptive
-+		mutex_unlock(&percpu->mtx);
-+#else
-+		put_cpu_var(sqlzma);
-+#endif
-+		if (unlikely(zlib_err)) {
-+			dpri("zlib_err %d\n", zlib_err);
-+			goto release_mutex;
-+		}
-+	} else {
-+		int i;
-+
-+		for(i = 0; i < b; i++) {
-+			wait_on_buffer(bh[i]);
-+			if (!buffer_uptodate(bh[i]))
-+				goto block_release;
-+		}
-+
-+		for (bytes = 0; k < b; k++) {
-+			avail_bytes = min(c_byte - bytes, msblk->devblksize - offset);
-+
-+			memcpy(buffer + bytes, bh[k]->b_data + offset, avail_bytes);
-+			bytes += avail_bytes;
-+			offset = 0;
-+			brelse(bh[k]);
-+		}
-+	}
-+
-+	if (next_index)
-+		*next_index = index + c_byte + (length ? 0 :
-+				(SQUASHFS_CHECK_DATA(msblk->sblk.flags) ? 3 : 2));
-+
-+	kfree(bh);
-+	return bytes;
-+
-+release_mutex:
-+	//mutex_unlock(&msblk->read_data_mutex);
-+
-+block_release:
-+	for (; k < b; k++)
-+		brelse(bh[k]);
-+
-+read_failure:
-+	ERROR("sb_bread failed reading block 0x%x\n", cur_index);
-+	kfree(bh);
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN int squashfs_get_cached_block(struct super_block *s, void *buffer,
-+				long long block, unsigned int offset,
-+				int length, long long *next_block,
-+				unsigned int *next_offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int n, i, bytes, return_length = length;
-+	long long next_index;
-+
-+	TRACE("Entered squashfs_get_cached_block [%llx:%x]\n", block, offset);
-+
-+	while (1) {
-+		for (i = 0; i < squashfs_cached_blks; i++) 
-+			if (msblk->block_cache[i].block == block)
-+				break; 
-+		
-+		mutex_lock(&msblk->block_cache_mutex);
-+
-+		if (i == squashfs_cached_blks) {
-+			/* read inode header block */
-+			if (msblk->unused_cache_blks == 0) {
-+				mutex_unlock(&msblk->block_cache_mutex);
-+				wait_event(msblk->waitq, msblk->unused_cache_blks);
-+				continue;
-+			}
-+
-+			i = msblk->next_cache;
-+			for (n = 0; n < squashfs_cached_blks; n++) {
-+				if (msblk->block_cache[i].block != SQUASHFS_USED_BLK)
-+					break;
-+				i = (i + 1) % squashfs_cached_blks;
-+			}
-+
-+			msblk->next_cache = (i + 1) % squashfs_cached_blks;
-+
-+			if (msblk->block_cache[i].block == SQUASHFS_INVALID_BLK) {
-+				msblk->block_cache[i].data = vmalloc(SQUASHFS_METADATA_SIZE);
-+				if (msblk->block_cache[i].data == NULL) {
-+					ERROR("Failed to allocate cache block\n");
-+					mutex_unlock(&msblk->block_cache_mutex);
-+					goto out;
-+				}
-+			}
-+	
-+			msblk->block_cache[i].block = SQUASHFS_USED_BLK;
-+			msblk->unused_cache_blks --;
-+			mutex_unlock(&msblk->block_cache_mutex);
-+
-+			msblk->block_cache[i].length = squashfs_read_data(s,
-+				msblk->block_cache[i].data, block, 0, &next_index,
-+				SQUASHFS_METADATA_SIZE);
-+
-+			if (msblk->block_cache[i].length == 0) {
-+				ERROR("Unable to read cache block [%llx:%x]\n", block, offset);
-+				mutex_lock(&msblk->block_cache_mutex);
-+				msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+				msblk->unused_cache_blks ++;
-+				smp_mb();
-+				vfree(msblk->block_cache[i].data);
-+				wake_up(&msblk->waitq);
-+				mutex_unlock(&msblk->block_cache_mutex);
-+				goto out;
-+			}
-+
-+			mutex_lock(&msblk->block_cache_mutex);
-+			msblk->block_cache[i].block = block;
-+			msblk->block_cache[i].next_index = next_index;
-+			msblk->unused_cache_blks ++;
-+			smp_mb();
-+			wake_up(&msblk->waitq);
-+			TRACE("Read cache block [%llx:%x]\n", block, offset);
-+		}
-+
-+		if (msblk->block_cache[i].block != block) {
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			continue;
-+		}
-+
-+		bytes = msblk->block_cache[i].length - offset;
-+
-+		if (bytes < 1) {
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			goto out;
-+		} else if (bytes >= length) {
-+			if (buffer)
-+				memcpy(buffer, msblk->block_cache[i].data + offset, length);
-+			if (msblk->block_cache[i].length - offset == length) {
-+				*next_block = msblk->block_cache[i].next_index;
-+				*next_offset = 0;
-+			} else {
-+				*next_block = block;
-+				*next_offset = offset + length;
-+			}
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			goto finish;
-+		} else {
-+			if (buffer) {
-+				memcpy(buffer, msblk->block_cache[i].data + offset, bytes);
-+				buffer = (char *) buffer + bytes;
-+			}
-+			block = msblk->block_cache[i].next_index;
-+			mutex_unlock(&msblk->block_cache_mutex);
-+			length -= bytes;
-+			offset = 0;
-+		}
-+	}
-+
-+finish:
-+	return return_length;
-+out:
-+	return 0;
-+}
-+
-+
-+static int get_fragment_location(struct super_block *s, unsigned int fragment,
-+				long long *fragment_start_block,
-+				unsigned int *fragment_size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start_block =
-+		msblk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)];
-+	int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment);
-+	struct squashfs_fragment_entry fragment_entry;
-+
-+	if (msblk->swap) {
-+		struct squashfs_fragment_entry sfragment_entry;
-+
-+		if (!squashfs_get_cached_block(s, &sfragment_entry, start_block, offset,
-+					 sizeof(sfragment_entry), &start_block,
-+					       (unsigned int *)&offset))
-+			goto out;
-+		SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry);
-+	} else
-+		if (!squashfs_get_cached_block(s, &fragment_entry, start_block, offset,
-+					 sizeof(fragment_entry), &start_block,
-+					       (unsigned int *)&offset))
-+			goto out;
-+
-+	*fragment_start_block = fragment_entry.start_block;
-+	*fragment_size = fragment_entry.size;
-+
-+	return 1;
-+
-+out:
-+	return 0;
-+}
-+
-+
-+SQSH_EXTERN void release_cached_fragment(struct squashfs_sb_info *msblk,
-+				struct squashfs_fragment_cache *fragment)
-+{
-+	mutex_lock(&msblk->fragment_mutex);
-+	fragment->locked --;
-+	if (fragment->locked == 0) {
-+		msblk->unused_frag_blks ++;
-+		smp_mb();
-+		wake_up(&msblk->fragment_wait_queue);
-+	}
-+	mutex_unlock(&msblk->fragment_mutex);
-+}
-+
-+
-+SQSH_EXTERN
-+struct squashfs_fragment_cache *get_cached_fragment(struct super_block *s,
-+				long long start_block, int length)
-+{
-+	int i, n;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	while (1) {
-+		mutex_lock(&msblk->fragment_mutex);
-+
-+		for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS &&
-+				msblk->fragment[i].block != start_block; i++);
-+
-+		if (i == SQUASHFS_CACHED_FRAGMENTS) {
-+			if (msblk->unused_frag_blks == 0) {
-+				mutex_unlock(&msblk->fragment_mutex);
-+				wait_event(msblk->fragment_wait_queue, msblk->unused_frag_blks);
-+				continue;
-+			}
-+
-+			i = msblk->next_fragment;
-+			for (n = 0; n < SQUASHFS_CACHED_FRAGMENTS; n++) {
-+				if (msblk->fragment[i].locked == 0)
-+					break;
-+				i = (i + 1) % SQUASHFS_CACHED_FRAGMENTS;
-+			}
-+
-+			msblk->next_fragment = (msblk->next_fragment + 1) %
-+				SQUASHFS_CACHED_FRAGMENTS;
-+			
-+			if (msblk->fragment[i].data == NULL) {
-+				msblk->fragment[i].data = vmalloc(sblk->block_size);
-+				if (msblk->fragment[i].data == NULL) {
-+					ERROR("Failed to allocate fragment cache block\n");
-+					mutex_unlock(&msblk->fragment_mutex);
-+					goto out;
-+				}
-+			}
-+
-+			msblk->unused_frag_blks --;
-+			msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+			msblk->fragment[i].locked = 1;
-+			mutex_unlock(&msblk->fragment_mutex);
-+
-+			msblk->fragment[i].length = squashfs_read_data(s,
-+				msblk->fragment[i].data, start_block, length, NULL,
-+				sblk->block_size);
-+
-+			if (msblk->fragment[i].length == 0) {
-+				ERROR("Unable to read fragment cache block [%llx]\n", start_block);
-+				msblk->fragment[i].locked = 0;
-+				msblk->unused_frag_blks ++;
-+				smp_mb();
-+				wake_up(&msblk->fragment_wait_queue);
-+				goto out;
-+			}
-+
-+			mutex_lock(&msblk->fragment_mutex);
-+			msblk->fragment[i].block = start_block;
-+			TRACE("New fragment %d, start block %lld, locked %d\n",
-+				i, msblk->fragment[i].block, msblk->fragment[i].locked);
-+			mutex_unlock(&msblk->fragment_mutex);
-+			break;
-+		}
-+
-+		if (msblk->fragment[i].locked == 0)
-+			msblk->unused_frag_blks --;
-+		msblk->fragment[i].locked++;
-+		mutex_unlock(&msblk->fragment_mutex);
-+		TRACE("Got fragment %d, start block %lld, locked %d\n", i,
-+			msblk->fragment[i].block, msblk->fragment[i].locked);
-+		break;
-+	}
-+
-+	return &msblk->fragment[i];
-+
-+out:
-+	return NULL;
-+}
-+
-+
-+static void squashfs_new_inode(struct squashfs_sb_info *msblk, struct inode *i,
-+				struct squashfs_base_inode_header *inodeb)
-+{
-+	i->i_ino = inodeb->inode_number;
-+	i->i_mtime.tv_sec = inodeb->mtime;
-+	i->i_atime.tv_sec = inodeb->mtime;
-+	i->i_ctime.tv_sec = inodeb->mtime;
-+	i->i_uid = msblk->uid[inodeb->uid];
-+	i->i_mode = inodeb->mode;
-+	i->i_size = 0;
-+
-+	if (inodeb->guid == SQUASHFS_GUIDS)
-+		i->i_gid = i->i_uid;
-+	else
-+		i->i_gid = msblk->guid[inodeb->guid];
-+}
-+
-+
-+static squashfs_inode_t squashfs_inode_lookup(struct super_block *s, int ino)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	long long start = msblk->inode_lookup_table[SQUASHFS_LOOKUP_BLOCK(ino - 1)];
-+	int offset = SQUASHFS_LOOKUP_BLOCK_OFFSET(ino - 1);
-+	squashfs_inode_t inode;
-+
-+	TRACE("Entered squashfs_inode_lookup, inode_number = %d\n", ino);
-+
-+	if (msblk->swap) {
-+		squashfs_inode_t sinode;
-+
-+		if (!squashfs_get_cached_block(s, &sinode, start, offset,
-+					sizeof(sinode), &start, (unsigned int *)&offset))
-+			goto out;
-+		SQUASHFS_SWAP_INODE_T((&inode), &sinode);
-+	} else if (!squashfs_get_cached_block(s, &inode, start, offset,
-+					sizeof(inode), &start, (unsigned int *)&offset))
-+			goto out;
-+
-+	TRACE("squashfs_inode_lookup, inode = 0x%llx\n", inode);
-+
-+	return inode;
-+
-+out:
-+	return SQUASHFS_INVALID_BLK;
-+}
-+	
-+
-+static void vfs_read_inode(struct inode *i)
-+{
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	squashfs_inode_t inode = squashfs_inode_lookup(i->i_sb, i->i_ino);
-+
-+	TRACE("Entered vfs_read_inode\n");
-+
-+	if(inode != SQUASHFS_INVALID_BLK)
-+		(msblk->read_inode)(i, inode);
-+}
-+
-+
-+static struct dentry *squashfs_get_parent(struct dentry *child)
-+{
-+	struct inode *i = child->d_inode;
-+	struct inode *parent = iget(i->i_sb, SQUASHFS_I(i)->u.s2.parent_inode);
-+	struct dentry *rv;
-+
-+	TRACE("Entered squashfs_get_parent\n");
-+
-+	if(parent == NULL) {
-+		rv = ERR_PTR(-EACCES);
-+		goto out;
-+	}
-+
-+	rv = d_alloc_anon(parent);
-+	if(rv == NULL)
-+		rv = ERR_PTR(-ENOMEM);
-+
-+out:
-+	return rv;
-+}
-+
-+	
-+SQSH_EXTERN struct inode *squashfs_iget(struct super_block *s,
-+				squashfs_inode_t inode, unsigned int inode_number)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct inode *i = iget_locked(s, inode_number);
-+
-+	TRACE("Entered squashfs_iget\n");
-+
-+	if(i && (i->i_state & I_NEW)) {
-+		(msblk->read_inode)(i, inode);
-+		unlock_new_inode(i);
-+	}
-+
-+	return i;
-+}
-+
-+
-+static int squashfs_read_inode(struct inode *i, squashfs_inode_t inode)
-+{
-+	struct super_block *s = i->i_sb;
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long block = SQUASHFS_INODE_BLK(inode) + sblk->inode_table_start;
-+	unsigned int offset = SQUASHFS_INODE_OFFSET(inode);
-+	long long next_block;
-+	unsigned int next_offset;
-+	union squashfs_inode_header id, sid;
-+	struct squashfs_base_inode_header *inodeb = &id.base, *sinodeb = &sid.base;
-+
-+	TRACE("Entered squashfs_read_inode\n");
-+
-+	if (msblk->swap) {
-+		if (!squashfs_get_cached_block(s, sinodeb, block, offset,
-+					sizeof(*sinodeb), &next_block, &next_offset))
-+			goto failed_read;
-+		SQUASHFS_SWAP_BASE_INODE_HEADER(inodeb, sinodeb, sizeof(*sinodeb));
-+	} else
-+		if (!squashfs_get_cached_block(s, inodeb, block, offset,
-+					sizeof(*inodeb), &next_block, &next_offset))
-+			goto failed_read;
-+
-+	squashfs_new_inode(msblk, i, inodeb);
-+
-+	switch(inodeb->inode_type) {
-+		case SQUASHFS_FILE_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_reg_inode_header *inodep = &id.reg;
-+			struct squashfs_reg_inode_header *sinodep = &sid.reg;
-+				
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_REG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG)
-+					if(!get_fragment_location(s, inodep->fragment, &frag_blk,
-+												&frag_size))
-+						goto failed_read;
-+				
-+			i->i_nlink = 1;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			i->i_data.a_ops = &squashfs_aops;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_LREG_TYPE: {
-+			unsigned int frag_size;
-+			long long frag_blk;
-+			struct squashfs_lreg_inode_header *inodep = &id.lreg;
-+			struct squashfs_lreg_inode_header *sinodep = &sid.lreg;
-+				
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LREG_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			frag_blk = SQUASHFS_INVALID_BLK;
-+
-+			if (inodep->fragment != SQUASHFS_INVALID_FRAG)
-+				if (!get_fragment_location(s, inodep->fragment, &frag_blk,
-+												 &frag_size))
-+					goto failed_read;
-+				
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_fop = &generic_ro_fops;
-+			i->i_mode |= S_IFREG;
-+			i->i_blocks = ((i->i_size - 1) >> 9) + 1;
-+			SQUASHFS_I(i)->u.s1.fragment_start_block = frag_blk;
-+			SQUASHFS_I(i)->u.s1.fragment_size = frag_size;
-+			SQUASHFS_I(i)->u.s1.fragment_offset = inodep->offset;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->u.s1.block_list_start = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+			i->i_data.a_ops = &squashfs_aops;
-+
-+			TRACE("File inode %x:%x, start_block %llx, "
-+					"block_list_start %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, next_block,
-+					next_offset);
-+			break;
-+		}
-+		case SQUASHFS_DIR_TYPE: {
-+			struct squashfs_dir_inode_header *inodep = &id.dir;
-+			struct squashfs_dir_inode_header *sinodep = &sid.dir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DIR_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = 0;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Directory inode %x:%x, start_block %x, offset "
-+					"%x\n", SQUASHFS_INODE_BLK(inode),
-+					offset, inodep->start_block,
-+					inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_LDIR_TYPE: {
-+			struct squashfs_ldir_inode_header *inodep = &id.ldir;
-+			struct squashfs_ldir_inode_header *sinodep = &sid.ldir;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_LDIR_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->file_size;
-+			i->i_op = &squashfs_dir_inode_ops;
-+			i->i_fop = &squashfs_dir_ops;
-+			i->i_mode |= S_IFDIR;
-+			SQUASHFS_I(i)->start_block = inodep->start_block;
-+			SQUASHFS_I(i)->offset = inodep->offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_start = next_block;
-+			SQUASHFS_I(i)->u.s2.directory_index_offset = next_offset;
-+			SQUASHFS_I(i)->u.s2.directory_index_count = inodep->i_count;
-+			SQUASHFS_I(i)->u.s2.parent_inode = inodep->parent_inode;
-+
-+			TRACE("Long directory inode %x:%x, start_block %x, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					inodep->start_block, inodep->offset);
-+			break;
-+		}
-+		case SQUASHFS_SYMLINK_TYPE: {
-+			struct squashfs_symlink_inode_header *inodep = &id.symlink;
-+			struct squashfs_symlink_inode_header *sinodep = &sid.symlink;
-+	
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_SYMLINK_INODE_HEADER(inodep, sinodep);
-+			} else
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_size = inodep->symlink_size;
-+			i->i_op = &page_symlink_inode_operations;
-+			i->i_data.a_ops = &squashfs_symlink_aops;
-+			i->i_mode |= S_IFLNK;
-+			SQUASHFS_I(i)->start_block = next_block;
-+			SQUASHFS_I(i)->offset = next_offset;
-+
-+			TRACE("Symbolic link inode %x:%x, start_block %llx, offset %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset,
-+					next_block, next_offset);
-+			break;
-+		 }
-+		 case SQUASHFS_BLKDEV_TYPE:
-+		 case SQUASHFS_CHRDEV_TYPE: {
-+			struct squashfs_dev_inode_header *inodep = &id.dev;
-+			struct squashfs_dev_inode_header *sinodep = &sid.dev;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_DEV_INODE_HEADER(inodep, sinodep);
-+			} else	
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_CHRDEV_TYPE) ?
-+					S_IFCHR : S_IFBLK;
-+			init_special_inode(i, i->i_mode, old_decode_dev(inodep->rdev));
-+
-+			TRACE("Device inode %x:%x, rdev %x\n",
-+					SQUASHFS_INODE_BLK(inode), offset, inodep->rdev);
-+			break;
-+		 }
-+		 case SQUASHFS_FIFO_TYPE:
-+		 case SQUASHFS_SOCKET_TYPE: {
-+			struct squashfs_ipc_inode_header *inodep = &id.ipc;
-+			struct squashfs_ipc_inode_header *sinodep = &sid.ipc;
-+
-+			if (msblk->swap) {
-+				if (!squashfs_get_cached_block(s, sinodep, block, offset,
-+						sizeof(*sinodep), &next_block, &next_offset))
-+					goto failed_read;
-+				SQUASHFS_SWAP_IPC_INODE_HEADER(inodep, sinodep);
-+			} else	
-+				if (!squashfs_get_cached_block(s, inodep, block, offset,
-+						sizeof(*inodep), &next_block, &next_offset))
-+					goto failed_read;
-+
-+			i->i_nlink = inodep->nlink;
-+			i->i_mode |= (inodeb->inode_type == SQUASHFS_FIFO_TYPE)
-+							? S_IFIFO : S_IFSOCK;
-+			init_special_inode(i, i->i_mode, 0);
-+			break;
-+		 }
-+		 default:
-+			ERROR("Unknown inode type %d in squashfs_iget!\n",
-+					inodeb->inode_type);
-+			goto failed_read1;
-+	}
-+	
-+	return 1;
-+
-+failed_read:
-+	ERROR("Unable to read inode [%llx:%x]\n", block, offset);
-+
-+failed_read1:
-+	make_bad_inode(i);
-+	return 0;
-+}
-+
-+
-+static int read_inode_lookup_table(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned int length = SQUASHFS_LOOKUP_BLOCK_BYTES(sblk->inodes);
-+
-+	TRACE("In read_inode_lookup_table, length %d\n", length);
-+
-+	/* Allocate inode lookup table */
-+	msblk->inode_lookup_table = kmalloc(length, GFP_KERNEL);
-+	if (msblk->inode_lookup_table == NULL) {
-+		ERROR("Failed to allocate inode lookup table\n");
-+		return 0;
-+	}
-+   
-+	if (!squashfs_read_data(s, (char *) msblk->inode_lookup_table,
-+			sblk->lookup_table_start, length |
-+			SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) {
-+		ERROR("unable to read inode lookup table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		long long block;
-+
-+		for (i = 0; i < SQUASHFS_LOOKUP_BLOCKS(sblk->inodes); i++) {
-+			/* XXX */
-+			SQUASHFS_SWAP_LOOKUP_BLOCKS((&block),
-+						&msblk->inode_lookup_table[i], 1);
-+			msblk->inode_lookup_table[i] = block;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int read_fragment_index_table(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned int length = SQUASHFS_FRAGMENT_INDEX_BYTES(sblk->fragments);
-+
-+	if(length == 0)
-+		return 1;
-+
-+	/* Allocate fragment index table */
-+	msblk->fragment_index = kmalloc(length, GFP_KERNEL);
-+	if (msblk->fragment_index == NULL) {
-+		ERROR("Failed to allocate fragment index table\n");
-+		return 0;
-+	}
-+   
-+	if (!squashfs_read_data(s, (char *) msblk->fragment_index,
-+			sblk->fragment_table_start, length |
-+			SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length)) {
-+		ERROR("unable to read fragment index table\n");
-+		return 0;
-+	}
-+
-+	if (msblk->swap) {
-+		int i;
-+		long long fragment;
-+
-+		for (i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sblk->fragments); i++) {
-+			/* XXX */
-+			SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment),
-+						&msblk->fragment_index[i], 1);
-+			msblk->fragment_index[i] = fragment;
-+		}
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int readahead_metadata(struct super_block *s)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	int i;
-+
-+	squashfs_cached_blks = SQUASHFS_CACHED_BLKS;
-+
-+	/* Init inode_table block pointer array */
-+	msblk->block_cache = kmalloc(sizeof(struct squashfs_cache) *
-+					squashfs_cached_blks, GFP_KERNEL);
-+	if (msblk->block_cache == NULL) {
-+		ERROR("Failed to allocate block cache\n");
-+		goto failed;
-+	}
-+
-+	for (i = 0; i < squashfs_cached_blks; i++)
-+		msblk->block_cache[i].block = SQUASHFS_INVALID_BLK;
-+
-+	msblk->next_cache = 0;
-+	msblk->unused_cache_blks = squashfs_cached_blks;
-+
-+	return 1;
-+
-+failed:
-+	return 0;
-+}
-+
-+
-+static int supported_squashfs_filesystem(struct squashfs_sb_info *msblk, int silent)
-+{
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	msblk->read_inode = squashfs_read_inode;
-+	msblk->read_blocklist = read_blocklist;
-+	msblk->read_fragment_index_table = read_fragment_index_table;
-+
-+	if (sblk->s_major == 1) {
-+		if (!squashfs_1_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 1.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with Squashfs 1.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if (sblk->s_major == 2) {
-+		if (!squashfs_2_0_supported(msblk)) {
-+			SERROR("Major/Minor mismatch, Squashfs 2.0 filesystems "
-+				"are unsupported\n");
-+			SERROR("Please recompile with Squashfs 2.0 support enabled\n");
-+			return 0;
-+		}
-+	} else if(sblk->s_major != SQUASHFS_MAJOR || sblk->s_minor >
-+			SQUASHFS_MINOR) {
-+		SERROR("Major/Minor mismatch, trying to mount newer %d.%d "
-+				"filesystem\n", sblk->s_major, sblk->s_minor);
-+		SERROR("Please update your kernel\n");
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+
-+static int squashfs_fill_super(struct super_block *s, void *data, int silent)
-+{
-+	struct squashfs_sb_info *msblk;
-+	struct squashfs_super_block *sblk;
-+	int i, err;
-+	char b[BDEVNAME_SIZE];
-+	struct inode *root;
-+
-+	TRACE("Entered squashfs_fill_superblock\n");
-+
-+	err = -ENOMEM;
-+	s->s_fs_info = kzalloc(sizeof(struct squashfs_sb_info), GFP_KERNEL);
-+	if (s->s_fs_info == NULL) {
-+		ERROR("Failed to allocate superblock\n");
-+		goto failure;
-+	}
-+	msblk = s->s_fs_info;
-+
-+	sblk = &msblk->sblk;
-+	
-+	msblk->devblksize = sb_min_blocksize(s, BLOCK_SIZE);
-+	msblk->devblksize_log2 = ffz(~msblk->devblksize);
-+
-+	//mutex_init(&msblk->read_data_mutex);
-+	mutex_init(&msblk->read_page_mutex);
-+	mutex_init(&msblk->block_cache_mutex);
-+	mutex_init(&msblk->fragment_mutex);
-+	mutex_init(&msblk->meta_index_mutex);
-+	
-+	init_waitqueue_head(&msblk->waitq);
-+	init_waitqueue_head(&msblk->fragment_wait_queue);
-+
-+	/* sblk->bytes_used is checked in squashfs_read_data to ensure reads are not
-+ 	 * beyond filesystem end.  As we're using squashfs_read_data to read sblk here,
-+ 	 * first set sblk->bytes_used to a useful value */
-+	err = -EINVAL;
-+	sblk->bytes_used = sizeof(struct squashfs_super_block);
-+	if (!squashfs_read_data(s, (char *) sblk, SQUASHFS_START,
-+					sizeof(struct squashfs_super_block) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, sizeof(struct squashfs_super_block))) {
-+		SERROR("unable to read superblock\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Check it is a SQUASHFS superblock */
-+	s->s_magic = sblk->s_magic;
-+	msblk->swap = 0;
-+	dpri("magic 0x%x\n", sblk->s_magic);
-+	switch (sblk->s_magic) {
-+		struct squashfs_super_block ssblk;
-+
-+	case SQUASHFS_MAGIC_SWAP:
-+		/*FALLTHROUGH*/
-+	case SQUASHFS_MAGIC_LZMA_SWAP:
-+		WARNING("Mounting a different endian SQUASHFS "
-+			"filesystem on %s\n", bdevname(s->s_bdev, b));
-+
-+		SQUASHFS_SWAP_SUPER_BLOCK(&ssblk, sblk);
-+		memcpy(sblk, &ssblk, sizeof(struct squashfs_super_block));
-+		msblk->swap = 1;
-+		/*FALLTHROUGH*/
-+	case SQUASHFS_MAGIC:
-+	case SQUASHFS_MAGIC_LZMA:
-+		break;
-+	default:
-+		SERROR("Can't find a SQUASHFS superblock on %s\n",
-+		       bdevname(s->s_bdev, b));
-+		goto failed_mount;
-+	}
-+
-+	{
-+		struct sqlzma *p;
-+		dpri("block_size %d\n", sblk->block_size);
-+		BUG_ON(sblk->block_size > sizeof(p->read_data));
-+	}
-+
-+	/* Check the MAJOR & MINOR versions */
-+	if(!supported_squashfs_filesystem(msblk, silent))
-+		goto failed_mount;
-+
-+	/* Check the filesystem does not extend beyond the end of the
-+	   block device */
-+	if(sblk->bytes_used < 0 || sblk->bytes_used > i_size_read(s->s_bdev->bd_inode))
-+		goto failed_mount;
-+
-+	/* Check the root inode for sanity */
-+	if (SQUASHFS_INODE_OFFSET(sblk->root_inode) > SQUASHFS_METADATA_SIZE)
-+		goto failed_mount;
-+
-+	TRACE("Found valid superblock on %s\n", bdevname(s->s_bdev, b));
-+	TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(sblk->flags)
-+					? "un" : "");
-+	TRACE("Data is %scompressed\n", SQUASHFS_UNCOMPRESSED_DATA(sblk->flags)
-+					? "un" : "");
-+	TRACE("Check data is %spresent in the filesystem\n",
-+					SQUASHFS_CHECK_DATA(sblk->flags) ?  "" : "not ");
-+	TRACE("Filesystem size %lld bytes\n", sblk->bytes_used);
-+	TRACE("Block size %d\n", sblk->block_size);
-+	TRACE("Number of inodes %d\n", sblk->inodes);
-+	if (sblk->s_major > 1)
-+		TRACE("Number of fragments %d\n", sblk->fragments);
-+	TRACE("Number of uids %d\n", sblk->no_uids);
-+	TRACE("Number of gids %d\n", sblk->no_guids);
-+	TRACE("sblk->inode_table_start %llx\n", sblk->inode_table_start);
-+	TRACE("sblk->directory_table_start %llx\n", sblk->directory_table_start);
-+	if (sblk->s_major > 1)
-+		TRACE("sblk->fragment_table_start %llx\n", sblk->fragment_table_start);
-+	TRACE("sblk->uid_start %llx\n", sblk->uid_start);
-+
-+	s->s_maxbytes = MAX_LFS_FILESIZE;
-+	s->s_flags |= MS_RDONLY;
-+	s->s_op = &squashfs_super_ops;
-+
-+	if (readahead_metadata(s) == 0)
-+		goto failed_mount;
-+
-+	/* Allocate read_page block */
-+	err = -ENOMEM;
-+	msblk->read_page = vmalloc(sblk->block_size);
-+	if (msblk->read_page == NULL) {
-+		ERROR("Failed to allocate read_page block\n");
-+		goto failed_mount;
-+	}
-+
-+	/* Allocate uid and gid tables */
-+	msblk->uid = kmalloc((sblk->no_uids + sblk->no_guids) *
-+					sizeof(unsigned int), GFP_KERNEL);
-+	if (msblk->uid == NULL) {
-+		ERROR("Failed to allocate uid/gid table\n");
-+		goto failed_mount;
-+	}
-+	msblk->guid = msblk->uid + sblk->no_uids;
-+   
-+	dpri("swap %d\n", msblk->swap);
-+	err = -EINVAL;
-+	if (msblk->swap) {
-+		unsigned int *suid;
-+
-+		err = -ENOMEM;
-+		suid = kmalloc(sizeof(*suid) * (sblk->no_uids + sblk->no_guids),
-+			       GFP_KERNEL);
-+		if (unlikely(!suid))
-+			goto failed_mount;
-+
-+		err = -EINVAL;
-+		if (!squashfs_read_data(s, (char *)suid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) {
-+			ERROR("unable to read uid/gid table\n");
-+			kfree(suid);
-+			goto failed_mount;
-+		}
-+
-+		SQUASHFS_SWAP_DATA(msblk->uid, suid, (sblk->no_uids +
-+			sblk->no_guids), (sizeof(unsigned int) * 8));
-+		kfree(suid);
-+	} else
-+		if (!squashfs_read_data(s, (char *) msblk->uid, sblk->uid_start,
-+					((sblk->no_uids + sblk->no_guids) *
-+					 sizeof(unsigned int)) |
-+					SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, (sblk->no_uids + sblk->no_guids) * sizeof(unsigned int))) {
-+			ERROR("unable to read uid/gid table\n");
-+			goto failed_mount;
-+		}
-+
-+
-+	if (sblk->s_major == 1 && squashfs_1_0_supported(msblk))
-+		goto allocate_root;
-+
-+	err = -ENOMEM;
-+	msblk->fragment = kzalloc(sizeof(struct squashfs_fragment_cache) *
-+				SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL);
-+	if (msblk->fragment == NULL) {
-+		ERROR("Failed to allocate fragment block cache\n");
-+		goto failed_mount;
-+	}
-+
-+	for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) {
-+		msblk->fragment[i].block = SQUASHFS_INVALID_BLK;
-+	}
-+
-+	msblk->next_fragment = 0;
-+	msblk->unused_frag_blks = SQUASHFS_CACHED_FRAGMENTS;
-+
-+	/* Allocate and read fragment index table */
-+	if (msblk->read_fragment_index_table(s) == 0)
-+		goto failed_mount;
-+
-+	if(sblk->s_major < 3 || sblk->lookup_table_start == SQUASHFS_INVALID_BLK)
-+		goto allocate_root;
-+
-+	/* Allocate and read inode lookup table */
-+	if (read_inode_lookup_table(s) == 0)
-+		goto failed_mount;
-+
-+	s->s_op = &squashfs_export_super_ops;
-+	s->s_export_op = &squashfs_export_ops;
-+
-+allocate_root:
-+	dpri("alloate_root\n");
-+	root = new_inode(s);
-+	if ((msblk->read_inode)(root, sblk->root_inode) == 0) {
-+		iput(root);
-+		goto failed_mount;
-+	}
-+	insert_inode_hash(root);
-+
-+	s->s_root = d_alloc_root(root);
-+	if (s->s_root == NULL) {
-+		ERROR("Root inode create failed\n");
-+		iput(root);
-+		goto failed_mount;
-+	}
-+
-+	TRACE("Leaving squashfs_fill_super\n");
-+	return 0;
-+
-+failed_mount:
-+	kfree(msblk->inode_lookup_table);
-+	kfree(msblk->fragment_index);
-+	kfree(msblk->fragment);
-+	kfree(msblk->uid);
-+	vfree(msblk->read_page);
-+	kfree(msblk->block_cache);
-+	kfree(msblk->fragment_index_2);
-+	kfree(s->s_fs_info);
-+	s->s_fs_info = NULL;
-+ failure:
-+	return err;
-+}
-+
-+
-+static int squashfs_statfs(struct dentry *dentry, struct kstatfs *buf)
-+{
-+	struct squashfs_sb_info *msblk = dentry->d_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+
-+	TRACE("Entered squashfs_statfs\n");
-+
-+	buf->f_type = sblk->s_magic;
-+	buf->f_bsize = sblk->block_size;
-+	buf->f_blocks = ((sblk->bytes_used - 1) >> sblk->block_log) + 1;
-+	buf->f_bfree = buf->f_bavail = 0;
-+	buf->f_files = sblk->inodes;
-+	buf->f_ffree = 0;
-+	buf->f_namelen = SQUASHFS_NAME_LEN;
-+
-+	return 0;
-+}
-+
-+
-+static int squashfs_symlink_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	int index = page->index << PAGE_CACHE_SHIFT, length, bytes, avail_bytes;
-+	long long block = SQUASHFS_I(inode)->start_block;
-+	int offset = SQUASHFS_I(inode)->offset;
-+	void *pageaddr = kmap(page);
-+
-+	TRACE("Entered squashfs_symlink_readpage, page index %ld, start block "
-+				"%llx, offset %x\n", page->index,
-+				SQUASHFS_I(inode)->start_block,
-+				SQUASHFS_I(inode)->offset);
-+
-+	for (length = 0; length < index; length += bytes) {
-+		bytes = squashfs_get_cached_block(inode->i_sb, NULL, block,
-+				offset, PAGE_CACHE_SIZE, &block,
-+						  (unsigned int *)&offset);
-+		if (bytes == 0) {
-+			ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
-+			goto skip_read;
-+		}
-+	}
-+
-+	if (length != index) {
-+		ERROR("(squashfs_symlink_readpage) length != index\n");
-+		bytes = 0;
-+		goto skip_read;
-+	}
-+
-+	avail_bytes = min_t(int, i_size_read(inode) - length, PAGE_CACHE_SIZE);
-+
-+	bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, offset,
-+		avail_bytes, &block, (unsigned int *)&offset);
-+	if (bytes == 0)
-+		ERROR("Unable to read symbolic link [%llx:%x]\n", block, offset);
-+
-+skip_read:
-+	memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes);
-+	kunmap(page);
-+	flush_dcache_page(page);
-+	SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	return 0;
-+}
-+
-+
-+static struct meta_index *locate_meta_index(struct inode *inode, int index, int offset)
-+{
-+	struct meta_index *meta = NULL;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	int i;
-+
-+	mutex_lock(&msblk->meta_index_mutex);
-+
-+	TRACE("locate_meta_index: index %d, offset %d\n", index, offset);
-+
-+	if (msblk->meta_index == NULL)
-+		goto not_allocated;
-+
-+	for (i = 0; i < SQUASHFS_META_NUMBER; i ++) {
-+		if (msblk->meta_index[i].inode_number == inode->i_ino &&
-+				msblk->meta_index[i].offset >= offset &&
-+				msblk->meta_index[i].offset <= index &&
-+				msblk->meta_index[i].locked == 0) {
-+			TRACE("locate_meta_index: entry %d, offset %d\n", i,
-+					msblk->meta_index[i].offset);
-+			meta = &msblk->meta_index[i];
-+			offset = meta->offset;
-+		}
-+	}
-+
-+	if (meta)
-+		meta->locked = 1;
-+
-+not_allocated:
-+	mutex_unlock(&msblk->meta_index_mutex);
-+
-+	return meta;
-+}
-+
-+
-+static struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct meta_index *meta = NULL;
-+	int i;
-+
-+	mutex_lock(&msblk->meta_index_mutex);
-+
-+	TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip);
-+
-+	if (msblk->meta_index == NULL) {
-+		msblk->meta_index = kmalloc(sizeof(struct meta_index) *
-+					SQUASHFS_META_NUMBER, GFP_KERNEL);
-+		if (msblk->meta_index == NULL) {
-+			ERROR("Failed to allocate meta_index\n");
-+			goto failed;
-+		}
-+		for (i = 0; i < SQUASHFS_META_NUMBER; i++) {
-+			msblk->meta_index[i].inode_number = 0;
-+			msblk->meta_index[i].locked = 0;
-+		}
-+		msblk->next_meta_index = 0;
-+	}
-+
-+	for (i = SQUASHFS_META_NUMBER; i &&
-+			msblk->meta_index[msblk->next_meta_index].locked; i --)
-+		msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	if (i == 0) {
-+		TRACE("empty_meta_index: failed!\n");
-+		goto failed;
-+	}
-+
-+	TRACE("empty_meta_index: returned meta entry %d, %p\n",
-+			msblk->next_meta_index,
-+			&msblk->meta_index[msblk->next_meta_index]);
-+
-+	meta = &msblk->meta_index[msblk->next_meta_index];
-+	msblk->next_meta_index = (msblk->next_meta_index + 1) %
-+			SQUASHFS_META_NUMBER;
-+
-+	meta->inode_number = inode->i_ino;
-+	meta->offset = offset;
-+	meta->skip = skip;
-+	meta->entries = 0;
-+	meta->locked = 1;
-+
-+failed:
-+	mutex_unlock(&msblk->meta_index_mutex);
-+	return meta;
-+}
-+
-+
-+static void release_meta_index(struct inode *inode, struct meta_index *meta)
-+{
-+	meta->locked = 0;
-+	smp_mb();
-+}
-+
-+
-+static int read_block_index(struct super_block *s, int blocks, char *block_list,
-+				long long *start_block, int *offset)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	unsigned int *block_listp;
-+	int block = 0;
-+	
-+	if (msblk->swap) {
-+		char *sblock_list;
-+
-+		sblock_list = kmalloc(blocks << 2, GFP_KERNEL);
-+		if (unlikely(!sblock_list))
-+			goto failure;
-+
-+		if (!squashfs_get_cached_block(s, sblock_list, *start_block,
-+				*offset, blocks << 2, start_block, (unsigned int *)offset)) {
-+			ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset);
-+			kfree(sblock_list);
-+			goto failure;
-+		}
-+		SQUASHFS_SWAP_INTS(((unsigned int *)block_list),
-+				((unsigned int *)sblock_list), blocks);
-+		kfree(sblock_list);
-+	} else {
-+		if (!squashfs_get_cached_block(s, block_list, *start_block,
-+				*offset, blocks << 2, start_block, (unsigned int *)offset)) {
-+			ERROR("Fail reading block list [%llx:%x]\n", *start_block, *offset);
-+			goto failure;
-+		}
-+	}
-+
-+	for (block_listp = (unsigned int *) block_list; blocks;
-+				block_listp++, blocks --)
-+		block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp);
-+
-+	return block;
-+
-+failure:
-+	return -1;
-+}
-+
-+
-+#define SIZE 256
-+
-+static inline int calculate_skip(int blocks) {
-+	int skip = (blocks - 1) / ((SQUASHFS_SLOTS * SQUASHFS_META_ENTRIES + 1) * SQUASHFS_META_INDEXES);
-+	return skip >= 7 ? 7 : skip + 1;
-+}
-+
-+
-+static int get_meta_index(struct inode *inode, int index,
-+		long long *index_block, int *index_offset,
-+		long long *data_block, char *block_list)
-+{
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int skip = calculate_skip(i_size_read(inode) >> sblk->block_log);
-+	int offset = 0;
-+	struct meta_index *meta;
-+	struct meta_entry *meta_entry;
-+	long long cur_index_block = SQUASHFS_I(inode)->u.s1.block_list_start;
-+	int cur_offset = SQUASHFS_I(inode)->offset;
-+	long long cur_data_block = SQUASHFS_I(inode)->start_block;
-+	int i;
-+ 
-+	index /= SQUASHFS_META_INDEXES * skip;
-+
-+	while (offset < index) {
-+		meta = locate_meta_index(inode, index, offset + 1);
-+
-+		if (meta == NULL) {
-+			meta = empty_meta_index(inode, offset + 1, skip);
-+			if (meta == NULL)
-+				goto all_done;
-+		} else {
-+			if(meta->entries == 0)
-+				goto failed;
-+			/* XXX */
-+			offset = index < meta->offset + meta->entries ? index :
-+				meta->offset + meta->entries - 1;
-+			/* XXX */
-+			meta_entry = &meta->meta_entry[offset - meta->offset];
-+			cur_index_block = meta_entry->index_block + sblk->inode_table_start;
-+			cur_offset = meta_entry->offset;
-+			cur_data_block = meta_entry->data_block;
-+			TRACE("get_meta_index: offset %d, meta->offset %d, "
-+				"meta->entries %d\n", offset, meta->offset, meta->entries);
-+			TRACE("get_meta_index: index_block 0x%llx, offset 0x%x"
-+				" data_block 0x%llx\n", cur_index_block,
-+				cur_offset, cur_data_block);
-+		}
-+
-+		for (i = meta->offset + meta->entries; i <= index &&
-+				i < meta->offset + SQUASHFS_META_ENTRIES; i++) {
-+			int blocks = skip * SQUASHFS_META_INDEXES;
-+
-+			while (blocks) {
-+				int block = blocks > (SIZE >> 2) ? (SIZE >> 2) : blocks;
-+				int res = read_block_index(inode->i_sb, block, block_list,
-+					&cur_index_block, &cur_offset);
-+
-+				if (res == -1)
-+					goto failed;
-+
-+				cur_data_block += res;
-+				blocks -= block;
-+			}
-+
-+			meta_entry = &meta->meta_entry[i - meta->offset];
-+			meta_entry->index_block = cur_index_block - sblk->inode_table_start;
-+			meta_entry->offset = cur_offset;
-+			meta_entry->data_block = cur_data_block;
-+			meta->entries ++;
-+			offset ++;
-+		}
-+
-+		TRACE("get_meta_index: meta->offset %d, meta->entries %d\n",
-+				meta->offset, meta->entries);
-+
-+		release_meta_index(inode, meta);
-+	}
-+
-+all_done:
-+	*index_block = cur_index_block;
-+	*index_offset = cur_offset;
-+	*data_block = cur_data_block;
-+
-+	return offset * SQUASHFS_META_INDEXES * skip;
-+
-+failed:
-+	release_meta_index(inode, meta);
-+	return -1;
-+}
-+
-+
-+static long long read_blocklist(struct inode *inode, int index,
-+				int readahead_blks, char *block_list,
-+				unsigned short **block_p, unsigned int *bsize)
-+{
-+	long long block_ptr;
-+	int offset;
-+	long long block;
-+	int res = get_meta_index(inode, index, &block_ptr, &offset, &block,
-+		block_list);
-+
-+	TRACE("read_blocklist: res %d, index %d, block_ptr 0x%llx, offset"
-+		       " 0x%x, block 0x%llx\n", res, index, block_ptr, offset, block);
-+
-+	if(res == -1)
-+		goto failure;
-+
-+	index -= res;
-+
-+	while (index) {
-+		int blocks = index > (SIZE >> 2) ? (SIZE >> 2) : index;
-+		int res = read_block_index(inode->i_sb, blocks, block_list,
-+			&block_ptr, &offset);
-+		if (res == -1)
-+			goto failure;
-+		block += res;
-+		index -= blocks;
-+	}
-+
-+	if (read_block_index(inode->i_sb, 1, block_list, &block_ptr, &offset) == -1)
-+		goto failure;
-+	*bsize = *((unsigned int *) block_list);
-+
-+	return block;
-+
-+failure:
-+	return 0;
-+}
-+
-+
-+static int squashfs_readpage(struct file *file, struct page *page)
-+{
-+	struct inode *inode = page->mapping->host;
-+	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	unsigned char *block_list = NULL;
-+	long long block;
-+	unsigned int bsize, i;
-+	int bytes;
-+	int index = page->index >> (sblk->block_log - PAGE_CACHE_SHIFT);
-+ 	void *pageaddr;
-+	struct squashfs_fragment_cache *fragment = NULL;
-+	char *data_ptr = msblk->read_page;
-+	
-+	int mask = (1 << (sblk->block_log - PAGE_CACHE_SHIFT)) - 1;
-+	int start_index = page->index & ~mask;
-+	int end_index = start_index | mask;
-+	int file_end = i_size_read(inode) >> sblk->block_log;
-+	int sparse = 0;
-+
-+	TRACE("Entered squashfs_readpage, page index %lx, start block %llx\n",
-+					page->index, SQUASHFS_I(inode)->start_block);
-+
-+	if (page->index >= ((i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>
-+					PAGE_CACHE_SHIFT))
-+		goto out;
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < file_end) {
-+		block_list = kmalloc(SIZE, GFP_KERNEL);
-+		if (block_list == NULL) {
-+			ERROR("Failed to allocate block_list\n");
-+			goto error_out;
-+		}
-+
-+		block = (msblk->read_blocklist)(inode, index, 1, block_list, NULL, &bsize);
-+		if (block == 0)
-+			goto error_out;
-+
-+		if (bsize == 0) { /* hole */
-+			bytes = index == file_end ?
-+				(i_size_read(inode) & (sblk->block_size - 1)) : sblk->block_size;
-+			sparse = 1;
-+		} else {
-+			mutex_lock(&msblk->read_page_mutex);
-+		
-+			bytes = squashfs_read_data(inode->i_sb, msblk->read_page, block,
-+				bsize, NULL, sblk->block_size);
-+
-+			if (bytes == 0) {
-+				ERROR("Unable to read page, block %llx, size %x\n", block, bsize);
-+				mutex_unlock(&msblk->read_page_mutex);
-+				goto error_out;
-+			}
-+		}
-+	} else {
-+		fragment = get_cached_fragment(inode->i_sb,
-+					SQUASHFS_I(inode)-> u.s1.fragment_start_block,
-+					SQUASHFS_I(inode)->u.s1.fragment_size);
-+
-+		if (fragment == NULL) {
-+			ERROR("Unable to read page, block %llx, size %x\n",
-+					SQUASHFS_I(inode)->u.s1.fragment_start_block,
-+					(int) SQUASHFS_I(inode)->u.s1.fragment_size);
-+			goto error_out;
-+		}
-+		bytes = i_size_read(inode) & (sblk->block_size - 1);
-+		data_ptr = fragment->data + SQUASHFS_I(inode)->u.s1.fragment_offset;
-+	}
-+
-+	for (i = start_index; i <= end_index && bytes > 0; i++,
-+						bytes -= PAGE_CACHE_SIZE, data_ptr += PAGE_CACHE_SIZE) {
-+		struct page *push_page;
-+		int avail = sparse ? 0 : min_t(unsigned int, bytes, PAGE_CACHE_SIZE);
-+
-+		TRACE("bytes %d, i %d, available_bytes %d\n", bytes, i, avail);
-+
-+		push_page = (i == page->index) ? page :
-+			grab_cache_page_nowait(page->mapping, i);
-+
-+		if (!push_page)
-+			continue;
-+
-+		if (PageUptodate(push_page))
-+			goto skip_page;
-+
-+ 		pageaddr = kmap_atomic(push_page, KM_USER0);
-+		memcpy(pageaddr, data_ptr, avail);
-+		memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail);
-+		kunmap_atomic(pageaddr, KM_USER0);
-+		flush_dcache_page(push_page);
-+		SetPageUptodate(push_page);
-+skip_page:
-+		unlock_page(push_page);
-+		if(i != page->index)
-+			page_cache_release(push_page);
-+	}
-+
-+	if (SQUASHFS_I(inode)->u.s1.fragment_start_block == SQUASHFS_INVALID_BLK
-+					|| index < file_end) {
-+		if (!sparse)
-+			mutex_unlock(&msblk->read_page_mutex);
-+		kfree(block_list);
-+	} else
-+		release_cached_fragment(msblk, fragment);
-+
-+	return 0;
-+
-+error_out:
-+	SetPageError(page);
-+out:
-+	pageaddr = kmap_atomic(page, KM_USER0);
-+	memset(pageaddr, 0, PAGE_CACHE_SIZE);
-+	kunmap_atomic(pageaddr, KM_USER0);
-+	flush_dcache_page(page);
-+	if (!PageError(page))
-+		SetPageUptodate(page);
-+	unlock_page(page);
-+
-+	kfree(block_list);
-+	return 0;
-+}
-+
-+
-+static int get_dir_index_using_offset(struct super_block *s,
-+				long long *next_block, unsigned int *next_offset,
-+				long long index_start, unsigned int index_offset, int i_count,
-+				long long f_pos)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index index;
-+
-+	TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n",
-+					i_count, (unsigned int) f_pos);
-+
-+	f_pos =- 3;
-+	if (f_pos == 0)
-+		goto finish;
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, &sindex, index_start, index_offset,
-+					sizeof(sindex), &index_start, &index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(&index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, &index, index_start, index_offset,
-+					sizeof(index), &index_start, &index_offset);
-+
-+		if (index.index > f_pos)
-+			break;
-+
-+		squashfs_get_cached_block(s, NULL, index_start, index_offset,
-+					index.size + 1, &index_start, &index_offset);
-+
-+		length = index.index;
-+		*next_block = index.start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+
-+finish:
-+	return length + 3;
-+}
-+
-+
-+static int get_dir_index_using_name(struct super_block *s,
-+				long long *next_block, unsigned int *next_offset,
-+				long long index_start, unsigned int index_offset, int i_count,
-+				const char *name, int size)
-+{
-+	struct squashfs_sb_info *msblk = s->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	int i, length = 0;
-+	struct squashfs_dir_index *index;
-+	char *str;
-+
-+	TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count);
-+
-+	str = kmalloc(sizeof(struct squashfs_dir_index) +
-+		(SQUASHFS_NAME_LEN + 1) * 2, GFP_KERNEL);
-+	if (str == NULL) {
-+		ERROR("Failed to allocate squashfs_dir_index\n");
-+		goto failure;
-+	}
-+
-+	index = (struct squashfs_dir_index *) (str + SQUASHFS_NAME_LEN + 1);
-+	strncpy(str, name, size);
-+	str[size] = '\0';
-+
-+	for (i = 0; i < i_count; i++) {
-+		if (msblk->swap) {
-+			struct squashfs_dir_index sindex;
-+			squashfs_get_cached_block(s, &sindex, index_start, index_offset,
-+				sizeof(sindex), &index_start, &index_offset);
-+			SQUASHFS_SWAP_DIR_INDEX(index, &sindex);
-+		} else
-+			squashfs_get_cached_block(s, index, index_start, index_offset,
-+				sizeof(struct squashfs_dir_index), &index_start, &index_offset);
-+
-+		squashfs_get_cached_block(s, index->name, index_start, index_offset,
-+					index->size + 1, &index_start, &index_offset);
-+
-+		index->name[index->size + 1] = '\0';
-+
-+		if (strcmp(index->name, str) > 0)
-+			break;
-+
-+		length = index->index;
-+		*next_block = index->start_block + sblk->directory_table_start;
-+	}
-+
-+	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
-+	kfree(str);
-+
-+failure:
-+	return length + 3;
-+}
-+
-+		
-+static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
-+{
-+	struct inode *i = file->f_dentry->d_inode;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+		sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dir_count;
-+	struct squashfs_dir_header dirh;
-+	struct squashfs_dir_entry *dire;
-+
-+	TRACE("Entered squashfs_readdir [%llx:%x]\n", next_block, next_offset);
-+
-+	dire = kmalloc(sizeof(struct squashfs_dir_entry) +
-+		SQUASHFS_NAME_LEN + 1, GFP_KERNEL);
-+	if (dire == NULL) {
-+		ERROR("Failed to allocate squashfs_dir_entry\n");
-+		goto finish;
-+	}
-+
-+	while(file->f_pos < 3) {
-+		char *name;
-+		int size, i_ino;
-+
-+		if(file->f_pos == 0) {
-+			name = ".";
-+			size = 1;
-+			i_ino = i->i_ino;
-+		} else {
-+			name = "..";
-+			size = 2;
-+			i_ino = SQUASHFS_I(i)->u.s2.parent_inode;
-+		}
-+		TRACE("Calling filldir(%x, %s, %d, %d, %d, %d)\n",
-+				(unsigned int) dirent, name, size, (int)
-+				file->f_pos, i_ino, squashfs_filetype_table[1]);
-+
-+		if (filldir(dirent, name, size, file->f_pos, i_ino,
-+				squashfs_filetype_table[1]) < 0) {
-+				TRACE("Filldir returned less than 0\n");
-+			goto finish;
-+		}
-+		file->f_pos += size;
-+	}
-+
-+	length = get_dir_index_using_offset(i->i_sb, &next_block,
-+					    (unsigned int *)&next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, file->f_pos);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+			
-+			if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block,
-+					 next_offset, sizeof(sdirh), &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block,
-+					next_offset, sizeof(dirh), &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block,
-+						next_offset, sizeof(sdire), &next_block,
-+							       (unsigned int *)&next_offset))
-+					goto failed_read;
-+				
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, dire, next_block,
-+						next_offset, sizeof(*dire), &next_block,
-+							       (unsigned int *)&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block,
-+						next_offset, dire->size + 1, &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (file->f_pos >= length)
-+				continue;
-+
-+			dire->name[dire->size + 1] = '\0';
-+
-+			TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d, %d)\n",
-+					(unsigned int) dirent, dire->name, dire->size + 1,
-+					(int) file->f_pos, dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type]);
-+
-+			if (filldir(dirent, dire->name, dire->size + 1, file->f_pos,
-+					dirh.inode_number + dire->inode_number,
-+					squashfs_filetype_table[dire->type]) < 0) {
-+				TRACE("Filldir returned less than 0\n");
-+				goto finish;
-+			}
-+			file->f_pos = length;
-+		}
-+	}
-+
-+finish:
-+	kfree(dire);
-+	return 0;
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	kfree(dire);
-+	return 0;
-+}
-+
-+
-+static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry,
-+				struct nameidata *nd)
-+{
-+	const unsigned char *name = dentry->d_name.name;
-+	int len = dentry->d_name.len;
-+	struct inode *inode = NULL;
-+	struct squashfs_sb_info *msblk = i->i_sb->s_fs_info;
-+	struct squashfs_super_block *sblk = &msblk->sblk;
-+	long long next_block = SQUASHFS_I(i)->start_block +
-+				sblk->directory_table_start;
-+	int next_offset = SQUASHFS_I(i)->offset, length = 0, dir_count;
-+	struct squashfs_dir_header dirh;
-+	struct squashfs_dir_entry *dire;
-+
-+	TRACE("Entered squashfs_lookup [%llx:%x]\n", next_block, next_offset);
-+
-+	dire = kmalloc(sizeof(struct squashfs_dir_entry) +
-+		SQUASHFS_NAME_LEN + 1, GFP_KERNEL);
-+	if (dire == NULL) {
-+		ERROR("Failed to allocate squashfs_dir_entry\n");
-+		goto exit_lookup;
-+	}
-+
-+	if (len > SQUASHFS_NAME_LEN)
-+		goto exit_lookup;
-+
-+	length = get_dir_index_using_name(i->i_sb, &next_block, (unsigned int *)&next_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_start,
-+				SQUASHFS_I(i)->u.s2.directory_index_offset,
-+				SQUASHFS_I(i)->u.s2.directory_index_count, name, len);
-+
-+	while (length < i_size_read(i)) {
-+		/* read directory header */
-+		if (msblk->swap) {
-+			struct squashfs_dir_header sdirh;
-+			if (!squashfs_get_cached_block(i->i_sb, &sdirh, next_block,
-+					 next_offset, sizeof(sdirh), &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(sdirh);
-+			SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-+		} else {
-+			if (!squashfs_get_cached_block(i->i_sb, &dirh, next_block,
-+					next_offset, sizeof(dirh), &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += sizeof(dirh);
-+		}
-+
-+		dir_count = dirh.count + 1;
-+		while (dir_count--) {
-+			if (msblk->swap) {
-+				struct squashfs_dir_entry sdire;
-+				if (!squashfs_get_cached_block(i->i_sb, &sdire, next_block,
-+						next_offset, sizeof(sdire), &next_block,
-+							       (unsigned int *)&next_offset))
-+					goto failed_read;
-+				
-+				length += sizeof(sdire);
-+				SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-+			} else {
-+				if (!squashfs_get_cached_block(i->i_sb, dire, next_block,
-+						next_offset, sizeof(*dire), &next_block,
-+							       (unsigned int *)&next_offset))
-+					goto failed_read;
-+
-+				length += sizeof(*dire);
-+			}
-+
-+			if (!squashfs_get_cached_block(i->i_sb, dire->name, next_block,
-+					next_offset, dire->size + 1, &next_block,
-+						       (unsigned int *)&next_offset))
-+				goto failed_read;
-+
-+			length += dire->size + 1;
-+
-+			if (name[0] < dire->name[0])
-+				goto exit_lookup;
-+
-+			if ((len == dire->size + 1) && !strncmp(name, dire->name, len)) {
-+				squashfs_inode_t ino = SQUASHFS_MKINODE(dirh.start_block,
-+								dire->offset);
-+
-+				TRACE("calling squashfs_iget for directory entry %s, inode"
-+					"  %x:%x, %d\n", name, dirh.start_block, dire->offset,
-+					dirh.inode_number + dire->inode_number);
-+
-+				inode = squashfs_iget(i->i_sb, ino, dirh.inode_number + dire->inode_number);
-+
-+				goto exit_lookup;
-+			}
-+		}
-+	}
-+
-+exit_lookup:
-+	kfree(dire);
-+	if (inode)
-+		return d_splice_alias(inode, dentry);
-+	d_add(dentry, inode);
-+	return ERR_PTR(0);
-+
-+failed_read:
-+	ERROR("Unable to read directory block [%llx:%x]\n", next_block,
-+		next_offset);
-+	goto exit_lookup;
-+}
-+
-+
-+static int squashfs_remount(struct super_block *s, int *flags, char *data)
-+{
-+	*flags |= MS_RDONLY;
-+	return 0;
-+}
-+
-+
-+static void squashfs_put_super(struct super_block *s)
-+{
-+	int i;
-+
-+	if (s->s_fs_info) {
-+		struct squashfs_sb_info *sbi = s->s_fs_info;
-+		if (sbi->block_cache)
-+			for (i = 0; i < squashfs_cached_blks; i++)
-+				if (sbi->block_cache[i].block != SQUASHFS_INVALID_BLK)
-+					vfree(sbi->block_cache[i].data);
-+		if (sbi->fragment)
-+			for (i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) 
-+				vfree(sbi->fragment[i].data);
-+		kfree(sbi->fragment);
-+		kfree(sbi->block_cache);
-+		vfree(sbi->read_page);
-+		kfree(sbi->uid);
-+		kfree(sbi->fragment_index);
-+		kfree(sbi->fragment_index_2);
-+		kfree(sbi->meta_index);
-+		kfree(s->s_fs_info);
-+		s->s_fs_info = NULL;
-+	}
-+}
-+
-+
-+static int squashfs_get_sb(struct file_system_type *fs_type, int flags,
-+				const char *dev_name, void *data, struct vfsmount *mnt)
-+{
-+	return get_sb_bdev(fs_type, flags, dev_name, data, squashfs_fill_super,
-+				mnt);
-+}
-+
-+static void free_sqlzma(void)
-+{
-+	int cpu;
-+	struct sqlzma *p;
-+
-+	for_each_online_cpu(cpu) {
-+		p = per_cpu(sqlzma, cpu);
-+		if (p) {
-+#ifdef KeepPreemptive
-+			mutex_destroy(&p->mtx);
-+#endif
-+			sqlzma_fin(&p->un);
-+			kfree(p);
-+		}
-+	}
-+}
-+
-+static int __init init_squashfs_fs(void)
-+{
-+	struct sqlzma *p;
-+	int cpu;
-+	int err = init_inodecache();
-+	if (err)
-+		goto out;
-+
-+	for_each_online_cpu(cpu) {
-+		dpri("%d: %p\n", cpu, per_cpu(sqlzma, cpu));
-+		err = -ENOMEM;
-+		p = kmalloc(sizeof(struct sqlzma), GFP_KERNEL);
-+		if (p) {
-+#ifdef KeepPreemptive
-+			mutex_init(&p->mtx);
-+#endif
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch deleted +0 -55

55 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch deleted +0 -17
deleted file mode 100644
index 550077b..0000000

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch deleted +0 -61

61 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch deleted +0 -12
deleted file mode 100644
index b0ec4ce..0000000

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5 deleted +0 -1827

1,827 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24/defconfig-oe deleted +0 -1774

1,774 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch deleted +0 -13
deleted file mode 100644
index 6e8692c..0000000

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm deleted +0 -31723

31,723 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch deleted +0 -473

473 lines not on this page · raw message

recipes/linux/linux-openmoko-2.6.24_git.bb deleted +0 -26
deleted file mode 100644
index 877c563..0000000

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.28/defconfig-oe.patch deleted +0 -12
deleted file mode 100644
index 3f65387..0000000

Lines of this file are not shown. View the raw message.

recipes/linux/linux-openmoko-2.6.28_git.bb deleted +0 -26
deleted file mode 100644
index ae5b3e5..0000000

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch new file +5342 -0

5,342 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch new file +55 -0

55 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch new file +17 -0
new file mode 100644
index 0000000..550077b

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch new file +61 -0

61 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch new file +12 -0
new file mode 100644
index 0000000..b0ec4ce

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5 new file +1827 -0

1,827 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-oe new file +1774 -0

1,774 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch new file +13 -0
new file mode 100644
index 0000000..6e8692c

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm new file +31723 -0

31,723 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch new file +473 -0

473 lines not on this page · raw message

recipes/obsolete/linux/linux-openmoko-2.6.24_git.bb new file +26 -0
new file mode 100644
index 0000000..877c563

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.28/defconfig-oe.patch new file +12 -0
new file mode 100644
index 0000000..3f65387

Lines of this file are not shown. View the raw message.

recipes/obsolete/linux/linux-openmoko-2.6.28_git.bb new file +26 -0
new file mode 100644
index 0000000..ae5b3e5

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.3.1

Part of the diff is not shown here. View the raw message.

#13 lore raw

PATCH 10/13 openmoko: remove openmoko directories used from FILESPATH as openmoko distribution was obsoleted on Aug 2010

In reply to Martin Jansa
---
 recipes/base-files/base-files/openmoko/issue       |   11 -
 recipes/base-files/base-files/openmoko/issue.net   |   12 -
 recipes/dropbear/dropbear/openmoko/default         |    1 -
 .../openmoko-system/ompower/openmoko/ompower-init  |    7 -
 recipes/psplash/files/openmoko/psplash-bar-img.h   |   59 -
 recipes/psplash/files/openmoko/psplash-poky-img.h  | 3292 --------------------
 recipes/scummvm/files/openmoko/openmoko-scummvm    |   19 -
 recipes/scummvm/files/openmoko/scummvm.desktop     |   12 -
 recipes/sysvinit/sysvinit/openmoko/rc              |  108 -
 recipes/sysvinit/sysvinit/openmoko/rcS             |    9 -
 recipes/sysvinit/sysvinit/openmoko/rcS-default     |   25 -
 recipes/udev/udev-118/openmoko/init                |  177 --
 .../xserver-kdrive-common/openmoko/Xserver         |  182 --
 .../openmoko/xsplash-qvga.ppm                      |  Bin 230460 -> 0 bytes
 .../xserver-kdrive-splash/openmoko/xsplash-vga.ppm |  Bin 921660 -> 0 bytes
 15 files changed, 0 insertions(+), 3914 deletions(-)
 delete mode 100644 recipes/base-files/base-files/openmoko/issue
 delete mode 100644 recipes/base-files/base-files/openmoko/issue.net
 delete mode 100644 recipes/dropbear/dropbear/openmoko/default
 delete mode 100755 recipes/openmoko-system/ompower/openmoko/ompower-init
 delete mode 100644 recipes/psplash/files/openmoko/psplash-bar-img.h
 delete mode 100644 recipes/psplash/files/openmoko/psplash-poky-img.h
 delete mode 100644 recipes/scummvm/files/openmoko/openmoko-scummvm
 delete mode 100644 recipes/scummvm/files/openmoko/scummvm.desktop
 delete mode 100644 recipes/sysvinit/sysvinit/openmoko/rc
 delete mode 100644 recipes/sysvinit/sysvinit/openmoko/rcS
 delete mode 100644 recipes/sysvinit/sysvinit/openmoko/rcS-default
 delete mode 100644 recipes/udev/udev-118/openmoko/init
 delete mode 100644 recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
 delete mode 100644 recipes/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-qvga.ppm
 delete mode 100644 recipes/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-vga.ppm
recipes/base-files/base-files/openmoko/issue deleted +0 -11
deleted file mode 100644
index 7512472..0000000
@@ -1,11 +0,0 @@
-.-------.                                           
-|       |                  .-.                      
-|   |   |-----.-----.-----.| |   .----..-----.-----.
-|       |     | __  |  ---'| '--.|  .-'|     |     |
-|   |   |  |  |     |---  ||  --'|  |  |  '  | | | |
-'---'---'--'--'--.  |-----''----''--'  '-----'-'-'-'
-                -'  |
-                '---'
-
-The Openmoko Distribution -- powered by Angstrom \n \l
-
recipes/base-files/base-files/openmoko/issue.net deleted +0 -12
deleted file mode 100644
index 1305085..0000000
@@ -1,12 +0,0 @@
-.-------.                                           
-|       |                  .-.                      
-|   |   |-----.-----.-----.| |   .----..-----.-----.
-|       |     | __  |  ---'| '--.|  .-'|     |     |
-|   |   |  |  |     |---  ||  --'|  |  |  '  | | | |
-'---'---'--'--'--.  |-----''----''--'  '-----'-'-'-'
-                -'  |
-                '---'
-
-The Openmoko Distribution -- powered by Angstrom %h
-
-
recipes/dropbear/dropbear/openmoko/default deleted +0 -1
deleted file mode 100644
index 19816b3..0000000
@@ -1 +0,0 @@
-DROPBEAR_PORT=`ip addr list usb0 | awk 'BEGIN { FS="[ /]+" } /inet / { print  $3 }'`:22
recipes/openmoko-system/ompower/openmoko/ompower-init deleted +0 -7
deleted file mode 100755
index 0b36867..0000000
@@ -1,7 +0,0 @@
-#!/bin/sh 
-
-. /etc/init.d/functions
-
-# xset need to be able to reach our display
-export DISPLAY=:0
-ompower &
recipes/psplash/files/openmoko/psplash-bar-img.h deleted +0 -59

59 lines not on this page · raw message

recipes/psplash/files/openmoko/psplash-poky-img.h deleted +0 -3292

2,910 lines not on this page · raw message

recipes/scummvm/files/openmoko/openmoko-scummvm deleted +0 -19
deleted file mode 100644
index 58eb2bb..0000000

Lines of this file are not shown. View the raw message.

recipes/scummvm/files/openmoko/scummvm.desktop deleted +0 -12
deleted file mode 100644
index 96c0250..0000000

Lines of this file are not shown. View the raw message.

recipes/sysvinit/sysvinit/openmoko/rc deleted +0 -108

108 lines not on this page · raw message

recipes/sysvinit/sysvinit/openmoko/rcS deleted +0 -9
deleted file mode 100644
index 08dca5d..0000000

Lines of this file are not shown. View the raw message.

recipes/sysvinit/sysvinit/openmoko/rcS-default deleted +0 -25
deleted file mode 100644
index 5bb57ef..0000000

Lines of this file are not shown. View the raw message.

recipes/udev/udev-118/openmoko/init deleted +0 -177

177 lines not on this page · raw message

recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver deleted +0 -182

182 lines not on this page · raw message

recipes/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-qvga.ppm deleted binary +0 -0
deleted file mode 100644
index 88df5e5476eff94372e97af6fdf48ff313ebf77c..0000000000000000000000000000000000000000
GIT binary patch
recipes/xserver-kdrive-common/xserver-kdrive-splash/openmoko/xsplash-vga.ppm deleted binary +0 -0
deleted file mode 100644
index 90eb0560560198aa9803ae76bd7b80ed97c7c7b4..0000000000000000000000000000000000000000
GIT binary patch

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.3.1

Part of the diff is not shown here. View the raw message.

#14 lore raw

PATCH 11/13 openmoko: move initscripts, psplash, alsa-scenarios also to obsolete

In reply to Martin Jansa
---
 .../initscripts/initscripts-openmoko/bootmisc.sh   |   47 ----
 recipes/initscripts/initscripts-openmoko/campgsm   |  128 ----------
 .../initscripts/initscripts-openmoko/checkroot.sh  |   43 ----
 .../initscripts-openmoko/led-trigger.sh            |    6 -
 .../initscripts/initscripts-openmoko/mountall.sh   |   52 ----
 .../initscripts-openmoko/mountdevsubfs.sh          |   14 --
 .../initscripts-openmoko/mountkernfs.sh            |   33 ---
 .../initscripts/initscripts-openmoko/mountnfs.sh   |   87 -------
 .../initscripts-openmoko/populate-volatile.sh      |  248 --------------------
 recipes/initscripts/initscripts-openmoko_1.0.bb    |  112 ---------
 .../initscripts/initscripts-openmoko/bootmisc.sh   |   47 ++++
 .../initscripts/initscripts-openmoko/campgsm       |  128 ++++++++++
 .../initscripts/initscripts-openmoko/checkroot.sh  |   43 ++++
 .../initscripts-openmoko/led-trigger.sh            |    6 +
 .../initscripts/initscripts-openmoko/mountall.sh   |   52 ++++
 .../initscripts-openmoko/mountdevsubfs.sh          |   14 ++
 .../initscripts-openmoko/mountkernfs.sh            |   33 +++
 .../initscripts/initscripts-openmoko/mountnfs.sh   |   87 +++++++
 .../initscripts-openmoko/populate-volatile.sh      |  248 ++++++++++++++++++++
 .../initscripts/initscripts-openmoko_1.0.bb        |  112 +++++++++
 .../openmoko2/openmoko-alsa-scenarios_svn.bb       |   25 ++
 recipes/obsolete/psplash/psplash-openmoko_svn.bb   |   20 ++
 recipes/openmoko2/openmoko-alsa-scenarios_svn.bb   |   25 --
 recipes/psplash/psplash-openmoko_svn.bb            |   20 --
 24 files changed, 815 insertions(+), 815 deletions(-)
 delete mode 100644 recipes/initscripts/initscripts-openmoko/bootmisc.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/campgsm
 delete mode 100644 recipes/initscripts/initscripts-openmoko/checkroot.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/led-trigger.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/mountall.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/mountdevsubfs.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/mountkernfs.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/mountnfs.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko/populate-volatile.sh
 delete mode 100644 recipes/initscripts/initscripts-openmoko_1.0.bb
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/bootmisc.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/campgsm
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/checkroot.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/led-trigger.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/mountall.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/mountdevsubfs.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/mountkernfs.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/mountnfs.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko/populate-volatile.sh
 create mode 100644 recipes/obsolete/initscripts/initscripts-openmoko_1.0.bb
 create mode 100644 recipes/obsolete/openmoko2/openmoko-alsa-scenarios_svn.bb
 create mode 100644 recipes/obsolete/psplash/psplash-openmoko_svn.bb
 delete mode 100644 recipes/openmoko2/openmoko-alsa-scenarios_svn.bb
 delete mode 100644 recipes/psplash/psplash-openmoko_svn.bb
recipes/initscripts/initscripts-openmoko/bootmisc.sh deleted +0 -47
deleted file mode 100644
index 4511e12..0000000
@@ -1,47 +0,0 @@
-#
-# bootmisc.sh	Miscellaneous things to be done during bootup.
-#
-
-. /etc/default/rcS
-#
-# Put a nologin file in /etc to prevent people from logging in before
-# system startup is complete.
-#
-if test "$DELAYLOGIN" = yes
-then
-  echo "System bootup in progress - please wait" > /etc/nologin
-  cp /etc/nologin /etc/nologin.boot
-fi
-
-#
-# Update /etc/motd.
-#
-if test "$EDITMOTD" != no
-then
-	uname -a > /etc/motd.tmp
-	sed 1d /etc/motd >> /etc/motd.tmp
-	mv /etc/motd.tmp /etc/motd
-fi
-
-#
-# Update dynamic library cache
-#
-#/sbin/ldconfig
-
-# Set the system clock from hardware clock
-# If the timestamp is 1 day or more recent than the current time,
-# use the timestamp instead.
-[ "$UTC" = yes ] || /etc/init.d/hwclock.sh start
-
-if ! test -f /etc/.configured && test -e /etc/timestamp
-then
-	SYSTEMDATE=`date "+%Y%m%d"`
-	TIMESTAMP=`cat /etc/timestamp | awk '{ print substr($0,9,4) substr($0,1,4);}'`
-        NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE \)`
-        if [ $NEEDUPDATE -eq 1 ]; then
-		date `cat /etc/timestamp`
-		/etc/init.d/hwclock.sh stop
-	fi
-fi
-
-: exit 0
recipes/initscripts/initscripts-openmoko/campgsm deleted +0 -128

128 lines not on this page · raw message

recipes/initscripts/initscripts-openmoko/checkroot.sh deleted +0 -43

43 lines not on this page · raw message

recipes/initscripts/initscripts-openmoko/led-trigger.sh deleted +0 -6
deleted file mode 100644
index 9583ce9..0000000
@@ -1,6 +0,0 @@
-#! /bin/sh
-sys_led_trigger="/sys/devices/platform/gta02-led.0/leds/gta02-aux:red/trigger"
-if test -e $sys_led_trigger ;then
-        echo bat-charging > $sys_led_trigger
-fi
-
recipes/initscripts/initscripts-openmoko/mountall.sh deleted +0 -52

52 lines not on this page · raw message

recipes/initscripts/initscripts-openmoko/mountdevsubfs.sh deleted +0 -14
deleted file mode 100644
index c6cfb05..0000000
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. /etc/default/devpts
-
-test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2
-
-if [ -d /dev/pts ]; then
-	mount -n -t devpts devpts /dev/pts -ogid=${TTYGRP},mode=${TTYMODE}
-fi
-
-
-if [ -d /dev/shm ]; then
-	mount -n -t tmpfs shmfs /dev/shm -omode=0777
-fi
recipes/initscripts/initscripts-openmoko/mountkernfs.sh deleted +0 -33
deleted file mode 100644
index 1ed09fc..0000000
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-supported_kernel() {
-  case "$(uname -r)" in
-    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
-    2.6.1[0-7]|2.6.1[0-7][!0-9]*) return 1 ;;
-  esac
-  return 0
-}
-
-check_kernel() {
-	if ! supported_kernel; then
-		echo "WARNING: kernel < 2.6.18"
-	fi
-
-	if ! grep -qs devpts /proc/filesystems; then
-		echo "WARNING: kernel does not support devpts"
-	fi
-
-	if ! grep -qs tmpfs /proc/filesystems; then
-		echo "WARNING: kernel does not support tmpfs"
-	fi
-}
-
-if [ -d /proc ]; then
-	mount -n -t proc proc /proc
-fi
-
-check_kernel
-
-if [ -d /sys ]; then
-	mount -n -t sysfs sysfs /sys
-fi
recipes/initscripts/initscripts-openmoko/mountnfs.sh deleted +0 -87

87 lines not on this page · raw message

recipes/initscripts/initscripts-openmoko/populate-volatile.sh deleted +0 -248

248 lines not on this page · raw message

recipes/initscripts/initscripts-openmoko_1.0.bb deleted +0 -112

112 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/bootmisc.sh new file +47 -0

47 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/campgsm new file +128 -0

128 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/checkroot.sh new file +43 -0

43 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/led-trigger.sh new file +6 -0
new file mode 100644
index 0000000..9583ce9
@@ -0,0 +1,6 @@
+#! /bin/sh
+sys_led_trigger="/sys/devices/platform/gta02-led.0/leds/gta02-aux:red/trigger"
+if test -e $sys_led_trigger ;then
+        echo bat-charging > $sys_led_trigger
+fi
+
recipes/obsolete/initscripts/initscripts-openmoko/mountall.sh new file +52 -0

52 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/mountdevsubfs.sh new file +14 -0
new file mode 100644
index 0000000..c6cfb05
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. /etc/default/devpts
+
+test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2
+
+if [ -d /dev/pts ]; then
+	mount -n -t devpts devpts /dev/pts -ogid=${TTYGRP},mode=${TTYMODE}
+fi
+
+
+if [ -d /dev/shm ]; then
+	mount -n -t tmpfs shmfs /dev/shm -omode=0777
+fi
recipes/obsolete/initscripts/initscripts-openmoko/mountkernfs.sh new file +33 -0
new file mode 100644
index 0000000..1ed09fc
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[0-7]|2.6.1[0-7][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+check_kernel() {
+	if ! supported_kernel; then
+		echo "WARNING: kernel < 2.6.18"
+	fi
+
+	if ! grep -qs devpts /proc/filesystems; then
+		echo "WARNING: kernel does not support devpts"
+	fi
+
+	if ! grep -qs tmpfs /proc/filesystems; then
+		echo "WARNING: kernel does not support tmpfs"
+	fi
+}
+
+if [ -d /proc ]; then
+	mount -n -t proc proc /proc
+fi
+
+check_kernel
+
+if [ -d /sys ]; then
+	mount -n -t sysfs sysfs /sys
+fi
recipes/obsolete/initscripts/initscripts-openmoko/mountnfs.sh new file +87 -0

87 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko/populate-volatile.sh new file +248 -0

248 lines not on this page · raw message

recipes/obsolete/initscripts/initscripts-openmoko_1.0.bb new file +112 -0

112 lines not on this page · raw message

recipes/obsolete/openmoko2/openmoko-alsa-scenarios_svn.bb new file +25 -0
new file mode 100644
index 0000000..315ea4d
@@ -0,0 +1,25 @@
+DESCRIPTION = "Package for the different scenarios used by Openmoko"
+SECTION = "openmoko/base"
+SRCREV = "4732"
+PV = "1.0+svnr${SRCPV}"
+PR = "r2"
+
+PROVIDES = "virtual/alsa-scenarios"
+
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/audio/;module=om-gta01;proto=http"
+SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
+
+S = "${WORKDIR}/${MACHINE_ARCH}"
+
+do_install() {
+    install -d ${D}${datadir}/openmoko/scenarios/
+    install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
+    install -d ${D}${sysconfdir}/
+    install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+FILES_${PN} += "${datadir}/openmoko"
recipes/obsolete/psplash/psplash-openmoko_svn.bb new file +20 -0
new file mode 100644
index 0000000..9c675b4
@@ -0,0 +1,20 @@
+require psplash.inc
+require psplash-ua.inc
+
+ALTERNATIVE_PRIORITY = "30"
+
+# You can create your own pslash-poky-img.h by doing
+# ./make-image-header.sh <file>.png POKY
+# and rename the resulting .h to pslash-poky-img.h (for the logo)
+# respectively psplash-bar-img.h (BAR) for the bar.
+# You might also want to patch the colors (see patch)
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
+          file://logo-math.patch \
+          file://psplash-poky-img.h \
+          file://psplash-bar-img.h \
+          file://psplash-default \
+          file://psplash-init"
+S = "${WORKDIR}/psplash"
+
+SRC_URI_append_openmoko = " file://configurability.patch "
recipes/openmoko2/openmoko-alsa-scenarios_svn.bb deleted +0 -25
deleted file mode 100644
index 315ea4d..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "Package for the different scenarios used by Openmoko"
-SECTION = "openmoko/base"
-SRCREV = "4732"
-PV = "1.0+svnr${SRCPV}"
-PR = "r2"
-
-PROVIDES = "virtual/alsa-scenarios"
-
-COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/audio/;module=om-gta01;proto=http"
-SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
-
-S = "${WORKDIR}/${MACHINE_ARCH}"
-
-do_install() {
-    install -d ${D}${datadir}/openmoko/scenarios/
-    install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
-    install -d ${D}${sysconfdir}/
-    install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
-}
-
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
-
-FILES_${PN} += "${datadir}/openmoko"
recipes/psplash/psplash-openmoko_svn.bb deleted +0 -20
deleted file mode 100644
index 9c675b4..0000000
@@ -1,20 +0,0 @@
-require psplash.inc
-require psplash-ua.inc
-
-ALTERNATIVE_PRIORITY = "30"
-
-# You can create your own pslash-poky-img.h by doing
-# ./make-image-header.sh <file>.png POKY
-# and rename the resulting .h to pslash-poky-img.h (for the logo)
-# respectively psplash-bar-img.h (BAR) for the bar.
-# You might also want to patch the colors (see patch)
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-          file://logo-math.patch \
-          file://psplash-poky-img.h \
-          file://psplash-bar-img.h \
-          file://psplash-default \
-          file://psplash-init"
-S = "${WORKDIR}/psplash"
-
-SRC_URI_append_openmoko = " file://configurability.patch "
Signature · 1 line
1.7.3.1
#15 lore raw

PATCH 12/13 settingsgui: move both versions to obsolete, nobody have it in task/images now

In reply to Martin Jansa
---
 .../obsolete/openmoko2/settingsgui_0.7+0.8-beta.bb |   14 ++++++++++++++
 recipes/obsolete/openmoko2/settingsgui_0.8.bb      |   13 +++++++++++++
 .../openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb  |   14 --------------
 recipes/openmoko2/settingsgui_0.8.bb               |   13 -------------
 4 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 recipes/obsolete/openmoko2/settingsgui_0.7+0.8-beta.bb
 create mode 100644 recipes/obsolete/openmoko2/settingsgui_0.8.bb
 delete mode 100644 recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb
 delete mode 100644 recipes/openmoko2/settingsgui_0.8.bb
recipes/obsolete/openmoko2/settingsgui_0.7+0.8-beta.bb new file +14 -0
new file mode 100644
index 0000000..f40c576
@@ -0,0 +1,14 @@
+DESCRIPTION = "Openmoko Settings GUI"
+AUTHOR = "Kristian M."
+SECTION = "openmoko/applications"
+RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
+S = "${WORKDIR}/settingsgui-0.8-beta"
+
+inherit distutils
+
+SRC_URI[md5sum] = "4a4c4855447f506078dfb762ba72e35d"
+SRC_URI[sha256sum] = "5f4f727cbe982db701dcc4a70cd2c19a4c153a4b0b35a6b5b561b48d53649855"
recipes/obsolete/openmoko2/settingsgui_0.8.bb new file +13 -0
new file mode 100644
index 0000000..2e4fcea
@@ -0,0 +1,13 @@
+DESCRIPTION = "Openmoko Settings GUI"
+AUTHOR = "Kristian M."
+SECTION = "openmoko/applications"
+RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8.tar.bz2"
+
+inherit distutils
+
+SRC_URI[md5sum] = "8b6f19636983fe22bad5ee1e0906c837"
+SRC_URI[sha256sum] = "e839e55b2d7babbbf0302429e9c58ff6e62a064c9ae4cb2d6f957a89b81e0022"
recipes/openmoko-3rdparty/settingsgui_0.7+0.8-beta.bb deleted +0 -14
deleted file mode 100644
index f40c576..0000000
@@ -1,14 +0,0 @@
-DESCRIPTION = "Openmoko Settings GUI"
-AUTHOR = "Kristian M."
-SECTION = "openmoko/applications"
-RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8-beta.tar.bz2"
-S = "${WORKDIR}/settingsgui-0.8-beta"
-
-inherit distutils
-
-SRC_URI[md5sum] = "4a4c4855447f506078dfb762ba72e35d"
-SRC_URI[sha256sum] = "5f4f727cbe982db701dcc4a70cd2c19a4c153a4b0b35a6b5b561b48d53649855"
recipes/openmoko2/settingsgui_0.8.bb deleted +0 -13
deleted file mode 100644
index 2e4fcea..0000000
@@ -1,13 +0,0 @@
-DESCRIPTION = "Openmoko Settings GUI"
-AUTHOR = "Kristian M."
-SECTION = "openmoko/applications"
-RDEPENDS_${PN} = "python-pygtk python-subprocess python-threading"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://mput.de/~kristian/.openmoko/settingsgui-0.8.tar.bz2"
-
-inherit distutils
-
-SRC_URI[md5sum] = "8b6f19636983fe22bad5ee1e0906c837"
-SRC_URI[sha256sum] = "e839e55b2d7babbbf0302429e9c58ff6e62a064c9ae4cb2d6f957a89b81e0022"
Signature · 1 line
1.7.3.1
#16 lore raw

PATCH 13/13 removal: add entry for removing obsoleted openmoko recipes

In reply to Martin Jansa
---
 removal.txt |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
removal.txt +9 -0
index c5891df..175e389 100644
@@ -25,3 +25,12 @@ Removal Date:	2009-04-15
 Maintainer:	Jamie Lenehan
 Reason:		http://www.clamav.net/lang/en/2009/10/05/eol-clamav-094/
 Proposed by:	Roman I Khimov <[email protected]>
+
+Package Name:   obsolete/*openmoko* nonworking/*openmoko*
+Removal Date:   2010-12-22
+Maintainer:     None
+Reason:         Obsoleted by SHR/FSO packages
+Proposed by:    Martin 'JaMa' Jansa
+Note:		Openmoko distribution removed 2010-08-10
+Note:		Moved to obsolete on 2010-10-19
+
Signature · 1 line
1.7.3.1
#17 lore raw
In reply to Martin Jansa

2010/10/19 Martin Jansa <[email protected]>:

Quoted 9 lines

I was asked few times to cleanup old openmoko recipes.

Openmoko as distribution was obsoleted on Aug 10 2010 and SHR is marked as successor in that distro config.

Yesterday khem asked me to fix libmokoui2 or obsolete it. We don't use libmokoui2 in SHR and seems like nobody else does
http://tinderbox.openembedded.org/packages/libmokoui2/

Quoted 8 lines

So I started to obsolete it and recipes depending on it.. and when it started to fall apart I've moved last remaining parts to obsolete too.

Please check this patch serie if you found something usefull for you and if yes, then became maintainer for it (as nobody seems to care now).

BTW: I have nothing against openmoko company/distro/recipes/machines :).

Patch 9 didn't land here.
I agree with your reasoning, and reviewed the other patches and see no issues. The only small remark is that if you plan to move to obsolete today, that full removal on oct 22 is a little bit early in my eyes.

Anyway for all the patches:

#18 lore raw
Quoted 13 lines · Frans Meulenbroeks

2010/10/19 Martin Jansa <[email protected]>:

Quoted 12 lines

I was asked few times to cleanup old openmoko recipes.

Openmoko as distribution was obsoleted on Aug 10 2010 and SHR is marked as successor in that distro config.

Yesterday khem asked me to fix libmokoui2 or obsolete it. We don't use libmokoui2 in SHR and seems like nobody else does
http://tinderbox.openembedded.org/packages/libmokoui2/

So I started to obsolete it and recipes depending on it.. and when it started to fall apart I've moved last remaining parts to obsolete too.

Quoted 7 lines
Quoted 5 lines

Please check this patch serie if you found something usefull for you and if yes, then became maintainer for it (as nobody seems to care now).

BTW: I have nothing against openmoko company/distro/recipes/machines :).

Patch 9 didn't land here.

It's probably because it's 3.8MB big :/ I'll attach dirstat here.

Quoted 4 lines

I agree with your reasoning, and reviewed the other patches and see no issues.

The only small remark is that if you plan to move to obsolete today, that full removal on oct 22 is a little bit early in my eyes.

Removal Date: 2010-12-22

it's not October, but I'm ok to postpone it to 2011-06-01 or whatever..

because obsolete/nonworking recipes are not in my BBFILES mask :).

Quoted 2 lines

Anyway for all the patches:

Thanks

----

Patch 09:

in short:

git mv recipes/linux/linux-openmoko-2.6.2[48]* recipes/obsolete/linux/

From 1578a95d9e9267e1a05f36063846d69343aca33e Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Tue, 19 Oct 2010 09:52:01 +0200
Subject: [PATCH 09/13] linux-openmoko: obsolete 2.6.24 and 2.6.28

---

 26 files changed, 41361 insertions(+), 41361 deletions(-)
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-oe
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24_git.bb
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28/defconfig-oe.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-oe
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28/defconfig-oe.patch
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28_git.bb
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#19 lore raw

2010/10/19 Martin Jansa <[email protected]>:

Quoted 22 lines · Frans Meulenbroeks
Quoted 13 lines

2010/10/19 Martin Jansa <[email protected]>:

Quoted 12 lines

I was asked few times to cleanup old openmoko recipes.

Openmoko as distribution was obsoleted on Aug 10 2010 and SHR is marked as successor in that distro config.

Yesterday khem asked me to fix libmokoui2 or obsolete it. We don't use libmokoui2 in SHR and seems like nobody else does
http://tinderbox.openembedded.org/packages/libmokoui2/

So I started to obsolete it and recipes depending on it.. and when it started to fall apart I've moved last remaining parts to obsolete too.

Quoted 7 lines
Quoted 5 lines

Please check this patch serie if you found something usefull for you and if yes, then became maintainer for it (as nobody seems to care now).

BTW: I have nothing against openmoko company/distro/recipes/machines :).

Patch 9 didn't land here.

Quoted 8 lines

It's probably because it's 3.8MB big :/ I'll attach dirstat here.

Quoted 4 lines

I agree with your reasoning, and reviewed the other patches and see no issues.

The only small remark is that if you plan to move to obsolete today, that full removal on oct 22 is a little bit early in my eyes.

Removal Date:   2010-12-22

Ah, misread as 2010-10-22
guess I am becoming lysdectic :-)
patch 9 is ok by me too, so i want to extend my ack to it.

Frans

Quoted 61 lines

it's not October, but I'm ok to postpone it to 2011-06-01 or whatever..

because obsolete/nonworking recipes are not in my BBFILES mask :).

Quoted 2 lines

Anyway for all the patches:

Thanks

----

Patch 09:

in short:

git mv recipes/linux/linux-openmoko-2.6.2[48]* recipes/obsolete/linux/

From 1578a95d9e9267e1a05f36063846d69343aca33e Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Tue, 19 Oct 2010 09:52:01 +0200
Subject: [PATCH 09/13] linux-openmoko: obsolete 2.6.24 and 2.6.28

---

 26 files changed, 41361 insertions(+), 41361 deletions(-)

 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/defconfig-oe
 delete mode 100644 recipes/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm delete mode 100644 recipes/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch delete mode 100644 recipes/linux/linux-openmoko-2.6.24_git.bb
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28/defconfig-oe.patch
 delete mode 100644 recipes/linux/linux-openmoko-2.6.28_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0001-squashfs-with-lzma.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0002-squashfs-initrd.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0003-squashfs-force-O2.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0004-squashfs-Kconfig.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/0005-squashfs-Makefile.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-2.6.22.5 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/defconfig-oe create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/gta01-fix-battery-class-name.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/logo_linux_clut224.ppm create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24/openwrt-ledtrig-netdev.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.24_git.bb
 create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28/defconfig-oe.patch create mode 100644 recipes/obsolete/linux/linux-openmoko-2.6.28_git.bb

--
Martin 'JaMa' Jansa     jabber: [email protected]

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel