From f005982a87edeab963f18454a871a34abb65c2cc Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 10 Jun 2005 08:40:12 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/10 10:39:39+02:00 utwente.nl!koen xserver-kdrive_20050207.bb: tweak PV, do 'rm x*20050207*.ipk' in your deploydir/feeds to unconfuse ipkg-imake-index -m 2005/06/10 10:26:15+02:00 utwente.nl!koen Add xextensions snapshot to match the kdrive snapshot 2005/06/10 10:24:21+02:00 utwente.nl!koen Add new kdrive snapshot, requires a new xextensions too 2005/06/10 10:13:33+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/10 10:13:13+02:00 utwente.nl!koen xserver-kdrive_cvs.bb: refresh patches BKrev: 42a951ecRTPtvMM-0QyPgMkUJgP7tg --- packages/xextensions/xextensions_20050610.bb | 0 packages/xserver/xserver-kdrive_20050207.bb | 5 ++++- packages/xserver/xserver-kdrive_20050610.bb | 0 packages/xserver/xserver-kdrive_cvs.bb | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 packages/xextensions/xextensions_20050610.bb create mode 100644 packages/xserver/xserver-kdrive_20050610.bb (limited to 'packages') diff --git a/packages/xextensions/xextensions_20050610.bb b/packages/xextensions/xextensions_20050610.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb index f7691a6038..3802ad8b8b 100644 --- a/packages/xserver/xserver-kdrive_20050207.bb +++ b/packages/xserver/xserver-kdrive_20050207.bb @@ -1,3 +1,6 @@ +PV = "0.0cvs${FIXEDCVSDATE}" +FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" + LICENSE = "MIT" DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext" PROVIDES = "virtual/xserver" @@ -29,7 +32,7 @@ FILES_xserver-kdrive-i810 = "${bindir}/Xi810" FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${PV} \ +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \ file://kmode.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" diff --git a/packages/xserver/xserver-kdrive_20050610.bb b/packages/xserver/xserver-kdrive_20050610.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb index 3cadddd29e..cbea0c136c 100644 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ b/packages/xserver/xserver-kdrive_cvs.bb @@ -32,7 +32,6 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver \ file://kmode.patch;patch=1 \ - file://epson.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1" SRC_URI_append_ramses = " file://onlyfb.patch;patch=1" -- cgit v1.2.3