From 3f71f864ce26e706f70a3f68e6b24c4cd5b913b0 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 15 Jun 2005 19:45:23 +0000 Subject: packages/gnumeric/* : drop old versions. --- .../gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty | 0 .../gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch | 11 -------- .../gnumeric-1.3.1.cvs/gnumeric-doc.make.patch | 11 -------- packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty | 0 .../workbook-control-gui-priv.h.patch | 11 -------- packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty | 0 packages/gnumeric/gnumeric-1.5.3/remove-docs.patch | 8 ------ packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty | 0 packages/gnumeric/gnumeric-1.5.5/remove-docs.patch | 8 ------ packages/gnumeric/gnumeric_1.3.1.bb | 20 --------------- packages/gnumeric/gnumeric_1.3.1.cvs.bb | 30 ---------------------- packages/gnumeric/gnumeric_1.5.3.bb | 20 --------------- packages/gnumeric/gnumeric_1.5.5.bb | 20 --------------- packages/gnumeric/gnumeric_1.5.90.bb | 20 --------------- packages/gnumeric/gnumeric_1.6.0.bb | 20 --------------- packages/gnumeric/gnumeric_1.6.1.bb | 20 --------------- packages/gnumeric/gnumeric_1.6.2.bb | 20 --------------- 17 files changed, 219 deletions(-) delete mode 100644 packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty delete mode 100644 packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch delete mode 100644 packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch delete mode 100644 packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty delete mode 100644 packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch delete mode 100644 packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty delete mode 100644 packages/gnumeric/gnumeric-1.5.3/remove-docs.patch delete mode 100644 packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty delete mode 100644 packages/gnumeric/gnumeric-1.5.5/remove-docs.patch delete mode 100644 packages/gnumeric/gnumeric_1.3.1.bb delete mode 100644 packages/gnumeric/gnumeric_1.3.1.cvs.bb delete mode 100644 packages/gnumeric/gnumeric_1.5.3.bb delete mode 100644 packages/gnumeric/gnumeric_1.5.5.bb delete mode 100644 packages/gnumeric/gnumeric_1.5.90.bb delete mode 100644 packages/gnumeric/gnumeric_1.6.0.bb delete mode 100644 packages/gnumeric/gnumeric_1.6.1.bb delete mode 100644 packages/gnumeric/gnumeric_1.6.2.bb diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch deleted file mode 100644 index fe06e2bae3..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ Makefile.am 2004-04-07 15:47:04.000000000 +0100 ---- Makefile.am.orig 2004-07-23 18:03:34.000000000 +0100 -@@ -44,7 +44,7 @@ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ -+# xmldocs.make \ -- xmldocs.make \ - omf.make \ - $(server_in_files) $(server_DATA) - diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch deleted file mode 100644 index 08ce8e1ee2..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ gnumeric-doc.make 2004-03-31 02:32:25.000000000 +0100 ---- gnumeric-doc.make.orig 2004-07-26 15:51:43.000000000 +0100 -@@ -24,7 +24,7 @@ - include $(top_srcdir)/xmldocs.make - - # include generated files to simplify installation --EXTRA_DIST += \ -+EXTRA_DIST = \ - func.defs \ - functions.xml \ - func-header.xml func-footer.xml diff --git a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch b/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch deleted file mode 100644 index 2fbd71ceaf..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnumeric/src/workbook-control-gui-priv.h.orig 2004-07-19 07:06:18.000000000 +0100 -+++ gnumeric/src/workbook-control-gui-priv.h 2004-07-28 00:15:46.000000000 +0100 -@@ -111,7 +111,7 @@ - void wbcg_insert_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_append_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_set_selection_halign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); --void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); -+void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleVAlignFlags halign); - - enum { - WBCG_MARKUP_CHANGED, diff --git a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb deleted file mode 100644 index 299c36cbb2..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r3" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1' - -EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` ' - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb deleted file mode 100644 index 6bbbf645c4..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -#SRCDATE="20040719" -CVSTAG="GNUMERIC_1_3_1" - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/gnumeric" - - -PR = "r1" -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnumeric;tag=${CVSTAG} \ - file://gnumeric-doc.make.patch;patch=1 \ - file://Makefile.am.patch;patch=1" - -DEPENDS = "libgsf1 gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" - - -EXTRA_OECONF = "--without-gnome" - -do_configure_prepend() { - touch xmldocs.make - intltoolize --automake --debug -# # aclocal seems to insist on looking in here. Make sure it exists. -# mkdir -p ${S}/m4 -# # work around automake lossage with AC_CONFIG_AUX_DIR -# ( cd libmutt; libtoolize --force ; cp ../ltmain.sh . ) -} - -inherit autotools diff --git a/packages/gnumeric/gnumeric_1.5.3.bb b/packages/gnumeric/gnumeric_1.5.3.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.5.bb b/packages/gnumeric/gnumeric_1.5.5.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.5.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.90.bb b/packages/gnumeric/gnumeric_1.5.90.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.5.90.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi " -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.0.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi " -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.1.bb b/packages/gnumeric/gnumeric_1.6.1.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi " -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.2.bb b/packages/gnumeric/gnumeric_1.6.2.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi " -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} -- cgit v1.2.3 From bafb3577029f7aa20a8a5376582573cae17a79f6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 15 Jun 2005 19:49:06 +0000 Subject: packages/gnome/goffice*.bb : drop old versions --- packages/gnome/goffice_0.0.1.bb | 21 --------------------- packages/gnome/goffice_0.0.2.bb | 21 --------------------- packages/gnome/goffice_0.0.3.bb | 21 --------------------- packages/gnome/goffice_0.0.4.bb | 21 --------------------- packages/gnome/goffice_0.1.0.bb | 21 --------------------- packages/gnome/goffice_0.1.2.bb | 21 --------------------- packages/gnome/goffice_0.2.0.bb | 21 --------------------- 7 files changed, 147 deletions(-) delete mode 100644 packages/gnome/goffice_0.0.1.bb delete mode 100644 packages/gnome/goffice_0.0.2.bb delete mode 100644 packages/gnome/goffice_0.0.3.bb delete mode 100644 packages/gnome/goffice_0.0.4.bb delete mode 100644 packages/gnome/goffice_0.1.0.bb delete mode 100644 packages/gnome/goffice_0.1.2.bb delete mode 100644 packages/gnome/goffice_0.2.0.bb diff --git a/packages/gnome/goffice_0.0.1.bb b/packages/gnome/goffice_0.0.1.bb deleted file mode 100644 index eabe184e36..0000000000 --- a/packages/gnome/goffice_0.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r1" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - - diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.4.bb b/packages/gnome/goffice_0.0.4.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.2.bb b/packages/gnome/goffice_0.1.2.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.2.0.bb b/packages/gnome/goffice_0.2.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - -- cgit v1.2.3 From 93ae5205401e065e7f8ff088c1ecd440d4abcf1f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 25 Mar 2006 21:34:50 +0000 Subject: Unslung: conf/distro/unslung.conf updated to Unslung 6.8-beta --- conf/distro/unslung.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index e961445209..1308340887 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.7-beta" +DISTRO_VERSION = "6.8-beta" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -- cgit v1.2.3 From 42c7a2f16f2986a5d0857b789741509b3d9a7c7e Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Mon, 27 Mar 2006 22:07:06 +0000 Subject: gomunicator: Gomunicator requires that alsa-lib is installed to target device. --- packages/gomunicator/gomunicator_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index d6d4ac6218..a567d16009 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" LICENSE = "GPLv2" AUTHOR = "Robert Woerle" MAINTAINER = "Koen Kooi " -DEPENDS = "libgpewidget gtk+ glib-2.0" +DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib" +RDEPENDS = "alsa-lib" #Remove the dash below when 0.1.3 changes in PV PV = "0.1.3+cvs-${SRCDATE}" -- cgit v1.2.3 From f97e0e24996af489efa9fefd2018ff4ad13d9aaf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Mar 2006 06:56:35 +0000 Subject: bitbake.conf: add E_CVS, a var holding the new anoncvs uri for enlightenment stuff --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 3b642e58f7..48a1daf64a 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" APACHE_MIRROR = "http://www.apache.org/dist" @@ -400,4 +401,4 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## -PCMCIA_MANAGER ?= "pcmcia-cs" \ No newline at end of file +PCMCIA_MANAGER ?= "pcmcia-cs" -- cgit v1.2.3 From f44b81361e71d294d29872f8e373eb68174f7805 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 28 Mar 2006 08:46:32 +0000 Subject: openobex_1.2.bb : fix to stop openobex pulling in includes from host --- packages/openobex/openobex_1.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 61ce72663b..1bb8149f55 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -11,7 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ inherit autotools binconfig pkgconfig -EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump" +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_DIR} --with-bluez=${STAGING_DIR}" do_stage() { oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} -- cgit v1.2.3 From 68a72241d56b3daec21f780235d34a84efb06b0b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:00:09 +0000 Subject: grub: substitute the anonymous python function w/ COMPATIBLE_HOST --- packages/grub/grub_0.93.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/grub/grub_0.93.bb b/packages/grub/grub_0.93.bb index d67247ccff..8341184476 100644 --- a/packages/grub/grub_0.93.bb +++ b/packages/grub/grub_0.93.bb @@ -1,5 +1,6 @@ +DESCRIPTION = "GRUB is the GRand Unified Bootloader" SECTION = "base" -DESCRIPTION = "grand unified bootloader" +HOMEPAGE = "http://www.gnu.org/software/grub" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;patch=1 \ @@ -10,9 +11,4 @@ S = "${WORKDIR}/grub-${PV}" inherit autotools -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('i.86.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} +COMPATIBLE_HOST = 'i.86.*-linux' -- cgit v1.2.3 From b522171f13f0aa07616f055200511f2ec73a0632 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:04:42 +0000 Subject: add python-psyco, a specializing compiler --- packages/python/python-egenix-mx-base_2.0.5.bb | 15 --------------- packages/python/python-egenix-mx-base_2.0.6.bb | 18 ++++++++++++++++++ packages/python/python-psyco_1.5.bb | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 packages/python/python-egenix-mx-base_2.0.5.bb create mode 100644 packages/python/python-egenix-mx-base_2.0.6.bb create mode 100644 packages/python/python-psyco_1.5.bb diff --git a/packages/python/python-egenix-mx-base_2.0.5.bb b/packages/python/python-egenix-mx-base_2.0.5.bb deleted file mode 100644 index 9e7f426928..0000000000 --- a/packages/python/python-egenix-mx-base_2.0.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ -tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ -processing, date/time processing and web site programming." -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "EGENIX" -SRCNAME = "egenix-mx-base" - -SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit distutils - -FILES_${PN} += "${datadir}" diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb new file mode 100644 index 0000000000..84bf7e2e3c --- /dev/null +++ b/packages/python/python-egenix-mx-base_2.0.6.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The eGenix.com mx Extensions for Python are a collection of professional quality Python software \ +tools which enhance Python's usability in many important areas such as ODBC database connectivity, fast text \ +processing, date/time processing and web site programming." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "EGENIX" +SRCNAME = "egenix-mx-base" + +SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + +export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}" +export LIB = "${STAGING_LIBDIR}" + +FILES_${PN} += "${datadir}" diff --git a/packages/python/python-psyco_1.5.bb b/packages/python/python-psyco_1.5.bb new file mode 100644 index 0000000000..b633b65061 --- /dev/null +++ b/packages/python/python-psyco_1.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Psyco lets you run your existing Python software much faster, with no change in your source." +HOMEPAGE = "http://psyco.sourceforge.net" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "dkm@kataplop.net" +LICENSE = "PSF" +RDEPENDS = "python-core" +SRCNAME = "psyco" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}-src.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit distutils -- cgit v1.2.3 From c20b2ca34cdf9be3245912dcf9b53590103cd9f7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 28 Mar 2006 10:22:32 +0000 Subject: uicmoc 2.3.10, 3.3.5: add patch to make it build on 64bit platforms. Thanks Darren Edmundson for writing the patch and Eric Shattow for testing. --- .../uicmoc-native-2.3.10/64bit-cleanup.patch | 226 +++++++++++++++++++++ packages/uicmoc/uicmoc-native_2.3.10.bb | 6 +- .../uicmoc3-native-3.3.5/64bit-cleanup.patch | 147 ++++++++++++++ packages/uicmoc/uicmoc3-native_3.3.5.bb | 7 +- 4 files changed, 382 insertions(+), 4 deletions(-) create mode 100644 packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch new file mode 100644 index 0000000000..3cca3e0d1d --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include + #include ++#include + + #if defined(QT_POSIX_QSHM) + #include +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include ++ + #ifndef QT_H + #include + #include +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index db884e166a..c9457e139e 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -1,15 +1,17 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ file://gcc3_4.patch;patch=1" \ file://gcc4.patch;patch=1 \ - file://gcc4_1.patch;patch=1" + file://gcc4_1.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch new file mode 100644 index 0000000000..17836802a6 --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch @@ -0,0 +1,147 @@ +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 +@@ -176,7 +176,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -737,7 +737,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +@@ -31,6 +31,7 @@ + **********************************************************************/ + + #include "qsharedmemory_p.h" ++#include + + #if !defined(QT_QWS_NO_SHM) + +@@ -132,7 +133,7 @@ + shmId = shmget (key, shmSize, 0); + + shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ if ((intptr_t) shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +@@ -107,6 +107,7 @@ + #include + #include + #include ++#include + + #if defined(Q_OS_QNX) + #include +@@ -1879,7 +1880,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -1898,11 +1899,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2130,7 +2131,7 @@ + } + if ( !qws_overrideCursor ) { + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +@@ -49,6 +49,7 @@ + #include "qgfx_qws.h" + #include "qtextengine_p.h" + #include "qfontengine_p.h" ++#include + + QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; + +@@ -133,7 +134,7 @@ + req.pointSize = req.pixelSize*10; + + if ( ! engineData ) { +- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); ++ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); + + // look for the requested font in the engine data cache + engineData = QFontCache::instance->findEngineData( key ); +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include ++#include + + #ifndef QT_NO_QWS_MULTIPROCESS + #include +@@ -288,7 +289,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +@@ -53,6 +53,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -631,7 +632,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1845,7 +1846,7 @@ + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb index 6354377bcf..142b3997e0 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -1,11 +1,14 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL QPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ - file://no-examples.patch;patch=1" + file://no-examples.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-embedded-free-${PV}" -- cgit v1.2.3 From 7c51ef4d2a6273039792bfc5f9dfc777e9f4f096 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 28 Mar 2006 16:01:16 +0000 Subject: keymap-locales: Include change from .oz3.5.4x --- packages/keymap-locales/keymap-locales.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index 5ba84e69ca..f1b479d47a 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,13 +4,17 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "file://*.map" # If any python guru wants to setup PACKAGES_$machine with some code instead, # be my guet =) PACKAGES_akita = "keymap-extension-de" +PACKAGES_spitz = "keymap-extension-de" +PACKAGES_borzoi = "keymap-extension-de" +PACKAGES_c7x0 = "keymap-extension-de" +PACKAGES_collie = "keymap-extension-de" FILES_keymap-extension-de = "/etc/*-de.map" FILES_keymap-extension-fr = "/etc/*-fr.map" -- cgit v1.2.3 From ecc1bd45d39bd4b1f36f682905c3f8b16c96d983 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Tue, 28 Mar 2006 17:57:59 +0000 Subject: libxml2: Fixed the download URL's for all libxml2 packages. --- packages/libxml/libxml2_2.6.10.bb | 2 +- packages/libxml/libxml2_2.6.22.bb | 3 +-- packages/libxml/libxml2_2.6.7.bb | 2 +- packages/libxml/libxml2_2.6.9.bb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.10.bb +++ b/packages/libxml/libxml2_2.6.10.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb index eb5f087df7..fae00a6063 100644 --- a/packages/libxml/libxml2_2.6.22.bb +++ b/packages/libxml/libxml2_2.6.22.bb @@ -8,9 +8,8 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz \ +SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \ file://no-testapi.patch;patch=1" - inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb index fc04b5e9d3..b204351b7b 100644 --- a/packages/libxml/libxml2_2.6.7.bb +++ b/packages/libxml/libxml2_2.6.7.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.9.bb +++ b/packages/libxml/libxml2_2.6.9.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig -- cgit v1.2.3 From aca937147be3a8a24513f2a46980e81ae7ee4dca Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 28 Mar 2006 18:24:47 +0000 Subject: altboot: Add tosa support for kernel 2.4 Contributed by Sebastian S --- packages/altboot/altboot_0.0.0.bb | 2 +- packages/altboot/files/tosa/.mtn2git_empty | 0 packages/altboot/files/tosa/altboot-2.4.cfg | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/altboot/files/tosa/.mtn2git_empty create mode 100644 packages/altboot/files/tosa/altboot-2.4.cfg diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 7d56cbd3a6..4b69c50e14 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r26" +PR = "r27" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg new file mode 100644 index 0000000000..edbaff8b87 --- /dev/null +++ b/packages/altboot/files/tosa/altboot-2.4.cfg @@ -0,0 +1,27 @@ +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="4" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="no" + +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" + +USB_HOST_AVAILABLE="yes" +USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" -- cgit v1.2.3 From 45e6ba5a493ba86472bab1238049a055f8fd9d9f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 28 Mar 2006 20:43:05 +0000 Subject: slugos-native: Fixed the libc6 RDEPENDS problem --- packages/meta/slugos-native.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index cbb74fc823..e23bfd1d8f 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 = "r0" +PR = "r1" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" @@ -16,8 +16,7 @@ PROVIDES += "${SLUGOS_IMAGENAME}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. SLUGOS_NATIVE_RT_prepend_linux = "\ - glibc-extra-nss glibc-utils \ - libc6 libc6-dev \ + glibc-extra-nss glibc-utils glibc \ " SLUGOS_NATIVE_RT_prepend_linux-uclibc = "\ uclibc-dev uclibc-utils \ -- cgit v1.2.3 From a616d6c1fc8aefe53d586a63f98a0f2e931fface Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 28 Mar 2006 20:47:05 +0000 Subject: slugos-packages: Removed obsolete openobex-apps reference --- conf/distro/slugos-packages.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 0278789f0b..1e578c48ba 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -168,7 +168,6 @@ ${PKGDIR}/packages/obexftp/*.bb \ ${PKGDIR}/packages/openjade/*.bb \ ${PKGDIR}/packages/openldap/*.bb \ ${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex-apps/*.bb \ ${PKGDIR}/packages/openobex/*.bb \ ${PKGDIR}/packages/opensp/*.bb \ ${PKGDIR}/packages/openssh/*.bb \ -- cgit v1.2.3 From f19059ca2d12415411489190c9b3c3849ecd1c0f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 03:38:18 +0000 Subject: altboot: Altboot now remembers the last loop-image (or realfs),too, which allowsa true automatic booting of the last user-setting --- packages/altboot/altboot_0.0.0.bb | 2 +- .../altboot/files/altboot-menu/Advanced/40-bootNFS | 20 ++++++++++-- packages/altboot/files/altboot.func | 36 +++++++++++++++++++--- packages/altboot/files/init.altboot | 7 +++++ 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 4b69c50e14..020546dd64 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r27" +PR = "r28" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 3a41fccf79..baa426218b 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -91,7 +91,20 @@ run_module() { do stty echo echo -n "Boot NFS root: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-bootNFS-source.last + then + junk="`cat /etc/.altboot-bootNFS-source.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi + cnt=1 for nfs_mount in $nfs_mounts @@ -99,6 +112,7 @@ run_module() { if test "$junk" = "$cnt" then selection="$nfs_mount" + echo "$junk" > /etc/.altboot-bootNFS-source.last fi let cnt=$cnt+1 done @@ -115,10 +129,10 @@ run_module() { mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs - echo -n "Copying resolv.conf..." + #echo -n "Copying resolv.conf..." #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - check_target "/media/nfsroot" + check_target "/media/nfsroot" bootNFS } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index c6af50a008..4389ff4ff8 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -1,6 +1,7 @@ #! /bin/sh # This function checks for the presence of a real filesystem and loop-images on the target # $1 = folder of rootfs, $2 = runlevel (defaults to 5) +# $2 = name of calling module check_target() { # Check if there is a /sbin/init or /sbin/init.sysvinit on the card if test -x $1/sbin/init -o -x $1/$REAL_INIT @@ -31,11 +32,24 @@ check_target() { while test -z "$ans" do echo -n "Your choice: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-$2-real-or-loop.last + then + junk="`cat /etc/.altboot-$2-real-or-loop.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi if test "$junk" = 1 -o "$junk" = 2 then ans="$junk" + echo "$junk" > /etc/.altboot-$2-real-or-loop.last fi done @@ -62,7 +76,7 @@ check_target() { # This function pivot_root's into a real filesystem calling $newrootfs/sbin/init # $1 = The new rootfs pivot_realfs() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" mount -o remount,ro / >/dev/null 2>&1 @@ -73,7 +87,7 @@ pivot_realfs() { # This function loop-mounts an image-file and pivot_root's into it # $1: The new rootfs pivot_image() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" cd $1/$IMAGE_PATH # Check for rootfs images on the card @@ -95,7 +109,18 @@ pivot_image() { while test -z "$IMAGE_NAME" do echo -en "Please choose one of the above: " - read junk < /dev/tty1 + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-loopimage.last + then + junk="`cat /etc/.altboot-loopimage.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi x=0 for file in `ls *rootfs.bin` @@ -103,7 +128,8 @@ pivot_image() { let x=$x+1 if test "$x" = "$junk" then - IMAGE_NAME="$file" + IMAGE_NAME="$file" + echo "$junk" > /etc/.altboot-loopimage.last fi done done diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 850912f20c..665b3fa4b5 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -183,6 +183,13 @@ run_timer() { echo -n "." >/dev/tty1 let cnt=$cnt+1 done + + if test "$launch_altboot" != "yes" + then + AUTOBOOT=yes + else + rm -f /etc/.altboot*.last + fi else launch_altboot=yes fi -- cgit v1.2.3 From 4c2325e5291acea9530852ca38486c6e9970796e Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 29 Mar 2006 03:53:28 +0000 Subject: zaurusd: Include changes from .oz354x --- packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch | 4 ++-- packages/zaurusd/zaurusd_svn.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch index f4ef7c5aee..e2d56874c9 100644 --- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch +++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch @@ -25,8 +25,8 @@ + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then -+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr ++ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" ++ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + else + cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + rm "/tmp/gpe-panel.session-$panel_user" diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 4f20dc23c5..52a7b353d3 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -3,7 +3,7 @@ SECTION = "base" MAINTAINER = "Richard Purdie " DESCRIPTION = "Daemon to handle device specifc features." PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r2" DEPENDS = "tslib" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ -- cgit v1.2.3 From 9fa59723d6e972949572078ab24a8de9d0d3af11 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 29 Mar 2006 11:25:41 +0000 Subject: slugos: Add required usb/scsi modules to rootfs --- conf/distro/debianslug.conf | 9 +++++++++ conf/distro/openslug.conf | 9 +++++++++ conf/distro/ucslugc.conf | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index c5c9f6868c..1063356217 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -87,6 +87,15 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " +DEBIANSLUG_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 304cd6dcfa..09f3691b65 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -87,6 +87,15 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 24ef6e6c33..bb6c6efa6a 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -19,6 +19,16 @@ UCSLUGC_EXTRA_BBFILES ?= "" # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_ # setting - either may be set in local.conf to override these values. UCSLUGC_EXTRA_RDEPENDS ?= "" + +UCSLUGC_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}" -- cgit v1.2.3 From b5250ea5c6edf8034c783f1b1e96a8334555ff4a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 29 Mar 2006 11:34:08 +0000 Subject: slugos-init: Make linuxrc load all the necessary modules --- packages/slugos-init/files/turnup | 6 ++++++ packages/slugos-init/slugos-init_0.10.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index f7fe0e7960..b365a49dda 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -403,6 +403,12 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' + echo 'modprobe ehci-hcd' + echo 'modprobe ohci-hcd' + echo 'modprobe sd_mod' + echo 'modprobe usb-storage' + echo 'modprobe ext3' + echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 3f1ab456ac..971f6cf288 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r57" +PR = "r58" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From eb3e23a1c96bc6b5738c8aa0ec023b93dc035880 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 29 Mar 2006 13:02:31 +0000 Subject: uicmoc4: upgrade from 4.0.1 to 4.1.1 NOTE: fix-mkspecs needs to be upgraded, 64bit platform patch needs to be added --- .../uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch | 179 --------------------- .../uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch | 179 +++++++++++++++++++++ packages/uicmoc/uicmoc4-native_4.0.1.bb | 42 ----- packages/uicmoc/uicmoc4-native_4.1.1.bb | 42 +++++ 6 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch delete mode 100644 packages/uicmoc/uicmoc4-native_4.0.1.bb create mode 100644 packages/uicmoc/uicmoc4-native_4.1.1.bb diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch deleted file mode 100644 index 491edde370..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch +++ /dev/null @@ -1,179 +0,0 @@ -Index: