Update patches and site.mk

don't patch gluon for adding packages, just add them to site.mk
pata_atiixp driver for x86-generic is enabled since v2016.1.2

patches/0001-Add-Gluon-Support-for-Futro-to-Target-x86-64.patch

@@ -0,0 +1,34 @@
+From: Karsten=Böddeker <freifunk@kb-light.de>
+Date: Sat, 9 Jan 2016 01:39:31 +0100
+Subject: [PATCH 65/65] Add Gluon-Support for Futro to Target x86-64
+
+---
+ ...-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletion(-)
+ create mode 100644 patches/openwrt/1000-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
+
+diff --git a/patches/openwrt/1000-x86-64-enable-pata_atiixp-driver.patch b/patches/openwrt/1000-x86-64-enable-pata_atiixp-driver.patch
+new file mode 100644
+index 0000000..ee4e38a
+--- /dev/null
++++ b/patches/openwrt/1000-x86-64-enable-pata_atiixp-driver.patch
+@@ -0,0 +1,16 @@
++From: Karsten Böddeker <freifunk@kb-light.de>
++Date: Sat, 9 Jan 2016 01:30:21 +0100
++Subject: x86-64: enable pata_atiixp driver
++
++diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
++index 1caad74..5bcadca 100644
++--- a/target/linux/x86/64/config-default
+++++ b/target/linux/x86/64/config-default
++@@ -131,6 +131,7 @@ CONFIG_PARAVIRT_CLOCK=y
++ # CONFIG_PARAVIRT_DEBUG is not set
++ # CONFIG_PARAVIRT_SPINLOCKS is not set
++ # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+++CONFIG_PATA_ATIIXP=y
++ CONFIG_PCIEAER=y
++ CONFIG_PCIEPORTBUS=y
++ # CONFIG_PCI_IOAPIC is not set
+-- 
+2.1.4
+

patches/0001-add-support-for-futro.patch

@@ -1,37 +0,0 @@
-From: Karten Böddeker <freifunk@kb-light.de>
-Date: Thu, 15 Oct 2015 16:35:06 +0200
-Subject: [PATCH] add support for futro
-
-diff --git a/patches/openwrt/1000-Add-support-for-futro.patch b/patches/openwrt/1000-Add-support-for-futro.patch
-new file mode 100644
-index 0000000..9efa901
---- /dev/null
-+++ b/patches/openwrt/1000-Add-support-for-futro.patch
-@@ -0,0 +1,13 @@
-+From: Karsten Böddeker <freifunk@kb-light.de>
-+Date: Thu, 15 Oct 2015 14:40:53 +0200
-+Subject: Add support for futro
-+
-+diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
-+index 2babaab..12d1c7f 100644
-+--- a/target/linux/x86/generic/config-default
-++++ b/target/linux/x86/generic/config-default
-+@@ -198,3 +198,4 @@
-+ # CONFIG_X86_LONGHAUL is not set
-+ # CONFIG_X86_PCC_CPUFREQ is not set
-+ CONFIG_X86_PM_TIMER=y
-++CONFIG_PATA_ATIIXP=y
-diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
-index b6551a7..a8a068d 100644
---- a/targets/x86-generic/profiles.mk
-+++ b/targets/x86-generic/profiles.mk
-@@ -1,4 +1,6 @@
--X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth
-+X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
-+       kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
-+
-
-
- $(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))
---
-2.1.4

patches/0002-Add-Gluon-Support-for-Futro-to-Target-x86-64.patch

@@ -1,46 +0,0 @@
-From: Karsten=Böddeker <freifunk@kb-light.de>
-Date: Sat, 9 Jan 2016 01:39:31 +0100
-Subject: [PATCH 65/65] Add Gluon-Support for Futro to Target x86-64
-
----
- ...-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch | 16 ++++++++++++++++
- targets/x86-64/profiles.mk                               |  3 ++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
- create mode 100644 patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
-
-diff --git a/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch b/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
-new file mode 100644
-index 0000000..ee4e38a
---- /dev/null
-+++ b/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
-@@ -0,0 +1,16 @@
-+From: Karsten Böddeker <freifunk@kb-light.de>
-+Date: Sat, 9 Jan 2016 01:30:21 +0100
-+Subject: Add OpenWRT-Support for Futro to Target x86-64
-+
-+diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
-+index 1caad74..5bcadca 100644
-+--- a/target/linux/x86/64/config-default
-++++ b/target/linux/x86/64/config-default
-+@@ -131,6 +131,7 @@ CONFIG_PARAVIRT_CLOCK=y
-+ # CONFIG_PARAVIRT_DEBUG is not set
-+ # CONFIG_PARAVIRT_SPINLOCKS is not set
-+ # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-++CONFIG_PATA_ATIIXP=y
-+ CONFIG_PCIEAER=y
-+ CONFIG_PCIEPORTBUS=y
-+ # CONFIG_PCI_IOAPIC is not set
-diff --git a/targets/x86-64/profiles.mk b/targets/x86-64/profiles.mk
-index 8f561fc..666daee 100644
---- a/targets/x86-64/profiles.mk
-+++ b/targets/x86-64/profiles.mk
-@@ -1,4 +1,5 @@
--X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth
-+X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
-+	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
- 
- 
- $(eval $(call GluonProfile,GENERIC,$(X86_64_NETWORK_MODULES)))
--- 
-2.1.4
-

patches/0003-Add-Gluon-Support-for-apu2-to-Target-x86-64.patch

@@ -1,22 +0,0 @@
-From: Karsten Böddeker <freifunk@kb-light.de>
-Date: Sat, 27 Feb 2016 01:29:42 +0100
-Subject: [PATCH] Add Gluon-Support for pc-engines apu2 to Target x86-64
-
----
- targets/x86-64/profiles.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/targets/x86-64/profiles.mk b/targets/x86-64/profiles.mk
-index 666daee..8deceef 100644
---- a/targets/x86-64/profiles.mk
-+++ b/targets/x86-64/profiles.mk
-@@ -1,5 +1,5 @@
- X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
--	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
-+	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether kmod-igb
- 
- 
- $(eval $(call GluonProfile,GENERIC,$(X86_64_NETWORK_MODULES)))
--- 
-2.1.4
-

site.mk

@@ -33,6 +33,30 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
+USB_BASIC := \
+	kmod-usb-core \
+	kmod-usb2 \
+	kmod-usb-hid
+
+USB_NIC := \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-rtl8150 \
+	kmod-usb-net-rtl8152 \
+	kmod-usb-net-dm9601-ether
+
+ifeq ($(GLUON_TARGET),x86-generic)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC)
+endif
+
+ifeq ($(GLUON_TARGET),x86-64)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC) \
+		kmod-igb #APU2
+endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
 DEFAULT_GLUON_RELEASE := 0.7.1~exp$(shell date '+%Y%m%d')