diff --git a/repos/dde_linux/patches/usb_hid_evdev.patch b/repos/dde_linux/patches/usb_hid_evdev.patch deleted file mode 100644 index 1c1d039cc3..0000000000 --- a/repos/dde_linux/patches/usb_hid_evdev.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c -index c81c79d..a31b866 100644 ---- a/drivers/input/evdev.c -+++ b/drivers/input/evdev.c -@@ -1425,6 +1425,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, - if (error) - goto err_cleanup_evdev; - -+ evdev_open_device(evdev); - return 0; - - err_cleanup_evdev: -@@ -1445,6 +1446,7 @@ static void evdev_disconnect(struct input_handle *handle) - evdev_cleanup(evdev); - input_free_minor(MINOR(evdev->dev.devt)); - input_unregister_handle(handle); -+ mutex_destroy(&evdev->mutex); - put_device(&evdev->dev); - } - -@@ -1456,8 +1458,7 @@ static const struct input_device_id evdev_ids[] = { - MODULE_DEVICE_TABLE(input, evdev_ids); - - static struct input_handler evdev_handler = { -- .event = evdev_event, -- .events = evdev_events, -+ .event = genode_evdev_event, - .connect = evdev_connect, - .disconnect = evdev_disconnect, - .legacy_minors = true, diff --git a/repos/dde_linux/patches/usb_hid_hid.patch b/repos/dde_linux/patches/usb_hid_hid.patch deleted file mode 100644 index 602106b94e..0000000000 --- a/repos/dde_linux/patches/usb_hid_hid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index c2560aa..0a45da0 100644 ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -2179,6 +2180,7 @@ static void hid_remove_device(struct hid_device *hdev) - kfree(hdev->dev_rdesc); - hdev->dev_rdesc = NULL; - hdev->dev_rsize = 0; -+ mutex_destroy(&hdev->ll_open_lock); - } - - /** diff --git a/repos/dde_linux/patches/usb_hid_input.patch b/repos/dde_linux/patches/usb_hid_input.patch deleted file mode 100644 index 7f288d074f..0000000000 --- a/repos/dde_linux/patches/usb_hid_input.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/drivers/input/input.c b/drivers/input/input.c -index 9785546..cf6f435 100644 ---- a/drivers/input/input.c -+++ b/drivers/input/input.c -@@ -1885,6 +1885,7 @@ void input_free_device(struct input_dev *dev) - devm_input_device_release, - devm_input_device_match, - dev)); -+ mutex_destroy(&dev->mutex); - input_put_device(dev); - } - } -@@ -2024,6 +2025,7 @@ static void __input_unregister_device(struct input_dev *dev) - - mutex_unlock(&input_mutex); - -+ mutex_destroy(&dev->mutex); - device_del(&dev->dev); - } - diff --git a/repos/dde_linux/patches/usb_hid_usbhid.patch b/repos/dde_linux/patches/usb_hid_usbhid.patch deleted file mode 100644 index b6d0cbf34d..0000000000 --- a/repos/dde_linux/patches/usb_hid_usbhid.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 77c50cd..b7d37b2 100644 ---- a/drivers/hid/usbhid/hid-core.c -+++ b/drivers/hid/usbhid/hid-core.c -@@ -1386,6 +1386,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * - err_free: - kfree(usbhid); - err: -+ usb_set_intfdata(intf, NULL); - hid_destroy_device(hid); - return ret; - } -@@ -1636,7 +1637,7 @@ struct usb_interface *usbhid_find_interface(int minor) - return usb_find_interface(&hid_driver, minor); - } - --static int __init hid_init(void) -+static int __init usbhid_init(void) - { - int retval = -ENOMEM; - -@@ -1655,14 +1656,14 @@ usbhid_quirks_init_fail: - return retval; - } - --static void __exit hid_exit(void) -+static void __exit usbhid_exit(void) - { - usb_deregister(&hid_driver); - hid_quirks_exit(BUS_USB); - } - --module_init(hid_init); --module_exit(hid_exit); -+module_init(usbhid_init); -+module_exit(usbhid_exit); - - MODULE_AUTHOR("Andreas Gal"); - MODULE_AUTHOR("Vojtech Pavlik"); diff --git a/repos/dde_linux/patches/usb_hid_wacom_sys.patch b/repos/dde_linux/patches/usb_hid_wacom_sys.patch deleted file mode 100644 index 67a3be737b..0000000000 --- a/repos/dde_linux/patches/usb_hid_wacom_sys.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c -index 4095431..92ea1ab 100644 ---- a/drivers/hid/wacom_sys.c -+++ b/drivers/hid/wacom_sys.c -@@ -14,6 +14,7 @@ - #include "wacom_wac.h" - #include "wacom.h" - #include -+#include - - #define WAC_MSG_RETRIES 5 - #define WAC_CMD_RETRIES 10 diff --git a/repos/dde_linux/patches/usb_modem_skbuff_cast.patch b/repos/dde_linux/patches/usb_modem_skbuff_cast.patch deleted file mode 100644 index 5e63596db9..0000000000 --- a/repos/dde_linux/patches/usb_modem_skbuff_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 9147f9f..c63ee5c 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -3281,7 +3281,7 @@ static inline void skb_remcsum_process(struct sk_buff *skb, void *ptr, - - if (unlikely(skb->ip_summed != CHECKSUM_COMPLETE)) { - __skb_checksum_complete(skb); -- skb_postpull_rcsum(skb, skb->data, ptr - (void *)skb->data); -+ skb_postpull_rcsum(skb, skb->data, (unsigned char*)ptr - skb->data); - } - - delta = remcsum_adjust(ptr, skb->csum, start, offset); diff --git a/repos/dde_linux/patches/usb_net_skbuff_cast.patch b/repos/dde_linux/patches/usb_net_skbuff_cast.patch deleted file mode 100644 index 5e63596db9..0000000000 --- a/repos/dde_linux/patches/usb_net_skbuff_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 9147f9f..c63ee5c 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -3281,7 +3281,7 @@ static inline void skb_remcsum_process(struct sk_buff *skb, void *ptr, - - if (unlikely(skb->ip_summed != CHECKSUM_COMPLETE)) { - __skb_checksum_complete(skb); -- skb_postpull_rcsum(skb, skb->data, ptr - (void *)skb->data); -+ skb_postpull_rcsum(skb, skb->data, (unsigned char*)ptr - skb->data); - } - - delta = remcsum_adjust(ptr, skb->csum, start, offset); diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index 610f7e195a..72d91e2bd6 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -5a43907af132d86664c0b4595a4e6d7d39d40fc2 +201055ff05704fc36e572df199f52e801246f3ca diff --git a/repos/dde_linux/ports/dde_linux.port b/repos/dde_linux/ports/dde_linux.port index 505f42f91d..33679938d4 100644 --- a/repos/dde_linux/ports/dde_linux.port +++ b/repos/dde_linux/ports/dde_linux.port @@ -1,40 +1,6 @@ LICENSE := GPLv2 VERSION := individual (see sources) -DOWNLOADS := lxip.archive usb_hid.archive usb_modem.archive usb_net.archive - -# -# Tools -# -$(call check_tool,flex) -$(call check_tool,bison) - -FLEX = flex -YACC = bison - - -SRC_DIR_USB_HID := src/drivers/usb_hid -VERSION(usb_hid) := 4.16.3 -URL(usb_hid) := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_hid)}.tar.xz -SHA(usb_hid) := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3 -DIR(usb_hid) := $(SRC_DIR_USB_HID) -TAR_OPT(usb_hid) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_hid)}/g' $(REP_DIR)/usb_hid.list) -HASH_INPUT += $(REP_DIR)/usb_hid.list - -SRC_DIR_USB_NET := src/drivers/usb_net -VERSION(usb_net) := 4.16.3 -URL(usb_net) := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_net)}.tar.xz -SHA(usb_net) := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3 -DIR(usb_net) := $(SRC_DIR_USB_NET) -TAR_OPT(usb_net) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_net)}/g' $(REP_DIR)/usb_net.list) -HASH_INPUT += $(REP_DIR)/usb_net.list - -SRC_DIR_USB_MODEM := src/drivers/usb_modem -VERSION(usb_modem) := 4.16.3 -URL(usb_modem) := https://www.kernel.org/pub/linux/kernel/v4.x/linux-${VERSION(usb_modem)}.tar.xz -SHA(usb_modem) := 0d6971a81da97e38b974c5eba31a74803bfe41aabc46d406c3acda56306c81a3 -DIR(usb_modem) := $(SRC_DIR_USB_MODEM) -TAR_OPT(usb_modem) := --strip-components=1 --files-from - < <(sed 's/-x.x.x/-${VERSION(usb_modem)}/g' $(REP_DIR)/usb_modem.list) -HASH_INPUT += $(REP_DIR)/usb_modem.list +DOWNLOADS := lxip.archive # # IP stack sources @@ -57,14 +23,6 @@ PATCHES += patches/lxip_netlink.patch PATCHES += patches/lxip_request_sock.patch PATCHES += patches/lxip_sk_wq.patch PATCHES += patches/lxip_skbuff_cast.patch -PATCHES += patches/usb_hid_evdev.patch -PATCHES += patches/usb_hid_hid.patch -PATCHES += patches/usb_hid_input.patch -PATCHES += patches/usb_hid_usbhid.patch -PATCHES += patches/usb_hid_wacom_sys.patch -PATCHES += patches/usb_modem_skbuff_cast.patch -PATCHES += patches/usb_net_skbuff_cast.patch - #IP stack LXIP_OPT = -p1 -d$(SRC_DIR_LXIP) @@ -76,20 +34,4 @@ PATCH_OPT(patches/lxip_request_sock.patch) := $(LXIP_OPT) PATCH_OPT(patches/lxip_sk_wq.patch) := $(LXIP_OPT) PATCH_OPT(patches/lxip_skbuff_cast.patch) := $(LXIP_OPT) -# USB HID -USB_HID_OPT = -p1 -d$(SRC_DIR_USB_HID) -PATCH_OPT(patches/usb_hid_usbhid.patch) := $(USB_HID_OPT) -PATCH_OPT(patches/usb_hid_wacom_sys.patch) := $(USB_HID_OPT) -PATCH_OPT(patches/usb_hid_evdev.patch) := $(USB_HID_OPT) -PATCH_OPT(patches/usb_hid_hid.patch) := $(USB_HID_OPT) -PATCH_OPT(patches/usb_hid_input.patch) := $(USB_HID_OPT) - -# USB NET -USB_NET_OPT = -p1 -d$(SRC_DIR_USB_NET) -PATCH_OPT(patches/usb_net_skbuff_cast.patch) := $(USB_NET_OPT) - -# USB MODEM -USB_MODEM_OPT = -p1 -d$(SRC_DIR_USB_MODEM) -PATCH_OPT(patches/usb_modem_skbuff_cast.patch) := $(USB_MODEM_OPT) - # vi: set ft=make : diff --git a/repos/dde_linux/usb_hid.list b/repos/dde_linux/usb_hid.list deleted file mode 100644 index 38a483b9c8..0000000000 --- a/repos/dde_linux/usb_hid.list +++ /dev/null @@ -1,50 +0,0 @@ -linux-x.x.x/drivers/hid/hid-apple.c -linux-x.x.x/drivers/hid/hid-cherry.c -linux-x.x.x/drivers/hid/hid-core.c -linux-x.x.x/drivers/hid/hid-generic.c -linux-x.x.x/drivers/hid/hid-holtek-mouse.c -linux-x.x.x/drivers/hid/hid-ids.h -linux-x.x.x/drivers/hid/hid-input.c -linux-x.x.x/drivers/hid/hid-microsoft.c -linux-x.x.x/drivers/hid/hid-multitouch.c -linux-x.x.x/drivers/hid/hid-quirks.c -linux-x.x.x/drivers/hid/wacom.h -linux-x.x.x/drivers/hid/wacom_sys.c -linux-x.x.x/drivers/hid/wacom_wac.c -linux-x.x.x/drivers/hid/wacom_wac.h -linux-x.x.x/drivers/hid/usbhid/hid-core.c -linux-x.x.x/drivers/hid/usbhid/usbhid.h -linux-x.x.x/drivers/input/evdev.c -linux-x.x.x/drivers/input/input-compat.h -linux-x.x.x/drivers/input/input-mt.c -linux-x.x.x/drivers/input/input.c -linux-x.x.x/drivers/usb/core/config.c -linux-x.x.x/drivers/usb/core/generic.c -linux-x.x.x/drivers/usb/core/quirks.c -linux-x.x.x/drivers/usb/core/usb.h -linux-x.x.x/include/asm-generic/atomic64.h -linux-x.x.x/include/asm-generic/bitops/__ffs.h -linux-x.x.x/include/asm-generic/bitops/__fls.h -linux-x.x.x/include/asm-generic/bitops/ffs.h -linux-x.x.x/include/asm-generic/bitops/fls.h -linux-x.x.x/include/asm-generic/bitops/fls64.h -linux-x.x.x/include/asm-generic/bitops/non-atomic.h -linux-x.x.x/include/linux/hiddev.h -linux-x.x.x/include/linux/hid.h -linux-x.x.x/include/linux/input.h -linux-x.x.x/include/linux/input/mt.h -linux-x.x.x/include/linux/kfifo.h -linux-x.x.x/include/linux/list.h -linux-x.x.x/include/linux/log2.h -linux-x.x.x/include/linux/mod_devicetable.h -linux-x.x.x/include/linux/power_supply.h -linux-x.x.x/include/linux/swab.h -linux-x.x.x/include/linux/usb.h -linux-x.x.x/include/linux/usb/ch9.h -linux-x.x.x/include/linux/usb/quirks.h -linux-x.x.x/include/uapi/linux/byteorder/little_endian.h -linux-x.x.x/include/uapi/linux/hid.h -linux-x.x.x/include/uapi/linux/input.h -linux-x.x.x/include/uapi/linux/input-event-codes.h -linux-x.x.x/include/uapi/linux/swab.h -linux-x.x.x/include/uapi/linux/usb/ch9.h diff --git a/repos/dde_linux/usb_modem.list b/repos/dde_linux/usb_modem.list deleted file mode 100644 index d7a931dfe9..0000000000 --- a/repos/dde_linux/usb_modem.list +++ /dev/null @@ -1,68 +0,0 @@ -linux-x.x.x/drivers/net/usb/cdc_mbim.c -linux-x.x.x/drivers/net/usb/cdc_ncm.c -linux-x.x.x/drivers/net/usb/usbnet.c -linux-x.x.x/drivers/usb/class/cdc-wdm.c -linux-x.x.x/net/core/skbuff.c -linux-x.x.x/net/ethernet/eth.c -linux-x.x.x/include/asm-generic/atomic64.h -linux-x.x.x/include/asm-generic/bitops/__ffs.h -linux-x.x.x/include/asm-generic/bitops/__fls.h -linux-x.x.x/include/asm-generic/bitops/ffs.h -linux-x.x.x/include/asm-generic/bitops/fls.h -linux-x.x.x/include/asm-generic/bitops/fls64.h -linux-x.x.x/include/asm-generic/bitops/non-atomic.h -linux-x.x.x/include/linux/cgroup-defs.h -linux-x.x.x/include/linux/errqueue.h -linux-x.x.x/include/linux/ethtool.h -linux-x.x.x/include/linux/if_ether.h -linux-x.x.x/include/linux/kfifo.h -linux-x.x.x/include/linux/list.h -linux-x.x.x/include/linux/list_nulls.h -linux-x.x.x/include/linux/log2.h -linux-x.x.x/include/linux/mii.h -linux-x.x.x/include/linux/mdio.h -linux-x.x.x/include/linux/mod_devicetable.h -linux-x.x.x/include/linux/netdev_features.h -linux-x.x.x/include/linux/net.h -linux-x.x.x/include/linux/phy.h -linux-x.x.x/include/linux/rbtree.h -linux-x.x.x/include/linux/rculist.h -linux-x.x.x/include/linux/rculist_nulls.h -linux-x.x.x/include/linux/refcount.h -linux-x.x.x/include/linux/rndis.h -linux-x.x.x/include/linux/skbuff.h -linux-x.x.x/include/linux/socket.h -linux-x.x.x/include/linux/swab.h -linux-x.x.x/include/linux/usb.h -linux-x.x.x/include/linux/usb/ch9.h -linux-x.x.x/include/linux/usb/cdc.h -linux-x.x.x/include/linux/usb/cdc_ncm.h -linux-x.x.x/include/linux/usb/cdc-wdm.h -linux-x.x.x/include/linux/usb/rndis_host.h -linux-x.x.x/include/linux/usb/usbnet.h -linux-x.x.x/include/net/dst.h -linux-x.x.x/include/net/dst_ops.h -linux-x.x.x/include/net/neighbour.h -linux-x.x.x/include/net/sock.h -linux-x.x.x/include/net/tcp_states.h -linux-x.x.x/include/net/tso.h -linux-x.x.x/include/uapi/linux/byteorder/little_endian.h -linux-x.x.x/include/uapi/linux/capability.h -linux-x.x.x/include/uapi/linux/errqueue.h -linux-x.x.x/include/uapi/linux/ethtool.h -linux-x.x.x/include/uapi/linux/if.h -linux-x.x.x/include/uapi/linux/if_ether.h -linux-x.x.x/include/uapi/linux/if_link.h -linux-x.x.x/include/uapi/linux/if_packet.h -linux-x.x.x/include/uapi/linux/libc-compat.h -linux-x.x.x/include/uapi/linux/mdio.h -linux-x.x.x/include/uapi/linux/mii.h -linux-x.x.x/include/uapi/linux/neighbour.h -linux-x.x.x/include/uapi/linux/net.h -linux-x.x.x/include/uapi/linux/rtnetlink.h -linux-x.x.x/include/uapi/linux/socket.h -linux-x.x.x/include/uapi/linux/swab.h -linux-x.x.x/include/uapi/linux/net_tstamp.h -linux-x.x.x/include/uapi/linux/usb/cdc.h -linux-x.x.x/include/uapi/linux/usb/ch9.h -linux-x.x.x/include/uapi/linux/usb/cdc-wdm.h diff --git a/repos/dde_linux/usb_net.list b/repos/dde_linux/usb_net.list deleted file mode 100644 index b625f3ab00..0000000000 --- a/repos/dde_linux/usb_net.list +++ /dev/null @@ -1,77 +0,0 @@ -linux-x.x.x/drivers/net/usb/asix_common.c -linux-x.x.x/drivers/net/usb/asix_devices.c -linux-x.x.x/drivers/net/usb/asix.h -linux-x.x.x/drivers/net/usb/ax88172a.c -linux-x.x.x/drivers/net/usb/ax88179_178a.c -linux-x.x.x/drivers/net/usb/cdc_ether.c -linux-x.x.x/drivers/net/usb/rndis_host.c -linux-x.x.x/drivers/net/usb/smsc95xx.h -linux-x.x.x/drivers/net/usb/smsc95xx.c -linux-x.x.x/drivers/net/usb/usbnet.c -linux-x.x.x/fs/nls/nls_base.c -linux-x.x.x/lib/ctype.c -linux-x.x.x/lib/hexdump.c -linux-x.x.x/net/core/skbuff.c -linux-x.x.x/net/ethernet/eth.c -linux-x.x.x/include/asm-generic/atomic64.h -linux-x.x.x/include/asm-generic/bitops/__ffs.h -linux-x.x.x/include/asm-generic/bitops/__fls.h -linux-x.x.x/include/asm-generic/bitops/ffs.h -linux-x.x.x/include/asm-generic/bitops/fls.h -linux-x.x.x/include/asm-generic/bitops/fls64.h -linux-x.x.x/include/asm-generic/bitops/non-atomic.h -linux-x.x.x/include/linux/cgroup-defs.h -linux-x.x.x/include/linux/ctype.h -linux-x.x.x/include/linux/errqueue.h -linux-x.x.x/include/linux/ethtool.h -linux-x.x.x/include/linux/if_ether.h -linux-x.x.x/include/linux/kfifo.h -linux-x.x.x/include/linux/list.h -linux-x.x.x/include/linux/list_nulls.h -linux-x.x.x/include/linux/log2.h -linux-x.x.x/include/linux/mii.h -linux-x.x.x/include/linux/mdio.h -linux-x.x.x/include/linux/mod_devicetable.h -linux-x.x.x/include/linux/netdev_features.h -linux-x.x.x/include/linux/net.h -linux-x.x.x/include/linux/nls.h -linux-x.x.x/include/linux/phy.h -linux-x.x.x/include/linux/rbtree.h -linux-x.x.x/include/linux/rculist.h -linux-x.x.x/include/linux/rculist_nulls.h -linux-x.x.x/include/linux/refcount.h -linux-x.x.x/include/linux/rndis.h -linux-x.x.x/include/linux/skbuff.h -linux-x.x.x/include/linux/socket.h -linux-x.x.x/include/linux/swab.h -linux-x.x.x/include/linux/usb.h -linux-x.x.x/include/linux/usb/ch9.h -linux-x.x.x/include/linux/usb/cdc.h -linux-x.x.x/include/linux/usb/quirks.h -linux-x.x.x/include/linux/usb/rndis_host.h -linux-x.x.x/include/linux/usb/usbnet.h -linux-x.x.x/include/net/dst.h -linux-x.x.x/include/net/dst_ops.h -linux-x.x.x/include/net/neighbour.h -linux-x.x.x/include/net/sock.h -linux-x.x.x/include/net/tcp_states.h -linux-x.x.x/include/net/tso.h -linux-x.x.x/include/uapi/linux/byteorder/little_endian.h -linux-x.x.x/include/uapi/linux/capability.h -linux-x.x.x/include/uapi/linux/errqueue.h -linux-x.x.x/include/uapi/linux/ethtool.h -linux-x.x.x/include/uapi/linux/if.h -linux-x.x.x/include/uapi/linux/if_ether.h -linux-x.x.x/include/uapi/linux/if_link.h -linux-x.x.x/include/uapi/linux/if_packet.h -linux-x.x.x/include/uapi/linux/libc-compat.h -linux-x.x.x/include/uapi/linux/mdio.h -linux-x.x.x/include/uapi/linux/mii.h -linux-x.x.x/include/uapi/linux/neighbour.h -linux-x.x.x/include/uapi/linux/net.h -linux-x.x.x/include/uapi/linux/rtnetlink.h -linux-x.x.x/include/uapi/linux/socket.h -linux-x.x.x/include/uapi/linux/swab.h -linux-x.x.x/include/uapi/linux/net_tstamp.h -linux-x.x.x/include/uapi/linux/usb/cdc.h -linux-x.x.x/include/uapi/linux/usb/ch9.h