From 63e2f3e549fa5ef0388f5e975ff166e287f64cf4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 Mar 2006 07:45:34 +0000 Subject: Misc changes to match OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@334 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/gcalctool/files/makefile-fix.diff | 18 --- .../packages/gcalctool/gcalctool/makefile-fix.diff | 18 +++ openembedded/packages/gcc/gcc3-build-cross.inc | 6 +- openembedded/packages/gnome/files/gtk-doc.m4 | 53 ++++++++ openembedded/packages/gnome/files/gtk-doc.make | 148 +++++++++++++++++++++ .../packages/gnome/orbit2-2.10.2/gtk-doc.m4 | 53 -------- .../packages/gnome/orbit2-2.10.2/gtk-doc.make | 148 --------------------- openembedded/packages/gtk+/gtk+_2.6.7.bb | 1 - openembedded/packages/libdaemon/libdaemon_0.6.bb | 4 +- .../linux-hotplug/linux-hotplug_20040920.bb | 6 +- openembedded/packages/loudmouth/loudmouth_1.0.1.bb | 7 +- openembedded/packages/tslib/tslib/simpad/ts.conf | 5 - openembedded/packages/zaurusd/zaurusd_0.0.bb | 17 --- openembedded/packages/zaurusd/zaurusd_svn.bb | 19 +++ 14 files changed, 252 insertions(+), 251 deletions(-) delete mode 100644 openembedded/packages/gcalctool/files/makefile-fix.diff create mode 100644 openembedded/packages/gcalctool/gcalctool/makefile-fix.diff create mode 100644 openembedded/packages/gnome/files/gtk-doc.m4 create mode 100644 openembedded/packages/gnome/files/gtk-doc.make delete mode 100644 openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4 delete mode 100644 openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make delete mode 100644 openembedded/packages/tslib/tslib/simpad/ts.conf delete mode 100644 openembedded/packages/zaurusd/zaurusd_0.0.bb create mode 100644 openembedded/packages/zaurusd/zaurusd_svn.bb diff --git a/openembedded/packages/gcalctool/files/makefile-fix.diff b/openembedded/packages/gcalctool/files/makefile-fix.diff deleted file mode 100644 index 48a546271..000000000 --- a/openembedded/packages/gcalctool/files/makefile-fix.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- gcalctool/Makefile.am~ 2005-03-23 16:50:10.000000000 +0000 -+++ gcalctool/Makefile.am 2006-03-20 13:59:17.000000000 +0000 -@@ -30,15 +30,8 @@ - - SCHEMAS_FILE = gcalctool.schemas - --### Install the schemas file in /etc if GNOME support is not compiled in, --### and do not install the schemas at all --if DISABLE_GNOME --schemasdir = $(sysconfdir)/gcalctool --schemas_DATA = $(SCHEMAS_FILE) --else - schemadir = $(GCONF_SCHEMA_FILE_DIR) - schema_DATA = $(SCHEMAS_FILE) --endif - - EXTRA_DIST = \ - autogen.sh \ diff --git a/openembedded/packages/gcalctool/gcalctool/makefile-fix.diff b/openembedded/packages/gcalctool/gcalctool/makefile-fix.diff new file mode 100644 index 000000000..48a546271 --- /dev/null +++ b/openembedded/packages/gcalctool/gcalctool/makefile-fix.diff @@ -0,0 +1,18 @@ +--- gcalctool/Makefile.am~ 2005-03-23 16:50:10.000000000 +0000 ++++ gcalctool/Makefile.am 2006-03-20 13:59:17.000000000 +0000 +@@ -30,15 +30,8 @@ + + SCHEMAS_FILE = gcalctool.schemas + +-### Install the schemas file in /etc if GNOME support is not compiled in, +-### and do not install the schemas at all +-if DISABLE_GNOME +-schemasdir = $(sysconfdir)/gcalctool +-schemas_DATA = $(SCHEMAS_FILE) +-else + schemadir = $(GCONF_SCHEMA_FILE_DIR) + schema_DATA = $(SCHEMAS_FILE) +-endif + + EXTRA_DIST = \ + autogen.sh \ diff --git a/openembedded/packages/gcc/gcc3-build-cross.inc b/openembedded/packages/gcc/gcc3-build-cross.inc index a41ae11d6..384886c76 100644 --- a/openembedded/packages/gcc/gcc3-build-cross.inc +++ b/openembedded/packages/gcc/gcc3-build-cross.inc @@ -39,5 +39,9 @@ do_stage_append () { rmdir ${CROSS_DIR}/include || : # We don't really need to keep this around - rm -rf ${CROSS_DIR}/share + # rm -rf ${CROSS_DIR}/share but leave java there + for d in share/man share/info; + do + rm -rf ${CROSS_DIR}/$d + done } diff --git a/openembedded/packages/gnome/files/gtk-doc.m4 b/openembedded/packages/gnome/files/gtk-doc.m4 new file mode 100644 index 000000000..3ec41666b --- /dev/null +++ b/openembedded/packages/gnome/files/gtk-doc.m4 @@ -0,0 +1,53 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) diff --git a/openembedded/packages/gnome/files/gtk-doc.make b/openembedded/packages/gnome/files/gtk-doc.make new file mode 100644 index 000000000..c319e7ad7 --- /dev/null +++ b/openembedded/packages/gnome/files/gtk-doc.make @@ -0,0 +1,148 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) + @echo '*** Scanning header files ***' + @-chmod -R u+w $(srcdir) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo '*** Rebuilding template files ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml + @echo '*** Building XML ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp +endif + +############## + +clean-local: + rm -f *~ *.bak + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi) + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local diff --git a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4 b/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4 deleted file mode 100644 index 3ec41666b..000000000 --- a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make b/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make deleted file mode 100644 index c319e7ad7..000000000 --- a/openembedded/packages/gnome/orbit2-2.10.2/gtk-doc.make +++ /dev/null @@ -1,148 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE).types \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) - @echo '*** Scanning header files ***' - @-chmod -R u+w $(srcdir) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo '*** Rebuilding template files ***' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml - @echo '*** Building XML ***' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp -endif - -############## - -clean-local: - rm -f *~ *.bak - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - fi) - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/* $(distdir)/html - -.PHONY : dist-hook-local diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb index e4e93cacd..260a03684 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb @@ -4,7 +4,6 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Philip Blundell " DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" PR = "r4" diff --git a/openembedded/packages/libdaemon/libdaemon_0.6.bb b/openembedded/packages/libdaemon/libdaemon_0.6.bb index 578c9b767..2bdf8cb5c 100644 --- a/openembedded/packages/libdaemon/libdaemon_0.6.bb +++ b/openembedded/packages/libdaemon/libdaemon_0.6.bb @@ -1,6 +1,8 @@ -SECTION = "libs" DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering " HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +MAINTAINER = "Philipp Zabel " LICENSE = "GPLv2" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" diff --git a/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb b/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb index ce503a219..c6bcbb66e 100644 --- a/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/openembedded/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" SECTION = "base" RSUGGESTS = "pciutils usbutils" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://userspecified_hcd.patch;patch=1 \ @@ -27,7 +27,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_2 file://isapnp-exit.diff;patch=1 \ file://usb-storage \ file://soc.agent" - + +SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1" + S = "${WORKDIR}/hotplug-2004_09_20" INITSCRIPT_NAME = "hotplug" diff --git a/openembedded/packages/loudmouth/loudmouth_1.0.1.bb b/openembedded/packages/loudmouth/loudmouth_1.0.1.bb index ca8dd2777..9161cd630 100755 --- a/openembedded/packages/loudmouth/loudmouth_1.0.1.bb +++ b/openembedded/packages/loudmouth/loudmouth_1.0.1.bb @@ -1,6 +1,6 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gnutls" -MAINTAINER = "Chris Lord " +MAINTAINER = "Koen Kooi " DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." PR = "r1" @@ -9,8 +9,5 @@ SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz" inherit autotools pkgconfig do_stage() { - oe_libinstall -so -C loudmouth libloudmouth-1 ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/${PN}/ - install -m 0644 ${S}/${PN}/*.h ${STAGING_INCDIR}/${PN}/ + autotools_stage_all } diff --git a/openembedded/packages/tslib/tslib/simpad/ts.conf b/openembedded/packages/tslib/tslib/simpad/ts.conf deleted file mode 100644 index 09309719f..000000000 --- a/openembedded/packages/tslib/tslib/simpad/ts.conf +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/openembedded/packages/zaurusd/zaurusd_0.0.bb b/openembedded/packages/zaurusd/zaurusd_0.0.bb deleted file mode 100644 index 164d9ca06..000000000 --- a/openembedded/packages/zaurusd/zaurusd_0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -SECTION = "base" -MAINTAINER = "Richard Purdie " -DESCRIPTION = "Daemon to handle device specifc features." -PR = "r0" - -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http" -S = "${WORKDIR}/${PN}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit autotools pkgconfig - -inherit update-rc.d - -INITSCRIPT_NAME = "zaurusd" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/openembedded/packages/zaurusd/zaurusd_svn.bb b/openembedded/packages/zaurusd/zaurusd_svn.bb new file mode 100644 index 000000000..d36fc1c11 --- /dev/null +++ b/openembedded/packages/zaurusd/zaurusd_svn.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" +SECTION = "base" +MAINTAINER = "Richard Purdie " +DESCRIPTION = "Daemon to handle device specifc features." +PV = "0.0+svn${SRCDATE}" +PR = "r0" +DEPENDS = "tslib" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http" +S = "${WORKDIR}/${PN}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig + +inherit update-rc.d + +INITSCRIPT_NAME = "zaurusd" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -- cgit v1.2.3