Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/15 02:42:05+01:00 vanille.de!mickeyl
initscript: remove bogus and do it properly

2005/01/15 02:29:55+01:00 vanille.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/local/pkg/oe/packages

2005/01/15 02:29:35+01:00 vanille.de!mickeyl
fix dependency error in initscripts

2005/01/15 00:32:06+00:00 nexus.co.uk!pb
remove error-dialog patch from gtk+ 2.4.13 as well

2005/01/15 00:31:01+00:00 nexus.co.uk!pb
remove accidentally-included patch for gtk+ error box title

2005/01/15 00:28:40+00:00 nexus.co.uk!pb
add workaround for gtk+ RTL bug #164125

2005/01/14 23:39:54+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/14 23:36:46+00:00 nexus.co.uk!pb
banish bootlogd to eponymous package

BKrev: 41e874ee05NaESBQ2krTEcTxw7Cvvw

diff --git a/packages/gtk+/gtk+-2.6.0/error-dialog.patch b/packages/gtk+/gtk+-2.6.0/error-dialog.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/gtk+/gtk+-2.6.1/error-dialog.patch b/packages/gtk+/gtk+-2.6.1/error-dialog.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/gtk+/gtk+-2.4.13/error-dialog.patch b/packages/gtk+/gtk+-2.6.1/ltr.patch
similarity index 100%
rename from packages/gtk+/gtk+-2.4.13/error-dialog.patch
rename to packages/gtk+/gtk+-2.6.1/ltr.patch

diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index baaff5c..d8a0aa1 100644 (file)
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
@@ -18,7 +18,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
           file://disable-tooltips.patch;patch=1 \
           file://gtklabel-resize-patch;patch=1 \
           file://menu-deactivate.patch;patch=1 \
-          file://error-dialog.patch;patch=1 \
           file://xsettings.patch;patch=1 \
           file://scroll-timings.patch;patch=1 \
           file://gtk-doc.m4 \

diff --git a/packages/gtk+/gtk+_2.6.0.bb b/packages/gtk+/gtk+_2.6.0.bb
index 98a2056..e25a9b4 100644 (file)
--- a/packages/gtk+/gtk+_2.6.0.bb
+++ b/packages/gtk+/gtk+_2.6.0.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
@@ -18,7 +18,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
           file://disable-tooltips.patch;patch=1 \
           file://gtklabel-resize-patch;patch=1 \
           file://menu-deactivate.patch;patch=1 \
-          file://error-dialog.patch;patch=1 \
           file://xsettings.patch;patch=1 \
           file://scroll-timings.patch;patch=1 \
           file://small-gtkfilesel.patch;patch=1 \

diff --git a/packages/gtk+/gtk+_2.6.1.bb b/packages/gtk+/gtk+_2.6.1.bb
index e69de29..7e91076 100644 (file)
--- a/packages/gtk+/gtk+_2.6.1.bb
+++ b/packages/gtk+/gtk+_2.6.1.bb
@@ -0,0 +1,72 @@
+LICENSE = LGPL
+DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
+           file://no-demos.patch;patch=1 \
+           file://no-xwc.patch;patch=1 \
+           file://automake-lossage.patch;patch=1 \
+           file://gtk+-handhelds.patch;patch=1 \
+          file://spinbutton.patch;patch=1 \
+          file://hardcoded_libtool.patch;patch=1 \
+          file://disable-tooltips.patch;patch=1 \
+          file://gtklabel-resize-patch;patch=1 \
+          file://menu-deactivate.patch;patch=1 \
+          file://xsettings.patch;patch=1 \
+          file://scroll-timings.patch;patch=1 \
+          file://small-gtkfilesel.patch;patch=1 \
+          file://single-click.patch;patch=1 \
+          file://ltr.patch;patch=1"
+
+inherit autotools pkgconfig flow-lossage
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+       ${bindir}/gtk-query-immodules-2.0 \
+       ${libdir}/lib*.so.* \
+       ${datadir}/themes ${sysconfdir}"
+FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
+
+RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
+
+EXTRA_OECONF = "--without-libtiff --disable-xkb"
+# --disable-cruft
+
+LIBV = "2.4.0"
+
+do_stage () {
+       oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+       oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+
+       autotools_stage_includes
+
+       mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
+       install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+
+       install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+do_install_append () {
+       install -d ${D}/etc/gtk-2.0
+}
+
+python populate_packages_prepend () {
+       import os.path
+
+       gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+       loaders_root = os.path.join(gtk_libdir, 'loaders')
+       immodules_root = os.path.join(gtk_libdir, 'immodules')
+
+       do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+       do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
+}

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index af2ae26..06aa140 100644 (file)
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r27"
+PR = "r28"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -34,7 +34,15 @@ SRC_URI = "file://halt \
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
 
-KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
+def read_kernel_version(d):
+       import bb
+       distro = bb.data.getVar('DISTRO', d, 1)
+       filename = bb.data.getVar('STAGING_KERNEL_DIR', d, 1)
+       if distro == "openzaurus":
+               return file( filename + "/kernel-abiversion", "r" ).read().strip()
+       else:
+               return "not important"
+KERNEL_VERSION = "${@read_kernel_version(d)}"
 
 do_install () {
 #

diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 7d996d8..2131e3c 100644 (file)
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -4,12 +4,15 @@ LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
 
-PR = "r4"
+PR = "r5"
 
-# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
+# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+PACKAGES =+ "bootlogd"
+FILES_bootlogd = "/etc/init.d/bootlogd /etc/rcS.d/*bootlogd /sbin/bootlogd"
+
 USE_VT ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz \