diff options
| author |   Phil Blundell <philb@gnu.org> | 2005-03-05 23:59:04 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2005-03-05 23:59:04 +0000 |
| commit | a9cb2b5c2a6120a98d108828e8f7e37ba4c95567 (patch) | |
| tree | d06ba5406db167201dcd74a2b41f017c71522050 /packages/dri | |
| parent | b692b2c25df5b073d8747cd44800133957def797 (diff) | |
| download | openembedded-a9cb2b5c2a6120a98d108828e8f7e37ba4c95567.tar.gz | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe
2005/03/05 23:58:46+00:00 nexus.co.uk!pb
update drm packaging to suit latest cvs version
BKrev: 422a47c8aFBbw60pvvFKU7OWnkkbhA
Diffstat (limited to 'packages/dri')
| -rw-r--r-- | packages/dri/config.patch | 10 | ||||
| -rw-r--r-- | packages/dri/drm_cvs.bb | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/packages/dri/config.patch b/packages/dri/config.patch index e69de29bb2..cec39b0073 100644 --- a/packages/dri/config.patch +++ b/packages/dri/config.patch @@ -0,0 +1,10 @@ +--- dri/shared-core/drm.h.old 2004-09-14 21:42:45.000000000 +0100 ++++ dri/shared-core/drm.h 2004-09-14 21:42:47.000000000 +0100 +@@ -38,7 +38,6 @@ + #define _DRM_H_ + + #if defined(__linux__) +-#include <linux/config.h> + #include <asm/ioctl.h> /* For _IO* macros */ + #define DRM_IOCTL_NR(n) _IOC_NR(n) + #define DRM_IOC_VOID _IOC_NONE diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 4bf3a38402..c12b2b8269 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -13,11 +13,18 @@ do_compile() { } do_stage() { - oe_libinstall -a -C libdrm libxf86drm ${STAGING_LIBDIR} + oe_libinstall -so -C libdrm libdrm ${STAGING_LIBDIR} for i in xf86drmCompat.h xf86drm.h; do install -m 0644 libdrm/$i ${STAGING_INCDIR} done for i in drm.h; do - install -m 0644 shared/$i ${STAGING_INCDIR} + install -m 0644 shared-core/$i ${STAGING_INCDIR} done } + +do_install() { + install -d ${D}${includedir} + install -d ${D}/lib + oe_runmake -C libdrm DESTDIR="${D}" install +} + |