From 64079a44f7fce4283b875dbefbf76f2970a3b21c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 27 Sep 2007 16:11:59 +0000 Subject: mono-1.2.5.1: add new version, and remove 1.2.5 --- packages/mono/README | 2 +- packages/mono/mono-1.2.5.1/.mtn2git_empty | 0 packages/mono/mono-1.2.5.1/configure.patch | 67 ++++++++++++++++++++++++++++++ packages/mono/mono-1.2.5/.mtn2git_empty | 0 packages/mono/mono-1.2.5/configure.patch | 67 ------------------------------ packages/mono/mono-native_1.2.5.1.bb | 10 +++++ packages/mono/mono-native_1.2.5.bb | 10 ----- packages/mono/mono_1.2.5.1.bb | 23 ++++++++++ packages/mono/mono_1.2.5.bb | 23 ---------- packages/mono/mono_1.2.5.inc | 7 +--- 10 files changed, 103 insertions(+), 106 deletions(-) create mode 100644 packages/mono/mono-1.2.5.1/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.5.1/configure.patch delete mode 100644 packages/mono/mono-1.2.5/.mtn2git_empty delete mode 100644 packages/mono/mono-1.2.5/configure.patch create mode 100644 packages/mono/mono-native_1.2.5.1.bb delete mode 100644 packages/mono/mono-native_1.2.5.bb create mode 100644 packages/mono/mono_1.2.5.1.bb delete mode 100644 packages/mono/mono_1.2.5.bb diff --git a/packages/mono/README b/packages/mono/README index 81e478bdb7..39479308b2 100644 --- a/packages/mono/README +++ b/packages/mono/README @@ -3,7 +3,7 @@ Mono in OE is still very much a work in progress. - is reported to work on MIPS. - has floating point problems on ARM -1.2.5pre5 +1.2.5 - tested on ARM EABI. Floating point issues have been worked around. There is still a lot of packaging work that needs done to package the mono dll's for installation. diff --git a/packages/mono/mono-1.2.5.1/.mtn2git_empty b/packages/mono/mono-1.2.5.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.5.1/configure.patch b/packages/mono/mono-1.2.5.1/configure.patch new file mode 100644 index 0000000000..1553115c0e --- /dev/null +++ b/packages/mono/mono-1.2.5.1/configure.patch @@ -0,0 +1,67 @@ +Index: mono-1.2.5/configure.in +=================================================================== +--- mono-1.2.5.orig/configure.in ++++ mono-1.2.5/configure.in +@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + +@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then + ]) + fi + +-if test ${TARGET} = ARM; then +- dnl ****************************************** +- dnl *** Check to see what FPU is available *** +- dnl ****************************************** +- AC_MSG_CHECKING(which FPU to use) +- +- AC_TRY_COMPILE([], [ +- __asm__ ("ldfd f0, [r0]"); +- ], fpu=FPA, [ +- AC_TRY_COMPILE([], [ +- __asm__ ("fldd d0, [r0]"); +- ], fpu=VFP, fpu=NONE) +- ]) ++#if test ${TARGET} = ARM; then ++# dnl ****************************************** ++# dnl *** Check to see what FPU is available *** ++# dnl ****************************************** ++# AC_MSG_CHECKING(which FPU to use) ++# ++# AC_TRY_COMPILE([], [ ++# __asm__ ("ldfd f0, [r0]"); ++# ], fpu=FPA, [ ++# AC_TRY_COMPILE([], [ ++# __asm__ ("fldd d0, [r0]"); ++# ], fpu=VFP, fpu=NONE) ++# ]) ++# ++# AC_MSG_RESULT($fpu) ++# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" ++# unset fpu ++#fi + +- AC_MSG_RESULT($fpu) +- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" +- unset fpu +-fi ++ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" + + if test ${TARGET} = unknown; then + CPPFLAGS="$CPPFLAGS -DNO_PORT" diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/mono/mono-1.2.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/mono-1.2.5/configure.patch b/packages/mono/mono-1.2.5/configure.patch deleted file mode 100644 index 1553115c0e..0000000000 --- a/packages/mono/mono-1.2.5/configure.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: mono-1.2.5/configure.in -=================================================================== ---- mono-1.2.5.orig/configure.in -+++ mono-1.2.5/configure.in -@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then - ], [ - AC_MSG_RESULT(no) - with_tls=pthread -+ ], [ -+ AC_MSG_RESULT(yes) - ]) - fi - -@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then - ], [ - with_sigaltstack=no - AC_MSG_RESULT(no) -+ ], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) - ]) - fi - -@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then - ]) - fi - --if test ${TARGET} = ARM; then -- dnl ****************************************** -- dnl *** Check to see what FPU is available *** -- dnl ****************************************** -- AC_MSG_CHECKING(which FPU to use) -- -- AC_TRY_COMPILE([], [ -- __asm__ ("ldfd f0, [r0]"); -- ], fpu=FPA, [ -- AC_TRY_COMPILE([], [ -- __asm__ ("fldd d0, [r0]"); -- ], fpu=VFP, fpu=NONE) -- ]) -+#if test ${TARGET} = ARM; then -+# dnl ****************************************** -+# dnl *** Check to see what FPU is available *** -+# dnl ****************************************** -+# AC_MSG_CHECKING(which FPU to use) -+# -+# AC_TRY_COMPILE([], [ -+# __asm__ ("ldfd f0, [r0]"); -+# ], fpu=FPA, [ -+# AC_TRY_COMPILE([], [ -+# __asm__ ("fldd d0, [r0]"); -+# ], fpu=VFP, fpu=NONE) -+# ]) -+# -+# AC_MSG_RESULT($fpu) -+# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -+# unset fpu -+#fi - -- AC_MSG_RESULT($fpu) -- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -- unset fpu --fi -+ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" - - if test ${TARGET} = unknown; then - CPPFLAGS="$CPPFLAGS -DNO_PORT" diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb new file mode 100644 index 0000000000..2670d3fb55 --- /dev/null +++ b/packages/mono/mono-native_1.2.5.1.bb @@ -0,0 +1,10 @@ +require mono_1.2.5.inc +PR = "r0" +DEPENDS = "glib-2.0-native" + +inherit native + +#do_stage_prepend() { +# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} +#} + diff --git a/packages/mono/mono-native_1.2.5.bb b/packages/mono/mono-native_1.2.5.bb deleted file mode 100644 index 0f1391cd25..0000000000 --- a/packages/mono/mono-native_1.2.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require mono_1.2.5.inc -PR = "r2" -DEPENDS = "glib-2.0-native" - -inherit native - -#do_stage_prepend() { -# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} -#} - diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb new file mode 100644 index 0000000000..c0a4cfb223 --- /dev/null +++ b/packages/mono/mono_1.2.5.1.bb @@ -0,0 +1,23 @@ +require mono_1.2.5.inc + +#DEPENDS = "mono-native glib-2.0" +# for now, we skip the mono-native build -- just install +# mono using your distro package manager for now +# after we get the target version working, we'll worry +# about the native package for systems that don't have mono +# installed +DEPENDS = "glib-2.0" + +PR = "r0" + +SRC_URI += "file://configure.patch;patch=1" + +do_install_append() { + install -d ${D}${libdir}/mono/1.0/ + cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ +} + +PACKAGES =+ "mono-dll" +FILES_mono-dll = "${libdir}/mono/1.0/" + + diff --git a/packages/mono/mono_1.2.5.bb b/packages/mono/mono_1.2.5.bb deleted file mode 100644 index c0a4cfb223..0000000000 --- a/packages/mono/mono_1.2.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -require mono_1.2.5.inc - -#DEPENDS = "mono-native glib-2.0" -# for now, we skip the mono-native build -- just install -# mono using your distro package manager for now -# after we get the target version working, we'll worry -# about the native package for systems that don't have mono -# installed -DEPENDS = "glib-2.0" - -PR = "r0" - -SRC_URI += "file://configure.patch;patch=1" - -do_install_append() { - install -d ${D}${libdir}/mono/1.0/ - cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ -} - -PACKAGES =+ "mono-dll" -FILES_mono-dll = "${libdir}/mono/1.0/" - - diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc index 0e0df1caf2..5164b05e2d 100644 --- a/packages/mono/mono_1.2.5.inc +++ b/packages/mono/mono_1.2.5.inc @@ -2,12 +2,9 @@ DESCRIPTION = "Mono Programming Language" SECTION = "devel/mono" LICENSE = "GPL LGPL X11" -# the md5 sum check is required because Novell does not version their pre release versions of mono -# if the md5sum check fails, contact cbrake on #oe -# checksums are stored in conf/checksums.ini -SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2" +SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2" -S = "${WORKDIR}/mono-1.2.5" +S = "${WORKDIR}/mono-${PV}" inherit autotools EXTRA_OECONF = "--disable-mcs-build" -- cgit v1.2.3 From 0179b6da643c30c5298bf880ced8cbb4a3bd57d0 Mon Sep 17 00:00:00 2001 From: Henryk Ploetz Date: Thu, 27 Sep 2007 20:24:22 +0000 Subject: mono-native 1.2.5.1: fix up mono native compile and make mono depend on it --- packages/mono/mono-native_1.2.5.1.bb | 13 ++++++++++++- packages/mono/mono_1.2.5.1.bb | 12 ++++-------- packages/mono/mono_1.2.5.inc | 1 - 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb index 2670d3fb55..09223ddcab 100644 --- a/packages/mono/mono-native_1.2.5.1.bb +++ b/packages/mono/mono-native_1.2.5.1.bb @@ -1,10 +1,21 @@ require mono_1.2.5.inc -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0-native" +SRC_URI += "file://mono-fix-libdir-path.patch;patch=1" + inherit native #do_stage_prepend() { # install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} #} +do_fix_libtool_name() { + # inherit native will make that all native tools that are being + # built are prefixed with something like "i686-linux-", + # including libtool. Fix up some hardcoded libtool names: + for i in "${S}"/runtime/*-wrapper.in; do + sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}" + done +} +addtask fix_libtool_name after do_patch before do_configure diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index c0a4cfb223..e1f3f1b6a5 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -1,14 +1,8 @@ require mono_1.2.5.inc -#DEPENDS = "mono-native glib-2.0" -# for now, we skip the mono-native build -- just install -# mono using your distro package manager for now -# after we get the target version working, we'll worry -# about the native package for systems that don't have mono -# installed -DEPENDS = "glib-2.0" +DEPENDS = "mono-native glib-2.0" -PR = "r0" +PR = "r1" SRC_URI += "file://configure.patch;patch=1" @@ -17,6 +11,8 @@ do_install_append() { cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ } +EXTRA_OECONF += " --disable-mcs-build " + PACKAGES =+ "mono-dll" FILES_mono-dll = "${libdir}/mono/1.0/" diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc index 5164b05e2d..aeca713d6b 100644 --- a/packages/mono/mono_1.2.5.inc +++ b/packages/mono/mono_1.2.5.inc @@ -7,7 +7,6 @@ SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2" S = "${WORKDIR}/mono-${PV}" inherit autotools -EXTRA_OECONF = "--disable-mcs-build" EXTRA_OECONF_arm = "--without-tls" EXTRA_OECONF_mipsel = "--without-tls" -- cgit v1.2.3 From 132c1e03383c5f1636cf1ccb183ebb5ad100444e Mon Sep 17 00:00:00 2001 From: Henryk Ploetz Date: Fri, 28 Sep 2007 02:14:39 +0000 Subject: mono-native 1.2.5.1: add needed patch libdir patch --- packages/mono/files/mono-fix-libdir-path.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/mono/files/mono-fix-libdir-path.patch diff --git a/packages/mono/files/mono-fix-libdir-path.patch b/packages/mono/files/mono-fix-libdir-path.patch new file mode 100644 index 0000000000..9255117bf8 --- /dev/null +++ b/packages/mono/files/mono-fix-libdir-path.patch @@ -0,0 +1,11 @@ +--- mono-1.2.5/scripts/Makefile.am.orig 2007-09-27 04:23:39.000000000 +0200 ++++ mono-1.2.5/scripts/Makefile.am 2007-09-27 04:24:19.000000000 +0200 +@@ -92,7 +92,7 @@ + mono_instdir = $(shell cygpath -m $(libdir))/mono + else + plat_bindir = $(bindir) +-mono_instdir = $(prefix)/lib/mono ++mono_instdir = $(libdir)/mono + endif + + REWRITE_COMMON = sed \ -- cgit v1.2.3 From 9735f87514c9f9933be62cd19ec81888e13f13c3 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 28 Sep 2007 19:51:03 +0000 Subject: sane-srcrevs.inc: Bump up libmokoui2 to a more recent SVN version as the current version version results in the ability to start the dialer, among other things. --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3330ecff4d..2d4fd0f82b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -22,7 +22,7 @@ SRCREV_pn-libgsmd ?= "2957" SRCREV_pn-libmokogsmd2 ?= "2950" SRCREV_pn-libmokojournal2 ?= "2780" SRCREV_pn-libmokopanelui2 ?= "2958" -SRCREV_pn-libmokoui2 ?= "3032" +SRCREV_pn-libmokoui2 ?= "3053" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -- cgit v1.2.3 From 7a04000a0c5e59cf4f77565210200b5de550ea2e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 28 Sep 2007 19:53:20 +0000 Subject: openmoko-feed: add kexec-tools to the list of available packages. --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 84a37afe1d..1c97a355f1 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r14" +PR = "r15" inherit task @@ -16,6 +16,7 @@ RDEPENDS_task-openmoko-feed = "\ ipkg-link ipkg-utils \ joe \ kbdd \ + kexec-tools \ midori \ mplayer \ mtpaint \ -- cgit v1.2.3 From 56a0b8217e225655eb0031b10214120c783c8df5 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 29 Sep 2007 03:24:15 +0000 Subject: libgsmd: Fix return value from lgsm_send(), this fixes the dialer failure on boot. --- packages/gsm/files/lgsm_send_fix_return_value.patch | 11 +++++++++++ packages/gsm/libgsmd_svn.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/gsm/files/lgsm_send_fix_return_value.patch diff --git a/packages/gsm/files/lgsm_send_fix_return_value.patch b/packages/gsm/files/lgsm_send_fix_return_value.patch new file mode 100644 index 0000000000..00ba3a4549 --- /dev/null +++ b/packages/gsm/files/lgsm_send_fix_return_value.patch @@ -0,0 +1,11 @@ +--- gsm/src/libgsmd/libgsmd.c.orig 2007-09-25 00:41:56.000000000 -0500 ++++ gsm/src/libgsmd/libgsmd.c 2007-09-25 00:43:44.000000000 -0500 +@@ -210,7 +210,7 @@ + pos += rc; + } + } +- return 0; ++ return (sizeof(*gmh) + gmh->len); + } + + struct gsmd_msg_hdr *lgsm_gmh_fill(int type, int subtype, int payload_len) diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 948b979c2c..9aaad58ee6 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.1+svnr${SRCREV}" -PR = "r30" +PR = "r31" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://024_sms-text-in-bracket.patch;patch=1;minrev=2957 \ @@ -16,6 +16,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://0003-Correctly-segment-incoming-usock-data-into-packets.patch;patch=1;minrev=2957 \ file://0004-Handle-read-and-write-return-values.patch;patch=1;minrev=2957 \ file://0005-Add-ask-ds-option-forSMS.patch;patch=1;minrev=2957 \ + file://lgsm_send_fix_return_value.patch;patch=1 \ file://gsmd \ file://default" S = "${WORKDIR}/gsm" -- cgit v1.2.3 From ca4c0d9813a41a7908f707a17f73db7d8cf6fbac Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 07:26:28 +0000 Subject: dbus: sync with poky and use .inc file --- packages/dbus/dbus-1.0.2/dbus-1.init | 18 ++++++++++++++++-- packages/dbus/dbus.inc | 19 ++++++++++++------- packages/dbus/dbus_1.0.2.bb | 13 +++++++++++-- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init index 46e321860d..0725083c69 100644 --- a/packages/dbus/dbus-1.0.2/dbus-1.init +++ b/packages/dbus/dbus-1.0.2/dbus-1.init @@ -62,6 +62,7 @@ start_it_up() shut_it_down() { if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " @@ -75,6 +76,16 @@ shut_it_down() rm -f $PIDFILE } +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + case "$1" in start) start_it_up @@ -82,13 +93,16 @@ case "$1" in stop) shut_it_down ;; - restart|force-reload) + reload|force-reload) + reload_it + ;; + restart) shut_it_down sleep 1 start_it_up ;; *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 exit 1 ;; esac diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index b329e82fa3..50e0ffedc4 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -2,13 +2,16 @@ SECTION = "base" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -DEPENDS = "expat virtual/libintl" +DEPENDS = "expat glib-2.0 virtual/libintl" -SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ file://tmpdir.patch;patch=1 \ file://dbus-1.init \ - file://cross.patch;patch=1 \ - file://fix-install-daemon.patch;patch=1" + ${SRC_URI_EXTRA}" + inherit autotools pkgconfig update-rc.d gettext @@ -17,8 +20,8 @@ INITSCRIPT_PARAMS = "defaults" CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" -FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include" +FILES_${PN} = "${bindir}/dbus-daemon-1 ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" pkg_postinst_dbus() { #!/bin/sh @@ -36,12 +39,14 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" } -EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ --disable-checks --disable-xml-docs --disable-doxygen-docs \ --with-xml=expat --without-x" + do_stage () { oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR} autotools_stage_includes diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index 799509ab66..62a22254c3 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -1,5 +1,14 @@ require dbus.inc -SRC_URI += " file://fix-waitpid.patch;patch=1" +DEFAULT_PREFERENCE = "1" + +PR = "r5" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://cross.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + + -PR = "r4" -- cgit v1.2.3 From e53b03dea3b3b9ae305b857c1965cdb820197871 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 07:27:39 +0000 Subject: gnome-keyring: sync with poky --- packages/gnome/gnome-keyring/.mtn2git_empty | 0 .../gnome/gnome-keyring/org.gnome.keyring.service | 3 +++ packages/gnome/gnome-keyring_0.8.1.bb | 12 +++++++++++ packages/gnome/gnome-keyring_2.20.bb | 23 ++++++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 packages/gnome/gnome-keyring/.mtn2git_empty create mode 100644 packages/gnome/gnome-keyring/org.gnome.keyring.service create mode 100644 packages/gnome/gnome-keyring_0.8.1.bb create mode 100644 packages/gnome/gnome-keyring_2.20.bb diff --git a/packages/gnome/gnome-keyring/.mtn2git_empty b/packages/gnome/gnome-keyring/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/gnome-keyring/org.gnome.keyring.service b/packages/gnome/gnome-keyring/org.gnome.keyring.service new file mode 100644 index 0000000000..96ea061cfb --- /dev/null +++ b/packages/gnome/gnome-keyring/org.gnome.keyring.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gnome.keyring +Exec=/usr/bin/gnome-keyring-daemon diff --git a/packages/gnome/gnome-keyring_0.8.1.bb b/packages/gnome/gnome-keyring_0.8.1.bb new file mode 100644 index 0000000000..6489cbee21 --- /dev/null +++ b/packages/gnome/gnome-keyring_0.8.1.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +inherit autotools gnome pkgconfig + +DEPENDS = "gtk+" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/gnome-keyring_2.20.bb b/packages/gnome/gnome-keyring_2.20.bb new file mode 100644 index 0000000000..c18d9f19f4 --- /dev/null +++ b/packages/gnome/gnome-keyring_2.20.bb @@ -0,0 +1,23 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" + +PR = "r1" + +inherit autotools gnome pkgconfig + +DEPENDS = "gtk+ libgcrypt" + +EXTRA_OECONF = "--disable-gtk-doc" + +SRC_URI += "file://org.gnome.keyring.service" + +do_install_append () { + install -d ${D}${datadir}/dbus-1/services + install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services +} + +FILES_${PN} += "${datadir}/dbus-1/services" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 3b4ef5e53b95cf3e715188f05e54143aad4abf54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 07:30:42 +0000 Subject: iproute2: sync with poky --- packages/iproute2/iproute2.inc | 2 +- packages/iproute2/iproute2_2.6.18.bb | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc index 7162231ec5..8c8519f230 100644 --- a/packages/iproute2/iproute2.inc +++ b/packages/iproute2/iproute2.inc @@ -7,7 +7,7 @@ DEPENDS = "flex-native bison-native" # Set the DATE in the .bb file SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" -# Set S in the .bb files +S = "${WORKDIR}/iproute2-${PV}-${DATE}" inherit update-alternatives diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb index ed5f3a11c6..d442a091db 100644 --- a/packages/iproute2/iproute2_2.6.18.bb +++ b/packages/iproute2/iproute2_2.6.18.bb @@ -1,10 +1,8 @@ -PR = "r2" +PR = "r3" -DATE = "061002" - -SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" +require iproute2.inc -S = "${WORKDIR}/iproute2-${PV}-${DATE}" +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ + file://new-flex-fix.patch;patch=1" -require iproute2.inc +DATE = "061002" -- cgit v1.2.3 From 8cd45ca0a06cdccf07efae39e03656a68512637d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 07:45:49 +0000 Subject: network-manager svn: sync with poky --- packages/networkmanager/files/25NetworkManager | 30 +++++++++++ packages/networkmanager/files/applet-no-gnome.diff | 59 ++++++++++++++++++++++ packages/networkmanager/files/no-restarts.diff | 21 ++++++++ .../networkmanager/networkmanager-applet_svn.bb | 19 +++++++ packages/networkmanager/networkmanager_svn.bb | 55 +++++++++++++++++--- 5 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 packages/networkmanager/files/25NetworkManager create mode 100644 packages/networkmanager/files/applet-no-gnome.diff create mode 100644 packages/networkmanager/files/no-restarts.diff create mode 100644 packages/networkmanager/networkmanager-applet_svn.bb diff --git a/packages/networkmanager/files/25NetworkManager b/packages/networkmanager/files/25NetworkManager new file mode 100644 index 0000000000..8e4dec167f --- /dev/null +++ b/packages/networkmanager/files/25NetworkManager @@ -0,0 +1,30 @@ +#!/bin/sh +# +# NetworkManager startup script + +. /etc/profile + +case $1 in + 'start') + echo -n "Starting NetworkManager daemon: NetworkManager" + /usr/sbin/NetworkManager + /usr/sbin/NetworkManagerDispatcher + echo "." + ;; + + 'stop') + echo -n "Stopping NetworkManager daemon: NetworkManager" + kill `ps |grep /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2` + kill `ps |grep /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2` + echo "." + ;; + + 'restart') + $0 stop + $0 start + ;; + + *) + echo "Usage: $0 { start | stop | restart }" + ;; +esac diff --git a/packages/networkmanager/files/applet-no-gnome.diff b/packages/networkmanager/files/applet-no-gnome.diff new file mode 100644 index 0000000000..e098e8c9ed --- /dev/null +++ b/packages/networkmanager/files/applet-no-gnome.diff @@ -0,0 +1,59 @@ +--- + configure.ac | 3 +-- + src/main.c | 8 ++++++++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +Index: src/main.c +=================================================================== +--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100 ++++ src/main.c 2007-09-26 10:39:37.000000000 +0100 +@@ -27,7 +27,9 @@ + + #include + #include ++#if 0 + #include ++#endif + #include + + #include "applet.h" +@@ -36,11 +38,15 @@ + int main (int argc, char *argv[]) + { + NMApplet * applet; ++#if 0 + GnomeProgram * program; + + program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE, + argc, argv, + GNOME_PARAM_NONE, GNOME_PARAM_NONE); ++#else ++ gtk_init (&argc, &argv); ++#endif + + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +@@ -53,7 +59,9 @@ int main (int argc, char *argv[]) + gtk_main (); + + g_object_unref (applet); ++#if 0 + g_object_unref (program); ++#endif + + exit (0); + } +Index: configure.ac +=================================================================== +--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100 ++++ configure.ac 2007-09-26 10:39:37.000000000 +0100 +@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA, + gtk+-2.0 >= 2.6 + libglade-2.0 + gconf-2.0 +- gnome-keyring-1 +- libgnomeui-2.0]) ++ gnome-keyring-1]) + + ##### Find out the version of DBUS we're using + dbus_version=`pkg-config --modversion dbus-1` diff --git a/packages/networkmanager/files/no-restarts.diff b/packages/networkmanager/files/no-restarts.diff new file mode 100644 index 0000000000..20bdf82aab --- /dev/null +++ b/packages/networkmanager/files/no-restarts.diff @@ -0,0 +1,21 @@ +Index: src/backends/NetworkManagerDebian.c +=================================================================== +--- src/backends/NetworkManagerDebian.c (revision 2881) ++++ src/backends/NetworkManagerDebian.c (working copy) +@@ -204,8 +204,6 @@ + */ + void nm_system_update_dns (void) + { +- nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); +- + } + + +@@ -218,7 +216,6 @@ + */ + void nm_system_restart_mdns_responder (void) + { +- nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder"); + } + + diff --git a/packages/networkmanager/networkmanager-applet_svn.bb b/packages/networkmanager/networkmanager-applet_svn.bb new file mode 100644 index 0000000000..d61e134e96 --- /dev/null +++ b/packages/networkmanager/networkmanager-applet_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GTK+ applet for NetworkManager" +LICENSE = "GPL" +DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring" +#TODO DEPENDS libnotify +RDEPENDS = "networkmanager" + +inherit gnome gtk-icon-cache + +SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \ + file://applet-no-gnome.diff;patch=1;pnum=0" + +PV = "0.0+svnr${SRCREV}" + +S = "${WORKDIR}/trunk" + +FILES_${PN} += "${datadir}/nm-applet/ \ + ${datadir}/gnome-vpn-properties/ \ + ${datadir}/gnome/autostart/ \ + " diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb index d879381975..610bd01e7e 100644 --- a/packages/networkmanager/networkmanager_svn.bb +++ b/packages/networkmanager/networkmanager_svn.bb @@ -1,14 +1,55 @@ -require networkmanager.inc +DESCRIPTION = "NetworkManager" +SECTION = "net/misc" +LICENSE = "GPL" +HOMEPAGE = "http://www.gnome.org" +PRIORITY = "optional" +DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" +RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" -PV = "0.6.5+svn${SRCDATE}" -PR = "r0" +PV = "0.7+svnr${SRCREV}" +PR = "r2" -SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \ - file://NetworkManager \ +SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ + file://no-restarts.diff;patch=1;pnum=0 \ + file://25NetworkManager \ file://99_networkmanager" -DEFAULT_PREFERENCE = "-1" +EXTRA_OECONF = " \ + --with-distro=debian \ + --with-ip=/sbin/ip" +# TODO: will /bin/ip from busybox do? -S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE" +S = "${WORKDIR}/trunk" +inherit autotools pkgconfig +do_install_append () { + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles + install -d ${D}/etc/dbus-1/event.d + install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d +} + +do_stage () { + autotools_stage_all +} + +pkg_postinst () { + if [ "x$D" != "x" ]; then + exit 1 + fi + /etc/init.d/populate-volatile.sh update +} + +PACKAGES =+ "libnmutil libnmglib" + +FILES_libnmutil += "${libdir}/libnm-util.so.*" + +FILES_libnmglib += "${libdir}/libnm_glib.so.*" + +FILES_${PN}-dev = "${includedir}/* \ + ${libdir}/*.so \ + ${libdir}/*.a \ + ${libdir}/pkgconfig/*.pc \ + ${datadir}/NetworkManager/gdb-cmd \ + " -- cgit v1.2.3 From 76b89b40f88ff9dc89b6b9ad882900c3f8c63970 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 07:53:07 +0000 Subject: packages/gnome: sync with poky, while maintaining OE tweaks like avahi and gnutls --- packages/gnome/gail_1.20.0.bb | 18 ++++++++ packages/gnome/gnome-common-2.20.0/.mtn2git_empty | 0 packages/gnome/gnome-common-2.20.0/omf.patch | 13 ++++++ packages/gnome/gnome-common_2.20.0.bb | 28 ++++++++++++ packages/gnome/gnome-doc-utils_0.12.0.bb | 16 +++++++ packages/gnome/gnome-mime-data_2.18.0.bb | 7 +++ packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty | 0 .../gnome/gnome-vfs-2.20.0/gconftool-lossage.patch | 11 +++++ .../gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch | 51 ++++++++++++++++++++++ packages/gnome/gnome-vfs_2.18.1.bb | 4 +- packages/gnome/gnome-vfs_2.20.0.bb | 42 ++++++++++++++++++ packages/gnome/libart-lgpl/Makefile.am.patch | 12 ++--- packages/gnome/libart-lgpl_2.3.19.bb | 30 +++++++++++++ packages/gnome/libgnomecanvas_2.14.0.bb | 17 ++++++++ packages/gnome/libgnomecanvas_2.20.0.bb | 17 ++++++++ packages/gnome/libsoup_2.2.100.bb | 9 ++-- 16 files changed, 260 insertions(+), 15 deletions(-) create mode 100644 packages/gnome/gail_1.20.0.bb create mode 100644 packages/gnome/gnome-common-2.20.0/.mtn2git_empty create mode 100644 packages/gnome/gnome-common-2.20.0/omf.patch create mode 100644 packages/gnome/gnome-common_2.20.0.bb create mode 100644 packages/gnome/gnome-doc-utils_0.12.0.bb create mode 100644 packages/gnome/gnome-mime-data_2.18.0.bb create mode 100644 packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty create mode 100644 packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch create mode 100644 packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch create mode 100644 packages/gnome/gnome-vfs_2.20.0.bb create mode 100644 packages/gnome/libart-lgpl_2.3.19.bb create mode 100644 packages/gnome/libgnomecanvas_2.14.0.bb create mode 100644 packages/gnome/libgnomecanvas_2.20.0.bb diff --git a/packages/gnome/gail_1.20.0.bb b/packages/gnome/gail_1.20.0.bb new file mode 100644 index 0000000000..58168a04d5 --- /dev/null +++ b/packages/gnome/gail_1.20.0.bb @@ -0,0 +1,18 @@ +LICENSE = "LGPL" +SECTION = "x11/libs" +PR = "r0" +DESCRIPTION = "GNOME Accessibility Implementation Library" +DEPENDS = "gtk+" + +inherit gnome + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" + +do_stage() { + gnome_stage_includes + oe_libinstall -C gail -so libgail ${STAGING_LIBDIR} + oe_libinstall -C libgail-util -so libgailutil ${STAGING_LIBDIR} +} diff --git a/packages/gnome/gnome-common-2.20.0/.mtn2git_empty b/packages/gnome/gnome-common-2.20.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/gnome-common-2.20.0/omf.patch b/packages/gnome/gnome-common-2.20.0/omf.patch new file mode 100644 index 0000000000..0d85b001e0 --- /dev/null +++ b/packages/gnome/gnome-common-2.20.0/omf.patch @@ -0,0 +1,13 @@ +--- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700 ++++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700 +@@ -43,7 +43,9 @@ + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ if [ -f $$file.out ]; then \ ++ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ fi; \ + done + -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb new file mode 100644 index 0000000000..2991db81c7 --- /dev/null +++ b/packages/gnome/gnome-common_2.20.0.bb @@ -0,0 +1,28 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +PR = "r0" +DESCRIPTION = "Common macros for building GNOME applications" +inherit gnome + +# The omf.make file failed if scrollkeeper doesn't happen to be +# installed + +SRC_URI += "file://omf.patch;patch=1" + +EXTRA_AUTORECONF = "" +DEPENDS = "" + +FILES_${PN} += "${datadir}/aclocal" +FILES_${PN}-dev = "" + +do_stage () { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + make DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin + install -d ${STAGING_DATADIR}/gnome-common + install -d ${STAGING_DATADIR}/aclocal + cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common + cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal + rm -rf ${STAGE_TEMP} +} diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb new file mode 100644 index 0000000000..f190a5ae13 --- /dev/null +++ b/packages/gnome/gnome-doc-utils_0.12.0.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL/LGPL" +DEPENDS = "libxml2 libxslt" + +PR = "r1" + +inherit gnome + +EXTRA_OECONF = "--disable-scrollkeeper" + +FILES_${PN} += "${datadir}/xml*" + +do_stage() { + mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ + autotools_stage_all +} diff --git a/packages/gnome/gnome-mime-data_2.18.0.bb b/packages/gnome/gnome-mime-data_2.18.0.bb new file mode 100644 index 0000000000..a9797d2298 --- /dev/null +++ b/packages/gnome/gnome-mime-data_2.18.0.bb @@ -0,0 +1,7 @@ +LICENSE = "GPL" +inherit gnome + +DEPENDS += "shared-mime-info intltool-native" +RDEPENDS = "shared-mime-info" + +FILES_${PN}-dev += "${datadir}/pkgconfig/*.pc" diff --git a/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty b/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch @@ -0,0 +1,11 @@ +--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 ++++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 +@@ -154,7 +154,7 @@ + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + + if test x"$GCONFTOOL" = xno; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) ++ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) + fi + + AM_GCONF_SOURCE_2 diff --git a/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch @@ -0,0 +1,51 @@ +removes kerberos completely to avoid conflicts with installed kerberos +--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 ++++ configure.in 2007-01-05 19:42:56.604261797 +0200 +@@ -436,47 +436,6 @@ + ]) + AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) + AC_SUBST(CDDA_LIBS) +- +-dnl GSSAPI +-dnl Check for Kerberos installation +-have_gssapi=no +-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) +- +-if test "x$KRB5_CONFIG" != "xnone"; then +- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" +- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" +- +- saved_CPPFLAGS="$CPPFLAGS" +- saved_LIBS="$LIBS" +- LIBS="$LIBS $GSSAPI_LIBS" +- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" +- # MIT and Heimdal put gssapi.h in different places +- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ +- AC_CHECK_FUNCS(gss_init_sec_context, [ +- AC_MSG_NOTICE([GSSAPI authentication support enabled]) +- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) +- AC_CHECK_HEADERS(gssapi/gssapi_generic.h) +- have_gssapi=yes +- +- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE +- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, +- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, +- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) +- ], [ +- #ifdef HAVE_GSSAPI_GSSAPI_H +- #include +- #else +- #include +- #endif +- ]) +- ]) +- break +- ]) +- LIBS="$saved_LIBS" +- CPPFLAGS="$saved_CPPFLAGS" +-fi +-AC_SUBST(GSSAPI_LIBS) +-AC_SUBST(GSSAPI_CFLAGS) + + dnl ****************************** + dnl http-method (neon checks) diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb index 4ae7406a46..8a3e460119 100644 --- a/packages/gnome/gnome-vfs_2.18.1.bb +++ b/packages/gnome/gnome-vfs_2.18.1.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info" -PR = "r0" +PR = "r1" inherit gnome @@ -20,7 +20,7 @@ EXTRA_OECONF = " \ --with-samba-includes=${STAGING_INCDIR} \ " -FILES_${PN} += " ${libdir}/vfs" +FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" FILES_${PN}-doc += " ${datadir}/gtk-doc" diff --git a/packages/gnome/gnome-vfs_2.20.0.bb b/packages/gnome/gnome-vfs_2.20.0.bb new file mode 100644 index 0000000000..5631a9c960 --- /dev/null +++ b/packages/gnome/gnome-vfs_2.20.0.bb @@ -0,0 +1,42 @@ +LICENSE = "GPL" +DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib" +RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" +# Some legacy packages will require gnome-mime-data to be installed, but use of +# it is deprecated. +PR = "r0" + +inherit gnome + +SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ + file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" + +# This is to provide compatibility with the gnome-vfs DBus fork +PROVIDES = "gnome-vfs-plugin-dbus" +RREPLACES = "gnome-vfs-dbus" + +EXTRA_OECONF = " \ + --disable-openssl \ + --enable-gnutls \ + --enable-avahi \ + --with-samba-includes=${STAGING_INCDIR} \ + " + +FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" +FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" +FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" +FILES_${PN}-doc += " ${datadir}/gtk-doc" + +do_stage () { +autotools_stage_all +} + +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" + +python populate_packages_prepend () { + print bb.data.getVar('FILES_gnome-vfs', d, 1) + + plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') +} + + diff --git a/packages/gnome/libart-lgpl/Makefile.am.patch b/packages/gnome/libart-lgpl/Makefile.am.patch index 749de32e2a..edeed0a6e5 100644 --- a/packages/gnome/libart-lgpl/Makefile.am.patch +++ b/packages/gnome/libart-lgpl/Makefile.am.patch @@ -1,13 +1,7 @@ --- libart_lgpl-2.3.16/Makefile.am.old 2004-06-26 18:57:07.000000000 +0100 +++ libart_lgpl-2.3.16/Makefile.am 2004-06-26 18:57:12.000000000 +0100 -@@ -5,8 +5,8 @@ - - BUILT_SOURCES = art_config.h - --art_config.h: gen_art_config +@@ -5,2 +5,2 @@ +-art_config.h: gen_art_config$(EXEEXT) - ./gen_art_config > art_config.h -+#art_config.h: gen_art_config ++#art_config.h: gen_art_config$(EXEEXT) +# ./gen_art_config > art_config.h - - EXTRA_DIST = \ - libart-config.in \ diff --git a/packages/gnome/libart-lgpl_2.3.19.bb b/packages/gnome/libart-lgpl_2.3.19.bb new file mode 100644 index 0000000000..a37b392593 --- /dev/null +++ b/packages/gnome/libart-lgpl_2.3.19.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Library of functions for 2D graphics" +SECTION = "x11/gnome" +LICENSE = "LGPL" + +ART_CONFIG = "${HOST_ARCH}/art_config.h" + +# can't use gnome.oeclass due to _ in filename +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ + file://${ART_CONFIG} \ + file://Makefile.am.patch;patch=1" + +inherit autotools pkgconfig + +DEPENDS = "" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dev += "${bindir}/libart2-config" + +S = "${WORKDIR}/libart_lgpl-${PV}" + +do_configure_prepend() { + cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h +} + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_includes + oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR} +} diff --git a/packages/gnome/libgnomecanvas_2.14.0.bb b/packages/gnome/libgnomecanvas_2.14.0.bb new file mode 100644 index 0000000000..df183bb674 --- /dev/null +++ b/packages/gnome/libgnomecanvas_2.14.0.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DESCRIPTION = "A powerful object-oriented display" + +inherit gnome + +DEPENDS = "libglade libart-lgpl" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/" +FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgnomecanvas_2.20.0.bb b/packages/gnome/libgnomecanvas_2.20.0.bb new file mode 100644 index 0000000000..8e13c9562b --- /dev/null +++ b/packages/gnome/libgnomecanvas_2.20.0.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DESCRIPTION = "A powerful object-oriented display" + +inherit gnome + +DEPENDS = "libglade libart-lgpl gail" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/" +FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index e829ad39ca..e642b83cc7 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -1,18 +1,19 @@ DESCRIPTION = "An HTTP library implementation in C" LICENSE = "GPL" SECTION = "x11/gnome/libs" + DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" + do_stage() { rm -f ${PKG_CONFIG_DIR}/libsoup* autotools_stage_all ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc } - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir}/ ${libdir}/" -FILES_${PN}-doc = "${datadir}/" -- cgit v1.2.3 From 3592753f85e84e230431d435efdc60325d1d7b4a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 29 Sep 2007 08:03:41 +0000 Subject: udev: sync with poky, def_pref 115 negative --- packages/udev/files/akita/.mtn2git_empty | 0 packages/udev/files/akita/mount.blacklist | 6 + packages/udev/files/c7x0/.mtn2git_empty | 0 packages/udev/files/c7x0/mount.blacklist | 6 + packages/udev/files/mount.blacklist | 2 +- packages/udev/files/network.sh | 2 - packages/udev/files/tosa/.mtn2git_empty | 0 packages/udev/files/tosa/mount.blacklist | 6 + packages/udev/udev-115/.mtn2git_empty | 0 packages/udev/udev-115/flags.patch | 56 +++++ packages/udev/udev-115/init | 227 +++++++++++++++++++++ packages/udev/udev-115/local.rules | 31 +++ packages/udev/udev-115/noasmlinkage.patch | 36 ++++ packages/udev/udev-115/permissions.rules | 101 +++++++++ packages/udev/udev-115/udev.rules | 102 +++++++++ .../udevtrigger_add_devname_filtering.patch | 104 ++++++++++ packages/udev/udev-115/vol_id_ld.patch | 17 ++ packages/udev/udev.inc | 2 + packages/udev/udev_092.bb | 2 +- packages/udev/udev_115.bb | 68 ++++++ 20 files changed, 764 insertions(+), 4 deletions(-) create mode 100644 packages/udev/files/akita/.mtn2git_empty create mode 100644 packages/udev/files/akita/mount.blacklist create mode 100644 packages/udev/files/c7x0/.mtn2git_empty create mode 100644 packages/udev/files/c7x0/mount.blacklist create mode 100644 packages/udev/files/tosa/.mtn2git_empty create mode 100644 packages/udev/files/tosa/mount.blacklist create mode 100644 packages/udev/udev-115/.mtn2git_empty create mode 100644 packages/udev/udev-115/flags.patch create mode 100644 packages/udev/udev-115/init create mode 100644 packages/udev/udev-115/local.rules create mode 100644 packages/udev/udev-115/noasmlinkage.patch create mode 100644 packages/udev/udev-115/permissions.rules create mode 100644 packages/udev/udev-115/udev.rules create mode 100644 packages/udev/udev-115/udevtrigger_add_devname_filtering.patch create mode 100644 packages/udev/udev-115/vol_id_ld.patch create mode 100644 packages/udev/udev_115.bb diff --git a/packages/udev/files/akita/.mtn2git_empty b/packages/udev/files/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/akita/mount.blacklist b/packages/udev/files/akita/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/akita/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram \ No newline at end of file diff --git a/packages/udev/files/c7x0/.mtn2git_empty b/packages/udev/files/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/c7x0/mount.blacklist b/packages/udev/files/c7x0/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/c7x0/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram \ No newline at end of file diff --git a/packages/udev/files/mount.blacklist b/packages/udev/files/mount.blacklist index 23b45ad8e3..d3ebb17176 100644 --- a/packages/udev/files/mount.blacklist +++ b/packages/udev/files/mount.blacklist @@ -1,3 +1,3 @@ /dev/loop -/dev/mtdblock /dev/ram +/dev/mtdblock diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 7c4bd00981..5016328df4 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -1,6 +1,4 @@ #!/bin/sh -# we need /sbin in our PATH -PATH="/sbin:/usr/sbin/:$PATH" # Do not run when pcmcia-cs is installed test -x /sbin/cardctl && exit 0 diff --git a/packages/udev/files/tosa/.mtn2git_empty b/packages/udev/files/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/files/tosa/mount.blacklist b/packages/udev/files/tosa/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/tosa/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram \ No newline at end of file diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-115/flags.patch new file mode 100644 index 0000000000..13f20eb6a8 --- /dev/null +++ b/packages/udev/udev-115/flags.patch @@ -0,0 +1,56 @@ +--- + Makefile | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +Index: udev-115/Makefile +=================================================================== +--- udev-115.orig/Makefile 2007-08-24 01:29:54.000000000 +0200 ++++ udev-115/Makefile 2007-09-20 17:21:45.000000000 +0200 +@@ -112,39 +112,39 @@ + 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,--as-needed + + 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 + + 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-115/init b/packages/udev/udev-115/init new file mode 100644 index 0000000000..73c655a0ee --- /dev/null +++ b/packages/udev/udev-115/init @@ -0,0 +1,227 @@ +#!/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 +} + +# 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[01]|2.6.1[01][!0-9]*) return 1 ;; + esac + return 0 +} + +set_hotplug_handler() { + case "$(uname -r)" in + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;; + esac + echo $HANDLER > /proc/sys/kernel/hotplug +} + +# 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 +} + +############################################################################## + +PATH="/sbin:/bin:/usr/bin" + +[ -x /sbin/udevd ] || exit 0 + +# defaults +tmpfs_size="2M" +udev_root="/dev" +udevd_timeout=30 + +. /etc/udev/udev.conf + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.12, 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. + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q /dev/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + set_hotplug_handler + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/ + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Synthesizing the initial hotplug events" + udevtrigger + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + while [ -d /dev/.udev/queue/ ]; do + sleep 1 + udevd_timeout=$(($udevd_timeout - 1)) + if [ $udevd_timeout -eq 0 ]; then + # ps axf + break + fi + done + if [ $udevd_timeout -eq 0 ]; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart|force-reload) + 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 + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-115/local.rules new file mode 100644 index 0000000000..5b926018f5 --- /dev/null +++ b/packages/udev/udev-115/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*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-115/noasmlinkage.patch b/packages/udev/udev-115/noasmlinkage.patch new file mode 100644 index 0000000000..5824d29590 --- /dev/null +++ b/packages/udev/udev-115/noasmlinkage.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- + udevd.c | 2 +- + udevstart.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: udev-115/udevd.c +=================================================================== +--- udev-115.orig/udevd.c 2007-08-24 01:29:54.000000000 +0200 ++++ udev-115/udevd.c 2007-09-20 17:04:51.000000000 +0200 +@@ -767,7 +767,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGINT: +Index: udev-115/udevstart.c +=================================================================== +--- udev-115.orig/udevstart.c 2007-08-24 01:29:54.000000000 +0200 ++++ udev-115/udevstart.c 2007-09-20 17:04:51.000000000 +0200 +@@ -304,7 +304,7 @@ + } + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-115/permissions.rules new file mode 100644 index 0000000000..99e03b1036 --- /dev/null +++ b/packages/udev/udev-115/permissions.rules @@ -0,0 +1,101 @@ +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}=="5", GROUP="cdrom" + +# 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=="rtc", GROUP="audio" + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +# 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" +