From 355c32c9303e2e2ea3ca480cb424ddbef84bb5e4 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Wed, 16 Aug 2006 19:57:00 +0000
Subject: slugos-native: moved libc6-dev to the linux section as it is not for
 uclibc

---
 packages/meta/slugos-native.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 7af7f7961a..e3988aa8a2 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
@@ -28,7 +28,6 @@ SLUGOS_NATIVE_RT = "\
 	gcc gcc-symlinks \
 	gdbm \
 	libstdc++-dev \
-	libc6-dev \
 	ncurses-dev ncurses-terminfo \
 	perl perl-modules \
 	python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
@@ -37,6 +36,7 @@ SLUGOS_NATIVE_RT = "\
 
 # Run-time and DEPENDS
 SLUGOS_NATIVE_prepend_linux = "\
+	libc6-dev \
 	"
 SLUGOS_NATIVE_prepend_linux-uclibc = "\
 	libiconv \
-- 
cgit v1.2.3


From ceca77cf969f24603a0527cfdf1d3d99d43ec820 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Wed, 16 Aug 2006 20:01:15 +0000
Subject: slugos-packages.bb: demoted apr, boost, linphone, sudo for ucslugc 
 promoted asterisk, asterisk-sounds, alsa-utils, ircp to common section 
 as they also work for ucslugc.

---
 packages/meta/slugos-packages.bb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index ec42c59c64..60a23cd16d 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
 CONFLICTS = "db3"
 PROVIDES += "${SLUGOS_IMAGENAME}-packages"
 
@@ -14,11 +14,13 @@ EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
 
-# The list of packages to build for the ucslugc DISTRO.
+# The list of packages to build for the slugos DISTRO.
 # KEEP IN ALPHABETICAL ORDER
 SLUGOS_PACKAGES = "\
 	alsa-lib \
-	apr \
+	alsa-utils \
+	asterisk \
+	asterisk-sounds \
 	atftp \
 	audiofile \
 	aumix \
@@ -31,7 +33,6 @@ SLUGOS_PACKAGES = "\
 	bison \
 	bluez-libs \
 	bluez-utils-nodbus \
-	boost \
 	bridge-utils \
 	bwmon \
 	bzip2 \
@@ -77,6 +78,7 @@ SLUGOS_PACKAGES = "\
 	ifupdown \
 	ipkg-utils \
 	iptables \
+	ircp \
 	joe \
 	jpeg \
 	lcdproc \
@@ -95,7 +97,6 @@ SLUGOS_PACKAGES = "\
 	libusb \
 	libvorbis \
 	libxml2 \
-	linphone \
 	lirc \
 	lrzsz \
 	lsof \
@@ -154,7 +155,6 @@ SLUGOS_PACKAGES = "\
 	ssmtp \
 	strace \
 	streamripper \
-	sudo \
 	sysfsutils \
 	syslog-ng \
 	tar \
@@ -199,11 +199,11 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
 
 # These packages work with glibc, but break on uclibc.
 UCLIBC_BROKEN_PACKAGES = "\
-	alsa-utils \
-	asterisk \
-	asterisk-sounds \
+	apr \
 	bogofilter \
-	ircp \
+	boost \
+	linphone \
+	sudo \
 	"
 
 # Packages which build only with glibc (some of these use internal
-- 
cgit v1.2.3


From 784225fada898f1b86cef4dcc20f53ff590889f3 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 19 Aug 2006 17:56:50 +0000
Subject: ushare: created; ushare is a UPnP media server

---
 packages/ushare/.mtn2git_empty  |  0
 packages/ushare/ushare_0.9.7.bb | 10 ++++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 packages/ushare/.mtn2git_empty
 create mode 100644 packages/ushare/ushare_0.9.7.bb

(limited to 'packages')

diff --git a/packages/ushare/.mtn2git_empty b/packages/ushare/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ushare/ushare_0.9.7.bb b/packages/ushare/ushare_0.9.7.bb
new file mode 100644
index 0000000000..a922fed2d0
--- /dev/null
+++ b/packages/ushare/ushare_0.9.7.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "ushare is a UPnP media server"
+LICENSE = "GPL"
+HOMEPAGE = "http://ushare.geexbox.org/"
+MAINTAINER = "eFfeM <fransmeulenbroeks at yahoo dot com>"
+DEPENDS = "libupnp"
+SRC_URI = "http://ushare.geexbox.org/releases/ushare-0.9.7.tar.bz2"
+S = "${WORKDIR}/ushare-${PV}"
+PR = "r0"
+
+inherit autotools
-- 
cgit v1.2.3


From 3713cf969e4073f08cc096f122032e9000674225 Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 19 Aug 2006 17:57:54 +0000
Subject: slugos-packages: added libupnp and ushare

---
 packages/meta/slugos-packages.bb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages')

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 60a23cd16d..241f999999 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -94,6 +94,7 @@ SLUGOS_PACKAGES = "\
 	libol \
 	libpng \
 	libtool \
+	libupnp \
 	libusb \
 	libvorbis \
 	libxml2 \
@@ -162,6 +163,7 @@ SLUGOS_PACKAGES = "\
 	tiff \
 	unzip \
 	usbutils \
+	ushare \
 	util-linux \
 	vim \
 	vlan \
-- 
cgit v1.2.3


From 808faadfbea5deb79b4bb14c64a6e8df4c4466e4 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 20 Aug 2006 02:31:20 +0000
Subject: php: upgrade PHP5 to 5.1.4, thanks to Shane Volpe <shanevolpe AT
 gmail dot com>, bug #1338

