Merge bk://oe-devel@oe-devel.bkbits.net/packages

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/12/04 18:20:04+00:00 nexus.co.uk!pb
using r/w ext2, not r/o cramfs, on epia

2004/12/04 18:19:11+00:00 nexus.co.uk!pb
fix typo in mythtv packaging

2004/12/04 17:01:03+00:00 nexus.co.uk!pb
increase mythtv packaging granularity a bit

2004/12/04 16:59:02+00:00 nexus.co.uk!pb
put lame binary and libraries in separate packages

2004/12/04 16:15:50+00:00 nexus.co.uk!pb
break udevinfo and udevtest out of main udev package (now in udev-utils)

2004/12/04 16:11:48+00:00 nexus.co.uk!pb
remove strace from epia BOOTSTRAP_EXTRA_(R)DEPENDS

2004/12/04 16:09:30+00:00 nexus.co.uk!pb
bump task-bootstrap PR

2004/12/04 16:07:24+00:00 nexus.co.uk!pb
move lrzsz dependency from task-bootstrap to handhelds-common

BKrev: 41b23cbbTdZ1jNiugIMAe6ydDY_o4Q

diff --git a/base-files/base-files/epia/fstab b/base-files/base-files/epia/fstab
index 53f9f34..70f0b07 100644 (file)
--- a/base-files/base-files/epia/fstab
+++ b/base-files/base-files/epia/fstab
@@ -1,4 +1,4 @@
-/dev/cramfs    /       cramfs  ro              1  1 
+/dev/ram0      /       ext2    rw              1  1 
 tmpfs          /var    tmpfs   defaults        0  0
 proc           /proc   proc    defaults        0  0
 tmpfs          /tmp    tmpfs   defaults        0  0

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index a48d743..c36ba37 100644 (file)
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r19"
+PR = "r20"
 LICENSE = "GPL"
 
 SRC_URI = " \

diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index ed74c94..03a9c53 100644 (file)
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -2,8 +2,8 @@ TARGET_ARCH = "i686"
 TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
 IMAGE_FSTYPE = "ext2.gz"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules"
 udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
 GLIBC_ADDONS = "nptl"

diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 0d77f77..c606b13 100644 (file)
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
 "
 
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm apmd"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl ${@linux_module_packages('${HANDHELD_MODULES}')}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan hostap-wpa-supplicant-nossl lrzsz ${@linux_module_packages('${HANDHELD_MODULES}')}"
 
 INHERIT += "linux_modules"

diff --git a/lame/lame_3.96.1.oe b/lame/lame_3.96.1.oe
index 32daf65..aa20308 100644 (file)
--- a/lame/lame_3.96.1.oe
+++ b/lame/lame_3.96.1.oe
@@ -1,12 +1,18 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
        file://no-gtk1.patch;patch=1"
 
 inherit autotools
 
+PACKAGES =+ "libmp3lame libmp3lame-dev"
+FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
+FILES_libmp3lame-dev = "${includedir} ${libdir}"
+FILES_${PN}-dev = ""
+
 do_configure() {
        # no autoreconf please
        aclocal

diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index 9199ed9..ebcbcc6 100644 (file)
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r10"
+PR = "r11"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
@@ -11,7 +11,7 @@ PACKAGES = "${PN}"
 
 DEPENDS = 'base-files base-passwd-3.5.7 \
        busybox dropbear hotplug initscripts modutils netbase \
-       sysvinit tinylogin lrzsz portmap \
+       sysvinit tinylogin portmap \
        modutils-initscripts \
        ${BOOTSTRAP_EXTRA_DEPENDS}'
 
@@ -21,5 +21,5 @@ RDEPENDS = 'base-files base-passwd busybox \
        modutils-initscripts \
        ${BOOTSTRAP_EXTRA_RDEPENDS}'
 
-RRECOMMENDS = 'dropbear lrzsz portmap \
+RRECOMMENDS = 'dropbear portmap \
        ${BOOTSTRAP_EXTRA_RRECOMMENDS}'

diff --git a/mythtv/mythtv_cvs.oe b/mythtv/mythtv_cvs.oe
index 31613fa..07c7425 100644 (file)
--- a/mythtv/mythtv_cvs.oe
+++ b/mythtv/mythtv_cvs.oe
@@ -1,12 +1,13 @@
 DESCRIPTION = "A full featured personal video recorder system."
 MAINTAINER = "Michael 'Mickey' Lauer"
 SECTION = "x11/multimedia"
-PR = "r2"
+PR = "r4"
 PV = "0.16+cvs${CVSDATE}"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "cvs://mythtv:mythtv@cvs.mythtv.org/var/lib/mythcvs;module=mythtv;method=pserver \
+       http://www.ivor.it/mythtv/epiaosd.tar.gz \
        file://settings.pro \
        file://prefix-etc.patch;patch=1"
 S = "${WORKDIR}/mythtv"
@@ -14,6 +15,12 @@ S = "${WORKDIR}/mythtv"
 DEPENDS = "xinerama qt-x11-free lame libxv libxxf86vm libxvmc lirc"
 RDEPENDS = "qt-x11-plugins"
 
+PACKAGES =+ "libmythavcodec libmythavformat libmythtv mythtv-backend"
+FILES_libmythavcodec = "${libdir}/libmythavcodec-*.so.*"
+FILES_libmythavformat = "${libdir}/libmythavformat-*.so.*"
+FILES_libmythtv = "${libdir}/libmythtv-*.so.*"
+FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythtranscode ${bindir}/mythfilldatabase ${bindir}/mythcommflag"
+
 inherit qmake qt3x11
 
 QMAKE_PROFILES = "mythtv.pro"
@@ -71,6 +78,8 @@ do_configure_prepend() {
                        --enable-risky
 
        install -m 0644 ${WORKDIR}/settings.pro ${S}/
+
+       cp -a ${WORKDIR}/themes/epiaosd ${S}/themes/
 }
 
 do_install() {

diff --git a/udev/udev_042.oe b/udev/udev_042.oe
index 79ea9d5..ef5e35d 100644 (file)
--- a/udev/udev_042.oe
+++ b/udev/udev_042.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://flags.patch;patch=1 \
@@ -9,6 +9,9 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://noasmlinkage.patch;patch=1 \
           file://init"
 
+PACKAGES =+ "udev-utils"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+
 inherit update-rc.d
 
 INITSCRIPT_NAME = "udev"