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

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

2004/12/05 18:42:23+00:00 nexus.co.uk!pb
fix up linux-input for latest cvs

BKrev: 41b356a4OqwH3zb7EtNlWvXnZ1nMSw

diff --git a/linux-input/linux-input_cvs.oe b/linux-input/linux-input_cvs.oe
index e44714d..6b0f3bc 100644 (file)
--- a/linux-input/linux-input_cvs.oe
+++ b/linux-input/linux-input_cvs.oe
@@ -1,5 +1,6 @@
 SECTION = "unknown"
 PR = "r1"
+PV = "0.0cvs${CVSDATE}"
 
 SRC_URI = "cvs://anonymous@cvs1.sourceforge.net/cvsroot/linuxconsole;module=ruby \
        file://serio.h \
@@ -10,7 +11,7 @@ inherit module-base
 
 S = "${WORKDIR}/ruby/utils"
 
-CFLAGS =+ "-I."
+CFLAGS =+ "-I. -I../linux/include -I../ruby-2.6/include"
 
 do_configure() {
        install -d linux

diff --git a/linux-input/makefile.patch b/linux-input/makefile.patch
index ca605a3..6499372 100644 (file)
--- a/linux-input/makefile.patch
+++ b/linux-input/makefile.patch
@@ -1,11 +1,11 @@
---- Makefile.old       2004-10-09 22:58:10.000000000 +0100
-+++ Makefile   2004-10-09 22:58:27.000000000 +0100
+--- Makefile.old       2004-12-05 18:33:23.000000000 +0000
++++ Makefile   2004-12-05 18:33:42.000000000 +0000
 @@ -32,8 +32,7 @@
  CC            = gcc
  CFLAGS                = -g -O2 -Wall -I../linux/include
  
 -PROGRAMS      = evtest inputattach jstest jscal fftest ffmvforce ffset \
--                ffcfstress acceltest
+-                ffcfstress # acceltest
 +PROGRAMS      = evtest inputattach jstest jscal fftest
  
  compile: $(PROGRAMS)