diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 21:54:39 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 21:54:39 +0000 |
commit | cb82144c79b159a634275390a7ac55f639192d0c (patch) | |
tree | da60d126aa2e6a47d9fcaa068b48dac4b3f56cb3 /packages/zmerlin | |
parent | 99a2c8c9cda0133d249b854e031d1a35632b9dfa (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/23 15:31:35-06:00 ti.com!kergoth
Apply fix to lame from Michael Kropfberg that ensures that the library packages get emitted.
2005/02/23 14:04:22-06:00 ti.com!kergoth
Use the recent glibc snaps by default for the sh3 and sh4 target architectures.
2005/02/23 13:49:33-06:00 ti.com!kergoth
Fix the unpleasant target path mangling in do_install in the uclibc builds to happen only when necessary (thereby unborking the uclibc build with default paths).
2005/02/23 13:30:16-06:00 ti.com!kergoth
modutils: apply patch from Hermann Lacheiner to fix another missing /.
2005/02/23 12:36:57-06:00 ti.com!kergoth
Add sh3 uclibc defconfigs for all the uclibc versions.
2005/02/23 12:27:56-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded
2005/02/23 12:27:44-06:00 ti.com!kergoth
module-init-tools: fix another bug caused by that rampant sed'ing.
2005/02/23 18:57:22+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/23 18:57:02+01:00 uni-frankfurt.de!mickeyl
introduce IPKGBUILDCMD to enable overwriting the ipkg-build command line arguments. tweak sharprom-compatible.conf to override IPKGBUILDCMD. thanksfully, ipkg-build still supports the outdated format
2005/02/23 10:32:16-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded
2005/02/23 10:31:54-06:00 ti.com!kergoth
Bump PR in the packages that were broken by the hokey sed from yesterday.
2005/02/23 17:14:56+01:00 uni-frankfurt.de!mickeyl
misc opie files: use palmtopdir variable instead of hardcoding /opt/QtPalmtop/
2005/02/23 17:05:25+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/23 09:56:05-06:00 ti.com!kergoth
Fixes per the overenthusiastic sed / removal I did yesterday. Thanks to Hermann Lacheiner and Holger Schurig for spotting a couple of them, this should fix the others.
2005/02/23 16:48:08+01:00 uni-frankfurt.de!mickeyl
make the prism3-support package work
BKrev: 421cfb9f-K6bfhnkhAVPJV_fqpHn7Q
Diffstat (limited to 'packages/zmerlin')
-rw-r--r-- | packages/zmerlin/zmerlin_0.9.1.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb index aba2bf2fd6..6eab86dbd8 100644 --- a/packages/zmerlin/zmerlin_0.9.1.bb +++ b/packages/zmerlin/zmerlin_0.9.1.bb @@ -3,6 +3,7 @@ SECTION = "opie/games" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz" S = "${WORKDIR}/zmerlin" @@ -12,6 +13,6 @@ inherit palmtop do_install() { install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin install -d ${D}${palmtopdir}/ - cp -a ipk/opt/* ${D}opt + cp -a ipk/opt/* ${D}/opt } |