diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2007-10-03 01:05:00 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2007-10-03 01:05:00 +0000 |
| commit | 3abbbc8df189436fce86546def220fdc027221aa (patch) | |
| tree | b7a418e10fdc7b2b1852be6a3e6aa4c063de2021 | |
| parent | c682389deb5384a1a18c9755376b0d255a9c3482 (diff) | |
| parent | a6e66709133c6393bea82160a4a6a648e37de708 (diff) | |
merge of '9b11d89eb867c4452963750a9d48fa45c70d0de6'
and 'd3bdc1b5bee60534f5a4180d1fb74d09b59c68a4'
4 files changed, 8 insertions, 7 deletions
diff --git a/packages/wifistix/wifistix-modules/marvell-devicename.patch b/packages/wifistix/wifistix-modules/marvell-devicename.patch index 4846b0947a..62ebe89883 100644 --- a/packages/wifistix/wifistix-modules/marvell-devicename.patch +++ b/packages/wifistix/wifistix-modules/marvell-devicename.patch @@ -5,7 +5,7 @@ if (!(dev = init_etherdev(dev, sizeof(wlan_private)))) { #else - if (!(dev = alloc_etherdev(sizeof(wlan_private)))) { -+ if (!(dev = alloc_netdev(sizeof(wlan_private), "mwlan%d", ether_setup))) { ++ if (!(dev = alloc_netdev(sizeof(wlan_private), "wlan%d", ether_setup))) { #endif PRINTM(MSG, "Init ethernet device failed!\n"); return NULL; diff --git a/packages/wifistix/wifistix-modules/wifistix.conf b/packages/wifistix/wifistix-modules/wifistix.conf index b232463975..117d8a2281 100644 --- a/packages/wifistix/wifistix-modules/wifistix.conf +++ b/packages/wifistix/wifistix-modules/wifistix.conf @@ -1,4 +1,4 @@ install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs -alias mwlan0 mcf25 +alias wlan0 mcf25 diff --git a/packages/wifistix/wifistix-modules_5.0.16.p0.bb b/packages/wifistix/wifistix-modules_5.0.16.p0.bb index 2682ae6cbc..923f24e27a 100644 --- a/packages/wifistix/wifistix-modules_5.0.16.p0.bb +++ b/packages/wifistix/wifistix-modules_5.0.16.p0.bb @@ -25,10 +25,10 @@ S = "${WORKDIR}/src_cf8385" inherit module-base -EXTRA_OEMAKE = "CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \ - KERNELDIR=${KERNEL_SOURCE} ARCH=${TARGET_ARCH} \ - CC=${KERNEL_CC} EXTRA_CFLAGS=${CFLAGS} \ - INSTALL_MOD_PATH="${D}" +EXTRA_OEMAKE = 'CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \ + KERNELDIR="${KERNEL_SOURCE}" ARCH="${TARGET_ARCH}" \ + CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" \ + INSTALL_MOD_PATH="${D}"' do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb index 8ed650266b..26f8666076 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb @@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate" PROVIDES = "virtual/xserver" PE = "1" -PR = "r2" +PR = "r3" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ @@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://kdrive-vidmemarea.patch;patch=1 \ file://kdrive-imageon.patch;patch=1 \ file://xcalibrate_coords.patch;patch=1 \ + file://enable-builtin-fonts.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" |