diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-10-02 13:16:39 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-10-02 13:16:39 +0000 |
| commit | b763fbcafedd1a05b4005b671e3a0cbb6fcf4ce2 (patch) | |
| tree | 2ca5cb8c3fc74c759a529d17e88f011ac2c50fe5 | |
| parent | 1b6eb4da40709a2c89660287cc843d53a81fa79d (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/10/02 15:16:21+02:00 uni-frankfurt.de!mickeyl
unbreak ramdisk script on collie (once again)
2004/10/02 01:57:16+02:00 uni-frankfurt.de!mickeyl
opie-mediaplayer2 catch up with upstream cleanups
BKrev: 415eaa37xIZOJ8ixZUaXWO4YEqLEdg
| -rw-r--r-- | initscripts/initscripts-1.0/ramdisk | 2 | ||||
| -rw-r--r-- | initscripts/initscripts_1.0.oe | 2 | ||||
| -rw-r--r-- | opie-mediaplayer2/opie-mediaplayer2_cvs.oe | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/initscripts/initscripts-1.0/ramdisk b/initscripts/initscripts-1.0/ramdisk index fc04e33852..192c212527 100644 --- a/initscripts/initscripts-1.0/ramdisk +++ b/initscripts/initscripts-1.0/ramdisk @@ -35,7 +35,7 @@ if (test ! -e /etc/.configured) || test "$OLD_MTD_SIZE" != "$RAM_MTD_SIZE"; then dd if=/dev/zero bs=1024 count=$RAM_MTD_SIZE of=$RAM_MTD 2>/dev/null >&2 || exit 1 test "$VERBOSE" != "no" && echo "$RAM_MTD"; test "$VERBOSE" != "no" && echo -n "Creating filesystem on ramdisk: " - mkfs -t $FSTYPE $RAM_MTDBLK 2>/dev/null >&2 || exit 1 + mkfs.$FSTYPE $RAM_MTDBLK 2>/dev/null >&2 || exit 1 test "$VERBOSE" != "no" && echo "$RAM_MTDBLK"; fi diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe index 9c74eefffd..9183388ff0 100644 --- a/initscripts/initscripts_1.0.oe +++ b/initscripts/initscripts_1.0.oe @@ -4,7 +4,7 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" -PR = "r14" +PR = "r15" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe index c560fd4b98..58eb9f268a 100644 --- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe +++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe @@ -1,13 +1,14 @@ -DESCRIPTION = "The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and more. Also it is streaming capable." +DESCRIPTION = "The next generation mediaplayer for Opie - based libxine. \ +It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming." SECTION = "opie/multimedia" PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie <opie@handhelds.org> PV = "1.1.6-cvs-${CVSDATE}" -DEPENDS = "libxine" +DEPENDS = "libxine-1.0.0-rc6a" RDEPENDS = "opie-mediaplayer2-skin" APPNAME = "opieplayer2" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/multimedia/opieplayer2 \ cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \ @@ -20,8 +21,6 @@ inherit opie QMAKE_PROFILES = "opieplayer2.pro" do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${WORKDIR}/apps/Applications/mediaplayer.desktop ${D}${palmtopdir}/apps/Applications/ } - |