---
 packages/php/php-5.0.5/.mtn2git_empty   |  0
 packages/php/php-5.0.5/autotools.patch  | 90 -------------------------------
 packages/php/php-5.0.5/endianness.patch | 10 ----
 packages/php/php-5.1.4/.mtn2git_empty   |  0
 packages/php/php-5.1.4/autotools.patch  | 94 +++++++++++++++++++++++++++++++++
 packages/php/php_5.0.5.bb               | 60 ---------------------
 packages/php/php_5.1.4.bb               | 38 +++++++++++++
 7 files changed, 132 insertions(+), 160 deletions(-)
 delete mode 100644 packages/php/php-5.0.5/.mtn2git_empty
 delete mode 100644 packages/php/php-5.0.5/autotools.patch
 delete mode 100644 packages/php/php-5.0.5/endianness.patch
 create mode 100644 packages/php/php-5.1.4/.mtn2git_empty
 create mode 100644 packages/php/php-5.1.4/autotools.patch
 delete mode 100644 packages/php/php_5.0.5.bb
 create mode 100644 packages/php/php_5.1.4.bb

(limited to 'packages')

diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/php/php-5.0.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch
deleted file mode 100644
index 7e466a425e..0000000000
--- a/packages/php/php-5.0.5/autotools.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4
---- php-5.0.5~/acinclude.m4	2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/acinclude.m4	2005-10-10 19:56:55.000000000 -0700
-@@ -781,10 +781,10 @@
-   OVERALL_TARGET=[]ifelse($1,,php,$1)
-   php_c_pre='$(CC)'
-   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
--  php_c_post=' && echo > $[@]'
-+  php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_cxx_pre='$(CXX)'
-   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
--  php_cxx_post=' && echo > $[@]'
-+  php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_lo=o
- 
-   case $with_pic in
-@@ -1531,6 +1531,7 @@
- 
- 		dnl even newer glibcs have a different seeker definition...
- 
-+		AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
- 		AC_TRY_RUN([
- #define _GNU_SOURCE
- #include <stdio.h>
-@@ -1560,8 +1561,8 @@
- }
- 
- 					   ],
--					   [ cookie_io_functions_use_off64_t=yes ],
--					   [ ] )
-+                                          [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
-+                                          [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
- 		
-       else
-   	    dnl older glibc versions (up to 2.1.2 ?)
-diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in
---- php-5.0.5~/configure.in	2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/configure.in	2005-10-10 19:56:55.000000000 -0700
-@@ -247,7 +247,7 @@
- sinclude(Zend/acinclude.m4)
- sinclude(Zend/Zend.m4)
- sinclude(TSRM/tsrm.m4)
--
-+sinclude(TSRM/threads.m4)
- 
- 
- divert(2)
-diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4
---- php-5.0.5~/scripts/phpize.m4	2005-10-10 19:56:46.000000000 -0700
-+++ php-5.0.5/scripts/phpize.m4	2005-10-10 19:56:55.000000000 -0700
-@@ -1,7 +1,5 @@
- dnl This file becomes configure.in for self-contained extensions.
- 
--AC_INIT(config.m4)
--
- PHP_INIT_BUILD_SYSTEM
- 
- AC_DEFUN([PHP_WITH_PHP_CONFIG],[
-@@ -55,8 +53,6 @@
- PHP_PROG_RE2C
- AC_PROG_AWK
-     
--sinclude(config.m4)
--
- enable_static=no
- enable_shared=yes
- 
-diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4
---- php-5.0.5~/TSRM/threads.m4	2005-10-10 19:56:40.000000000 -0700
-+++ php-5.0.5/TSRM/threads.m4	2005-10-10 19:57:11.000000000 -0700
-@@ -86,7 +86,7 @@
-   pthreads_working=no
-   ], [
-   dnl For cross compiling running this test is of no use. NetWare supports pthreads
--  pthreads_working=no
-+  pthreads_working=yes
-   case $host_alias in
-   *netware*)
-     pthreads_working=yes
-diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4
---- php-5.0.5~/TSRM/tsrm.m4	2005-10-10 19:56:40.000000000 -0700
-+++ php-5.0.5/TSRM/tsrm.m4	2005-10-10 19:56:55.000000000 -0700
-@@ -68,7 +68,6 @@
- ])
- 
- sinclude(threads.m4)
--sinclude(TSRM/threads.m4)
- 
- AC_DEFUN([TSRM_CHECK_PTHREADS],[
- 		
diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch
deleted file mode 100644
index 0231727c33..0000000000
--- a/packages/php/php-5.0.5/endianness.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- php-5.0.5/Zend/zend_strtod.c~	2005-10-10 19:58:06.000000000 -0700
-+++ php-5.0.5/Zend/zend_strtod.c	2005-10-10 20:21:35.000000000 -0700
-@@ -130,6 +130,7 @@
-  * but the word order is big endian.
-  */
- #define IEEE_BIG_ENDIAN
-+#undef IEEE_LITTLE_ENDIAN
- #endif
- 
- #ifdef __vax__
diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch
new file mode 100644
index 0000000000..d198c8e36d
--- /dev/null
+++ b/packages/php/php-5.1.4/autotools.patch
@@ -0,0 +1,94 @@
+diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4
+--- php-5.1.4~/acinclude.m4	2006-04-10 08:17:36.000000000 -0400
++++ php-5.1.4/acinclude.m4	2006-08-16 22:32:58.000000000 -0400
+@@ -818,10 +818,10 @@
+   OVERALL_TARGET=[]ifelse($1,,php,$1)
+   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+-  php_c_post=
++  php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+   php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
+   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+-  php_cxx_post=
++  php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+   php_lo=lo
+ 
+   case $with_pic in
+@@ -1670,6 +1670,7 @@
+       have_fopen_cookie=yes
+ 
+ dnl even newer glibcs have a different seeker definition...
++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
+ AC_TRY_RUN([
+ #define _GNU_SOURCE
+ #include <stdio.h>
+@@ -1702,10 +1703,11 @@
+   cookie_io_functions_use_off64_t=yes
+ ], [
+   cookie_io_functions_use_off64_t=no
+-], [
+-  cookie_io_functions_use_off64_t=no
+-])
+-    
++],
++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
++
++
+     else
+ 
+ dnl older glibc versions (up to 2.1.2 ?)
+diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in
+--- php-5.1.4~/configure.in	2006-05-03 19:30:02.000000000 -0400
++++ php-5.1.4/configure.in	2006-08-16 20:39:19.000000000 -0400
+@@ -209,6 +209,7 @@
+ 
+ sinclude(Zend/Zend.m4)
+ sinclude(TSRM/tsrm.m4)
++sinclude(TSRM/threads.m4)
+ 
+ 
+ divert(2)
+diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4
+--- php-5.1.4~/scripts/phpize.m4	2006-04-10 08:16:17.000000000 -0400
++++ php-5.1.4/scripts/phpize.m4	2006-08-16 20:39:19.000000000 -0400
+@@ -3,7 +3,6 @@
+ divert(1)
+ 
+ AC_PREREQ(2.13)
+-AC_INIT(config.m4)
+ 
+ PHP_CONFIG_NICE(config.nice)
+ 
+@@ -69,8 +68,6 @@
+ PHP_PROG_RE2C
+ PHP_PROG_AWK
+     
+-sinclude(config.m4)
+-
+ enable_static=no
+ enable_shared=yes
+ 
+diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4
+--- php-5.1.4~/TSRM/threads.m4	2005-04-27 09:22:18.000000000 -0400
++++ php-5.1.4/TSRM/threads.m4	2006-08-16 20:39:19.000000000 -0400
+@@ -86,7 +86,7 @@
+   pthreads_working=no
+   ], [
+   dnl For cross compiling running this test is of no use. NetWare supports pthreads
+-  pthreads_working=no
++  pthreads_working=yes
+   case $host_alias in
+   *netware*)
+     pthreads_working=yes
+diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4
+--- php-5.1.4~/TSRM/tsrm.m4	2005-05-29 19:16:40.000000000 -0400
++++ php-5.1.4/TSRM/tsrm.m4	2006-08-16 20:39:19.000000000 -0400
+@@ -68,7 +68,6 @@
+ ])
+ 
+ sinclude(threads.m4)
+-sinclude(TSRM/threads.m4)
+ 
+ AC_DEFUN([TSRM_CHECK_PTHREADS],[
+ 		
diff --git a/packages/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb
deleted file mode 100644
index b4b721f85e..0000000000
--- a/packages/php/php_5.0.5.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-LICENSE = "PHP"
-DEPENDS = "zlib libxml2 mysql"
-SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1 \
-           file://endianness.patch;patch=1"
-S = "${WORKDIR}/php-${PV}"
-
-inherit autotools
-
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
-                --with-mysql=${STAGING_LIBDIR}/.. \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
-                --without-libpng --without-libjpeg \
-                --with-config-file-path=${sysconfdir}/php5 \
-    --cache-file=config.cache \
-    --disable-debug \
-    --disable-rpath \
-    --enable-bcmath \
-    --enable-calendar \
-    --enable-maintainer-zts \
-    --enable-embed=shared \
-    --enable-force-cgi-redirect \
-    --enable-ftp \
-    --enable-inline-optimization \
-    --enable-magic-quotes \
-    --enable-memory-limit \
-    --enable-pic \
-    --enable-safe-mode \
-    --enable-sockets \
-    --enable-track-vars \
-    --enable-trans-sid \
-    --enable-wddx \
-    --sysconfdir=/etc/appWeb \
-    --with-exec-dir=/etc/appWeb/exec \
-    --with-db \
-    --with-regex=system \
-    --with-pear \
-    --with-xml \
-    --with-xmlrpc \
-    --with-zlib \
-    --without-iconv"
-
-EXTRA_OECONF += " --without-pear"
-# Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
-#DEPENDS += " php-native"
-
-acpaths = ""
-
-do_configure_prepend() {
-	find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
-}
-
-do_install  () {
-	oe_runmake 'INSTALL_ROOT=${D}' install
-}
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
new file mode 100644
index 0000000000..fc982a678c
--- /dev/null
+++ b/packages/php/php_5.1.4.bb
@@ -0,0 +1,38 @@
+SECTION = "console/network"
+DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI."
+MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>"
+LICENSE = "PHP"
+DEPENDS = "zlib libxml2 mysql libiconv"
+SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\
+	       file://autotools.patch;patch=1"
+S = "${WORKDIR}/php-${PV}"
+PR = "r1"
+
+inherit autotools
+
+export THREADS="pthread"
+export LIBS=" -lpthread "
+
+CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+EXTRA_OECONF = "--without-iconv \
+ 			    --enable-discard-path \
+			    --enable-sockets \
+    		    --enable-memory-limit \
+    		    --enable-wddx \
+    		    --with-zlib"
+
+EXTRA_OECONF += " --without-pear"
+# Uncomment the following two lines, and comment the above to enable PEAR
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#DEPENDS += " php-native"
+
+acpaths = ""
+
+do_configure_append() {
+    find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
+    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+}
+
+do_install  () {
+	oe_runmake 'INSTALL_ROOT=${D}' install
+}
-- 
cgit v1.2.3


From 78d758eca2ba374026229ebe2254026dd08749b4 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 20 Aug 2006 13:11:11 +0000
Subject: dbus: add 0.92, dbus-daemon install fix

---
 packages/dbus/dbus-0.92/.mtn2git_empty           |  0
 packages/dbus/dbus-0.92/dbus-1.init              | 86 ++++++++++++++++++++++++
 packages/dbus/dbus-0.92/fix-install-daemon.patch | 11 +++
 packages/dbus/dbus-0.92/fix-segfault.patch       | 11 +++
 4 files changed, 108 insertions(+)
 create mode 100644 packages/dbus/dbus-0.92/.mtn2git_empty
 create mode 100644 packages/dbus/dbus-0.92/dbus-1.init
 create mode 100644 packages/dbus/dbus-0.92/fix-install-daemon.patch
 create mode 100644 packages/dbus/dbus-0.92/fix-segfault.patch

(limited to 'packages')

diff --git a/packages/dbus/dbus-0.92/.mtn2git_empty b/packages/dbus/dbus-0.92/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/dbus/dbus-0.92/dbus-1.init b/packages/dbus/dbus-0.92/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/packages/dbus/dbus-0.92/dbus-1.init
@@ -0,0 +1,86 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus-1
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus-1 ]; then
+  . /etc/default/dbus-1
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  restart|force-reload)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/dbus/dbus-0.92/fix-install-daemon.patch b/packages/dbus/dbus-0.92/fix-install-daemon.patch
new file mode 100644
index 0000000000..0cfe5db650
--- /dev/null
+++ b/packages/dbus/dbus-0.92/fix-install-daemon.patch
@@ -0,0 +1,11 @@
+--- dbus-0.92/bus/Makefile.am.orig	2006-08-20 14:37:07.393810316 +0200
++++ dbus-0.92/bus/Makefile.am	2006-08-20 14:38:01.509274554 +0200
+@@ -107,7 +107,7 @@
+  		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+  		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+  	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/packages/dbus/dbus-0.92/fix-segfault.patch b/packages/dbus/dbus-0.92/fix-segfault.patch
new file mode 100644
index 0000000000..de5bcff774
--- /dev/null
+++ b/packages/dbus/dbus-0.92/fix-segfault.patch
@@ -0,0 +1,11 @@
+--- /tmp/dbus-marshal-recursive.c	2006-07-28 14:58:08.000000000 +0200
++++ dbus-0.90/dbus/dbus-marshal-recursive.c	2006-07-28 14:58:18.724411000 +0200
+@@ -1294,7 +1294,7 @@
+                                                _dbus_string_get_length (&block->replacement) - block->padding,
+                                                &fixups))
+     goto oom;
+-
++printf("%s(%d)""got here", __FILE__, __LINE__);
+ #if RECURSIVE_MARSHAL_WRITE_TRACE
+   _dbus_verbose ("REPLACEMENT at padding %d len %d\n", block->padding,
+                  _dbus_string_get_length (&block->replacement) - block->padding);
-- 
cgit v1.2.3


