rpms/VirtualBox-OSE/F-16 VirtualBox-OSE-3.2.10-noansi.patch, 1.1, 1.2 VirtualBox-OSE-4.1.4-xorg17.patch, 1.1, 1.2 VirtualBox-OSE-4.1.6-strings.patch, 1.1, 1.2 VirtualBox-OSE.spec, 1.80, 1.81
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22509
Modified Files:
VirtualBox-OSE-3.2.10-noansi.patch
VirtualBox-OSE-4.1.4-xorg17.patch
VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE.spec
Log Message:
* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-2
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
VirtualBox-OSE-3.2.10-noansi.patch:
b/Config.kmk | 4 ++--
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: VirtualBox-OSE-3.2.10-noansi.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE-3.2.10-noansi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.2.10-noansi.patch 12 Nov 2010 12:47:55 -0000 1.1
+++ VirtualBox-OSE-3.2.10-noansi.patch 15 Jan 2012 00:45:57 -0000 1.2
@@ -5,6 +5,8 @@
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
+
+add by Sérgio M. B. file x11/vboxvideo/testcase/Makefile.kmk
---
Config.kmk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
@@ -31,6 +33,14 @@
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
---
-1.7.3.1
-
+--- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:46:24.695866363 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:46:38.202992949 +0000
+@@ -35,7 +35,7 @@ endif # !VBOX_ONLY_SDK
+ # tstSetModeXOrg
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+-tstSetModeXOrg_CFLAGS += -std=c99
++tstSetModeXOrg_CFLAGS += -std=gnu99
+ tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES = \
+ tstSetModeXOrg.c \
VirtualBox-OSE-4.1.4-xorg17.patch:
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++----
b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 18 +++++---
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 37 ++++++++++++++++-
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 -
4 files changed, 56 insertions(+), 17 deletions(-)
Index: VirtualBox-OSE-4.1.4-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE-4.1.4-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.4-xorg17.patch 10 Dec 2011 04:15:06 -0000 1.1
+++ VirtualBox-OSE-4.1.4-xorg17.patch 15 Jan 2012 00:45:57 -0000 1.2
@@ -27,37 +27,25 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
-
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -56,6 +56,18 @@
- endif
-
+@@ -53,9 +53,18 @@
+ mouse.c \
+ pnp.c \
+ VBoxUtils_68.c
+-endif
+-
-+ifeq ($(KBUILD_TARGET), linux)
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+vboxmouse_drv_$(XSERVER_VERSION)_TEMPLATE = VBOXGUESTR3XORGMOD
-+vboxmouse_drv_$(XSERVER_VERSION)_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
++DLLS += vboxmouse_drv_17
++vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ NO_ANSIC
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
++vboxmouse_drv_17_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
-+vboxmouse_drv_$(XSERVER_VERSION) = \
++vboxmouse_drv_17 = \
+ vboxmouse_15.c
+else
#
@@ -89,80 +77,18 @@
TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \
- # base keywords instead of using .solaris or .linux.
- # Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
-+#DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
- vboxvideo_drv_70_CFLAGS += \
-@@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
-+#DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
-@@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
-+#DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
-@@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
-+#DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
-@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
-+#DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
-@@ -192,7 +192,7 @@ endif
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
-+#DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
- vboxvideo_drv_17_INCS = \
-- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
-- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
-- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
-- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
-- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
-- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
-- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
-- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2011-12-19 12:58:57.000000000 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-01-12 03:47:06.381765975 +0000
+@@ -88,6 +88,42 @@ vboxvideo_drv_SOURCES = \
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
+
++DLLS += vboxvideo_drv_17
++vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
++vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
++ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI
++vboxvideo_drv_17_INCS = \
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
@@ -189,36 +115,34 @@
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
- vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
- vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
++vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) edid.c vboxvideo_dri.c
++
++ifdef NOT_FEDORA_VBOX_WITH_TESTCASES
-@@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
-+#DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
-+#DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ # vboxvideo_drv_70
+@@ -354,7 +390,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
-+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
---
-1.7.3.4
-
+--- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
+@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+ tstSetModeXOrg_CFLAGS += -std=c99
+-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
++tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES = \
+ tstSetModeXOrg.c \
+ ../setmode.c
+-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
++tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
+
+
+ # generate rules.
VirtualBox-OSE-4.1.6-strings.patch:
b/src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
b/src/VBox/VMM/VMMR3/VM.cpp | 9 ++++-----
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
Index: VirtualBox-OSE-4.1.6-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE-4.1.6-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.6-strings.patch 10 Dec 2011 04:15:06 -0000 1.1
+++ VirtualBox-OSE-4.1.6-strings.patch 15 Jan 2012 00:45:57 -0000 1.2
@@ -76,7 +76,7 @@
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
-+ '/sbin/udevtrigger' (as root)
++ 'systemctl restart udev-trigger.service' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- VirtualBox-OSE.spec 1 Jan 2012 11:41:31 -0000 1.80
+++ VirtualBox-OSE.spec 15 Jan 2012 00:45:58 -0000 1.81
@@ -15,7 +15,7 @@
Name: VirtualBox-OSE
Version: 4.1.8
-Release: 1%{?prerel:.%{prerel}}%{?dist}.1
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -387,8 +387,10 @@
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
- /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
- /sbin/udevadm settle >/dev/null 2>&1 || :
+# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+# /sbin/udevadm settle >/dev/null 2>&1 || :
+ systemctl restart udev-trigger.service
+ systemctl restart udev-settle.service
fi
@@ -496,6 +498,10 @@
%changelog
+* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-2
+- Try fix usb/udev problem on updates without reboot computer.
+- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
+
* Sun Jan 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.8-1.1
- Fix vboxweb-service installation
12 years, 9 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-4.1.8-gcc47.patch, NONE, 1.1
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21163
Added Files:
VirtualBox-OSE-4.1.8-gcc47.patch
Log Message:
added VirtualBox-OSE-4.1.8-gcc47.patch
VirtualBox-OSE-4.1.8-gcc47.patch:
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.8-gcc47.patch ---
add by Sérgio M. B.: Allow building with gcc-4.7 same as for gcc-4.6
From: Lubomir Rintel <lkundrak(a)v3.sk>
Subject: [PATCH] Allow building with gcc-4.6
--- a/configure
+++ b/configure
@@ -413,9 +413,9 @@ check_gcc()
elif [ $cc_maj -lt 3 \
-o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
- -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \
+ -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-o $cc_maj -gt 4 ]; then
- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<7"
+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
fail really
else
log_success "found version $cc_ver"
12 years, 9 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.2.10-noansi.patch, 1.1, 1.2 VirtualBox-OSE-4.1.4-xorg17.patch, 1.1, 1.2 VirtualBox-OSE-4.1.6-strings.patch, 1.1, 1.2 VirtualBox-OSE.spec, 1.85, 1.86
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20584
Modified Files:
VirtualBox-OSE-3.2.10-noansi.patch
VirtualBox-OSE-4.1.4-xorg17.patch
VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE.spec
Log Message:
* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
Currently broken on rawhide with xorg-x11-server-1.11.99.901-2.20120103.fc17. As mentioned on
https://bugs.freedesktop.org/show_bug.cgi?id=43235, it fix on git, so I hope that will be fix on
next build of xorg-x11-server.
VirtualBox-OSE-3.2.10-noansi.patch:
b/Config.kmk | 4 ++--
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: VirtualBox-OSE-3.2.10-noansi.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.2.10-noansi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.2.10-noansi.patch 12 Nov 2010 12:47:55 -0000 1.1
+++ VirtualBox-OSE-3.2.10-noansi.patch 15 Jan 2012 00:33:08 -0000 1.2
@@ -5,6 +5,8 @@
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
+
+add by Sérgio M. B. file x11/vboxvideo/testcase/Makefile.kmk
---
Config.kmk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
@@ -31,6 +33,14 @@
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
---
-1.7.3.1
-
+--- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:46:24.695866363 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:46:38.202992949 +0000
+@@ -35,7 +35,7 @@ endif # !VBOX_ONLY_SDK
+ # tstSetModeXOrg
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+-tstSetModeXOrg_CFLAGS += -std=c99
++tstSetModeXOrg_CFLAGS += -std=gnu99
+ tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES = \
+ tstSetModeXOrg.c \
VirtualBox-OSE-4.1.4-xorg17.patch:
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++----
b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 18 +++++---
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 37 ++++++++++++++++-
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 -
4 files changed, 56 insertions(+), 17 deletions(-)
Index: VirtualBox-OSE-4.1.4-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-4.1.4-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.4-xorg17.patch 2 Dec 2011 23:24:04 -0000 1.1
+++ VirtualBox-OSE-4.1.4-xorg17.patch 15 Jan 2012 00:33:09 -0000 1.2
@@ -27,37 +27,25 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
-
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -56,6 +56,18 @@
- endif
-
+@@ -53,9 +53,18 @@
+ mouse.c \
+ pnp.c \
+ VBoxUtils_68.c
+-endif
+-
-+ifeq ($(KBUILD_TARGET), linux)
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+vboxmouse_drv_$(XSERVER_VERSION)_TEMPLATE = VBOXGUESTR3XORGMOD
-+vboxmouse_drv_$(XSERVER_VERSION)_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
++DLLS += vboxmouse_drv_17
++vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ NO_ANSIC
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
++vboxmouse_drv_17_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
-+vboxmouse_drv_$(XSERVER_VERSION) = \
++vboxmouse_drv_17 = \
+ vboxmouse_15.c
+else
#
@@ -89,80 +77,18 @@
TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \
- # base keywords instead of using .solaris or .linux.
- # Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
-+#DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
- vboxvideo_drv_70_CFLAGS += \
-@@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
-+#DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
-@@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
-+#DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
-@@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
-+#DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
-@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_SOURCES)
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
-+#DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
-@@ -192,7 +192,7 @@ endif
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
-+#DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
- vboxvideo_drv_17_INCS = \
-- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
-- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
-- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
-- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
-- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
-- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
-- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
-- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
-- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
-- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2011-12-19 12:58:57.000000000 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-01-12 03:47:06.381765975 +0000
+@@ -88,6 +88,42 @@ vboxvideo_drv_SOURCES = \
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
+
++DLLS += vboxvideo_drv_17
++vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
++vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
++ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI
++vboxvideo_drv_17_INCS = \
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
@@ -189,36 +115,34 @@
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
- vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
- vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
++vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) edid.c vboxvideo_dri.c
++
++ifdef NOT_FEDORA_VBOX_WITH_TESTCASES
-@@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
-+#DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
-+#DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ # vboxvideo_drv_70
+@@ -354,7 +390,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
-+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
---
-1.7.3.4
-
+--- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
+@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+ tstSetModeXOrg_CFLAGS += -std=c99
+-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
++tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES = \
+ tstSetModeXOrg.c \
+ ../setmode.c
+-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
++tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
+
+
+ # generate rules.
VirtualBox-OSE-4.1.6-strings.patch:
b/src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
b/src/VBox/VMM/VMMR3/VM.cpp | 9 ++++-----
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
Index: VirtualBox-OSE-4.1.6-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-4.1.6-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.6-strings.patch 2 Dec 2011 23:24:04 -0000 1.1
+++ VirtualBox-OSE-4.1.6-strings.patch 15 Jan 2012 00:33:09 -0000 1.2
@@ -76,7 +76,7 @@
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
-+ '/sbin/udevtrigger' (as root)
++ 'systemctl restart udev-trigger.service' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- VirtualBox-OSE.spec 1 Jan 2012 11:41:31 -0000 1.85
+++ VirtualBox-OSE.spec 15 Jan 2012 00:33:09 -0000 1.86
@@ -15,7 +15,7 @@
Name: VirtualBox-OSE
Version: 4.1.8
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,6 +42,7 @@
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
+Patch21: VirtualBox-OSE-4.1.8-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -170,6 +171,7 @@
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
%patch20 -p1 -b .testmangle
+%patch21 -p1 -b .gcc47
# Remove prebuilt binary tools
rm -rf kBuild
@@ -387,8 +389,10 @@
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
- /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
- /sbin/udevadm settle >/dev/null 2>&1 || :
+# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+# /sbin/udevadm settle >/dev/null 2>&1 || :
+ systemctl restart udev-trigger.service
+ systemctl restart udev-settle.service
fi
@@ -496,6 +500,14 @@
%changelog
+* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
+- Patch to allow to build with GCC 4.7
+- Try fix usb/udev problem on updates without reboot computer.
+- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
+ Currently broken on rawhide with xorg-x11-server-1.11.99.901-2.20120103.fc17. As mentioned on
+ https://bugs.freedesktop.org/show_bug.cgi?id=43235, it fix on git, so I hope that will be fix on
+ next build of xorg-x11-server.
+
* Sun Jan 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.8-3
- Fix vboxweb-service installation
12 years, 9 months
rpms/wl-kmod/F-16 broadcom-wl-5.100.82.112-kernel-3.2.patch, NONE, 1.1 wl-kmod.spec, 1.66, 1.67
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18103
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.2.patch
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)
broadcom-wl-5.100.82.112-kernel-3.2.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.2.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.641120013 +0100
@@ -387,7 +387,11 @@
#endif
.ndo_get_stats = wl_get_stats,
.ndo_set_mac_address = wl_set_mac_address,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 42) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0))
+ .ndo_set_rx_mode = wl_set_multicast_list,
+#else
.ndo_set_multicast_list = wl_set_multicast_list,
+#endif
.ndo_do_ioctl = wl_ioctl
};
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-16/wl-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- wl-kmod.spec 9 Jan 2012 12:44:52 -0000 1.66
+++ wl-kmod.spec 11 Jan 2012 22:15:05 -0000 1.67
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-%define buildforkernels newest
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmods
Name: wl-kmod
Version: 5.100.82.112
-Release: 1%{?dist}.10
+Release: 2%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@
Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
Patch0: broadcom-wl-5.100.82.112-license.patch
+Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
BuildRequires: %{_bindir}/kmodtool
@@ -54,6 +55,7 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
+%patch1 -p1 -b .kernel-3.2
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +85,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
+- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)
+
* Mon Jan 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-1.10
- rebuild for updated kernel
12 years, 9 months
rpms/wl-kmod/F-15 wl-kmod.spec,1.74,1.75
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17228
Modified Files:
wl-kmod.spec
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1.1
- Corrected broadcom-wl-5.100.82.112-kernel-3.2.patch
12 years, 9 months
rpms/wl-kmod/F-15 broadcom-wl-5.100.82.112-kernel-3.2.patch, 1.1, 1.2
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16007
Modified Files:
broadcom-wl-5.100.82.112-kernel-3.2.patch
Log Message:
broadcom-wl-5.100.82.112-kernel-3.2.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
Index: broadcom-wl-5.100.82.112-kernel-3.2.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/broadcom-wl-5.100.82.112-kernel-3.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.100.82.112-kernel-3.2.patch 11 Jan 2012 21:45:55 -0000 1.1
+++ broadcom-wl-5.100.82.112-kernel-3.2.patch 11 Jan 2012 22:01:46 -0000 1.2
@@ -5,7 +5,7 @@
#endif
.ndo_get_stats = wl_get_stats,
.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 42) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0))
+ .ndo_set_rx_mode = wl_set_multicast_list,
+#else
.ndo_set_multicast_list = wl_set_multicast_list,
12 years, 9 months
rpms/wl-kmod/F-15 broadcom-wl-5.100.82.112-kernel-3.2.patch, NONE, 1.1 broadcom-wl-5.100.82.112-license.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wl-kmod.spec, 1.73, 1.74 5_100_82_38.patch, 1.1, NONE broadcom-wl-5.100.82.38-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14149
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-kernel-3.2.patch
broadcom-wl-5.100.82.112-license.patch
Removed Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)
broadcom-wl-5.100.82.112-kernel-3.2.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.2.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.641120013 +0100
@@ -387,7 +387,11 @@
#endif
.ndo_get_stats = wl_get_stats,
.ndo_set_mac_address = wl_set_mac_address,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
+ .ndo_set_rx_mode = wl_set_multicast_list,
+#else
.ndo_set_multicast_list = wl_set_multicast_list,
+#endif
.ndo_do_ioctl = wl_ioctl
};
broadcom-wl-5.100.82.112-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-license.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-22 18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 4 Nov 2011 00:42:42 -0000 1.10
+++ .cvsignore 11 Jan 2012 21:45:55 -0000 1.11
@@ -1,3 +1,3 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
broadcom-wl-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 4 Nov 2011 00:42:47 -0000 1.10
+++ sources 11 Jan 2012 21:45:55 -0000 1.11
@@ -1,3 +1,3 @@
-cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- wl-kmod.spec 9 Jan 2012 12:55:27 -0000 1.73
+++ wl-kmod.spec 11 Jan 2012 21:45:55 -0000 1.74
@@ -3,22 +3,22 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-%define buildforkernels newest
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmods
Name: wl-kmod
-Version: 5.100.82.38
-Release: 1%{?dist}.9
+Version: 5.100.82.112
+Release: 1%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.38-license.patch
-Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+Patch0: broadcom-wl-5.100.82.112-license.patch
+Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
BuildRequires: %{_bindir}/kmodtool
@@ -55,7 +55,7 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
+%patch1 -p1 -b .kernel-3.2
popd
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +85,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+- Updated version to 5.100.82.112
+- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)
+
* Mon Jan 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.38-1.9
- rebuild for updated kernel
--- 5_100_82_38.patch DELETED ---
--- broadcom-wl-5.100.82.38-license.patch DELETED ---
12 years, 9 months
rpms/broadcom-wl/F-15 broadcom-wl-5.100.82.112-license.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 README.txt, 1.3, 1.4 broadcom-wl-blacklist.conf, 1.3, 1.4 broadcom-wl.spec, 1.13, 1.14 sources, 1.11, 1.12 5_100_82_38.patch, 1.1, NONE broadcom-wl-5.100.82.38-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13469
Modified Files:
.cvsignore README.txt broadcom-wl-blacklist.conf
broadcom-wl.spec sources
Added Files:
broadcom-wl-5.100.82.112-license.patch
Removed Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
- Cleaned-up broadcom-wl-blacklist.conf
broadcom-wl-5.100.82.112-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-license.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-22 18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 3 Nov 2011 23:41:40 -0000 1.10
+++ .cvsignore 11 Jan 2012 21:42:49 -0000 1.11
@@ -1,5 +1,4 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-README.txt
-bcma.txt
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
broadcom-wl-blacklist.conf
+README.txt
Index: README.txt
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.txt 1 Feb 2011 22:29:12 -0000 1.3
+++ README.txt 11 Jan 2012 21:42:49 -0000 1.4
@@ -1,9 +1,10 @@
Broadcom Linux hybrid wireless driver
+Version 5.100.82.1XX
DISCLAIMER
----------
This is an Official Release of Broadcom's hybrid Linux driver for use with
-Broadcom-based hardware.
+Broadcom based hardware.
WHERE TO GET THE RELEASE
------------------------
@@ -38,32 +39,36 @@
SUPPORTED DEVICES
-----------------
The cards with the following PCI Device IDs are supported with this driver.
-Both Broadcom and and Dell product names are described. Cards not listed here
-may also work.
+Both Broadcom and and Dell product names are described. Cards not listed
+here may also work.
- BRCM PCI PCI Dell
- Product Name Vendor ID Device ID Product ID
- ------------- ---------- --------- -----------
+ BRCM PCI PCI Dell
+ Product Name Vendor ID Device ID Product ID
+ ------------- ---------- --------- -----------
4311 2.4 Ghz 0x14e4 0x4311 Dell 1390
4311 Dualband 0x14e4 0x4312 Dell 1490
- 4311 5 Ghz 0x14e4 0x4313
+ 4311 5 Ghz 0x14e4 0x4313
4312 2.4 Ghz 0x14e4 0x4315 Dell 1395
- 4313 2.4 Ghz 0x14e4 0x4727 Dell 1501
+ 4313 2.4 Ghz 0x14e4 0x4727 Dell 1501
4321 Dualband 0x14e4 0x4328 Dell 1505
4321 Dualband 0x14e4 0x4328 Dell 1500
4321 2.4 Ghz 0x14e4 0x4329
4321 5 Ghz 0x14e4 0x432a
- 4322 Dualband 0x14e4 0x432b Dell 1510
+ 4322 Dualband 0x14e4 0x432b Dell 1510
4322 2.4 Ghz 0x14e4 0x432c
4322 5 Ghz 0x14e4 0x432d
43224 Dualband 0x14e4 0x4353 Dell 1520
43225 2.4 Ghz 0x14e4 0x4357
- 43227 2.4 Ghz 0x14e4 0x4358
- 43228 Dualband 0x14e4 0x4359 Dell 1530
+ 43227 2.4 Ghz 0x14e4 0x4358
+ 43228 Dualband 0x14e4 0x4359 Dell 1530
To find the Device ID's of Broadcom cards on your machines do:
# lspci -n | grep 14e4
+NOTABLE CHANGES
+---------------
+ Added Cfg80211 support (described below)
+ Added Monitor mode (described below)
REQUIREMENTS
------------
@@ -73,7 +78,6 @@
package and varies from distro to distro. Consult the documentation for
your specific OS.
-
If you cannot successfully build a module that comes with your distro's
kernel developer or kernel source package, you will not be able to build
this module either.
@@ -102,13 +106,13 @@
------------------
1. Setup the directory by untarring the proper tarball:
-For 32 bit: hybrid-portsrc_x86-32_v5.100.82.38.tar.gz
-For 64 bit: hybrid-portsrc_x86-64_v5.100.82.38.tar.gz
+For 32 bit: hybrid-portsrc.tar.gz
+For 64 bit: hybrid-portsrc-x86_64.tar.gz
Example:
# mkdir hybrid_wl
# cd hybrid_wl
-# tar xzf <path>/hybrid-portsrc_x86-32_v5.100.82.38.tar.gz
+# tar xzf <path>/hybrid-portsrc.tar or <path>/hybrid-portsrc-x86_64.tar.gz
2. Build the driver as a Linux loadable kernel module (LKM):
@@ -121,6 +125,15 @@
If your driver does not build, check to make sure you have installed the
kernel package described in the requirements above.
+This driver now supports the new linux cfg80211 wireless configuration API in
+addition to the older Wireless Extensions (Wext). The makefile will
+automaticly build the right version for your system but it can be
+overridden if needed:
+
+# make API=WEXT
+ or
+# make API=CFG80211
+
INSTALL INSTRUCTIONS
--------------------
@@ -143,26 +156,28 @@
------------------
1: Remove any other drivers for the Broadcom wireless device.
-There are several open source drivers that are used to drive Broadcom 802.11
-chips such as b43 and ssb. They will conflict with this driver and need
-to be uninstalled before this driver can be installed. Any previous
-revisions of the wl driver also need to be removed.
+There are several other drivers (besides this one) that can drive
+Broadcom 802.11 chips such as b43, bcma and ssb. They will conflict with
+this driver and need to be uninstalled before this driver can be installed.
+Any previous revisions of the wl driver also need to be removed.
Note: On some systems such as Ubuntu 9.10, the ssb module may load during
boot even though it is blacklisted (see note under Common Issues on how to
-resolve this). Nevertheless, ssb still must be removed
+resolve this. Nevertheless, ssb still must be removed
(by hand or script) before wl is loaded. The wl driver will not function
properly if ssb the module is loaded.
-# lsmod | grep "b43\|ssb\|wl"
+# lsmod | grep "b43\|ssb\|bcma\|wl"
If any of these are installed, remove them:
# rmmod b43
# rmmod ssb
+# rmmod bcma
# rmmod wl
To blacklist these drivers and prevent them from loading in the future:
# echo "blacklist ssb" >> /etc/modprobe.d/blacklist.conf
+# echo "blacklist bcma" >> /etc/modprobe.d/blacklist.conf
# echo "blacklist b43" >> /etc/modprobe.d/blacklist.conf
2: Insmod the driver.
@@ -176,6 +191,11 @@
or
# modprobe ieee80211_crypt_tkip
+If your using the cfg80211 version of the driver, then cfg80211 needs to be
+loaded:
+
+# modprobe cfg80211
+
Then:
# insmod wl.ko
@@ -183,38 +203,42 @@
Manager to notice a new network driver has been installed and show the
surrounding wireless networks.
+If there was an error, see Common issues below.
+
Common issues:
----------------
-
* After the insmod you may see this message:
- "WARNING: modpost: missing MODULE_LICENSE()"
+ WARNING: modpost: missing MODULE_LICENSE()
It is expected, not harmful and can be ignored.
-* You might see this message:
+* If you see this message:
+
"insmod: error inserting 'wl.ko': -1 Unknown symbol in module"
- Usually this means that the wlan security module (as mentioned above) is
+
+ Usually this means that one of the required modules (as mentioned above) is
not loaded. Try this:
- # modprobe lib80211
- or
- # modprobe ieee80211_crypt_tkip
- and then re-try to insmod the wl driver.
+ # modprobe lib80211 or ieee80211_crypt_tkip (depending on your os)
+ # modprobe cfg80211
+
+ Now re-try to insmod the wl driver:
# insmod wl.ko
-
+
* If the wl driver loads but doesn't seem to do anything:
the ssb module may be the cause. Sometimes blacklisting ssb may not
be enough to prevent it from loading and it loads anyway. (This is mostly
seen on Ubuntu/Debian systems).
- Check to see if ssb, wl or b43 is loaded:
- # lsmod | grep "b43\|ssb\|wl"
+ Check to see if ssb, bcma, wl or b43 is loaded:
+ # lsmod | grep "ssb\|wl\|b43\|bcma"
If any of these are installed, remove them:
- # rmmod b43
# rmmod ssb
+ # rmmod bcma
# rmmod wl
+ # insmod wl
- Back up the current boot ramfs and generate a new one.
- # cp /boot/initrd.img-`uname -r` somewheresafe
+ Back up the current boot ramfs and generate a new one:
+ # cp /boot/initrd.img-`uname -r` somewheresafe
# update-initramfs -u
# reboot
@@ -248,65 +272,66 @@
Internally, the actual tx power is always kept within regulatory limits
no matter what the user request is set to.
-WHAT'S NEW IN RELEASE 5.100.82.38
----------------------------------
-+ Support for bcm43227 and bcm43228
-+ Fix for issue where iwconfig was sometime reporting rate incorrectly
-+ Supports rfkill in kernels 2.6.31 to 2.6.36
-+ Supports scan complete event (SIOCGIWSCAN)
-+ Adds EAGAIN (busy signal) to query of scan results
-WHAT'S NEW IN RELEASE 5.100.57.15
----------------------------------
-+ Following fixes (issues introduced in 5.100.57.13)
- Issue #87477 - 4313: DUT is not able to associate in WPA2-PSK TKIP/AES
- Issue #87533 - NetworkManager: 4313: Unable to associate to APs with WPA2-PSK
-
-WHAT'S NEW IN RELEASE 5.100.57.13
----------------------------------
-+ 4313 PHY fixes to improve throughput stability at different ranges
-+ Fix for interop issues with different APs
-+ Fix for hangs seen during Fn-F2 sequence
-- Support for rfkill in kernels 2.6.31 to 2.6.36
-
-WHAT'S NEW IN RELEASE 5.60.246.6
---------------------------------
-+ Supports rfkill in kernels 2.6.31 to 2.6.36
-+ Fix for compile error with multicast list in kernel 2.6.34
-+ Fix for #76743 - Ubuntu9.04: Network manager displays n/w's with radio disabled
-
-WHAT'S NEW IN RELEASE 5.60.246.2
---------------------------------
-+ Supports up to linux kernel 2.6.36 (from 2.6.32)
-+ Fix for #86668: [Canonical] Bug #611575/617369: System will hang if
- you use the F2 hot key to enable/disable wireless quickly while
- wireless is still in the process of re-association with AP
-
-WHAT'S NEW IN RELEASE 5.60.48.36
---------------------------------
-+ Supports up to linux kernel 2.6.32
+ISSUES FIXED AND WHAT'S NEW IN THIS RELEASE
+-------------------------------------------
++ Added cfg80211 API support. The choice of API is done at compile time. If
+kernel version >= 2.6.32, cfg80211 is used, otherwise wireless extension
+is used. (End users should notice little difference.)
++ Supports Linux kernel 2.6.38
++ Fix for problem with rebooting while wireless disabled via airline switch.
++ Fixed a kernel panic observed on some 64-bit systems
+
+HOW TO USE MONITOR MODE
+-----------------------
+To enable monitor mode:
+$ echo 1 > /proc/brcm_monitor0
+
+Enabling monitor mode will create a 'prism0' network interface. Wireshark and
+other netwokk tools can use this new prism0 interface.
+
+To disable monitor mode:
+$ echo 0 > /proc/brcm_monitor0
+
+
+ISSUES FIXED AND WHAT'S NEW IN RECENT RELEASES
+-------------------------------------------
++ Supports monitor mode
++ Supports cfg80211
+ Supports hidden networks
-+ Supports rfkill in kernels < 2.6.31
-+ Setting power level via 'iwconfig eth1 txpower X' now operational
-+ Support for bcm4313
-+ Additional channels in both 2.4 and 5 Ghz bands
-+ Fixed issue with tkip group keys that caused this message to repeat often:
- TKIP: RX tkey->key_idx=2 frame keyidx=1 priv=ffff8800cf80e840
-+ Following fixes
- Issue #72216 - Ubuntu 8.04: standby/resume with WPA2 and wpa_supplicant causes
- a continuous assoc/disassoc loop (issue in 2.6.24 kernel)
- Issue #72324 - Ubuntu 8.04: cannot ping when Linux STA is IBSS creator with WEP
- Issue #76739 - Ubuntu 9.04: unable to connect to hidden network after stdby/resume
- Issue #80392 - S4 resume hang with SuSE SLED 11 and 43225
- Issue #80792 - LSTA is not able to associate to AP with transition from AES to TKIP encryption
++ Supports rfkill
+
KNOWN ISSUES AND LIMITATIONS
----------------------------
#72238 - 20% lower throughput on channels 149, 153, 157, and 161
-#76793 - Ubuntu9.04: STA fails to create IBSS network in 5 Ghz band
-#81392 - Unable to transfer data over ad-hoc network created by NetworkManager (iwconfig OK)
-#81452 - STA unable to associate to AP when PEAPv1-MSCHAPv2 authentication is used
-#87531 - WPASUP: 4313: WPA Supplicant crashes when trying to connect to 802.1x
+#72324 - Ubuntu 8.04: cannot ping when Linux STA is IBSS creator with WEP
+enabled
+#72216 - Ubuntu 8.04: standby/resume with WPA2 and wpa_supplicant causes
+a continuous assoc/disassoc loop (issue with wpa_supplicant, restarting
+wpa_supplicant fixes the issue)
+#76739 Ubuntu9.04: unable to connect to hidden network after stdby/resume
+#76793 Ubuntu9.04: STA fails to create IBSS network in 5 Ghz band
+
+
+KNOWN ISSUES AND LIMITATIONS IN EXTERNAL COMPONENTS
+----------------------------
+
+wpa_supplicant 0.6.3 + nl80211 + WEP - (Note: This would only affect you if
+you are using wpa_supplicant directly from the command line and specify
+nl80211 interface, e.g. "wpa_supplicant -Dnl80211 -ieth1 ..". If you are using
+network manager GUI to connect it should work file.)
+wpa_supplicant 0.6.3 might have a bug that affect WEP connections created
+through nl80211. Upgrade to wpa_supplicant to 0.7.3 would solve this problem.
+
+Ubuntu 10.10 kernel + nl80211 + WPA/WPA2 - (Note: This would only affect you if
+you are using wpa_supplicant directly from the command line and specify
+nl80211 interface, e.g. "wpa_supplicant -Dnl80211 -ieth1 ..". If you are using
+network manager GUI to connect it should work file.)
+Some kernel versions of Ubuntu such as 2.6.35-22 (released with Ubuntu
+10.10) may have problems that affect WPA/WPA2 connections created through
+nl80211. Upgrade to 2.6.35-25 or later should solve this problem.
+
HOW TO INSTALL A PRE-COMPILED DRIVER
-----------------------------------
Index: broadcom-wl-blacklist.conf
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl-blacklist.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- broadcom-wl-blacklist.conf 16 Nov 2011 11:14:58 -0000 1.3
+++ broadcom-wl-blacklist.conf 11 Jan 2012 21:42:49 -0000 1.4
@@ -1,7 +1,5 @@
# modules blacklisted for broadcom-wl
-blacklist bcm43xx
blacklist ssb
-blacklist b43
-blacklist ndiswrapper
blacklist bcma
+blacklist b43
blacklist brcmsmac
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- broadcom-wl.spec 16 Nov 2011 11:14:58 -0000 1.13
+++ broadcom-wl.spec 11 Jan 2012 21:42:49 -0000 1.14
@@ -1,17 +1,15 @@
Name: broadcom-wl
-Version: 5.100.82.38
-Release: 2%{?dist}
+Version: 5.100.82.112
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
-Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
-Patch0: broadcom-wl-5.100.82.38-license.patch
-Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+Patch0: broadcom-wl-5.100.82.112-license.patch
BuildArch: noarch
Provides: wl-kmod-common = %{version}
@@ -30,10 +28,9 @@
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
-cp -p %{SOURCE2} %{SOURCE4} .
-chmod 644 lib/LICENSE.txt README.txt bcma.txt
+cp -p %{SOURCE2} .
+chmod 644 lib/LICENSE.txt README.txt
%patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
%build
echo "Nothing to build."
@@ -48,10 +45,14 @@
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt bcma.txt
+%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+- Updated version to 5.100.82.112
+- Cleaned-up broadcom-wl-blacklist.conf
+
* Wed Nov 16 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-2
- Added brcmsmac to broadcom-wl-blacklist.conf
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 16 Nov 2011 11:14:58 -0000 1.11
+++ sources 11 Jan 2012 21:42:49 -0000 1.12
@@ -1,5 +1,4 @@
-cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-24976921c7b8854ed2cd56fbc5b1c13c README.txt
-521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
-c655110a94f44daab8192831cb6a4161 broadcom-wl-blacklist.conf
+62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+24e1e33923375ce9ad4c049f27286fd9 broadcom-wl-blacklist.conf
+6fd54aac59a53559d01520f35500693b README.txt
--- 5_100_82_38.patch DELETED ---
--- broadcom-wl-5.100.82.38-license.patch DELETED ---
12 years, 9 months
rpms/ndiswrapper-kmod/devel ndiswrapper-kmod-nomodinfo.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.51, 1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10210/devel
Modified Files:
ndiswrapper-kmod.spec
Added Files:
ndiswrapper-kmod-nomodinfo.patch
Log Message:
Remove modinfo requirement
ndiswrapper-kmod-nomodinfo.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ndiswrapper-kmod-nomodinfo.patch ---
diff -up ndiswrapper-1.57/driver/Makefile.orig ndiswrapper-1.57/driver/Makefile
--- ndiswrapper-1.57/driver/Makefile.orig 2012-01-11 22:04:35.103054918 +0100
+++ ndiswrapper-1.57/driver/Makefile 2012-01-11 22:06:37.880672013 +0100
@@ -192,8 +192,8 @@ clean:
rm -rf .tmp_versions
install: config_check $(MODULE)
- @/sbin/modinfo $(MODULE) | grep -q "^vermagic: *$(KVERS) " || \
- { echo "$(MODULE)" is not for Linux $(KVERS); exit 1; }
+ #@/sbin/modinfo $(MODULE) | grep -q "^vermagic: *$(KVERS) " || \
+ # { echo "$(MODULE)" is not for Linux $(KVERS); exit 1; }
mkdir -p -m 755 $(DESTDIR)$(INST_DIR)
install -m 0644 $(MODULE) $(DESTDIR)$(INST_DIR)
ifndef DESTDIR
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ndiswrapper-kmod.spec 11 Jan 2012 14:37:55 -0000 1.51
+++ ndiswrapper-kmod.spec 11 Jan 2012 21:20:28 -0000 1.52
@@ -16,6 +16,7 @@
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?_rc}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
+Patch0: ndiswrapper-kmod-nomodinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -45,9 +46,9 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
# go
%setup -q -c -T -a 0 -n %{name}-%{version}%{?_rc}
-#(cd ndiswrapper-%{version} ;
-#Nothing to patch
-#)
+(cd ndiswrapper-%{version} ;
+%patch0 -p1 -b .orig
+)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?_rc}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
cp -a ndiswrapper-%{version}%{?_rc} _kmod_build_${kernel_version%%___*}
12 years, 9 months
rpms/ndiswrapper-kmod/F-16 ndiswrapper-kmod-nomodinfo.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.60, 1.61
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10210/F-16
Modified Files:
ndiswrapper-kmod.spec
Added Files:
ndiswrapper-kmod-nomodinfo.patch
Log Message:
Remove modinfo requirement
ndiswrapper-kmod-nomodinfo.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ndiswrapper-kmod-nomodinfo.patch ---
diff -up ndiswrapper-1.57/driver/Makefile.orig ndiswrapper-1.57/driver/Makefile
--- ndiswrapper-1.57/driver/Makefile.orig 2012-01-11 22:04:35.103054918 +0100
+++ ndiswrapper-1.57/driver/Makefile 2012-01-11 22:06:37.880672013 +0100
@@ -192,8 +192,8 @@ clean:
rm -rf .tmp_versions
install: config_check $(MODULE)
- @/sbin/modinfo $(MODULE) | grep -q "^vermagic: *$(KVERS) " || \
- { echo "$(MODULE)" is not for Linux $(KVERS); exit 1; }
+ #@/sbin/modinfo $(MODULE) | grep -q "^vermagic: *$(KVERS) " || \
+ # { echo "$(MODULE)" is not for Linux $(KVERS); exit 1; }
mkdir -p -m 755 $(DESTDIR)$(INST_DIR)
install -m 0644 $(MODULE) $(DESTDIR)$(INST_DIR)
ifndef DESTDIR
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-16/ndiswrapper-kmod.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ndiswrapper-kmod.spec 11 Jan 2012 14:36:17 -0000 1.60
+++ ndiswrapper-kmod.spec 11 Jan 2012 21:20:28 -0000 1.61
@@ -16,6 +16,7 @@
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?_rc}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
+Patch0: ndiswrapper-kmod-nomodinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -45,9 +46,9 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
# go
%setup -q -c -T -a 0 -n %{name}-%{version}%{?_rc}
-#(cd ndiswrapper-%{version} ;
-#Nothing to patch
-#)
+(cd ndiswrapper-%{version} ;
+%patch0 -p1 -b .orig
+)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?_rc}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
cp -a ndiswrapper-%{version}%{?_rc} _kmod_build_${kernel_version%%___*}
12 years, 9 months