Message ID | 1309789333-19985-2-git-send-email-apw@canonical.com |
---|---|
State | New |
Headers | show |
On 04.07.2011 16:22, Andy Whitcroft wrote: > From: Tim Gardner <tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/805494 > > The makefile for this module is hideaous. It checkes the build host kernel > version in order to determine which driver version should be built. Since > we know it will only _ever_ be built for 2.6/3.0, then just shortcut > the ifeq(). > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > ubuntu/rtl8192se/Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/ubuntu/rtl8192se/Makefile b/ubuntu/rtl8192se/Makefile > index 0f2c735..6ad0730 100755 > --- a/ubuntu/rtl8192se/Makefile > +++ b/ubuntu/rtl8192se/Makefile > @@ -4,7 +4,7 @@ CC = gcc > KVER := $(shell uname -r) > MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ > > -ifeq ($(shell uname -r|cut -d. -f1,2), 2.6) > +ifeq (1,1) > ###################### KERNEL 2.6 ################################ > ifeq ($(NIC_SELECT),RTL8192CE) > sub_folder = rtl8192c Seems to be the appropriate action, given that the code will always be part of a 2.6 kernel build that way. I guess the successful build after that change is proof enough that KVER is not getting in our way somewhere? Acked-by: Stefan Bader <stefan.bader@canonical.com>
On 07/04/2011 08:22 AM, Andy Whitcroft wrote: > From: Tim Gardner<tim.gardner@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/805494 > > The makefile for this module is hideaous. It checkes the build host kernel > version in order to determine which driver version should be built. Since > we know it will only _ever_ be built for 2.6/3.0, then just shortcut > the ifeq(). > > Signed-off-by: Tim Gardner<tim.gardner@canonical.com> > Signed-off-by: Andy Whitcroft<apw@canonical.com> > --- > ubuntu/rtl8192se/Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/ubuntu/rtl8192se/Makefile b/ubuntu/rtl8192se/Makefile > index 0f2c735..6ad0730 100755 > --- a/ubuntu/rtl8192se/Makefile > +++ b/ubuntu/rtl8192se/Makefile > @@ -4,7 +4,7 @@ CC = gcc > KVER := $(shell uname -r) > MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ > > -ifeq ($(shell uname -r|cut -d. -f1,2), 2.6) > +ifeq (1,1) > ###################### KERNEL 2.6 ################################ > ifeq ($(NIC_SELECT),RTL8192CE) > sub_folder = rtl8192c no brainer. Acked-by: Tim Gardner <tim.gardner@canonical.com>
diff --git a/ubuntu/rtl8192se/Makefile b/ubuntu/rtl8192se/Makefile index 0f2c735..6ad0730 100755 --- a/ubuntu/rtl8192se/Makefile +++ b/ubuntu/rtl8192se/Makefile @@ -4,7 +4,7 @@ CC = gcc KVER := $(shell uname -r) MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ -ifeq ($(shell uname -r|cut -d. -f1,2), 2.6) +ifeq (1,1) ###################### KERNEL 2.6 ################################ ifeq ($(NIC_SELECT),RTL8192CE) sub_folder = rtl8192c