From 3a20ce21b8d7fc104d861431a0c5cf58cb895f5d Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 20 Aug 2006 22:29:45 +0000
Subject: sqlite3: add 3.3.7

---
 packages/sqlite/sqlite3-3.3.7/.mtn2git_empty      |  0
 packages/sqlite/sqlite3-3.3.7/cross-compile.patch | 92 +++++++++++++++++++++++
 packages/sqlite/sqlite3-3.3.7/ldflags.patch       | 67 +++++++++++++++++
 packages/sqlite/sqlite3-3.3.7/libtool.patch       | 25 ++++++
 packages/sqlite/sqlite3_3.3.7.bb                  |  2 +
 5 files changed, 186 insertions(+)
 create mode 100644 packages/sqlite/sqlite3-3.3.7/.mtn2git_empty
 create mode 100644 packages/sqlite/sqlite3-3.3.7/cross-compile.patch
 create mode 100644 packages/sqlite/sqlite3-3.3.7/ldflags.patch
 create mode 100644 packages/sqlite/sqlite3-3.3.7/libtool.patch
 create mode 100644 packages/sqlite/sqlite3_3.3.7.bb

(limited to 'packages')

diff --git a/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/sqlite/sqlite3-3.3.7/cross-compile.patch b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch
new file mode 100644
index 0000000000..31d4f0d162
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.3.7/cross-compile.patch
@@ -0,0 +1,92 @@
+--- sqlite-3.3.7/configure.ac.orig	2006-08-21 00:20:50.000000000 +0200
++++ sqlite-3.3.7/configure.ac	2006-08-21 00:22:35.000000000 +0200
+@@ -187,10 +187,11 @@
+ default_build_cflags="-g"
+ if test "$config_BUILD_CC" = ""; then
+   AC_PROG_CC
+-  if test "$cross_compiling" = "yes"; then
+-    AC_MSG_ERROR([unable to find a compiler for building build tools])
+-  fi
+-  BUILD_CC=$CC
++#  if test "$cross_compiling" = "yes"; then
++#    AC_MSG_ERROR([unable to find a compiler for building build tools])
++#  fi
++#  BUILD_CC=$CC
++BUILD_CC=gcc
+   default_build_cflags=$CFLAGS
+ else
+   BUILD_CC=$config_BUILD_CC
+@@ -238,6 +239,12 @@
+   TARGET_LINK=$config_TARGET_LINK
+ fi
+ AC_MSG_RESULT($TARGET_LINK)
++if test "$config_TARGET_LFLAGS" != ""; then
++  TARGET_LFLAGS=$config_TARGET_LFLAGS
++  else
++    TARGET_LFLAGS=$BUILD_LFLAGS
++  fi
++AC_MSG_RESULT($TARGET_LFLAGS)
+ AC_MSG_CHECKING([switches on the target compiler])
+ if test "$config_TARGET_TFLAGS" != ""; then
+   TARGET_TFLAGS=$config_TARGET_TFLAGS
+@@ -592,15 +599,7 @@
+ # Figure out what C libraries are required to compile programs
+ # that use "readline()" library.
+ #
+-if test "$config_TARGET_READLINE_LIBS" != ""; then
+-  TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS"
+-else
+-  CC=$TARGET_CC
+-  LIBS=""
+-  AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap])
+-  AC_CHECK_LIB([readline], [readline])
+-  TARGET_READLINE_LIBS="$LIBS"
+-fi
++TARGET_READLINE_LIBS="-lreadline"
+ AC_SUBST(TARGET_READLINE_LIBS)
+ 
+ ##########
+@@ -615,41 +614,8 @@
+ ##########
+ # Figure out where to get the READLINE header files.
+ #
+-AC_MSG_CHECKING([readline header files])
+-found=no
+-if test "$config_TARGET_READLINE_INC" != ""; then
+-  TARGET_READLINE_INC=$config_TARGET_READLINE_INC
+-  found=yes
+-fi
+-if test "$found" = "yes"; then
+-  AC_MSG_RESULT($TARGET_READLINE_INC)
+-else
+-  AC_MSG_RESULT(not specified: still searching...)
+-  AC_CHECK_HEADER(readline.h, [found=yes])
+-fi
+-if test "$found" = "no"; then
+-  for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do
+-    AC_CHECK_FILE($dir/include/readline.h, found=yes)
+-    if test "$found" = "yes"; then
+-      TARGET_READLINE_INC="-I$dir/include"
+-      break
+-    fi
+-    AC_CHECK_FILE($dir/include/readline/readline.h, found=yes)
+-    if test "$found" = "yes"; then
+-      TARGET_READLINE_INC="-I$dir/include/readline"
+-      break
+-    fi
+-  done
+-fi
+-if test "$found" = "yes"; then
+-  if test "$TARGET_READLINE_LIBS" = ""; then
+-    TARGET_HAVE_READLINE=0
+-  else
+-    TARGET_HAVE_READLINE=1
+-  fi
+-else
+-  TARGET_HAVE_READLINE=0
+-fi
++TARGET_READLINE_INC=""
++TARGET_HAVE_READLINE=1
+ AC_SUBST(TARGET_READLINE_INC)
+ AC_SUBST(TARGET_HAVE_READLINE)
+ 
diff --git a/packages/sqlite/sqlite3-3.3.7/ldflags.patch b/packages/sqlite/sqlite3-3.3.7/ldflags.patch
new file mode 100644
index 0000000000..ee5105ffff
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.3.7/ldflags.patch
@@ -0,0 +1,67 @@
+--- sqlite-3.3.7/Makefile.in.orig	2006-08-20 23:05:36.000000000 +0200
++++ sqlite-3.3.7/Makefile.in	2006-08-20 23:42:49.000000000 +0200
+@@ -31,6 +31,10 @@
+ #
+ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
+ 
++# OE overrides
++#
++TARGET_LFLAGS = @TARGET_LFLAGS@
++
+ # Define -DNDEBUG to compile without debugging (i.e., for production usage)
+ # Omitting the define will cause extra debugging code to be inserted and
+ # includes extra comments when "EXPLAIN stmt" is used.
+@@ -257,17 +261,17 @@
+           | $(NAWK) '{print $$5,$$6}' >last_change
+ 
+ libsqlite3.la:	$(LIBOBJ)
+-	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
++	$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \
+ 		${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8"
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -o libtclsqlite3.la tclsqlite.lo \
+-		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \
++		$(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \
+                 -rpath $(libdir)/sqlite \
+ 		-version-info "8:6:8"
+ 
+ sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
+-	$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
++	$(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \
+ 		-o $@ $(TOP)/src/shell.c libsqlite3.la \
+ 		$(LIBREADLINE) $(TLIBS)
+ 
+@@ -456,12 +460,12 @@
+ 
+ tclsqlite3:	tclsqlite-shell.lo libsqlite3.la
+ 	$(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
+-		 libsqlite3.la $(LIBTCL)
++		 libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
+ 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
+ 		$(TEMP_STORE) -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
+-		libsqlite3.la $(LIBTCL)
++		libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ 
+ fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
+@@ -471,7 +475,7 @@
+ 	./testfixture $(TOP)/test/quick.test
+ 
+ sqlite3_analyzer$(TEXE):	$(TOP)/src/tclsqlite.c libtclsqlite3.la \
+-				$(TESTSRC) $(TOP)/tool/spaceanal.tcl
++				$(TARGET_LFLAGS) $(TESTSRC) $(TOP)/tool/spaceanal.tcl
+ 	sed \
+ 	  -e '/^#/d' \
+ 	  -e 's,\\,\\\\,g' \
+@@ -481,7 +485,7 @@
+ 	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
+ 	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
+                 -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
+-		libtclsqlite3.la $(LIBTCL)
++		libtclsqlite3.la $(TARGET_LFLAGS) $(LIBTCL)
+ 
+ # Rules used to build documentation
+ #
diff --git a/packages/sqlite/sqlite3-3.3.7/libtool.patch b/packages/sqlite/sqlite3-3.3.7/libtool.patch
new file mode 100644
index 0000000000..ccf9993ed2
--- /dev/null
+++ b/packages/sqlite/sqlite3-3.3.7/libtool.patch
@@ -0,0 +1,25 @@
+Index: sqlite-3.2.1/Makefile.in
+===================================================================
+--- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
++++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
+@@ -15,7 +15,10 @@
+ # The toplevel directory of the source tree.  This is the directory
+ # that contains this "Makefile.in" and the "configure.in" script.
+ #
+-TOP = @srcdir@
++TOP = $(srcdir)
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = .
+ 
+ # C Compiler and options for use in building executables that
+ # will run on the platform that is doing the build.
+@@ -96,7 +99,7 @@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+ INSTALL = @INSTALL@
+-LIBTOOL = ./libtool
++LIBTOOL = @LIBTOOL@
+ ALLOWRELEASE = @ALLOWRELEASE@
+ 
+ # libtool compile/link/install
diff --git a/packages/sqlite/sqlite3_3.3.7.bb b/packages/sqlite/sqlite3_3.3.7.bb
new file mode 100644
index 0000000000..d21fb6ad3e
--- /dev/null
+++ b/packages/sqlite/sqlite3_3.3.7.bb
@@ -0,0 +1,2 @@
+require sqlite3.inc
+PR = "r2"
-- 
cgit v1.2.3


From 89a69d490f2dc6f2de7f45ec92d63e28fb969e5a Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 20 Aug 2006 22:36:43 +0000
Subject: libsoup: add 2.2.96

---
 packages/gnome/libsoup_2.2.96.bb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/gnome/libsoup_2.2.96.bb

(limited to 'packages')

diff --git a/packages/gnome/libsoup_2.2.96.bb b/packages/gnome/libsoup_2.2.96.bb
new file mode 100644
index 0000000000..33a4f16d06
--- /dev/null
+++ b/packages/gnome/libsoup_2.2.96.bb
@@ -0,0 +1,18 @@
+LICENSE = "GPL"
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
+DEPENDS = "glib-2.0 gnutls libxml2"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+
+inherit autotools pkgconfig
+
+PACKAGES_DYNAMIC = "libsoup-2.2*"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
+
+do_stage() {
+	autotools_stage_all
+	ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc
+}
-- 
cgit v1.2.3


From 2a8f467da1b250808cfcb5825b413551e028493a Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 20 Aug 2006 23:28:20 +0000
Subject: gst-plugins.inc: Turn on esd support, add dependency.

---
 packages/gstreamer/gst-plugins.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index 6ebf6560d1..54af128fb4 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "Plugins for GStreamer"
 SECTION = "multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
-DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag"
-PR = "r0"
+DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound-gpe"
+PR = "r1"
 
 # until we have decided for a final naming scheme,
 # keep using version 0.8
@@ -13,7 +13,7 @@ inherit autotools pkgconfig gconf
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
 
-EXTRA_OECONF = "--disable-x --disable-aalib --disable-esd --disable-shout2 \
+EXTRA_OECONF = "--disable-x --disable-aalib --disable-shout2 \
 		--disable-sdl"
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
@@ -28,8 +28,8 @@ python populate_packages_prepend () {
 	do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)')
 }
 
-do_stage() {
-	autotools_stage_all
-}
+#do_stage() {
+#	autotools_stage_all
+#}
 
 ALLOW_EMPTY = "1"
-- 
cgit v1.2.3


From 66cd4cd0f81950147e8ad285b9dc14a66ccead64 Mon Sep 17 00:00:00 2001
From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 21 Aug 2006 00:01:32 +0000
Subject: starling: Add inital release.

---
 packages/starling/.mtn2git_empty  |  0
 packages/starling/starling_0.1.bb | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 packages/starling/.mtn2git_empty
 create mode 100644 packages/starling/starling_0.1.bb

(limited to 'packages')

diff --git a/packages/starling/.mtn2git_empty b/packages/starling/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb
new file mode 100644
index 0000000000..5f4311dfe5
--- /dev/null
+++ b/packages/starling/starling_0.1.bb
@@ -0,0 +1,26 @@
+LICENSE = "GPL"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+MAINTAINER = "Florian Boor <fb@kernelconcepts.de>
+
+inherit gpe autotools
+
+DESCRIPTION = "Starling audio player for GPE"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound-gpe"
+RDEPENDS = "esd \
+	gst-plugins \
+	gst-plugin-audio \
+	gst-plugin-audioconvert \
+	gst-plugin-audiofile \
+	gst-plugin-esd \
+	gst-plugin-typefindfunctions \
+        gst-plugin-decodebin \
+	gst-plugin-volume"
+
+RRECOMMENDS = "gst-plugin-mad \
+	gst-plugin-tagedit \
+	gst-plugin-ivorbis \
+	gst-plugin-tcp"
+
+SRC_URI = "http://handhelds.org/~skyhusker/${P}.tar.bz2"
-- 
cgit v1.2.3


From 9c9201d4e014375ef0a075d5974b41468b845f3f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 08:42:48 +0000
Subject: linux-openzaurus: bump PR to get dependencies in modules recreated
 for feeds

---
 packages/linux/linux-openzaurus_2.6.17.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index bd30de0562..950f9fd787 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r15"
+PR = "r16"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
-- 
cgit v1.2.3


From 71447f62c6b08e13bb2c4ac4429268fc67ab6fa1 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 08:45:37 +0000
Subject: linux-openzaurus: added dummy do_rm_work to not remove WORKDIR
 because wlan-ng stuff needs it

---
 packages/linux/linux-openzaurus.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 0bb2e3a645..bba29ac1d6 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -198,3 +198,7 @@ do_deploy() {
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_package after do_install
+
+# wlan-ng stuff need compiled kernel sources
+do_rm_work() {
+}
-- 
cgit v1.2.3


From c0afd4cb563555e06843c196c8af83ad9df1b394 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 22 Aug 2006 08:48:46 +0000
Subject: udev: add 097  - drop support for kernels <2.6.15, udevsynthesize
 replaced by udevtrigger  - split out libvolume_id into its own package  - I
 set PKG_libvolume-id-dev="libvolume-id-dev" because otherwise   
 libvolume-id-dev would be renamed to libvolume-id0, too.  -
 DEFAULT_PREFERENCE="-1", it's not run-time tested yet.

---
 packages/udev/files/50-hostap_cs.rules    |   4 +
 packages/udev/udev-092/50-hostap_cs.rules |   4 -
 packages/udev/udev-097/.mtn2git_empty     |   0
 packages/udev/udev-097/flags.patch        |  51 +++++++
 packages/udev/udev-097/init               | 242 ++++++++++++++++++++++++++++++
 packages/udev/udev-097/local.rules        |  31 ++++
 packages/udev/udev-097/permissions.rules  | 109 ++++++++++++++
 packages/udev/udev-097/udev.rules         |  98 ++++++++++++
 packages/udev/udev_097.bb                 |  59 ++++++++
 9 files changed, 594 insertions(+), 4 deletions(-)
 create mode 100644 packages/udev/files/50-hostap_cs.rules
 delete mode 100644 packages/udev/udev-092/50-hostap_cs.rules
 create mode 100644 packages/udev/udev-097/.mtn2git_empty
 create mode 100644 packages/udev/udev-097/flags.patch
 create mode 100644 packages/udev/udev-097/init
 create mode 100644 packages/udev/udev-097/local.rules
 create mode 100644 packages/udev/udev-097/permissions.rules
 create mode 100644 packages/udev/udev-097/udev.rules
 create mode 100644 packages/udev/udev_097.bb

(limited to 'packages')

diff --git a/packages/udev/files/50-hostap_cs.rules b/packages/udev/files/50-hostap_cs.rules
new file mode 100644
index 0000000000..efefdc58fc
--- /dev/null
+++ b/packages/udev/files/50-hostap_cs.rules
@@ -0,0 +1,4 @@
+# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
+#
+ACTION=="add", DEVICE=="hostap_cs", \
+ SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/packages/udev/udev-092/50-hostap_cs.rules b/packages/udev/udev-092/50-hostap_cs.rules
deleted file mode 100644
index efefdc58fc..0000000000
--- a/packages/udev/udev-092/50-hostap_cs.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
-#
-ACTION=="add", DEVICE=="hostap_cs", \
- SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/packages/udev/udev-097/.mtn2git_empty b/packages/udev/udev-097/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/udev/udev-097/flags.patch b/packages/udev/udev-097/flags.patch
new file mode 100644
index 0000000000..492a39881c
--- /dev/null
+++ b/packages/udev/udev-097/flags.patch
@@ -0,0 +1,51 @@
+--- udev-089/Makefile.orig	2006-04-08 13:32:53.000000000 +0200
++++ udev-089/Makefile	2006-04-08 13:34:27.000000000 +0200
+@@ -117,28 +117,28 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS		+= $(WARNINGS)
+ 
+ LDFLAGS = -Wl,-warn-common
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+@@ -151,11 +151,11 @@
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init
new file mode 100644
index 0000000000..cc25c026a3
--- /dev/null
+++ b/packages/udev/udev-097/init
@@ -0,0 +1,242 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+create_dev_makedev() {
+  if [ -e /sbin/MAKEDEV ]; then
+    [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV
+  else
+    ln -s /bin/true /dev/MAKEDEV
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+load_input_modules() {
+  case "$(uname -r)" in
+    2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15
+    *) return 0
+  esac
+
+  for module in mousedev evdev joydev; do
+    modprobe -q $module || true
+  done
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+[ -x /sbin/udevd ] || exit 0
+
+PATH="/sbin:/bin:/usr/bin"
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+
+if [ -e /etc/udev/udev.conf ]; then
+  . /etc/udev/udev.conf
+fi
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.15, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+udev_root=${udev_root%/}
+
+case "$1" in
+    start)
+    if [ -e "$udev_root/.udev/" ]; then
+	if mountpoint -q $udev_root/; then
+	    TMPFS_MOUNTED=1
+	else
+	    echo ".udev/ already exists on the static $udev_root!"
+	fi
+    else
+	warn_if_interactive
+    fi
+
+    echo > /proc/sys/kernel/hotplug
+
+    if [ -z "$TMPFS_MOUNTED" ]; then
+	unmount_devpts
+	mount_tmpfs
+	[ -d /proc/1 ] || mount -n /proc
+    fi
+
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    # if this directory is not present /dev will not be updated by udev
+    mkdir -p /dev/.udev/db/ /dev/.udev/queue/
+
+    echo "Synthesizing the initial hotplug events"
+    udevtrigger
+
+    load_input_modules
+    create_dev_makedev
+
+    # wait for the udevd childs to finish
+    echo "Waiting for /dev to be fully populated"
+    if ! udevsettle; then
+	echo 'timeout'
+    fi
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    reload)
+    udevcontrol reload_rules
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-097/local.rules b/packages/udev/udev-097/local.rules
new file mode 100644
index 0000000000..2308b52c4a
--- /dev/null
+++ b/packages/udev/udev-097/local.rules
@@ -0,0 +1,31 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-097/permissions.rules b/packages/udev/udev-097/permissions.rules
new file mode 100644
index 0000000000..8da35c3090
--- /dev/null
+++ b/packages/udev/udev-097/permissions.rules
@@ -0,0 +1,109 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="nvram",				GROUP="nvram"
+KERNEL=="rtc",					GROUP="audio"
+KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
+KERNEL=="fuse",					GROUP="fuse"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+KERNEL=="uverbs*",				GROUP="rdma"
+KERNEL=="ucm*",					GROUP="rdma"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-097/udev.rules b/packages/udev/udev-097/udev.rules
new file mode 100644
index 0000000000..9c4ea4214d
--- /dev/null
+++ b/packages/udev/udev-097/udev.rules
@@ -0,0 +1,98 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+	PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm",			NAME="infiniband/%k"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
new file mode 100644
index 0000000000..29fa05c965
--- /dev/null
+++ b/packages/udev/udev_097.bb
@@ -0,0 +1,59 @@
+DEFAULT_PREFERENCE = "-1"
+
+require udev.inc
+
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.15."
+
+PR = "r0"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://flags.patch;patch=1 \
+	   file://mount.blacklist \
+	   "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+PACKAGES =+ "libvolume-id-dev libvolume-id"
+PKG_libvolume-id-dev = "libvolume-id-dev"
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+do_install_append_h2200() {
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
-- 
cgit v1.2.3


From a15a508dcbdb819b5d87d837956eed6d75003eb9 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 22 Aug 2006 08:53:25 +0000
Subject: udev: stop overwriting description in udev.inc

---
 packages/udev/udev.inc    | 2 +-
 packages/udev/udev_097.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 5b7024cd72..5245d6e2b3 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
+DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
 
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 29fa05c965..d2bb043c50 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -1,7 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require udev.inc
-
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.15."
@@ -14,6 +12,8 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
 	   "
 
+require udev.inc
+
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
-- 
cgit v1.2.3


From 9534a5ea1e01133ed20093a8b3f24ddd071d9070 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 22 Aug 2006 08:58:18 +0000
Subject: udev: add description for libvolume_id

---
 packages/udev/udev_097.bb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index d2bb043c50..2e9e8d500f 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -3,6 +3,10 @@ DEFAULT_PREFERENCE = "-1"
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.15."
+DESCRIPTION_libvolume-id = "libvolume_id shared library, \
+used to detect the type of a file system and read its metadata."
+DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
+needed to link programs with libvolume_id."
 
 PR = "r0"
 
-- 
cgit v1.2.3


From 288100abb8fb1973b071b93f89c5f112659e23e8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 09:18:31 +0000
Subject: base-files: (un)load ohci-hcd on tosa to get usb working after
 suspend/resume

---
 packages/base-files/base-files/tosa/usbd | 6 +++++-
 packages/base-files/base-files_3.0.14.bb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/base-files/base-files/tosa/usbd b/packages/base-files/base-files/tosa/usbd
index 40931ee8e9..8c80044167 100644
--- a/packages/base-files/base-files/tosa/usbd
+++ b/packages/base-files/base-files/tosa/usbd
@@ -1 +1,5 @@
-usbdmodule=pxa_bi
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 85c0e84d6e..d4c03bdefe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r53"
+PR = "r54"
 LICENSE = "GPL"
 
 SRC_URI = " \
-- 
cgit v1.2.3


From 3109615e98eddd744d9ba9b428086ae7964944c7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 22 Aug 2006 09:48:18 +0000
Subject: LAB-kernel cvs: add hhv version check

---
 packages/linux/LAB-kernel_cvs.bb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'packages')

diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index aae29cd23f..aa393af203 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -33,7 +33,12 @@ HHV     = "0"
 #
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
+
 do_configure() {
+	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
+		die "-hh version mismatch"
+	fi
+
 	# Substitute our uid/gid so the initramfs gets the right ownership.
 	MY_UID=`id -u`
 	MY_GID=`id -g`
-- 
cgit v1.2.3


From 23350e2fe42ee3847ac9a6aaf4821613752f63e6 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 10:52:40 +0000
Subject: netbase: bump PR because of change of tosa interfaces pushed in
 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e - disable usage of usbctl on
 tosa/2.6 until we get 2.6 version

---
 packages/netbase/netbase_4.21.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index d79dbc2a26..8c0652daec 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r11"
+PR = "r12"
 
 inherit update-rc.d
 
-- 
cgit v1.2.3


From 14ef0be15b166f8fcce1c6e54ce9d6dedbecf442 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 10:58:48 +0000
Subject: zaurus-updater: move do_deploy so it does not conflict with rm_work
 applied changes from dc69aab02eb323fa6a030fa05f7b63be3642fb52             
 through 41767e9744f20a6d01a4cede1ef96c50c85d78f6

---
 packages/zaurus-updater/zaurus-updater.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 26cf1e5453..3a45a2bf74 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -28,4 +28,4 @@ do_deploy() {
 	esac
 }
 
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_compile
-- 
cgit v1.2.3


From 5da68c2ea813c62978286f7f0df58a927448ff35 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 22 Aug 2006 11:00:02 +0000
Subject: dbus: ad 0.92, last commit was missing the actual recipe

---
 packages/dbus/dbus_0.92.bb | 64 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 packages/dbus/dbus_0.92.bb

(limited to 'packages')

diff --git a/packages/dbus/dbus_0.92.bb b/packages/dbus/dbus_0.92.bb
new file mode 100644
index 0000000000..a4ab61322f
--- /dev/null
+++ b/packages/dbus/dbus_0.92.bb
@@ -0,0 +1,64 @@
+DEFAULT_PREFERENCE="-1"
+
+SECTION = "base"
+PR = "r1"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "