From: Arne Fitzenreiter Date: Sat, 4 Aug 2012 14:32:42 +0000 (+0200) Subject: compat-wireless: fix xen build. X-Git-Tag: v2.13-beta1~313 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064f9fdb8009a89f9165ec82a0b0cec5eee2cac1;p=ipfire-2.x.git compat-wireless: fix xen build. --- diff --git a/lfs/compat-wireless b/lfs/compat-wireless index cf49332c11..63d0ab0709 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -28,6 +28,10 @@ VERSUFIX=ipfire$(KCFG) VER = 3.5-1-snpc +ifeq "$(KCFG)" "-xen" + KVER = 2.6.32.59 +endif + THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 DL_FROM = $(URL_IPFIRE) @@ -93,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch # uAP will not build with xen-kernel (2.6) -ifneq "$(KCFG)" "xen" +ifneq "$(KCFG)" "-xen" cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk endif diff --git a/make.sh b/make.sh index 9334955b3f..add76a2a3f 100755 --- a/make.sh +++ b/make.sh @@ -387,7 +387,7 @@ buildipfire() { # ipfiremake mISDN KCFG="-xen" # ipfiremake dahdi KCFG="-xen" KMOD=1 ipfiremake cryptodev KCFG="-xen" -# ipfiremake compat-wireless KCFG="-xen" + ipfiremake compat-wireless KCFG="-xen" # ipfiremake r8169 KCFG="-xen" # ipfiremake r8168 KCFG="-xen" # ipfiremake r8101 KCFG="-xen"