From 50fb1ac493e9961c0113bfcb826ed5bb756daddc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 18 Aug 2005 15:29:12 +0000 Subject: Set CVSDATE for ipkg-utils for nslu2 firmware. --- conf/machine/nslu2.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1616299ae9..7f56b32282 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -129,6 +129,7 @@ USE_VT = "0" #------------------------------------------------------------------------------- CVSDATE_gnu-config ?= "20050713" CVSDATE_gnu-config-native ?= "20050713" +CVSDATE_ipkg-utils ?= "20050713" CVSDATE_ipkg-utils-native ?= "20050713" CVSDATE_ipkg-link ?= "20050713" -- cgit v1.2.3 From 7ee162e3380a6fd3e7cfd69caeedd458a4acd1b3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 Aug 2005 21:51:52 +0000 Subject: efl++: create .inc file, split into a .bb for -x11 and a .bb for -fb --- packages/efl++/efl++-fb_0.0.2.bb | 3 +++ packages/efl++/efl++-x11_0.0.2.bb | 3 +++ packages/efl++/efl++.inc | 48 +++++++++++++++++++++++++++++++++++++++ packages/efl++/efl++_0.0.2.bb | 48 --------------------------------------- 4 files changed, 54 insertions(+), 48 deletions(-) create mode 100644 packages/efl++/efl++-fb_0.0.2.bb create mode 100644 packages/efl++/efl++-x11_0.0.2.bb create mode 100644 packages/efl++/efl++.inc delete mode 100644 packages/efl++/efl++_0.0.2.bb diff --git a/packages/efl++/efl++-fb_0.0.2.bb b/packages/efl++/efl++-fb_0.0.2.bb new file mode 100644 index 0000000000..b6a23d832d --- /dev/null +++ b/packages/efl++/efl++-fb_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES-=EFL_HAVE_X11" diff --git a/packages/efl++/efl++-x11_0.0.2.bb b/packages/efl++/efl++-x11_0.0.2.bb new file mode 100644 index 0000000000..d3f37911ee --- /dev/null +++ b/packages/efl++/efl++-x11_0.0.2.bb @@ -0,0 +1,3 @@ +include efl++.inc + +EFL_CONFIGURATION = "DEFINES+=EFL_HAVE_X11" diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc new file mode 100644 index 0000000000..3a0aa9f691 --- /dev/null +++ b/packages/efl++/efl++.inc @@ -0,0 +1,48 @@ +DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries" +SECTION = "e/libs" +LICENSE = "LGPL" +AUTHOR = "Michael 'Mickey' Lauer " +MAINTAINER = "${AUTHOR}" +HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" +DEPENDS = "virtual/evas virtual/ecore edje" +PROVIDES = "virtual/efl++" + +SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" +S = "${WORKDIR}/efl++-${PV}" + +inherit qmake + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "efl++.pro" +EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ + LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}" +export OE_QMAKE_LINK="${CXX}" +export EDIR="${S}" + +do_configure_prepend() { + rm include.pro + cat <include.pro +include ( common.pro ) +DEFINES += DATADIR=\"${datadir}/efl++/\" +EOF +} + +do_stage() { + for i in src/evas/*.h src/ecore/*.h src/edje/*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done + oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR} +} + +do_install() { + oe_libinstall -so -C ${S} libefl++ ${D}${libdir} + install -d ${D}${bindir} + install edje-simple ${D}${bindir} + install -d ${D}${datadir}/efl++ + cp -a data/* ${D}${datadir}/efl++ +} + +PACKAGES =+ "efl++-examples" +FILES_${PN} = "${libdir}" +FILES_efl++-examples = "${bindir} ${datadir}" diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++_0.0.2.bb deleted file mode 100644 index 5803f5db7a..0000000000 --- a/packages/efl++/efl++_0.0.2.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries" -SECTION = "e/libs" -LICENSE = "LGPL" -AUTHOR = "Michael 'Mickey' Lauer " -MAINTAINER = "${AUTHOR}" -HOMEPAGE = "http://www.Vanille.de/projects/efl++.html" -DEPENDS = "virtual/evas virtual/ecore edje" - -SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2" -S = "${WORKDIR}/efl++-${PV}" - -inherit qmake - -PARALLEL_MAKE = "" -QMAKE_PROFILES = "efl++.pro" -EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ - LIBS+=-L${S} DESTDIR=${S}" -export OE_QMAKE_LINK="${CXX}" -export EDIR="${S}" - -do_configure_prepend() { - rm include.pro - cat <include.pro -include ( common.pro ) -DEFINES += DATADIR=\"${datadir}/efl++/\" -DEFINES += EFL_HAVE_X11 -EOF -} - -do_stage() { - for i in src/evas/*.h src/ecore/*.h src/edje/*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done - oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR} -} - -do_install() { - oe_libinstall -so -C ${S} libefl++ ${D}${libdir} - install -d ${D}${bindir} - install edje-simple ${D}${bindir} - install -d ${D}${datadir}/efl++ - cp -a data/* ${D}${datadir}/efl++ -} - -PACKAGES =+ "efl++-examples" -FILES_${PN} = "${libdir}" -FILES_efl++-examples = "${bindir} ${datadir}" -- cgit v1.2.3 From 7197d584317484d1d051c81481a18a38cf0385db Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 Aug 2005 22:16:25 +0000 Subject: evince rdepends on gconf --- packages/evince/evince_0.3.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 86ca664655..18ad005092 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Evince is simply a document viewer" LICENSE = "GPL" DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs" +RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \ file://no-doc.patch;patch=1" -- cgit v1.2.3 From 8bb35d79a72d5f01933394552594cb3b857277a9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 19 Aug 2005 22:19:21 +0000 Subject: make osso-gnome-vfs2 not PROVIDE gnome-vfs2. If it really PROVIDES it you should add a virtual/gnome-vfs2 providee --- packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb index bf4fae08bc..eb461a860c 100644 --- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb +++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb @@ -1,7 +1,7 @@ +DESCRIPTION = "The Gnome Virtual File System - OSSO Version" LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r1" -PROVIDES = "gnome-vfs" +PR = "r2" RPROVIDES = "gnome-vfs" inherit gnome pkgconfig -- cgit v1.2.3 From 9ad4b61cdaa656eda5ed4e92e17b7e2c57e3af63 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 20 Aug 2005 17:34:00 +0000 Subject: sulogini -> sulogin typo --- packages/sysvinit/sysvinit/openslug/inittab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/openslug/inittab index 567855b9f0..a82c1f5449 100644 --- a/packages/sysvinit/sysvinit/openslug/inittab +++ b/packages/sysvinit/sysvinit/openslug/inittab @@ -27,6 +27,6 @@ l4:4:wait:/etc/init.d/rc 4 l5:5:wait:/etc/init.d/rc 5 l6:6:wait:/etc/init.d/rc 6 # Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogini +z6:6:respawn:/sbin/sulogin ca:123456:ctrlaltdel:/sbin/poweroff -- cgit v1.2.3 From 8bb6db501e85577a0dcf8faab9b5480d4df53673 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 20 Aug 2005 20:48:49 +0000 Subject: Adding evidence --- packages/e17/evidence_20050810.bb | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 packages/e17/evidence_20050810.bb diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050810.bb new file mode 100644 index 0000000000..0950b590c6 --- /dev/null +++ b/packages/e17/evidence_20050810.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "evidence, an enlightenemt file manager" +LICENSE = "GPL" +SECTION = "e" +MAINTAINER = "Justin Patrin " +# can support dbus, avifile, libmpeg3 +DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" +RDEPENDS += "examine" +PR = "r0" +CVSDATE = "${PV}" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" +S = "${WORKDIR}/evidence" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --enable-ecore \ + --enable-ecore-ipc \ + --enable-canvas-evas2 \ + --enable-edje \ + --enable-x \ + --enable-tree-view \ + --enable-icon-view \ + --enable-browser-view \ + --with-libxine=${STAGING_LIBDIR}" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +do_compile_prepend() { + sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile +} + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" +export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + +inherit autotools pkgconfig binconfig -- cgit v1.2.3 From 7ab6bafabc5d7567f81cf1165b500dbb4227c409 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 21 Aug 2005 00:11:25 +0000 Subject: module.bbclass: run depmod/update-modules in postinst/postrm --- classes/module.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/classes/module.bbclass b/classes/module.bbclass index 4da3f5f30b..8a13f1f858 100644 --- a/classes/module.bbclass +++ b/classes/module.bbclass @@ -34,6 +34,18 @@ module_do_install() { oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install } +pkg_postinst_append () { + if [ -n "$D" ]; then + exit 1 + fi + depmod -A + update-modules || true +} + +pkg_postrm_append () { + update-modules || true +} + EXPORT_FUNCTIONS do_compile do_install FILES_${PN} = "/etc /lib/modules" -- cgit v1.2.3 From c7b36accb8f6008044957000b25ab13ecef273ce Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 21 Aug 2005 00:14:27 +0000 Subject: at76c503a-modules: running update-modules is now done by module.bbclass --- packages/at76c503a/at76c503a-modules_cvs.bb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 7e737e9447..1c8f1faa9c 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ file://makefile.cc.patch;patch=1" S = "${WORKDIR}/at76c503a" -PR = "r3" +PR = "r4" PV = "0.0cvs${CVSDATE}" inherit module @@ -11,19 +11,6 @@ inherit module MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \ at76c505-rfmd at76c503-i3863 at76c505-rfmd2958" -pkg_postinst() { -#!/bin/sh -if [ "x$D" != "x" ]; then - exit 1 -fi -update-modules || true -} - -pkg_postrm() { -#!/bin/sh -update-modules || true -} - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ for i in ${MODULES}; do -- cgit v1.2.3 From 24d5fd396fd92838715ae761bb1a61783e17e8c5 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 21 Aug 2005 00:18:58 +0000 Subject: bt950-cs: running depmod is now done by module.bbclass --- packages/bt950-cs/bt950-cs_0.1.bb | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb index e32db47b6d..dfd288e50a 100644 --- a/packages/bt950-cs/bt950-cs_0.1.bb +++ b/packages/bt950-cs/bt950-cs_0.1.bb @@ -4,6 +4,7 @@ LICENSE = "GPLv2" HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html" DEPENDS = "pcmcia-cs" RDEPENDS = "pcmcia-cs" +PR = "r1" SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \ file://makefile.patch;patch=1" @@ -22,16 +23,3 @@ do_install() { install -m 0644 bt950.conf ${D}${sysconfdir}/pcmcia/ } -pkg_postinst() { -#!/bin/sh -if [ "x$D" != "x" ]; then - exit 1 -fi -update-modules || true -} - -pkg_postrm() { -#!/bin/sh -update-modules || true -} - -- cgit v1.2.3 From 90c78b5bd7e7f720c9d8520703e87194b681289c Mon Sep 17 00:00:00 2001 From: Tom King Date: Sun, 21 Aug 2005 00:33:18 +0000 Subject: Added usb-audio support --- packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +- packages/linux/openslug-kernel-2.6.12.2/defconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index f51c8e2ba6..cd597fadfe 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r12" +PR = "r13" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 15f2fecdb1..f9c4865c47 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -941,7 +941,9 @@ CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_OSSEMUL=y # # Open Sound System -- cgit v1.2.3