blob42/tenku
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Most recent version (with module parameters)

Browse Source 
Fixed an issue with inspecting a base image
This commit is contained in:
gdm85 2015-11-24 10:58:13 +01:00
parent 49d951e855
commit 7a92ae8858
3 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker/scripts/build-macos121-wily-kernel.sh
View File

@ -24,30 +24,6 @@ make wily
cd ../ubuntu-kernelbuilder
cat<<EOF > patches/macos-121-btusb-fix.patch
--- a/drivers/bluetooth/btusb.c 2015-10-28 14:52:20.466644715 +0000
+++ b/drivers/bluetooth/btusb.c 2015-10-28 14:52:34.715107143 +0000
@@ -2657,7 +2657,7 @@
BT_DBG("intf %p id %p", intf, id);
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != 2)
return -ENODEV;
if (!id->driver_info) {
@@ -2827,7 +2827,7 @@
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 1);
+ data->isoc = usb_ifnum_to_if(data->udev, 3);
}
if (!reset)
EOF
make wily linux-image-wily
echo "Linux kernel .deb packages are now available in packages/"

44
docker/ubuntu-kernelbuilder/patches/add-module-parms.patch Normal file
View File

@ -0,0 +1,44 @@
--- a/drivers/bluetooth/btusb.c 2015-11-24 09:53:01.230539986 +0000
+++ b/drivers/bluetooth/btusb.c 2015-11-24 09:54:32.598314339 +0000
@@ -38,6 +38,9 @@
static bool disable_scofix;
static bool force_scofix;
+static int probe_interface = 2;
+static int usb_interface = 3;
+
static bool reset = true;
static struct usb_driver btusb_driver;
@@ -2657,7 +2660,7 @@
BT_DBG("intf %p id %p", intf, id);
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 2)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != probe_interface)
return -ENODEV;
if (!id->driver_info) {
@@ -2827,7 +2830,7 @@
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 3);
+ data->isoc = usb_ifnum_to_if(data->udev, usb_interface);
}
if (!reset)
@@ -3057,6 +3060,12 @@
module_param(force_scofix, bool, 0644);
MODULE_PARM_DESC(force_scofix, "Force fixup of wrong SCO buffers size");
+module_param(probe_interface, int, 0644);
+MODULE_PARM_DESC(probe_interface, "Interface to probe");
+
+module_param(usb_interface, int, 0644);
+MODULE_PARM_DESC(probe_interface, "USB interface to use");
+
module_param(reset, bool, 0644);
MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");

21
docker/ubuntu-kernelbuilder/patches/macos-121-btusb-fix.patch
View File

@ -1,21 +0,0 @@
--- a/drivers/bluetooth/btusb.c 2015-10-28 14:52:20.466644715 +0000
+++ b/drivers/bluetooth/btusb.c 2015-10-28 14:52:34.715107143 +0000
@@ -2657,7 +2657,7 @@
BT_DBG("intf %p id %p", intf, id);
/* interface numbers are hardcoded in the spec */
- if (intf->cur_altsetting->desc.bInterfaceNumber != 0)
+ if (intf->cur_altsetting->desc.bInterfaceNumber != 2)
return -ENODEV;
if (!id->driver_info) {
@@ -2827,7 +2827,7 @@
data->isoc = NULL;
} else {
/* Interface numbers are hardcoded in the specification */
- data->isoc = usb_ifnum_to_if(data->udev, 1);
+ data->isoc = usb_ifnum_to_if(data->udev, 3);
}
if (!reset)