Platform

The main Radix cross Linux repository contains build scripts of the GNU/Linux distribution.

1000 Commits   6 Branches   3 Tags   |
Index: X.org/app/appres/1.0.4/Makefile
===================================================================
--- X.org/app/appres/1.0.4/Makefile	(revision 646)
+++ X.org/app/appres/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/bdftopcf/1.0.4/Makefile
===================================================================
--- X.org/app/bdftopcf/1.0.4/Makefile	(revision 646)
+++ X.org/app/bdftopcf/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/bdftopcf/1.0.5/Makefile
===================================================================
--- X.org/app/bdftopcf/1.0.5/Makefile	(revision 646)
+++ X.org/app/bdftopcf/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/beforelight/1.0.5/Makefile
===================================================================
--- X.org/app/beforelight/1.0.5/Makefile	(revision 646)
+++ X.org/app/beforelight/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/beforelight/1.0.5/PATCHES
===================================================================
--- X.org/app/beforelight/1.0.5/PATCHES	(revision 646)
+++ X.org/app/beforelight/1.0.5/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/beforelight/patches/beforelight-1.0.5-automake.patch -p0
Index: X.org/app/bitmap/1.0.7/Makefile
===================================================================
--- X.org/app/bitmap/1.0.7/Makefile	(revision 646)
+++ X.org/app/bitmap/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -186,4 +193,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/bitmap/1.0.8/Makefile
===================================================================
--- X.org/app/bitmap/1.0.8/Makefile	(revision 646)
+++ X.org/app/bitmap/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -187,4 +194,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/editres/1.0.6/Makefile
===================================================================
--- X.org/app/editres/1.0.6/Makefile	(revision 646)
+++ X.org/app/editres/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/editres/1.0.6/PATCHES
===================================================================
--- X.org/app/editres/1.0.6/PATCHES	(revision 646)
+++ X.org/app/editres/1.0.6/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/editres/patches/editres-1.0.6-automake.patch -p0
Index: X.org/app/fonttosfnt/1.0.4/Makefile
===================================================================
--- X.org/app/fonttosfnt/1.0.4/Makefile	(revision 646)
+++ X.org/app/fonttosfnt/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/fonttosfnt/1.0.4/PATCHES
===================================================================
--- X.org/app/fonttosfnt/1.0.4/PATCHES	(revision 646)
+++ X.org/app/fonttosfnt/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/fonttosfnt/patches/fonttosfnt-1.0.4-automake.patch -p0
Index: X.org/app/fslsfonts/1.0.4/Makefile
===================================================================
--- X.org/app/fslsfonts/1.0.4/Makefile	(revision 646)
+++ X.org/app/fslsfonts/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/fslsfonts/1.0.5/Makefile
===================================================================
--- X.org/app/fslsfonts/1.0.5/Makefile	(revision 646)
+++ X.org/app/fslsfonts/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/fstobdf/1.0.5/Makefile
===================================================================
--- X.org/app/fstobdf/1.0.5/Makefile	(revision 646)
+++ X.org/app/fstobdf/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/fstobdf/1.0.6/Makefile
===================================================================
--- X.org/app/fstobdf/1.0.6/Makefile	(revision 646)
+++ X.org/app/fstobdf/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/iceauth/1.0.6/Makefile
===================================================================
--- X.org/app/iceauth/1.0.6/Makefile	(revision 646)
+++ X.org/app/iceauth/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/iceauth/1.0.7/Makefile
===================================================================
--- X.org/app/iceauth/1.0.7/Makefile	(revision 646)
+++ X.org/app/iceauth/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/ico/1.0.4/Makefile
===================================================================
--- X.org/app/ico/1.0.4/Makefile	(revision 646)
+++ X.org/app/ico/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/ico/1.0.4/PATCHES
===================================================================
--- X.org/app/ico/1.0.4/PATCHES	(revision 646)
+++ X.org/app/ico/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/ico/patches/ico-1.0.4-automake.patch -p0
Index: X.org/app/listres/1.0.3/Makefile
===================================================================
--- X.org/app/listres/1.0.3/Makefile	(revision 646)
+++ X.org/app/listres/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/listres/1.0.3/PATCHES
===================================================================
--- X.org/app/listres/1.0.3/PATCHES	(revision 646)
+++ X.org/app/listres/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/listres/patches/listres-1.0.3-automake.patch -p0
Index: X.org/app/luit/1.1.1/Makefile
===================================================================
--- X.org/app/luit/1.1.1/Makefile	(revision 646)
+++ X.org/app/luit/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/luit/1.1.1/PATCHES
===================================================================
--- X.org/app/luit/1.1.1/PATCHES	(revision 646)
+++ X.org/app/luit/1.1.1/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
-../../../../../sources/X.org/app/luit/patches/luit-1.1.1.patch -p0
+../../../../../sources/X.org/app/luit/patches/luit-1.1.1.patch          -p0
+../../../../../sources/X.org/app/luit/patches/luit-1.1.1-automake.patch -p0
Index: X.org/app/mkcomposecache/1.2.1/Makefile
===================================================================
--- X.org/app/mkcomposecache/1.2.1/Makefile	(revision 646)
+++ X.org/app/mkcomposecache/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/mkcomposecache/1.2.1/PATCHES
===================================================================
--- X.org/app/mkcomposecache/1.2.1/PATCHES	(revision 646)
+++ X.org/app/mkcomposecache/1.2.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/mkcomposecache/patches/mkcomposecache-1.2.1-automake.patch -p0
Index: X.org/app/mkfontdir/1.0.7/Makefile
===================================================================
--- X.org/app/mkfontdir/1.0.7/Makefile	(revision 646)
+++ X.org/app/mkfontdir/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/mkfontdir/1.0.7/PATCHES
===================================================================
--- X.org/app/mkfontdir/1.0.7/PATCHES	(revision 646)
+++ X.org/app/mkfontdir/1.0.7/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/mkfontdir/patches/mkfontdir-1.0.7-automake.patch -p0
Index: X.org/app/mkfontscale/1.1.1/Makefile
===================================================================
--- X.org/app/mkfontscale/1.1.1/Makefile	(revision 646)
+++ X.org/app/mkfontscale/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/mkfontscale/1.1.2/Makefile
===================================================================
--- X.org/app/mkfontscale/1.1.2/Makefile	(revision 646)
+++ X.org/app/mkfontscale/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/oclock/1.0.3/Makefile
===================================================================
--- X.org/app/oclock/1.0.3/Makefile	(revision 646)
+++ X.org/app/oclock/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/oclock/1.0.3/PATCHES
===================================================================
--- X.org/app/oclock/1.0.3/PATCHES	(revision 646)
+++ X.org/app/oclock/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/oclock/patches/oclock-1.0.3-automake.patch -p0
Index: X.org/app/rendercheck/1.4/Makefile
===================================================================
--- X.org/app/rendercheck/1.4/Makefile	(revision 646)
+++ X.org/app/rendercheck/1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/rendercheck/1.5/Makefile
===================================================================
--- X.org/app/rendercheck/1.5/Makefile	(revision 646)
+++ X.org/app/rendercheck/1.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/rgb/1.0.6/Makefile
===================================================================
--- X.org/app/rgb/1.0.6/Makefile	(revision 646)
+++ X.org/app/rgb/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/sessreg/1.0.8/Makefile
===================================================================
--- X.org/app/sessreg/1.0.8/Makefile	(revision 646)
+++ X.org/app/sessreg/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/sessreg/1.1.0/Makefile
===================================================================
--- X.org/app/sessreg/1.1.0/Makefile	(revision 646)
+++ X.org/app/sessreg/1.1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -187,4 +194,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/setxkbmap/1.3.0/Makefile
===================================================================
--- X.org/app/setxkbmap/1.3.0/Makefile	(revision 646)
+++ X.org/app/setxkbmap/1.3.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/setxkbmap/1.3.1/Makefile
===================================================================
--- X.org/app/setxkbmap/1.3.1/Makefile	(revision 646)
+++ X.org/app/setxkbmap/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/showfont/1.0.4/Makefile
===================================================================
--- X.org/app/showfont/1.0.4/Makefile	(revision 646)
+++ X.org/app/showfont/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/showfont/1.0.5/Makefile
===================================================================
--- X.org/app/showfont/1.0.5/Makefile	(revision 646)
+++ X.org/app/showfont/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/smproxy/1.0.5/Makefile
===================================================================
--- X.org/app/smproxy/1.0.5/Makefile	(revision 646)
+++ X.org/app/smproxy/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/smproxy/1.0.6/Makefile
===================================================================
--- X.org/app/smproxy/1.0.6/Makefile	(revision 646)
+++ X.org/app/smproxy/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/transset/1.0.1/Makefile
===================================================================
--- X.org/app/transset/1.0.1/Makefile	(revision 646)
+++ X.org/app/transset/1.0.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/twm/1.0.8/Makefile
===================================================================
--- X.org/app/twm/1.0.8/Makefile	(revision 646)
+++ X.org/app/twm/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/twm/1.0.9/Makefile
===================================================================
--- X.org/app/twm/1.0.9/Makefile	(revision 646)
+++ X.org/app/twm/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/viewres/1.0.4/Makefile
===================================================================
--- X.org/app/viewres/1.0.4/Makefile	(revision 646)
+++ X.org/app/viewres/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/viewres/1.0.4/PATCHES
===================================================================
--- X.org/app/viewres/1.0.4/PATCHES	(revision 646)
+++ X.org/app/viewres/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/viewres/patches/viewres-1.0.4-automake.patch -p0
Index: X.org/app/x11perf/1.5.4/Makefile
===================================================================
--- X.org/app/x11perf/1.5.4/Makefile	(revision 646)
+++ X.org/app/x11perf/1.5.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/x11perf/1.6.0/Makefile
===================================================================
--- X.org/app/x11perf/1.6.0/Makefile	(revision 646)
+++ X.org/app/x11perf/1.6.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xauth/1.0.9/Makefile
===================================================================
--- X.org/app/xauth/1.0.9/Makefile	(revision 646)
+++ X.org/app/xauth/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xbacklight/1.2.1/Makefile
===================================================================
--- X.org/app/xbacklight/1.2.1/Makefile	(revision 646)
+++ X.org/app/xbacklight/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xbiff/1.0.3/Makefile
===================================================================
--- X.org/app/xbiff/1.0.3/Makefile	(revision 646)
+++ X.org/app/xbiff/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xbiff/1.0.3/PATCHES
===================================================================
--- X.org/app/xbiff/1.0.3/PATCHES	(revision 646)
+++ X.org/app/xbiff/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xbiff/patches/xbiff-1.0.3-automake.patch -p0
Index: X.org/app/xcalc/1.0.5/Makefile
===================================================================
--- X.org/app/xcalc/1.0.5/Makefile	(revision 646)
+++ X.org/app/xcalc/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcalc/1.0.6/Makefile
===================================================================
--- X.org/app/xcalc/1.0.6/Makefile	(revision 646)
+++ X.org/app/xcalc/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xclipboard/1.1.3/Makefile
===================================================================
--- X.org/app/xclipboard/1.1.3/Makefile	(revision 646)
+++ X.org/app/xclipboard/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xclock/1.0.7/Makefile
===================================================================
--- X.org/app/xclock/1.0.7/Makefile	(revision 646)
+++ X.org/app/xclock/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcm/0.5.3/Makefile
===================================================================
--- X.org/app/xcm/0.5.3/Makefile	(revision 646)
+++ X.org/app/xcm/0.5.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -191,4 +198,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcm/0.5.3/PATCHES
===================================================================
--- X.org/app/xcm/0.5.3/PATCHES	(revision 646)
+++ X.org/app/xcm/0.5.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xcm/patches/xcm-0.5.3-automake.patch -p0
Index: X.org/app/xcmsdb/1.0.4/Makefile
===================================================================
--- X.org/app/xcmsdb/1.0.4/Makefile	(revision 646)
+++ X.org/app/xcmsdb/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcmsdb/1.0.5/Makefile
===================================================================
--- X.org/app/xcmsdb/1.0.5/Makefile	(revision 646)
+++ X.org/app/xcmsdb/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcompmgr/1.1.6/Makefile
===================================================================
--- X.org/app/xcompmgr/1.1.6/Makefile	(revision 646)
+++ X.org/app/xcompmgr/1.1.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcompmgr/1.1.7/Makefile
===================================================================
--- X.org/app/xcompmgr/1.1.7/Makefile	(revision 646)
+++ X.org/app/xcompmgr/1.1.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xconsole/1.0.6/Makefile
===================================================================
--- X.org/app/xconsole/1.0.6/Makefile	(revision 646)
+++ X.org/app/xconsole/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xcursorgen/1.0.6/Makefile
===================================================================
--- X.org/app/xcursorgen/1.0.6/Makefile	(revision 646)
+++ X.org/app/xcursorgen/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdbedizzy/1.1.0/Makefile
===================================================================
--- X.org/app/xdbedizzy/1.1.0/Makefile	(revision 646)
+++ X.org/app/xdbedizzy/1.1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdbedizzy/1.1.0/PATCHES
===================================================================
--- X.org/app/xdbedizzy/1.1.0/PATCHES	(revision 646)
+++ X.org/app/xdbedizzy/1.1.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xdbedizzy/patches/xdbedizzy-1.1.0-automake.patch -p0
Index: X.org/app/xditview/1.0.3/Makefile
===================================================================
--- X.org/app/xditview/1.0.3/Makefile	(revision 646)
+++ X.org/app/xditview/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xditview/1.0.4/Makefile
===================================================================
--- X.org/app/xditview/1.0.4/Makefile	(revision 646)
+++ X.org/app/xditview/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdm/1.1.11/Makefile
===================================================================
--- X.org/app/xdm/1.1.11/Makefile	(revision 646)
+++ X.org/app/xdm/1.1.11/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -233,4 +240,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdm/1.1.11/PATCHES
===================================================================
--- X.org/app/xdm/1.1.11/PATCHES	(revision 646)
+++ X.org/app/xdm/1.1.11/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
-../../../../../sources/X.org/app/xdm/patches/xdm-1.1.11.patch -p0
+../../../../../sources/X.org/app/xdm/patches/xdm-1.1.11.patch          -p0
+../../../../../sources/X.org/app/xdm/patches/xdm-1.1.11-automake.patch -p0
Index: X.org/app/xdpyinfo/1.3.1/Makefile
===================================================================
--- X.org/app/xdpyinfo/1.3.1/Makefile	(revision 646)
+++ X.org/app/xdpyinfo/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdpyinfo/1.3.2/Makefile
===================================================================
--- X.org/app/xdpyinfo/1.3.2/Makefile	(revision 646)
+++ X.org/app/xdpyinfo/1.3.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdriinfo/1.0.4/Makefile
===================================================================
--- X.org/app/xdriinfo/1.0.4/Makefile	(revision 646)
+++ X.org/app/xdriinfo/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xdriinfo/1.0.5/Makefile
===================================================================
--- X.org/app/xdriinfo/1.0.5/Makefile	(revision 646)
+++ X.org/app/xdriinfo/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xedit/1.2.1/Makefile
===================================================================
--- X.org/app/xedit/1.2.1/Makefile	(revision 646)
+++ X.org/app/xedit/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xedit/1.2.2/Makefile
===================================================================
--- X.org/app/xedit/1.2.2/Makefile	(revision 646)
+++ X.org/app/xedit/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -184,4 +191,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xev/1.2.1/Makefile
===================================================================
--- X.org/app/xev/1.2.1/Makefile	(revision 646)
+++ X.org/app/xev/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xev/1.2.2/Makefile
===================================================================
--- X.org/app/xev/1.2.2/Makefile	(revision 646)
+++ X.org/app/xev/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xeyes/1.1.1/Makefile
===================================================================
--- X.org/app/xeyes/1.1.1/Makefile	(revision 646)
+++ X.org/app/xeyes/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xeyes/1.1.1/PATCHES
===================================================================
--- X.org/app/xeyes/1.1.1/PATCHES	(revision 646)
+++ X.org/app/xeyes/1.1.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xeyes/patches/xeyes-1.1.1-automake.patch -p0
Index: X.org/app/xf86dga/1.0.3/Makefile
===================================================================
--- X.org/app/xf86dga/1.0.3/Makefile	(revision 646)
+++ X.org/app/xf86dga/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xf86dga/1.0.3/PATCHES
===================================================================
--- X.org/app/xf86dga/1.0.3/PATCHES	(revision 646)
+++ X.org/app/xf86dga/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xf86dga/patches/xf86dga-1.0.3-automake.patch -p0
Index: X.org/app/xfd/1.1.2/Makefile
===================================================================
--- X.org/app/xfd/1.1.2/Makefile	(revision 646)
+++ X.org/app/xfd/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xfontsel/1.0.5/Makefile
===================================================================
--- X.org/app/xfontsel/1.0.5/Makefile	(revision 646)
+++ X.org/app/xfontsel/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xfs/1.1.4/Makefile
===================================================================
--- X.org/app/xfs/1.1.4/Makefile	(revision 646)
+++ X.org/app/xfs/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xfsinfo/1.0.4/Makefile
===================================================================
--- X.org/app/xfsinfo/1.0.4/Makefile	(revision 646)
+++ X.org/app/xfsinfo/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xfsinfo/1.0.5/Makefile
===================================================================
--- X.org/app/xfsinfo/1.0.5/Makefile	(revision 646)
+++ X.org/app/xfsinfo/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xgamma/1.0.5/Makefile
===================================================================
--- X.org/app/xgamma/1.0.5/Makefile	(revision 646)
+++ X.org/app/xgamma/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xgamma/1.0.6/Makefile
===================================================================
--- X.org/app/xgamma/1.0.6/Makefile	(revision 646)
+++ X.org/app/xgamma/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xgc/1.0.4/Makefile
===================================================================
--- X.org/app/xgc/1.0.4/Makefile	(revision 646)
+++ X.org/app/xgc/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xgc/1.0.5/Makefile
===================================================================
--- X.org/app/xgc/1.0.5/Makefile	(revision 646)
+++ X.org/app/xgc/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xhost/1.0.6/Makefile
===================================================================
--- X.org/app/xhost/1.0.6/Makefile	(revision 646)
+++ X.org/app/xhost/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xhost/1.0.7/Makefile
===================================================================
--- X.org/app/xhost/1.0.7/Makefile	(revision 646)
+++ X.org/app/xhost/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xinit/1.3.4/Makefile
===================================================================
--- X.org/app/xinit/1.3.4/Makefile	(revision 646)
+++ X.org/app/xinit/1.3.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -185,4 +192,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xinput/1.6.1/Makefile
===================================================================
--- X.org/app/xinput/1.6.1/Makefile	(revision 646)
+++ X.org/app/xinput/1.6.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xinput/1.6.2/Makefile
===================================================================
--- X.org/app/xinput/1.6.2/Makefile	(revision 646)
+++ X.org/app/xinput/1.6.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbcomp/1.3.0/Makefile
===================================================================
--- X.org/app/xkbcomp/1.3.0/Makefile	(revision 646)
+++ X.org/app/xkbcomp/1.3.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -181,4 +188,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbcomp/1.3.1/Makefile
===================================================================
--- X.org/app/xkbcomp/1.3.1/Makefile	(revision 646)
+++ X.org/app/xkbcomp/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -181,4 +188,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbevd/1.1.3/Makefile
===================================================================
--- X.org/app/xkbevd/1.1.3/Makefile	(revision 646)
+++ X.org/app/xkbevd/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbevd/1.1.4/Makefile
===================================================================
--- X.org/app/xkbevd/1.1.4/Makefile	(revision 646)
+++ X.org/app/xkbevd/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbprint/1.0.3/Makefile
===================================================================
--- X.org/app/xkbprint/1.0.3/Makefile	(revision 646)
+++ X.org/app/xkbprint/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbprint/1.0.4/Makefile
===================================================================
--- X.org/app/xkbprint/1.0.4/Makefile	(revision 646)
+++ X.org/app/xkbprint/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbutils/1.0.4/Makefile
===================================================================
--- X.org/app/xkbutils/1.0.4/Makefile	(revision 646)
+++ X.org/app/xkbutils/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xkbutils/1.0.4/PATCHES
===================================================================
--- X.org/app/xkbutils/1.0.4/PATCHES	(revision 646)
+++ X.org/app/xkbutils/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xkbutils/patches/xkbutils-1.0.4-automake.patch -p0
Index: X.org/app/xkill/1.0.4/Makefile
===================================================================
--- X.org/app/xkill/1.0.4/Makefile	(revision 646)
+++ X.org/app/xkill/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xload/1.1.2/Makefile
===================================================================
--- X.org/app/xload/1.1.2/Makefile	(revision 646)
+++ X.org/app/xload/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlogo/1.0.4/Makefile
===================================================================
--- X.org/app/xlogo/1.0.4/Makefile	(revision 646)
+++ X.org/app/xlogo/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlogo/1.0.4/PATCHES
===================================================================
--- X.org/app/xlogo/1.0.4/PATCHES	(revision 646)
+++ X.org/app/xlogo/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xlogo/patches/xlogo-1.0.4-automake.patch -p0
Index: X.org/app/xlsatoms/1.1.1/Makefile
===================================================================
--- X.org/app/xlsatoms/1.1.1/Makefile	(revision 646)
+++ X.org/app/xlsatoms/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlsatoms/1.1.2/Makefile
===================================================================
--- X.org/app/xlsatoms/1.1.2/Makefile	(revision 646)
+++ X.org/app/xlsatoms/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlsclients/1.1.3/Makefile
===================================================================
--- X.org/app/xlsclients/1.1.3/Makefile	(revision 646)
+++ X.org/app/xlsclients/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlsfonts/1.0.4/Makefile
===================================================================
--- X.org/app/xlsfonts/1.0.4/Makefile	(revision 646)
+++ X.org/app/xlsfonts/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xlsfonts/1.0.5/Makefile
===================================================================
--- X.org/app/xlsfonts/1.0.5/Makefile	(revision 646)
+++ X.org/app/xlsfonts/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmag/1.0.5/Makefile
===================================================================
--- X.org/app/xmag/1.0.5/Makefile	(revision 646)
+++ X.org/app/xmag/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmag/1.0.6/Makefile
===================================================================
--- X.org/app/xmag/1.0.6/Makefile	(revision 646)
+++ X.org/app/xmag/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xman/1.1.3/Makefile
===================================================================
--- X.org/app/xman/1.1.3/Makefile	(revision 646)
+++ X.org/app/xman/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xman/1.1.4/Makefile
===================================================================
--- X.org/app/xman/1.1.4/Makefile	(revision 646)
+++ X.org/app/xman/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmessage/1.0.4/Makefile
===================================================================
--- X.org/app/xmessage/1.0.4/Makefile	(revision 646)
+++ X.org/app/xmessage/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmessage/1.0.4/PATCHES
===================================================================
--- X.org/app/xmessage/1.0.4/PATCHES	(revision 646)
+++ X.org/app/xmessage/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xmessage/patches/xmessage-1.0.4-automake.patch -p0
Index: X.org/app/xmh/1.0.2/Makefile
===================================================================
--- X.org/app/xmh/1.0.2/Makefile	(revision 646)
+++ X.org/app/xmh/1.0.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmh/1.0.3/Makefile
===================================================================
--- X.org/app/xmh/1.0.3/Makefile	(revision 646)
+++ X.org/app/xmh/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmodmap/1.0.8/Makefile
===================================================================
--- X.org/app/xmodmap/1.0.8/Makefile	(revision 646)
+++ X.org/app/xmodmap/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmodmap/1.0.9/Makefile
===================================================================
--- X.org/app/xmodmap/1.0.9/Makefile	(revision 646)
+++ X.org/app/xmodmap/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmore/1.0.2/Makefile
===================================================================
--- X.org/app/xmore/1.0.2/Makefile	(revision 646)
+++ X.org/app/xmore/1.0.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xmore/1.0.2/PATCHES
===================================================================
--- X.org/app/xmore/1.0.2/PATCHES	(revision 646)
+++ X.org/app/xmore/1.0.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xmore/patches/xmore-1.0.2-automake.patch -p0
Index: X.org/app/xpr/1.0.4/Makefile
===================================================================
--- X.org/app/xpr/1.0.4/Makefile	(revision 646)
+++ X.org/app/xpr/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xpr/1.0.4/PATCHES
===================================================================
--- X.org/app/xpr/1.0.4/PATCHES	(revision 646)
+++ X.org/app/xpr/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xpr/patches/xpr-1.0.4-automake.patch -p0
Index: X.org/app/xprop/1.2.2/Makefile
===================================================================
--- X.org/app/xprop/1.2.2/Makefile	(revision 646)
+++ X.org/app/xprop/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xrandr/1.4.3/Makefile
===================================================================
--- X.org/app/xrandr/1.4.3/Makefile	(revision 646)
+++ X.org/app/xrandr/1.4.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xrandr/1.5.0/Makefile
===================================================================
--- X.org/app/xrandr/1.5.0/Makefile	(revision 646)
+++ X.org/app/xrandr/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xrdb/1.1.0/Makefile
===================================================================
--- X.org/app/xrdb/1.1.0/Makefile	(revision 646)
+++ X.org/app/xrdb/1.1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xrefresh/1.0.5/Makefile
===================================================================
--- X.org/app/xrefresh/1.0.5/Makefile	(revision 646)
+++ X.org/app/xrefresh/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xscope/1.4.1/Makefile
===================================================================
--- X.org/app/xscope/1.4.1/Makefile	(revision 646)
+++ X.org/app/xscope/1.4.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xset/1.2.3/Makefile
===================================================================
--- X.org/app/xset/1.2.3/Makefile	(revision 646)
+++ X.org/app/xset/1.2.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,4 +184,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xsetroot/1.1.1/Makefile
===================================================================
--- X.org/app/xsetroot/1.1.1/Makefile	(revision 646)
+++ X.org/app/xsetroot/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xsetroot/1.1.1/PATCHES
===================================================================
--- X.org/app/xsetroot/1.1.1/PATCHES	(revision 646)
+++ X.org/app/xsetroot/1.1.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xsetroot/patches/xsetroot-1.1.1-automake.patch -p0
Index: X.org/app/xsm/1.0.3/Makefile
===================================================================
--- X.org/app/xsm/1.0.3/Makefile	(revision 646)
+++ X.org/app/xsm/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xsm/1.0.3/PATCHES
===================================================================
--- X.org/app/xsm/1.0.3/PATCHES	(revision 646)
+++ X.org/app/xsm/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xsm/patches/xsm-1.0.3-automake.patch -p0
Index: X.org/app/xstdcmap/1.0.3/Makefile
===================================================================
--- X.org/app/xstdcmap/1.0.3/Makefile	(revision 646)
+++ X.org/app/xstdcmap/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xstdcmap/1.0.3/PATCHES
===================================================================
--- X.org/app/xstdcmap/1.0.3/PATCHES	(revision 646)
+++ X.org/app/xstdcmap/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xstdcmap/patches/xstdcmap-1.0.3-automake.patch -p0
Index: X.org/app/xvidtune/1.0.3/Makefile
===================================================================
--- X.org/app/xvidtune/1.0.3/Makefile	(revision 646)
+++ X.org/app/xvidtune/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xvidtune/1.0.3/PATCHES
===================================================================
--- X.org/app/xvidtune/1.0.3/PATCHES	(revision 646)
+++ X.org/app/xvidtune/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xvidtune/patches/xvidtune-1.0.3-automake.patch -p0
Index: X.org/app/xvinfo/1.1.2/Makefile
===================================================================
--- X.org/app/xvinfo/1.1.2/Makefile	(revision 646)
+++ X.org/app/xvinfo/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xvinfo/1.1.3/Makefile
===================================================================
--- X.org/app/xvinfo/1.1.3/Makefile	(revision 646)
+++ X.org/app/xvinfo/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xwd/1.0.6/Makefile
===================================================================
--- X.org/app/xwd/1.0.6/Makefile	(revision 646)
+++ X.org/app/xwd/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xwininfo/1.1.3/Makefile
===================================================================
--- X.org/app/xwininfo/1.1.3/Makefile	(revision 646)
+++ X.org/app/xwininfo/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xwud/1.0.4/Makefile
===================================================================
--- X.org/app/xwud/1.0.4/Makefile	(revision 646)
+++ X.org/app/xwud/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/app/xwud/1.0.4/PATCHES
===================================================================
--- X.org/app/xwud/1.0.4/PATCHES	(revision 646)
+++ X.org/app/xwud/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xwud/patches/xwud-1.0.4-automake.patch -p0
Index: X.org/app-collection/Makefile
===================================================================
--- X.org/app-collection/Makefile	(revision 646)
+++ X.org/app-collection/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
Index: X.org/data/xbitmaps/1.1.1/Makefile
===================================================================
--- X.org/data/xbitmaps/1.1.1/Makefile	(revision 646)
+++ X.org/data/xbitmaps/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -176,4 +183,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/data/xbitmaps/1.1.1/PATCHES
===================================================================
--- X.org/data/xbitmaps/1.1.1/PATCHES	(revision 646)
+++ X.org/data/xbitmaps/1.1.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/data/xbitmaps/patches/xbitmaps-1.1.1-automake.patch -p0
Index: X.org/data/xbitmaps/1.1.1-x86_32/Makefile
===================================================================
--- X.org/data/xbitmaps/1.1.1-x86_32/Makefile	(revision 646)
+++ X.org/data/xbitmaps/1.1.1-x86_32/Makefile	(revision 647)
@@ -135,4 +135,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/data/xbitmaps/1.1.1-x86_32/PATCHES
===================================================================
--- X.org/data/xbitmaps/1.1.1-x86_32/PATCHES	(revision 646)
+++ X.org/data/xbitmaps/1.1.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/data/xbitmaps/patches/xbitmaps-1.1.1-automake.patch -p0
Index: X.org/data/xcursor-themes/1.0.4/Makefile
===================================================================
--- X.org/data/xcursor-themes/1.0.4/Makefile	(revision 646)
+++ X.org/data/xcursor-themes/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,6 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/data/xcursor-themes
 
 REQUIRES           = X11/X.org/util/util-macros/1.19.0
+REQUIRES          += X11/X.org/lib/libXcursor/1.1.14
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +180,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/data/xkeyboard-config/2.13/Makefile
===================================================================
--- X.org/data/xkeyboard-config/2.13/Makefile	(revision 646)
+++ X.org/data/xkeyboard-config/2.13/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -183,4 +190,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/data/xkeyboard-config/2.17/Makefile
===================================================================
--- X.org/data/xkeyboard-config/2.17/Makefile	(revision 646)
+++ X.org/data/xkeyboard-config/2.17/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,6 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/data/xkeyboard-config
 
 REQUIRES           = X11/X.org/util/util-macros/1.19.0
+REQUIRES          += X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -183,4 +191,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/doc/xorg-docs/1.7/Makefile
===================================================================
--- X.org/doc/xorg-docs/1.7/Makefile	(revision 646)
+++ X.org/doc/xorg-docs/1.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -30,10 +37,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES          += X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES          += X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/doc/xorg-docs/1.7.1/Makefile
===================================================================
--- X.org/doc/xorg-docs/1.7.1/Makefile	(revision 646)
+++ X.org/doc/xorg-docs/1.7.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -30,10 +37,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES          += X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES          += X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/doc/xorg-sgml-doctools/1.11/Makefile
===================================================================
--- X.org/doc/xorg-sgml-doctools/1.11/Makefile	(revision 646)
+++ X.org/doc/xorg-sgml-doctools/1.11/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/doc/xorg-sgml-doctools/1.11/PATCHES
===================================================================
--- X.org/doc/xorg-sgml-doctools/1.11/PATCHES	(revision 646)
+++ X.org/doc/xorg-sgml-doctools/1.11/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/doc/xorg-sgml-doctools/patches/xorg-sgml-doctools-1.11-automake.patch -p0
Index: X.org/driver/xf86-input-acecad/1.5.0/Makefile
===================================================================
--- X.org/driver/xf86-input-acecad/1.5.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-acecad/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -214,4 +221,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-acecad/1.5.0/PATCHES
===================================================================
--- X.org/driver/xf86-input-acecad/1.5.0/PATCHES	(revision 646)
+++ X.org/driver/xf86-input-acecad/1.5.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/driver/xf86-input-acecad/patches/xf86-input-acecad-1.5.0-automake.patch -p0
Index: X.org/driver/xf86-input-aiptek/1.4.1/Makefile
===================================================================
--- X.org/driver/xf86-input-aiptek/1.4.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-aiptek/1.4.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-aiptek/1.4.1/PATCHES
===================================================================
--- X.org/driver/xf86-input-aiptek/1.4.1/PATCHES	(revision 646)
+++ X.org/driver/xf86-input-aiptek/1.4.1/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
-../../../../../sources/X.org/driver/xf86-input-aiptek/patches/xf86-input-aiptek-1.4.1-abi.patch -p0
+../../../../../sources/X.org/driver/xf86-input-aiptek/patches/xf86-input-aiptek-1.4.1-abi.patch      -p0
+../../../../../sources/X.org/driver/xf86-input-aiptek/patches/xf86-input-aiptek-1.4.1-automake.patch -p0
Index: X.org/driver/xf86-input-evdev/2.10.2/Makefile
===================================================================
--- X.org/driver/xf86-input-evdev/2.10.2/Makefile	(revision 646)
+++ X.org/driver/xf86-input-evdev/2.10.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -223,4 +230,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-evdev/2.9.0/Makefile
===================================================================
--- X.org/driver/xf86-input-evdev/2.9.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-evdev/2.9.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -223,4 +230,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-joystick/1.6.2/Makefile
===================================================================
--- X.org/driver/xf86-input-joystick/1.6.2/Makefile	(revision 646)
+++ X.org/driver/xf86-input-joystick/1.6.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-joystick/1.6.2/PATCHES
===================================================================
--- X.org/driver/xf86-input-joystick/1.6.2/PATCHES	(revision 646)
+++ X.org/driver/xf86-input-joystick/1.6.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/driver/xf86-input-joystick/patches/xf86-input-joystick-1.6.2-automake.patch -p0
Index: X.org/driver/xf86-input-keyboard/1.8.0/Makefile
===================================================================
--- X.org/driver/xf86-input-keyboard/1.8.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-keyboard/1.8.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-keyboard/1.8.1/Makefile
===================================================================
--- X.org/driver/xf86-input-keyboard/1.8.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-keyboard/1.8.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-libinput/0.19.0/Makefile
===================================================================
--- X.org/driver/xf86-input-libinput/0.19.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-libinput/0.19.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -231,4 +238,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-mouse/1.9.1/Makefile
===================================================================
--- X.org/driver/xf86-input-mouse/1.9.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-mouse/1.9.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-penmount/1.5.0/Makefile
===================================================================
--- X.org/driver/xf86-input-penmount/1.5.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-penmount/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-penmount/1.5.0/PATCHES
===================================================================
--- X.org/driver/xf86-input-penmount/1.5.0/PATCHES	(revision 646)
+++ X.org/driver/xf86-input-penmount/1.5.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/driver/xf86-input-penmount/patches/xf86-input-penmount-1.5.0-automake.patch -p0
Index: X.org/driver/xf86-input-synaptics/1.8.1/Makefile
===================================================================
--- X.org/driver/xf86-input-synaptics/1.8.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-synaptics/1.8.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -237,4 +244,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile
===================================================================
--- X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -237,4 +244,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-vmmouse/13.0.0/Makefile
===================================================================
--- X.org/driver/xf86-input-vmmouse/13.0.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-vmmouse/13.0.0/Makefile	(revision 647)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-vmmouse
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 REQUIRES          += libs/eudev/3.1.5
 
 # ======= __END_OF_REQUIRES__ =======
@@ -188,4 +188,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-vmmouse/13.1.0/Makefile
===================================================================
--- X.org/driver/xf86-input-vmmouse/13.1.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-vmmouse/13.1.0/Makefile	(revision 647)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-vmmouse
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 REQUIRES          += libs/eudev/3.1.5
 
 # ======= __END_OF_REQUIRES__ =======
@@ -202,4 +202,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-void/1.4.0/Makefile
===================================================================
--- X.org/driver/xf86-input-void/1.4.0/Makefile	(revision 646)
+++ X.org/driver/xf86-input-void/1.4.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-input-void/1.4.1/Makefile
===================================================================
--- X.org/driver/xf86-input-void/1.4.1/Makefile	(revision 646)
+++ X.org/driver/xf86-input-void/1.4.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-dummy/0.3.7/Makefile
===================================================================
--- X.org/driver/xf86-video-dummy/0.3.7/Makefile	(revision 646)
+++ X.org/driver/xf86-video-dummy/0.3.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-fbdev/0.4.4/Makefile
===================================================================
--- X.org/driver/xf86-video-fbdev/0.4.4/Makefile	(revision 646)
+++ X.org/driver/xf86-video-fbdev/0.4.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile
===================================================================
--- X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile	(revision 646)
+++ X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile	(revision 647)
@@ -198,4 +198,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile
===================================================================
--- X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile	(revision 646)
+++ X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile	(revision 647)
@@ -190,4 +190,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/Makefile
===================================================================
--- X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/Makefile	(nonexistent)
+++ X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/Makefile	(revision 647)
@@ -0,0 +1,198 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_ODROID_C2)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/xf86-video-fbturbo/r6p1-01rel0
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
+REQUIRES          += hal/ump/DX/6.1.1.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.5.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/hal/Mali/xf86-video-fbturbo/r6p1-01rel0/xf86-video-fbturbo-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-fbturbo-$(version)
+src_dir_name       = xf86-video-fbturbo-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+xorg_config_in     = $(CURDIR)/etc/X11/xorg.conf.fbturbo.in
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-fbturbo
+XORG_PKG_VERSION             = 0.5.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = optimized framebuffer video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@mkdir -p $(XORG_PKG)/etc/X11
+	@cat $(xorg_config_in) | \
+	     sed 's,@HARDWARE_SPEC@,$(HW_SPEC),' > $(XORG_PKG)/etc/X11/xorg.conf.fbturbo
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING README xorg.conf \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" fbturbo_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" fbturbo_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" fbturbo_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/PATCHES
===================================================================
Index: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/etc/X11/xorg.conf.fbturbo.in
===================================================================
--- X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/etc/X11/xorg.conf.fbturbo.in	(nonexistent)
+++ X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/etc/X11/xorg.conf.fbturbo.in	(revision 647)
@@ -0,0 +1,31 @@
+# This is a minimal sample config file, which can be copied to
+# /etc/X11/xorg.conf in order to make the Xorg server pick up
+# and load xf86-video-fbturbo driver installed in the system.
+#
+# When troubleshooting, check /var/log/Xorg.0.log for the debugging
+# output and error messages.
+#
+# Run "man fbturbo" to get additional information about the extra
+# configuration options for tuning the driver.
+
+# X.Org X server configuration file for @HARDWARE_SPEC@
+
+Section "Device"
+    Identifier      "Device0"
+    Driver          "fbturbo"
+    Option          "fbdev" "/dev/fb0"
+
+    Option          "SwapbuffersWait" "true"
+    Option          "alpha_swap" "true"
+EndSection
+
+Section "Monitor"
+    Identifier      "Monitor"
+EndSection
+
+Section "Screen"
+    Identifier      "Screen0"
+    Monitor         "Monitor"
+    Device          "Device0"
+    DefaultFbBpp    32
+EndSection
Index: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-description.in
===================================================================
--- X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-description.in	(nonexistent)
+++ X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
+xf86-video-fbturbo: xf86-video-fbturbo @VERSION@ (optimized framebuffer video driver)
+xf86-video-fbturbo:
+xf86-video-fbturbo: xf86-video-fbturbo video driver, primarily optimized for the
+xf86-video-fbturbo: devices powered by the Amlogic SoC (S905, S905X). It can use
+xf86-video-fbturbo: some of the 2D/3D hardware acceleration features.
+xf86-video-fbturbo:
+xf86-video-fbturbo: See: https://github.com/tnmeyer/xf86-video-fbturbo
+xf86-video-fbturbo:
+xf86-video-fbturbo:
+xf86-video-fbturbo:
+xf86-video-fbturbo:
Index: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-install.sh
===================================================================
--- X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-install.sh	(nonexistent)
+++ X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1/xf86-video-fbturbo-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: X.org/driver/xf86-video-intel/2.99.916/Makefile
===================================================================
--- X.org/driver/xf86-video-intel/2.99.916/Makefile	(revision 646)
+++ X.org/driver/xf86-video-intel/2.99.916/Makefile	(revision 647)
@@ -210,4 +210,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-intel/2.99.917.1/Makefile
===================================================================
--- X.org/driver/xf86-video-intel/2.99.917.1/Makefile	(revision 646)
+++ X.org/driver/xf86-video-intel/2.99.917.1/Makefile	(revision 647)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-intel
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
 REQUIRES          += X11/X.org/lib/libXtst/1.2.2
 REQUIRES          += X11/X.org/lib/libXvMC/1.0.9
@@ -210,4 +210,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile
===================================================================
--- X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile	(revision 646)
+++ X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile	(revision 647)
@@ -197,4 +197,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile
===================================================================
--- X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile	(revision 646)
+++ X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile	(revision 647)
@@ -1,6 +1,6 @@
 
 COMPONENT_TARGETS  = $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 
 
 NEED_ABS_PATH      = true
@@ -102,6 +102,7 @@
 	$(APPLY_PATCHES)
 	@( cd $(SRC_DIR) ; \
 	   sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
+	   autoreconf -v --install ; \
 	   automake ; \
 	 )
 	@touch $@
@@ -204,4 +205,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile
===================================================================
--- X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile	(revision 646)
+++ X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile	(revision 647)
@@ -1,6 +1,6 @@
 
 COMPONENT_TARGETS  = $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 
 
 NEED_ABS_PATH      = true
@@ -102,7 +102,8 @@
 	$(APPLY_PATCHES)
 	@( cd $(SRC_DIR) ; \
 	   sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
-	   automake ; \
+	   aclocal ; \
+	   automake --add-missing ; \
 	 )
 	@touch $@
 
@@ -204,4 +205,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/Makefile
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/Makefile	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/Makefile	(revision 647)
@@ -0,0 +1,220 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/xf86-video-mali/DX/r7p0-00rel0
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
+REQUIRES          += X11/X.org/lib/pixman/0.34.0
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X)),)
+REQUIRES          += X11/libs/aml-mali/5.1.1.0
+endif
+ifneq ($(filter $(HARDWARE),                 $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+REQUIRES          += X11/libs/aml-mali/6.1.1.0
+endif
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.4.2
+tar_gz_archive     = $(SRC_PACKAGE_PATH)/hal/Mali/xf86-video-mali/DX/r7p0-00rel0/xf86-video-mali-$(version).tar.gz
+SRC_ARCHIVE        = $(tar_gz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-mali-$(version)
+src_dir_name       = xf86-video-mali-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+license            = $(CURDIR)/license/COPYING
+xorg_config_in     = $(CURDIR)/etc/X11/xorg.conf.mali.in
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-mali
+XORG_PKG_VERSION             = 0.4.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Mali X11 video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+CFLAGS += -I$(CURDIR)/ddk-include/include -DHAVE_STRNDUP
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
+	   aclocal ; \
+	   automake --add-missing ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install default xorg.conf file =======
+	@mkdir -p $(XORG_PKG)/etc/X11
+	@cat $(xorg_config_in) | \
+	     sed 's,@HARDWARE_SPEC@,$(HW_SPEC),' > $(XORG_PKG)/etc/X11/xorg.conf.mali
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(license) \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a $(license) README* xorg.conf \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" mali_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" mali_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" mali_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/PATCHES
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/PATCHES	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../../../sources/hal/Mali/xf86-video-mali/DX/r7p0-00rel0/patches/xf86-video-mali-0.4.2-amlogic.patch -p0
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump.h
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump.h	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump.h	(revision 647)
@@ -0,0 +1,262 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump.h
+ *
+ * This file contains the user space part of the UMP API.
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_H_
+#define _UNIFIED_MEMORY_PROVIDER_H_
+
+
+/** @defgroup ump_user_space_api UMP User Space API
+ * @{ */
+
+
+#include "ump_platform.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * External representation of a UMP handle in user space.
+ */
+typedef void *ump_handle;
+
+/**
+ * Typedef for a secure ID, a system wide identificator for UMP memory buffers.
+ */
+typedef unsigned int ump_secure_id;
+
+/**
+ * Value to indicate an invalid UMP memory handle.
+ */
+#define UMP_INVALID_MEMORY_HANDLE ((ump_handle)0)
+
+/**
+ * Value to indicate an invalid secure Id.
+ */
+#define UMP_INVALID_SECURE_ID     ((ump_secure_id)-1)
+
+/**
+ * UMP error codes for user space.
+ */
+typedef enum
+{
+	UMP_OK = 0, /**< indicates success */
+	UMP_ERROR,  /**< indicates failure */
+} ump_result;
+
+
+/**
+ * Opens and initializes the UMP library.
+ *
+ * This function must be called at least once before calling any other UMP API functions.
+ * Each open is reference counted and must be matched with a call to @ref ump_close "ump_close".
+ *
+ * @see ump_close
+ *
+ * @return UMP_OK indicates success, UMP_ERROR indicates failure.
+ */
+UMP_API_EXPORT ump_result ump_open(void);
+
+
+/**
+ * Terminate the UMP library.
+ *
+ * This must be called once for every successful @ref ump_open "ump_open". The UMP library is
+ * terminated when, and only when, the last open reference to the UMP interface is closed.
+ *
+ * @see ump_open
+ */
+UMP_API_EXPORT void ump_close(void);
+
+
+/**
+ * Retrieves the secure ID for the specified UMP memory.
+ *
+ * This identificator is unique across the entire system, and uniquely identifies
+ * the specified UMP memory. This identificator can later be used through the
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id" or
+ * @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ * functions in order to access this UMP memory, for instance from another process.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_secure_id_get "ump_dd_secure_id_get"
+ *
+ * @see ump_handle_create_from_secure_id
+ * @see ump_dd_handle_create_from_secure_id
+ * @see ump_dd_secure_id_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the secure ID for the specified UMP memory.
+ */
+UMP_API_EXPORT ump_secure_id ump_secure_id_get(ump_handle mem);
+
+
+/**
+ * Retrieves a handle to allocated UMP memory.
+ *
+ * The usage of UMP memory is reference counted, so this will increment the reference
+ * count by one for the specified UMP memory.
+ * Use @ref ump_reference_release "ump_reference_release" when there is no longer any
+ * use for the retrieved handle.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ *
+ * @see ump_reference_release
+ * @see ump_dd_handle_create_from_secure_id
+ *
+ * @param secure_id The secure ID of the UMP memory to open, that can be retrieved using the @ref ump_secure_id_get "ump_secure_id_get " function.
+ *
+ * @return UMP_INVALID_MEMORY_HANDLE indicates failure, otherwise a valid handle is returned.
+ */
+UMP_API_EXPORT ump_handle ump_handle_create_from_secure_id(ump_secure_id secure_id);
+
+
+/**
+ * Retrieves the actual size of the specified UMP memory.
+ *
+ * The size is reported in bytes, and is typically page aligned.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_size_get "ump_dd_size_get"
+ *
+ * @see ump_dd_size_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the allocated size of the specified UMP memory, in bytes.
+ */
+UMP_API_EXPORT unsigned long ump_size_get(ump_handle mem);
+
+
+/**
+ * Read from specified UMP memory.
+ *
+ * Another way of reading from (and writing to) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Destination buffer.
+ * @param src Handle to UMP memory to read from.
+ * @param offset Where to start reading, given in bytes.
+ * @param length How much to read, given in bytes.
+ */
+UMP_API_EXPORT void ump_read(void *dst, ump_handle src, unsigned long offset, unsigned long length);
+
+
+/**
+ * Write to specified UMP memory.
+ *
+ * Another way of writing to (and reading from) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Handle to UMP memory to write to.
+ * @param offset Where to start writing, given in bytes.
+ * @param src Buffer to read from.
+ * @param length How much to write, given in bytes.
+ */
+UMP_API_EXPORT void ump_write(ump_handle dst, unsigned long offset, const void *src, unsigned long length);
+
+
+/**
+ * Retrieves a memory mapped pointer to the specified UMP memory.
+ *
+ * This function retrieves a memory mapped pointer to the specified UMP memory,
+ * that can be used by the CPU. Every successful call to
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" is reference counted,
+ * and must therefore be followed by a call to
+ * @ref ump_mapped_pointer_release "ump_mapped_pointer_release " when the
+ * memory mapping is no longer needed.
+ *
+ * @note Systems without a MMU for the CPU only return the physical address, because no mapping is required.
+ *
+ * @see ump_mapped_pointer_release
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return NULL indicates failure, otherwise a CPU mapped pointer is returned.
+ */
+UMP_API_EXPORT void *ump_mapped_pointer_get(ump_handle mem);
+
+
+/**
+ * Releases a previously mapped pointer to the specified UMP memory.
+ *
+ * The CPU mapping of the specified UMP memory memory is reference counted,
+ * so every call to @ref ump_mapped_pointer_get "ump_mapped_pointer_get" must
+ * be matched with a call to this function when the mapping is no longer needed.
+ *
+ * The CPU mapping is not removed before all references to the mapping is released.
+ *
+ * @note Systems without a MMU must still implement this function, even though no unmapping should be needed.
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_mapped_pointer_release(ump_handle mem);
+
+
+/**
+ * Adds an extra reference to the specified UMP memory.
+ *
+ * This function adds an extra reference to the specified UMP memory. This function should
+ * be used every time a UMP memory handle is duplicated, that is, assigned to another ump_handle
+ * variable. The function @ref ump_reference_release "ump_reference_release" must then be used
+ * to release each copy of the UMP memory handle.
+ *
+ * @note You are not required to call @ref ump_reference_add "ump_reference_add"
+ * for UMP handles returned from
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id",
+ * because these handles are already reference counted by this function.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_add "ump_dd_reference_add"
+ *
+ * @see ump_dd_reference_add
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_add(ump_handle mem);
+
+
+/**
+ * Releases a reference from the specified UMP memory.
+ *
+ * This function should be called once for every reference to the UMP memory handle.
+ * When the last reference is released, all resources associated with this UMP memory
+ * handle are freed.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_release "ump_dd_reference_release"
+ *
+ * @see ump_dd_reference_release
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_release(ump_handle mem);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_H_ */
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h	(revision 647)
@@ -0,0 +1,62 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2011, 2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_platform.h
+ *
+ * This file should define UMP_API_EXPORT,
+ * which dictates how the UMP user space API should be exported/imported.
+ * Modify this file, if needed, to match your platform setup.
+ */
+
+#ifndef __UMP_PLATFORM_H__
+#define __UMP_PLATFORM_H__
+
+/** @addtogroup ump_user_space_api
+ * @{ */
+
+/**
+ * A define which controls how UMP user space API functions are imported and exported.
+ * This define should be set by the implementor of the UMP API.
+ */
+#if defined(_WIN32)
+
+#define UMP_API_EXPORT
+
+#elif defined(__SYMBIAN32__)
+
+#define UMP_API_EXPORT IMPORT_C
+
+#else
+
+#if defined(__GNUC__)
+#if __GNUC__ >= 4
+#   define MALI_VISIBLE  __attribute__ ((visibility ("default")))       /**< Function should be visible from outside the dll */
+#else
+#   define MALI_VISIBLE
+#endif
+
+#elif defined(__ARMCC_VERSION)
+/* ARMCC specific */
+#   define MALI_VISIBLE  __declspec(dllexport)
+
+#else
+#   define MALI_VISIBLE
+
+#endif
+
+#define UMP_API_EXPORT MALI_VISIBLE
+
+#endif
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /* __UMP_PLATFORM_H__ */
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h	(revision 647)
@@ -0,0 +1,103 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2009-2010, 2012-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_ref_drv.h
+ *
+ * Reference driver extensions to the UMP user space API for allocating UMP memory
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+#define _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+
+#include "ump.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum
+{
+	/* This enum must match with the IOCTL enum in ump_ioctl.h */
+	UMP_REF_DRV_CONSTRAINT_NONE = 0,
+	UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR = 1,
+	UMP_REF_DRV_CONSTRAINT_USE_CACHE = 4,
+} ump_alloc_constraints;
+
+/** Allocate an UMP handle containing a memory buffer.
+ * Input: Size: The minimum size for the allocation.
+ * Usage: If this is UMP_REF_DRV_CONSTRAINT_USE_CACHE, the allocation is mapped as cached by the cpu.
+ *        If it is UMP_REF_DRV_CONSTRAINT_NONE it is mapped as noncached.
+ *        The flag UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR is not supported.*/
+UMP_API_EXPORT ump_handle ump_ref_drv_allocate(unsigned long size, ump_alloc_constraints usage);
+
+typedef enum
+{
+	UMP_MSYNC_CLEAN = 0 ,
+	UMP_MSYNC_CLEAN_AND_INVALIDATE = 1,
+	UMP_MSYNC_INVALIDATE = 2,
+	UMP_MSYNC_READOUT_CACHE_ENABLED = 128,
+} ump_cpu_msync_op;
+
+typedef enum
+{
+	UMP_READ = 1,
+	UMP_READ_WRITE = 3,
+} ump_lock_usage;
+
+/** Flushing cache for an ump_handle.
+ * The function will always CLEAN_AND_INVALIDATE as long as the \a op is not UMP_MSYNC_READOUT_CACHE_ENABLED.
+ * If so it will only report back if the given ump_handle is cacheable.
+ * At the momement the implementation does not use \a address or \a size.
+ * Return value is 1 if cache is enabled, and 0 if it is disabled for the given allocation.*/
+UMP_API_EXPORT int ump_cpu_msync_now(ump_handle mem, ump_cpu_msync_op op, void *address, int size);
+
+
+typedef enum
+{
+	UMP_USED_BY_CPU = 0,
+	UMP_USED_BY_MALI = 1,
+	UMP_USED_BY_UNKNOWN_DEVICE = 100,
+} ump_hw_usage;
+
+typedef enum
+{
+	UMP_CACHE_OP_START = 0,
+	UMP_CACHE_OP_FINISH  = 1,
+} ump_cache_op_control;
+
+/** Cache operation control. Tell when cache maintenance operations start and end.
+This will allow the kernel to merge cache operations togheter, thus making them faster */
+UMP_API_EXPORT int ump_cache_operations_control(ump_cache_op_control op);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage(ump_handle mem, ump_hw_usage new_user);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage_secure_id(ump_secure_id ump_id, ump_hw_usage new_user);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock(ump_handle mem, ump_lock_usage lock_usage);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock_secure_id(ump_secure_id ump_id, ump_lock_usage lock_usage);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock(ump_handle mem);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock_secure_id(ump_secure_id ump_id);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_REF_DRV_H_ */
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h	(revision 647)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012-2013 ARM Limited. All rights reserved.
+ * 
+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence.
+ * 
+ * A copy of the licence is included with the program, and can also be obtained from Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __UMPLOCK_IOCTL_H__
+#define __UMPLOCK_IOCTL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#ifndef __user
+#define __user
+#endif
+
+
+/**
+ * @file umplock_ioctl.h
+ * This file describes the interface needed to use the Linux device driver.
+ * The interface is used by the userpace Mali DDK.
+ */
+
+typedef enum {
+	_LOCK_ACCESS_RENDERABLE = 1,
+	_LOCK_ACCESS_TEXTURE,
+	_LOCK_ACCESS_CPU_WRITE,
+	_LOCK_ACCESS_CPU_READ,
+} _lock_access_usage;
+
+typedef struct _lock_item_s {
+	unsigned int secure_id;
+	_lock_access_usage usage;
+} _lock_item_s;
+
+
+#define LOCK_IOCTL_GROUP 0x91
+
+#define _LOCK_IOCTL_CREATE_CMD  0   /* create kernel lock item        */
+#define _LOCK_IOCTL_PROCESS_CMD 1   /* process kernel lock item       */
+#define _LOCK_IOCTL_RELEASE_CMD 2   /* release kernel lock item       */
+#define _LOCK_IOCTL_ZAP_CMD     3   /* clean up all kernel lock items */
+#define _LOCK_IOCTL_DUMP_CMD    4   /* dump all the items */
+
+#define LOCK_IOCTL_MAX_CMDS     5
+
+#define LOCK_IOCTL_CREATE  _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_CREATE_CMD,  _lock_item_s )
+#define LOCK_IOCTL_PROCESS _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_PROCESS_CMD, _lock_item_s )
+#define LOCK_IOCTL_RELEASE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_RELEASE_CMD, _lock_item_s )
+#define LOCK_IOCTL_ZAP     _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_ZAP_CMD )
+#define LOCK_IOCTL_DUMP    _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_DUMP_CMD )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UMPLOCK_IOCTL_H__ */
+
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in	(revision 647)
@@ -0,0 +1,60 @@
+#
+ # Copyright (C) 2010 ARM Limited. All rights reserved.
+ 
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to deal
+ # in the Software without restriction, including without limitation the rights
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ # copies of the Software, and to permit persons to whom the Software is
+ # furnished to do so, subject to the following conditions:
+ 
+ # The above copyright notice and this permission notice shall be included in
+ # all copies or substantial portions of the Software.
+ 
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+ # /
+
+# X.Org X server configuration file for @HARDWARE_SPEC@
+
+Section "Device"
+	Identifier "Mali FBDEV"
+	Driver	"mali"
+	Option	"fbdev"           "/dev/fb0"
+	Option	"DRI2"            "true"
+	Option  "DRI2_PAGE_FLIP"  "false"
+	Option  "DRI2_WAIT_VSYNC" "false"
+	Option  "UMP_CACHED"      "false"
+	Option  "UMP_LOCK"        "false"
+	Option  "SWCursor"        "true"
+	Option  "HWCursor"        "false"
+EndSection
+
+Section "DRI"
+	Mode 0666
+EndSection
+
+Section "Screen"
+	Identifier "DefaultScreen"
+	Device "Mali FBDEV"
+	DefaultDepth 24
+	DefaultFbBpp 32
+EndSection
+
+Section "ServerFlags"
+	Option     "NoTrapSignals" "true"
+	Option     "DontZap" "false"
+
+	# Disable DPMS timeouts.
+	Option     "StandbyTime" "0"
+	Option     "SuspendTime" "0"
+	Option     "OffTime" "0"
+
+	# Disable screen saver timeout.
+	Option     "BlankTime" "0"
+EndSection
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/license/COPYING
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/license/COPYING	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/license/COPYING	(revision 647)
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) 2016 ARM Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xf86-video-mali: xf86-video-mali @VERSION@ (Mali X11 video driver)
+xf86-video-mali:
+xf86-video-mali: xf86-video-mali is provided as a basis for creating your own
+xf86-video-mali: X Display Driver. It requires a resent version of the xorg-server,
+xf86-video-mali: as well as a successfull integration of UMP with your display device
+xf86-video-mali: driver.
+xf86-video-mali:
+xf86-video-mali: See: http://malideveloper.arm.com/develop-for-mali/drivers
+xf86-video-mali:
+xf86-video-mali:
+xf86-video-mali:
Index: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh
===================================================================
--- X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh	(nonexistent)
+++ X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: X.org/driver/xf86-video-modesetting/0.9.0/Makefile
===================================================================
--- X.org/driver/xf86-video-modesetting/0.9.0/Makefile	(revision 646)
+++ X.org/driver/xf86-video-modesetting/0.9.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-siliconmotion/1.7.8.1/Makefile
===================================================================
--- X.org/driver/xf86-video-siliconmotion/1.7.8.1/Makefile	(nonexistent)
+++ X.org/driver/xf86-video-siliconmotion/1.7.8.1/Makefile	(revision 647)
@@ -0,0 +1,182 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-siliconmotion
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.7.8.1
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-video-siliconmotion/xf86-video-siliconmotion-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-siliconmotion-$(version)
+src_dir_name       = xf86-video-siliconmotion-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-siliconmotion
+XORG_PKG_VERSION             = 1.7.8.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Silicon Motion video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+CFLAGS += -Wno-declaration-after-statement -Wno-discarded-qualifiers
+CFLAGS += -Wno-unused-but-set-variable -Wno-cast-qual
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a CALLMAP COPYING README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" siliconmotion_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" siliconmotion_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" siliconmotion_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-siliconmotion/1.7.8.1/PATCHES
===================================================================
Index: X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-description.in
===================================================================
--- X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-description.in	(nonexistent)
+++ X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                        |-----handy-ruler------------------------------------------------------|
+xf86-video-siliconmotion: xf86-video-siliconmotion @VERSION@ (Silicon Motion video driver)
+xf86-video-siliconmotion:
+xf86-video-siliconmotion: xf86-video-siliconmotion is part of X11.
+xf86-video-siliconmotion:
+xf86-video-siliconmotion: For more information about the X.Org Foundation (the providers
+xf86-video-siliconmotion: of the X.Org implementation of the X Window System).
+xf86-video-siliconmotion:
+xf86-video-siliconmotion: See: http://www.x.org
+xf86-video-siliconmotion:
+xf86-video-siliconmotion:
+xf86-video-siliconmotion:
Index: X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-install.sh
===================================================================
--- X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-install.sh	(nonexistent)
+++ X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: X.org/driver/xf86-video-siliconmotion/1.7.8.1/xf86-video-siliconmotion-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: X.org/driver/xf86-video-v4l/0.2.0/Makefile
===================================================================
--- X.org/driver/xf86-video-v4l/0.2.0/Makefile	(revision 646)
+++ X.org/driver/xf86-video-v4l/0.2.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-v4l/0.2.0/PATCHES
===================================================================
--- X.org/driver/xf86-video-v4l/0.2.0/PATCHES	(revision 646)
+++ X.org/driver/xf86-video-v4l/0.2.0/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
 ../../../../../sources/X.org/driver/xf86-video-v4l/patches/xf86-video-v4l-0.2.0-v4l2-only.patch -p0
+../../../../../sources/X.org/driver/xf86-video-v4l/patches/xf86-video-v4l-0.2.0-automake.patch  -p0
Index: X.org/driver/xf86-video-vesa/2.3.3/Makefile
===================================================================
--- X.org/driver/xf86-video-vesa/2.3.3/Makefile	(revision 646)
+++ X.org/driver/xf86-video-vesa/2.3.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-vesa/2.3.4/Makefile
===================================================================
--- X.org/driver/xf86-video-vesa/2.3.4/Makefile	(revision 646)
+++ X.org/driver/xf86-video-vesa/2.3.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -29,10 +36,10 @@
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXV)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 else
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 endif
 endif
 endif
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-vmware/13.0.2/Makefile
===================================================================
--- X.org/driver/xf86-video-vmware/13.0.2/Makefile	(revision 646)
+++ X.org/driver/xf86-video-vmware/13.0.2/Makefile	(revision 647)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vmware
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 
 REQUIRES          += X11/libs/opengl-collection
 
@@ -205,4 +205,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver/xf86-video-vmware/13.1.0/Makefile
===================================================================
--- X.org/driver/xf86-video-vmware/13.1.0/Makefile	(revision 646)
+++ X.org/driver/xf86-video-vmware/13.1.0/Makefile	(revision 647)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vmware
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.4
 
 REQUIRES          += X11/libs/opengl-collection
 
@@ -205,4 +205,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/driver-input/Makefile
===================================================================
--- X.org/driver-input/Makefile	(revision 646)
+++ X.org/driver-input/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
Index: X.org/driver-video/Makefile
===================================================================
--- X.org/driver-video/Makefile	(revision 646)
+++ X.org/driver-video/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -45,11 +52,25 @@
 REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2
 endif
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_MXV)),)
 REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2
 endif
 
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r7p0-00rel0/0.4.2
+endif
 
+ifneq ($(filter $(HARDWARE),$(HARDWARE_ODROID_C2)),)
+REQUIRES += X11/X.org/driver/xf86-video-fbturbo/r6p1-01rel0/0.5.1
+endif
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_BT1)),)
+REQUIRES += X11/X.org/driver/xf86-video-siliconmotion/1.7.8.1
+endif
+
+
 # ======= __END_OF_REQUIRES__ =======
 
 
Index: X.org/font/encodings/1.0.4/Makefile
===================================================================
--- X.org/font/encodings/1.0.4/Makefile	(revision 646)
+++ X.org/font/encodings/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/encodings
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -171,4 +178,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/encodings/1.0.4/PATCHES
===================================================================
--- X.org/font/encodings/1.0.4/PATCHES	(revision 646)
+++ X.org/font/encodings/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/encodings/patches/encodings-1.0.4-automake.patch -p0
Index: X.org/font/font-adobe-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-adobe-100dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-adobe-100dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-100dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-adobe-100dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-adobe-100dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-adobe-100dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-adobe-100dpi/patches/font-adobe-100dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-adobe-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-adobe-75dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-adobe-75dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-75dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-adobe-75dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-adobe-75dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-adobe-75dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-adobe-75dpi/patches/font-adobe-75dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile	(revision 646)
+++ X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-100dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-adobe-utopia-100dpi/1.0.4/PATCHES
===================================================================
--- X.org/font/font-adobe-utopia-100dpi/1.0.4/PATCHES	(revision 646)
+++ X.org/font/font-adobe-utopia-100dpi/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-adobe-utopia-100dpi/patches/font-adobe-utopia-100dpi-1.0.4-automake.patch -p0
Index: X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile	(revision 646)
+++ X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-75dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-adobe-utopia-75dpi/1.0.4/PATCHES
===================================================================
--- X.org/font/font-adobe-utopia-75dpi/1.0.4/PATCHES	(revision 646)
+++ X.org/font/font-adobe-utopia-75dpi/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-adobe-utopia-75dpi/patches/font-adobe-utopia-75dpi-1.0.4-automake.patch -p0
Index: X.org/font/font-adobe-utopia-type1/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-type1/1.0.4/Makefile	(revision 646)
+++ X.org/font/font-adobe-utopia-type1/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-type1
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-adobe-utopia-type1/1.0.4/PATCHES
===================================================================
--- X.org/font/font-adobe-utopia-type1/1.0.4/PATCHES	(revision 646)
+++ X.org/font/font-adobe-utopia-type1/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-adobe-utopia-type1/patches/font-adobe-utopia-type1-1.0.4-automake.patch -p0
Index: X.org/font/font-alias/1.0.3/Makefile
===================================================================
--- X.org/font/font-alias/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-alias/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-alias
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -171,4 +178,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-alias/1.0.3/PATCHES
===================================================================
--- X.org/font/font-alias/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-alias/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-alias/patches/font-alias-1.0.3-automake.patch -p0
Index: X.org/font/font-arabic-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-arabic-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-arabic-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-arabic-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-arabic-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-arabic-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-arabic-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-arabic-misc/patches/font-arabic-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-100dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-100dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-100dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-100dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-100dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-100dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-100dpi/patches/font-bh-100dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-75dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-75dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-75dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-75dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-75dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-75dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-75dpi/patches/font-bh-75dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-lucidatypewriter-100dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-lucidatypewriter-100dpi/patches/font-bh-lucidatypewriter-100dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-lucidatypewriter-75dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-lucidatypewriter-75dpi/patches/font-bh-lucidatypewriter-75dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-ttf/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-ttf/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-ttf/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-ttf
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-ttf/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-ttf/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-ttf/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-ttf/patches/font-bh-ttf-1.0.3-automake.patch -p0
Index: X.org/font/font-bh-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-type1/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bh-type1/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-type1
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bh-type1/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bh-type1/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bh-type1/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bh-type1/patches/font-bh-type1-1.0.3-automake.patch -p0
Index: X.org/font/font-bitstream-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-100dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bitstream-100dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-100dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bitstream-100dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bitstream-100dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bitstream-100dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bitstream-100dpi/patches/font-bitstream-100dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bitstream-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-75dpi/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bitstream-75dpi/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-75dpi
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bitstream-75dpi/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bitstream-75dpi/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bitstream-75dpi/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bitstream-75dpi/patches/font-bitstream-75dpi-1.0.3-automake.patch -p0
Index: X.org/font/font-bitstream-speedo/1.0.2/Makefile
===================================================================
--- X.org/font/font-bitstream-speedo/1.0.2/Makefile	(revision 646)
+++ X.org/font/font-bitstream-speedo/1.0.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-speedo
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bitstream-speedo/1.0.2/PATCHES
===================================================================
--- X.org/font/font-bitstream-speedo/1.0.2/PATCHES	(revision 646)
+++ X.org/font/font-bitstream-speedo/1.0.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bitstream-speedo/patches/font-bitstream-speedo-1.0.2-automake.patch -p0
Index: X.org/font/font-bitstream-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-type1/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-bitstream-type1/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-type1
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-bitstream-type1/1.0.3/PATCHES
===================================================================
--- X.org/font/font-bitstream-type1/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-bitstream-type1/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-bitstream-type1/patches/font-bitstream-type1-1.0.3-automake.patch -p0
Index: X.org/font/font-cronyx-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-cronyx-cyrillic/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-cronyx-cyrillic/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-cronyx-cyrillic
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-cronyx-cyrillic/1.0.3/PATCHES
===================================================================
--- X.org/font/font-cronyx-cyrillic/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-cronyx-cyrillic/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-cronyx-cyrillic/patches/font-cronyx-cyrillic-1.0.3-automake.patch -p0
Index: X.org/font/font-cursor-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-cursor-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-cursor-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-cursor-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-cursor-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-cursor-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-cursor-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-cursor-misc/patches/font-cursor-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-daewoo-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-daewoo-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-daewoo-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-daewoo-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-daewoo-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-daewoo-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-daewoo-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-daewoo-misc/patches/font-daewoo-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-dec-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-dec-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-dec-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-dec-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-dec-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-dec-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-dec-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-dec-misc/patches/font-dec-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-ibm-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-ibm-type1/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-ibm-type1/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-ibm-type1
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-ibm-type1/1.0.3/PATCHES
===================================================================
--- X.org/font/font-ibm-type1/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-ibm-type1/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-ibm-type1/patches/font-ibm-type1-1.0.3-automake.patch -p0
Index: X.org/font/font-isas-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-isas-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-isas-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-isas-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-isas-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-isas-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-isas-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-isas-misc/patches/font-isas-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-jis-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-jis-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-jis-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-jis-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-jis-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-jis-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-jis-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-jis-misc/patches/font-jis-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-micro-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-micro-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-micro-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-micro-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-micro-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-micro-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-micro-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-micro-misc/patches/font-micro-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-misc-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-cyrillic/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-misc-cyrillic/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-cyrillic
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-misc-cyrillic/1.0.3/PATCHES
===================================================================
--- X.org/font/font-misc-cyrillic/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-misc-cyrillic/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-misc-cyrillic/patches/font-misc-cyrillic-1.0.3-automake.patch -p0
Index: X.org/font/font-misc-ethiopic/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-ethiopic/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-misc-ethiopic/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-ethiopic
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-misc-ethiopic/1.0.3/PATCHES
===================================================================
--- X.org/font/font-misc-ethiopic/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-misc-ethiopic/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-misc-ethiopic/patches/font-misc-ethiopic-1.0.3-automake.patch -p0
Index: X.org/font/font-misc-meltho/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-meltho/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-misc-meltho/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-meltho
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-misc-meltho/1.0.3/PATCHES
===================================================================
--- X.org/font/font-misc-meltho/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-misc-meltho/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-misc-meltho/patches/font-misc-meltho-1.0.3-automake.patch -p0
Index: X.org/font/font-misc-misc/1.1.2/Makefile
===================================================================
--- X.org/font/font-misc-misc/1.1.2/Makefile	(revision 646)
+++ X.org/font/font-misc-misc/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-misc-misc/1.1.2/PATCHES
===================================================================
--- X.org/font/font-misc-misc/1.1.2/PATCHES	(revision 646)
+++ X.org/font/font-misc-misc/1.1.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-misc-misc/patches/font-misc-misc-1.1.2-automake.patch -p0
Index: X.org/font/font-mutt-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-mutt-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-mutt-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-mutt-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-mutt-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-mutt-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-mutt-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-mutt-misc/patches/font-mutt-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-schumacher-misc/1.1.2/Makefile
===================================================================
--- X.org/font/font-schumacher-misc/1.1.2/Makefile	(revision 646)
+++ X.org/font/font-schumacher-misc/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-schumacher-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-schumacher-misc/1.1.2/PATCHES
===================================================================
--- X.org/font/font-schumacher-misc/1.1.2/PATCHES	(revision 646)
+++ X.org/font/font-schumacher-misc/1.1.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-schumacher-misc/patches/font-schumacher-misc-1.1.2-automake.patch -p0
Index: X.org/font/font-screen-cyrillic/1.0.4/Makefile
===================================================================
--- X.org/font/font-screen-cyrillic/1.0.4/Makefile	(revision 646)
+++ X.org/font/font-screen-cyrillic/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-screen-cyrillic
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-screen-cyrillic/1.0.4/PATCHES
===================================================================
--- X.org/font/font-screen-cyrillic/1.0.4/PATCHES	(revision 646)
+++ X.org/font/font-screen-cyrillic/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-screen-cyrillic/patches/font-screen-cyrillic-1.0.4-automake.patch -p0
Index: X.org/font/font-sony-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-sony-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-sony-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-sony-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-sony-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-sony-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-sony-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-sony-misc/patches/font-sony-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-sun-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-sun-misc/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-sun-misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-sun-misc
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-sun-misc/1.0.3/PATCHES
===================================================================
--- X.org/font/font-sun-misc/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-sun-misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-sun-misc/patches/font-sun-misc-1.0.3-automake.patch -p0
Index: X.org/font/font-util/1.3.0/Makefile
===================================================================
--- X.org/font/font-util/1.3.0/Makefile	(revision 646)
+++ X.org/font/font-util/1.3.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-util/1.3.1/Makefile
===================================================================
--- X.org/font/font-util/1.3.1/Makefile	(revision 646)
+++ X.org/font/font-util/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -152,8 +159,10 @@
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(XORG_PKG))
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	# ======= do not touch fontrootdir variable in fontutil.pc file                      =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
-	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" fontutil.pc \
+	   sed -i "s,prefix=/usr,prefix=$(TARGET_DEST_DIR)/usr,g" fontutil.pc ; \
+	   sed -i "s,libdir=/usr,libdir=$(TARGET_DEST_DIR)/usr,g" fontutil.pc ; \
 	 )
 	# ======= Strip binaries =======
 	@( cd $(XORG_PKG); \
@@ -180,4 +189,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-winitzki-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-winitzki-cyrillic/1.0.3/Makefile	(revision 646)
+++ X.org/font/font-winitzki-cyrillic/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-winitzki-cyrillic
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-winitzki-cyrillic/1.0.3/PATCHES
===================================================================
--- X.org/font/font-winitzki-cyrillic/1.0.3/PATCHES	(revision 646)
+++ X.org/font/font-winitzki-cyrillic/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-winitzki-cyrillic/patches/font-winitzki-cyrillic-1.0.3-automake.patch -p0
Index: X.org/font/font-xfree86-type1/1.0.4/Makefile
===================================================================
--- X.org/font/font-xfree86-type1/1.0.4/Makefile	(revision 646)
+++ X.org/font/font-xfree86-type1/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/font/font-xfree86-type1
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -172,4 +179,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/font/font-xfree86-type1/1.0.4/PATCHES
===================================================================
--- X.org/font/font-xfree86-type1/1.0.4/PATCHES	(revision 646)
+++ X.org/font/font-xfree86-type1/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/font/font-xfree86-type1/patches/font-xfree86-type1-1.0.4-automake.patch -p0
Index: X.org/font-collection/Makefile
===================================================================
--- X.org/font-collection/Makefile	(revision 646)
+++ X.org/font-collection/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
Index: X.org/lib/libFS/1.0.6/Makefile
===================================================================
--- X.org/lib/libFS/1.0.6/Makefile	(revision 646)
+++ X.org/lib/libFS/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -196,4 +203,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libFS/1.0.6-x86_32/Makefile
===================================================================
--- X.org/lib/libFS/1.0.6-x86_32/Makefile	(revision 646)
+++ X.org/lib/libFS/1.0.6-x86_32/Makefile	(revision 647)
@@ -155,4 +155,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libFS/1.0.7/Makefile
===================================================================
--- X.org/lib/libFS/1.0.7/Makefile	(revision 646)
+++ X.org/lib/libFS/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -196,4 +203,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libFS/1.0.7-x86_32/Makefile
===================================================================
--- X.org/lib/libFS/1.0.7-x86_32/Makefile	(revision 646)
+++ X.org/lib/libFS/1.0.7-x86_32/Makefile	(revision 647)
@@ -155,4 +155,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libICE/1.0.9/Makefile
===================================================================
--- X.org/lib/libICE/1.0.9/Makefile	(revision 646)
+++ X.org/lib/libICE/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -193,4 +200,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libICE/1.0.9-x86_32/Makefile
===================================================================
--- X.org/lib/libICE/1.0.9-x86_32/Makefile	(revision 646)
+++ X.org/lib/libICE/1.0.9-x86_32/Makefile	(revision 647)
@@ -152,4 +152,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libSM/1.2.2/Makefile
===================================================================
--- X.org/lib/libSM/1.2.2/Makefile	(revision 646)
+++ X.org/lib/libSM/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -209,4 +216,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libSM/1.2.2-x86_32/Makefile
===================================================================
--- X.org/lib/libSM/1.2.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libSM/1.2.2-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libX11/1.6.2/Makefile
===================================================================
--- X.org/lib/libX11/1.6.2/Makefile	(revision 646)
+++ X.org/lib/libX11/1.6.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -255,4 +262,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libX11/1.6.2-x86_32/Makefile
===================================================================
--- X.org/lib/libX11/1.6.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libX11/1.6.2-x86_32/Makefile	(revision 647)
@@ -170,4 +170,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libX11/1.6.3/Makefile
===================================================================
--- X.org/lib/libX11/1.6.3/Makefile	(revision 646)
+++ X.org/lib/libX11/1.6.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -257,4 +264,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libX11/1.6.3-x86_32/Makefile
===================================================================
--- X.org/lib/libX11/1.6.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libX11/1.6.3-x86_32/Makefile	(revision 647)
@@ -172,4 +172,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXScrnSaver/1.2.2/Makefile
===================================================================
--- X.org/lib/libXScrnSaver/1.2.2/Makefile	(revision 646)
+++ X.org/lib/libXScrnSaver/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -221,4 +228,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXScrnSaver/1.2.2/PATCHES
===================================================================
--- X.org/lib/libXScrnSaver/1.2.2/PATCHES	(revision 646)
+++ X.org/lib/libXScrnSaver/1.2.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXScrnSaver/patches/libXScrnSaver-1.2.2-automake.patch -p0
Index: X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXScrnSaver/1.2.2-x86_32/PATCHES
===================================================================
--- X.org/lib/libXScrnSaver/1.2.2-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXScrnSaver/1.2.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXScrnSaver/patches/libXScrnSaver-1.2.2-automake.patch -p0
Index: X.org/lib/libXau/1.0.8/Makefile
===================================================================
--- X.org/lib/libXau/1.0.8/Makefile	(revision 646)
+++ X.org/lib/libXau/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -203,4 +210,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXau/1.0.8-x86_32/Makefile
===================================================================
--- X.org/lib/libXau/1.0.8-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXau/1.0.8-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw/1.0.12/Makefile
===================================================================
--- X.org/lib/libXaw/1.0.12/Makefile	(revision 646)
+++ X.org/lib/libXaw/1.0.12/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw/1.0.12-x86_32/Makefile
===================================================================
--- X.org/lib/libXaw/1.0.12-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXaw/1.0.12-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw/1.0.13/Makefile
===================================================================
--- X.org/lib/libXaw/1.0.13/Makefile	(revision 646)
+++ X.org/lib/libXaw/1.0.13/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw/1.0.13-x86_32/Makefile
===================================================================
--- X.org/lib/libXaw/1.0.13-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXaw/1.0.13-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw3d/1.6.2/Makefile
===================================================================
--- X.org/lib/libXaw3d/1.6.2/Makefile	(revision 646)
+++ X.org/lib/libXaw3d/1.6.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -212,4 +219,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw3d/1.6.2/PATCHES
===================================================================
--- X.org/lib/libXaw3d/1.6.2/PATCHES	(revision 646)
+++ X.org/lib/libXaw3d/1.6.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXaw3d/patches/libXaw3d-1.6.2-automake.patch -p0
Index: X.org/lib/libXaw3d/1.6.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXaw3d/1.6.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXaw3d/1.6.2-x86_32/Makefile	(revision 647)
@@ -171,4 +171,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXaw3d/1.6.2-x86_32/PATCHES
===================================================================
--- X.org/lib/libXaw3d/1.6.2-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXaw3d/1.6.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXaw3d/patches/libXaw3d-1.6.2-automake.patch -p0
Index: X.org/lib/libXcm/0.5.3/Makefile
===================================================================
--- X.org/lib/libXcm/0.5.3/Makefile	(revision 646)
+++ X.org/lib/libXcm/0.5.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXcm/0.5.3/PATCHES
===================================================================
--- X.org/lib/libXcm/0.5.3/PATCHES	(revision 646)
+++ X.org/lib/libXcm/0.5.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXcm/patches/libXcm-0.5.3-automake.patch -p0
Index: X.org/lib/libXcm/0.5.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXcm/0.5.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXcm/0.5.3-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXcm/0.5.3-x86_32/PATCHES
===================================================================
--- X.org/lib/libXcm/0.5.3-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXcm/0.5.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXcm/patches/libXcm-0.5.3-automake.patch -p0
Index: X.org/lib/libXcomposite/0.4.4/Makefile
===================================================================
--- X.org/lib/libXcomposite/0.4.4/Makefile	(revision 646)
+++ X.org/lib/libXcomposite/0.4.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXcomposite/0.4.4/PATCHES
===================================================================
--- X.org/lib/libXcomposite/0.4.4/PATCHES	(revision 646)
+++ X.org/lib/libXcomposite/0.4.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXcomposite/patches/libXcomposite-0.4.4-automake.patch -p0
Index: X.org/lib/libXcomposite/0.4.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXcomposite/0.4.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXcomposite/0.4.4-x86_32/Makefile	(revision 647)
@@ -165,4 +165,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXcomposite/0.4.4-x86_32/PATCHES
===================================================================
--- X.org/lib/libXcomposite/0.4.4-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXcomposite/0.4.4-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXcomposite/patches/libXcomposite-0.4.4-automake.patch -p0
Index: X.org/lib/libXcursor/1.1.14/Makefile
===================================================================
--- X.org/lib/libXcursor/1.1.14/Makefile	(revision 646)
+++ X.org/lib/libXcursor/1.1.14/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -177,8 +184,10 @@
 	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXcursor.la \
 	 )
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	# ======= do not touch datarootdir variable in xcursor.pc file                       =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
-	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xcursor.pc \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"     xcursor.pc ; \
+	   sed -i "s,^\(datarootdir=\).*,\1/usr/share," xcursor.pc ; \
 	 )
 	# ======= Strip binaries =======
 	@( cd $(XORG_PKG) ; \
@@ -218,4 +227,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXcursor/1.1.14-x86_32/Makefile
===================================================================
--- X.org/lib/libXcursor/1.1.14-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXcursor/1.1.14-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdamage/1.1.4/Makefile
===================================================================
--- X.org/lib/libXdamage/1.1.4/Makefile	(revision 646)
+++ X.org/lib/libXdamage/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -207,4 +214,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdamage/1.1.4/PATCHES
===================================================================
--- X.org/lib/libXdamage/1.1.4/PATCHES	(revision 646)
+++ X.org/lib/libXdamage/1.1.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXdamage/patches/libXdamage-1.1.4-automake.patch -p0
Index: X.org/lib/libXdamage/1.1.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXdamage/1.1.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXdamage/1.1.4-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdamage/1.1.4-x86_32/PATCHES
===================================================================
--- X.org/lib/libXdamage/1.1.4-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXdamage/1.1.4-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXdamage/patches/libXdamage-1.1.4-automake.patch -p0
Index: X.org/lib/libXdmcp/1.1.1/Makefile
===================================================================
--- X.org/lib/libXdmcp/1.1.1/Makefile	(revision 646)
+++ X.org/lib/libXdmcp/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -191,4 +198,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdmcp/1.1.1-x86_32/Makefile
===================================================================
--- X.org/lib/libXdmcp/1.1.1-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXdmcp/1.1.1-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdmcp/1.1.2/Makefile
===================================================================
--- X.org/lib/libXdmcp/1.1.2/Makefile	(revision 646)
+++ X.org/lib/libXdmcp/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -191,4 +198,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXdmcp/1.1.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXdmcp/1.1.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXdmcp/1.1.2-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXevie/1.0.3/Makefile
===================================================================
--- X.org/lib/libXevie/1.0.3/Makefile	(revision 646)
+++ X.org/lib/libXevie/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXevie/1.0.3/PATCHES
===================================================================
--- X.org/lib/libXevie/1.0.3/PATCHES	(revision 646)
+++ X.org/lib/libXevie/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXevie/patches/libXevie-1.0.3-automake.patch -p0
Index: X.org/lib/libXevie/1.0.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXevie/1.0.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXevie/1.0.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXevie/1.0.3-x86_32/PATCHES
===================================================================
--- X.org/lib/libXevie/1.0.3-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXevie/1.0.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXevie/patches/libXevie-1.0.3-automake.patch -p0
Index: X.org/lib/libXext/1.3.3/Makefile
===================================================================
--- X.org/lib/libXext/1.3.3/Makefile	(revision 646)
+++ X.org/lib/libXext/1.3.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -220,4 +227,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXext/1.3.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXext/1.3.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXext/1.3.3-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfixes/5.0.1/Makefile
===================================================================
--- X.org/lib/libXfixes/5.0.1/Makefile	(revision 646)
+++ X.org/lib/libXfixes/5.0.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -207,4 +214,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfixes/5.0.1-x86_32/Makefile
===================================================================
--- X.org/lib/libXfixes/5.0.1-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXfixes/5.0.1-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfont/1.5.0/Makefile
===================================================================
--- X.org/lib/libXfont/1.5.0/Makefile	(revision 646)
+++ X.org/lib/libXfont/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfont/1.5.0-x86_32/Makefile
===================================================================
--- X.org/lib/libXfont/1.5.0-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXfont/1.5.0-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfont/1.5.1/Makefile
===================================================================
--- X.org/lib/libXfont/1.5.1/Makefile	(revision 646)
+++ X.org/lib/libXfont/1.5.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfont/1.5.1-x86_32/Makefile
===================================================================
--- X.org/lib/libXfont/1.5.1-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXfont/1.5.1-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfontcache/1.0.5/Makefile
===================================================================
--- X.org/lib/libXfontcache/1.0.5/Makefile	(revision 646)
+++ X.org/lib/libXfontcache/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -220,4 +227,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfontcache/1.0.5/PATCHES
===================================================================
--- X.org/lib/libXfontcache/1.0.5/PATCHES	(revision 646)
+++ X.org/lib/libXfontcache/1.0.5/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXfontcache/patches/libXfontcache-1.0.5-automake.patch -p0
Index: X.org/lib/libXfontcache/1.0.5-x86_32/Makefile
===================================================================
--- X.org/lib/libXfontcache/1.0.5-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXfontcache/1.0.5-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXfontcache/1.0.5-x86_32/PATCHES
===================================================================
--- X.org/lib/libXfontcache/1.0.5-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXfontcache/1.0.5-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXfontcache/patches/libXfontcache-1.0.5-automake.patch -p0
Index: X.org/lib/libXft/2.3.2/Makefile
===================================================================
--- X.org/lib/libXft/2.3.2/Makefile	(revision 646)
+++ X.org/lib/libXft/2.3.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -219,4 +226,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXft/2.3.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXft/2.3.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXft/2.3.2-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXi/1.7.4/Makefile
===================================================================
--- X.org/lib/libXi/1.7.4/Makefile	(revision 646)
+++ X.org/lib/libXi/1.7.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -219,4 +226,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXi/1.7.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXi/1.7.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXi/1.7.4-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXi/1.7.6/Makefile
===================================================================
--- X.org/lib/libXi/1.7.6/Makefile	(revision 646)
+++ X.org/lib/libXi/1.7.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -221,4 +228,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXi/1.7.6-x86_32/Makefile
===================================================================
--- X.org/lib/libXi/1.7.6-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXi/1.7.6-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXinerama/1.1.3/Makefile
===================================================================
--- X.org/lib/libXinerama/1.1.3/Makefile	(revision 646)
+++ X.org/lib/libXinerama/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXinerama/1.1.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXinerama/1.1.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXinerama/1.1.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXmu/1.1.2/Makefile
===================================================================
--- X.org/lib/libXmu/1.1.2/Makefile	(revision 646)
+++ X.org/lib/libXmu/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXmu/1.1.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXmu/1.1.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXmu/1.1.2-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXp/1.0.2/Makefile
===================================================================
--- X.org/lib/libXp/1.0.2/Makefile	(revision 646)
+++ X.org/lib/libXp/1.0.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXp/1.0.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXp/1.0.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXp/1.0.2-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXp/1.0.3/Makefile
===================================================================
--- X.org/lib/libXp/1.0.3/Makefile	(revision 646)
+++ X.org/lib/libXp/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXp/1.0.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXp/1.0.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXp/1.0.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXpm/3.5.11/Makefile
===================================================================
--- X.org/lib/libXpm/3.5.11/Makefile	(revision 646)
+++ X.org/lib/libXpm/3.5.11/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXpm/3.5.11-x86_32/Makefile
===================================================================
--- X.org/lib/libXpm/3.5.11-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXpm/3.5.11-x86_32/Makefile	(revision 647)
@@ -181,4 +181,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrandr/1.4.2/Makefile
===================================================================
--- X.org/lib/libXrandr/1.4.2/Makefile	(revision 646)
+++ X.org/lib/libXrandr/1.4.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -219,4 +226,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrandr/1.4.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXrandr/1.4.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXrandr/1.4.2-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrandr/1.5.0/Makefile
===================================================================
--- X.org/lib/libXrandr/1.5.0/Makefile	(revision 646)
+++ X.org/lib/libXrandr/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -221,4 +228,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrandr/1.5.0-x86_32/Makefile
===================================================================
--- X.org/lib/libXrandr/1.5.0-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXrandr/1.5.0-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrender/0.9.8/Makefile
===================================================================
--- X.org/lib/libXrender/0.9.8/Makefile	(revision 646)
+++ X.org/lib/libXrender/0.9.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrender/0.9.8-x86_32/Makefile
===================================================================
--- X.org/lib/libXrender/0.9.8-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXrender/0.9.8-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrender/0.9.9/Makefile
===================================================================
--- X.org/lib/libXrender/0.9.9/Makefile	(revision 646)
+++ X.org/lib/libXrender/0.9.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -209,4 +216,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXrender/0.9.9-x86_32/Makefile
===================================================================
--- X.org/lib/libXrender/0.9.9-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXrender/0.9.9-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXres/1.0.7/Makefile
===================================================================
--- X.org/lib/libXres/1.0.7/Makefile	(revision 646)
+++ X.org/lib/libXres/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -221,4 +228,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXres/1.0.7-x86_32/Makefile
===================================================================
--- X.org/lib/libXres/1.0.7-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXres/1.0.7-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXt/1.1.4/Makefile
===================================================================
--- X.org/lib/libXt/1.1.4/Makefile	(revision 646)
+++ X.org/lib/libXt/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -225,4 +232,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXt/1.1.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXt/1.1.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXt/1.1.4-x86_32/Makefile	(revision 647)
@@ -173,4 +173,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXt/1.1.5/Makefile
===================================================================
--- X.org/lib/libXt/1.1.5/Makefile	(revision 646)
+++ X.org/lib/libXt/1.1.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -227,4 +234,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXt/1.1.5-x86_32/Makefile
===================================================================
--- X.org/lib/libXt/1.1.5-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXt/1.1.5-x86_32/Makefile	(revision 647)
@@ -175,4 +175,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXtst/1.2.2/Makefile
===================================================================
--- X.org/lib/libXtst/1.2.2/Makefile	(revision 646)
+++ X.org/lib/libXtst/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXtst/1.2.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXtst/1.2.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXtst/1.2.2-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXv/1.0.10/Makefile
===================================================================
--- X.org/lib/libXv/1.0.10/Makefile	(revision 646)
+++ X.org/lib/libXv/1.0.10/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXv/1.0.10-x86_32/Makefile
===================================================================
--- X.org/lib/libXv/1.0.10-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXv/1.0.10-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXvMC/1.0.8/Makefile
===================================================================
--- X.org/lib/libXvMC/1.0.8/Makefile	(revision 646)
+++ X.org/lib/libXvMC/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXvMC/1.0.8-x86_32/Makefile
===================================================================
--- X.org/lib/libXvMC/1.0.8-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXvMC/1.0.8-x86_32/Makefile	(revision 647)
@@ -165,4 +165,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXvMC/1.0.9/Makefile
===================================================================
--- X.org/lib/libXvMC/1.0.9/Makefile	(revision 646)
+++ X.org/lib/libXvMC/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXvMC/1.0.9-x86_32/Makefile
===================================================================
--- X.org/lib/libXvMC/1.0.9-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXvMC/1.0.9-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86dga/1.1.4/Makefile
===================================================================
--- X.org/lib/libXxf86dga/1.1.4/Makefile	(revision 646)
+++ X.org/lib/libXxf86dga/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86dga/1.1.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXxf86dga/1.1.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXxf86dga/1.1.4-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86misc/1.0.3/Makefile
===================================================================
--- X.org/lib/libXxf86misc/1.0.3/Makefile	(revision 646)
+++ X.org/lib/libXxf86misc/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86misc/1.0.3/PATCHES
===================================================================
--- X.org/lib/libXxf86misc/1.0.3/PATCHES	(revision 646)
+++ X.org/lib/libXxf86misc/1.0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXxf86misc/patches/libXxf86misc-1.0.3-automake.patch -p0
Index: X.org/lib/libXxf86misc/1.0.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXxf86misc/1.0.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXxf86misc/1.0.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86misc/1.0.3-x86_32/PATCHES
===================================================================
--- X.org/lib/libXxf86misc/1.0.3-x86_32/PATCHES	(revision 646)
+++ X.org/lib/libXxf86misc/1.0.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/lib/libXxf86misc/patches/libXxf86misc-1.0.3-automake.patch -p0
Index: X.org/lib/libXxf86vm/1.1.3/Makefile
===================================================================
--- X.org/lib/libXxf86vm/1.1.3/Makefile	(revision 646)
+++ X.org/lib/libXxf86vm/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86vm/1.1.3-x86_32/Makefile
===================================================================
--- X.org/lib/libXxf86vm/1.1.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXxf86vm/1.1.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86vm/1.1.4/Makefile
===================================================================
--- X.org/lib/libXxf86vm/1.1.4/Makefile	(revision 646)
+++ X.org/lib/libXxf86vm/1.1.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -220,4 +227,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libXxf86vm/1.1.4-x86_32/Makefile
===================================================================
--- X.org/lib/libXxf86vm/1.1.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libXxf86vm/1.1.4-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libdmx/1.1.3/Makefile
===================================================================
--- X.org/lib/libdmx/1.1.3/Makefile	(revision 646)
+++ X.org/lib/libdmx/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libdmx/1.1.3-x86_32/Makefile
===================================================================
--- X.org/lib/libdmx/1.1.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libdmx/1.1.3-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libfontenc/1.1.2/Makefile
===================================================================
--- X.org/lib/libfontenc/1.1.2/Makefile	(revision 646)
+++ X.org/lib/libfontenc/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -192,4 +199,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libfontenc/1.1.2-x86_32/Makefile
===================================================================
--- X.org/lib/libfontenc/1.1.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libfontenc/1.1.2-x86_32/Makefile	(revision 647)
@@ -152,4 +152,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libfontenc/1.1.3/Makefile
===================================================================
--- X.org/lib/libfontenc/1.1.3/Makefile	(revision 646)
+++ X.org/lib/libfontenc/1.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -192,4 +199,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libfontenc/1.1.3-x86_32/Makefile
===================================================================
--- X.org/lib/libfontenc/1.1.3-x86_32/Makefile	(revision 646)
+++ X.org/lib/libfontenc/1.1.3-x86_32/Makefile	(revision 647)
@@ -152,4 +152,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libpciaccess/0.13.2/Makefile
===================================================================
--- X.org/lib/libpciaccess/0.13.2/Makefile	(revision 646)
+++ X.org/lib/libpciaccess/0.13.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -195,4 +202,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libpciaccess/0.13.2-x86_32/Makefile
===================================================================
--- X.org/lib/libpciaccess/0.13.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libpciaccess/0.13.2-x86_32/Makefile	(revision 647)
@@ -154,4 +154,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libpciaccess/0.13.4/Makefile
===================================================================
--- X.org/lib/libpciaccess/0.13.4/Makefile	(revision 646)
+++ X.org/lib/libpciaccess/0.13.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -195,4 +202,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libpciaccess/0.13.4-x86_32/Makefile
===================================================================
--- X.org/lib/libpciaccess/0.13.4-x86_32/Makefile	(revision 646)
+++ X.org/lib/libpciaccess/0.13.4-x86_32/Makefile	(revision 647)
@@ -154,4 +154,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxkbfile/1.0.8/Makefile
===================================================================
--- X.org/lib/libxkbfile/1.0.8/Makefile	(revision 646)
+++ X.org/lib/libxkbfile/1.0.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxkbfile/1.0.8-x86_32/Makefile
===================================================================
--- X.org/lib/libxkbfile/1.0.8-x86_32/Makefile	(revision 646)
+++ X.org/lib/libxkbfile/1.0.8-x86_32/Makefile	(revision 647)
@@ -165,4 +165,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxkbfile/1.0.9/Makefile
===================================================================
--- X.org/lib/libxkbfile/1.0.9/Makefile	(revision 646)
+++ X.org/lib/libxkbfile/1.0.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxkbfile/1.0.9-x86_32/Makefile
===================================================================
--- X.org/lib/libxkbfile/1.0.9-x86_32/Makefile	(revision 646)
+++ X.org/lib/libxkbfile/1.0.9-x86_32/Makefile	(revision 647)
@@ -165,4 +165,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxshmfence/1.1/Makefile
===================================================================
--- X.org/lib/libxshmfence/1.1/Makefile	(revision 646)
+++ X.org/lib/libxshmfence/1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -195,4 +202,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxshmfence/1.1-x86_32/Makefile
===================================================================
--- X.org/lib/libxshmfence/1.1-x86_32/Makefile	(revision 646)
+++ X.org/lib/libxshmfence/1.1-x86_32/Makefile	(revision 647)
@@ -154,4 +154,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxshmfence/1.2/Makefile
===================================================================
--- X.org/lib/libxshmfence/1.2/Makefile	(revision 646)
+++ X.org/lib/libxshmfence/1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -195,4 +202,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/libxshmfence/1.2-x86_32/Makefile
===================================================================
--- X.org/lib/libxshmfence/1.2-x86_32/Makefile	(revision 646)
+++ X.org/lib/libxshmfence/1.2-x86_32/Makefile	(revision 647)
@@ -154,4 +154,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/pixman/0.32.6/Makefile
===================================================================
--- X.org/lib/pixman/0.32.6/Makefile	(revision 646)
+++ X.org/lib/pixman/0.32.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -196,4 +203,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/pixman/0.32.6-x86_32/Makefile
===================================================================
--- X.org/lib/pixman/0.32.6-x86_32/Makefile	(revision 646)
+++ X.org/lib/pixman/0.32.6-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/pixman/0.34.0/Makefile
===================================================================
--- X.org/lib/pixman/0.34.0/Makefile	(revision 646)
+++ X.org/lib/pixman/0.34.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -196,4 +203,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/pixman/0.34.0-x86_32/Makefile
===================================================================
--- X.org/lib/pixman/0.34.0-x86_32/Makefile	(revision 646)
+++ X.org/lib/pixman/0.34.0-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/xtrans/1.3.5/Makefile
===================================================================
--- X.org/lib/xtrans/1.3.5/Makefile	(revision 646)
+++ X.org/lib/xtrans/1.3.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/lib/xtrans/1.3.5-x86_32/Makefile
===================================================================
--- X.org/lib/xtrans/1.3.5-x86_32/Makefile	(revision 646)
+++ X.org/lib/xtrans/1.3.5-x86_32/Makefile	(revision 647)
@@ -136,4 +136,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/applewmproto/1.4.2/Makefile
===================================================================
--- X.org/proto/applewmproto/1.4.2/Makefile	(revision 646)
+++ X.org/proto/applewmproto/1.4.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/applewmproto/1.4.2/PATCHES
===================================================================
--- X.org/proto/applewmproto/1.4.2/PATCHES	(revision 646)
+++ X.org/proto/applewmproto/1.4.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/applewmproto/patches/applewmproto-1.4.2-automake.patch -p0
Index: X.org/proto/applewmproto/1.4.2-x86_32/Makefile
===================================================================
--- X.org/proto/applewmproto/1.4.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/applewmproto/1.4.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/applewmproto/1.4.2-x86_32/PATCHES
===================================================================
--- X.org/proto/applewmproto/1.4.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/applewmproto/1.4.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/applewmproto/patches/applewmproto-1.4.2-automake.patch -p0
Index: X.org/proto/bigreqsproto/1.1.2/Makefile
===================================================================
--- X.org/proto/bigreqsproto/1.1.2/Makefile	(revision 646)
+++ X.org/proto/bigreqsproto/1.1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/bigreqsproto/1.1.2/PATCHES
===================================================================
--- X.org/proto/bigreqsproto/1.1.2/PATCHES	(revision 646)
+++ X.org/proto/bigreqsproto/1.1.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/bigreqsproto/patches/bigreqsproto-1.1.2-automake.patch -p0
Index: X.org/proto/bigreqsproto/1.1.2-x86_32/Makefile
===================================================================
--- X.org/proto/bigreqsproto/1.1.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/bigreqsproto/1.1.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/bigreqsproto/1.1.2-x86_32/PATCHES
===================================================================
--- X.org/proto/bigreqsproto/1.1.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/bigreqsproto/1.1.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/bigreqsproto/patches/bigreqsproto-1.1.2-automake.patch -p0
Index: X.org/proto/compositeproto/0.4.2/Makefile
===================================================================
--- X.org/proto/compositeproto/0.4.2/Makefile	(revision 646)
+++ X.org/proto/compositeproto/0.4.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/compositeproto/0.4.2/PATCHES
===================================================================
--- X.org/proto/compositeproto/0.4.2/PATCHES	(revision 646)
+++ X.org/proto/compositeproto/0.4.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/compositeproto/patches/compositeproto-0.4.2-automake.patch -p0
Index: X.org/proto/compositeproto/0.4.2-x86_32/Makefile
===================================================================
--- X.org/proto/compositeproto/0.4.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/compositeproto/0.4.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/compositeproto/0.4.2-x86_32/PATCHES
===================================================================
--- X.org/proto/compositeproto/0.4.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/compositeproto/0.4.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/compositeproto/patches/compositeproto-0.4.2-automake.patch -p0
Index: X.org/proto/damageproto/1.2.1/Makefile
===================================================================
--- X.org/proto/damageproto/1.2.1/Makefile	(revision 646)
+++ X.org/proto/damageproto/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/damageproto/1.2.1/PATCHES
===================================================================
--- X.org/proto/damageproto/1.2.1/PATCHES	(revision 646)
+++ X.org/proto/damageproto/1.2.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/damageproto/patches/damageproto-1.2.1-automake.patch -p0
Index: X.org/proto/damageproto/1.2.1-x86_32/Makefile
===================================================================
--- X.org/proto/damageproto/1.2.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/damageproto/1.2.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/damageproto/1.2.1-x86_32/PATCHES
===================================================================
--- X.org/proto/damageproto/1.2.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/damageproto/1.2.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/damageproto/patches/damageproto-1.2.1-automake.patch -p0
Index: X.org/proto/dmxproto/2.3.1/Makefile
===================================================================
--- X.org/proto/dmxproto/2.3.1/Makefile	(revision 646)
+++ X.org/proto/dmxproto/2.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/dmxproto/2.3.1/PATCHES
===================================================================
--- X.org/proto/dmxproto/2.3.1/PATCHES	(revision 646)
+++ X.org/proto/dmxproto/2.3.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/dmxproto/patches/dmxproto-2.3.1-automake.patch -p0
Index: X.org/proto/dmxproto/2.3.1-x86_32/Makefile
===================================================================
--- X.org/proto/dmxproto/2.3.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/dmxproto/2.3.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/dmxproto/2.3.1-x86_32/PATCHES
===================================================================
--- X.org/proto/dmxproto/2.3.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/dmxproto/2.3.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/dmxproto/patches/dmxproto-2.3.1-automake.patch -p0
Index: X.org/proto/dri2proto/2.8/Makefile
===================================================================
--- X.org/proto/dri2proto/2.8/Makefile	(revision 646)
+++ X.org/proto/dri2proto/2.8/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -178,4 +185,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/dri2proto/2.8/PATCHES
===================================================================
--- X.org/proto/dri2proto/2.8/PATCHES	(revision 646)
+++ X.org/proto/dri2proto/2.8/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/dri2proto/patches/dri2proto-2.8-automake.patch -p0
Index: X.org/proto/dri2proto/2.8/PATCHES.omap543x
===================================================================
--- X.org/proto/dri2proto/2.8/PATCHES.omap543x	(revision 646)
+++ X.org/proto/dri2proto/2.8/PATCHES.omap543x	(revision 647)
@@ -1,2 +1,3 @@
 
 ../../../../../sources/X.org/proto/dri2proto/patches/dri2proto-2.8-ti-glsdk.patch -p0
+../../../../../sources/X.org/proto/dri2proto/patches/dri2proto-2.8-automake.patch -p0
Index: X.org/proto/dri2proto/2.8-x86_32/Makefile
===================================================================
--- X.org/proto/dri2proto/2.8-x86_32/Makefile	(revision 646)
+++ X.org/proto/dri2proto/2.8-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/dri2proto/2.8-x86_32/PATCHES
===================================================================
--- X.org/proto/dri2proto/2.8-x86_32/PATCHES	(revision 646)
+++ X.org/proto/dri2proto/2.8-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/dri2proto/patches/dri2proto-2.8-automake.patch -p0
Index: X.org/proto/dri3proto/1.0/Makefile
===================================================================
--- X.org/proto/dri3proto/1.0/Makefile	(revision 646)
+++ X.org/proto/dri3proto/1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -171,4 +178,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/dri3proto/1.0-x86_32/Makefile
===================================================================
--- X.org/proto/dri3proto/1.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/dri3proto/1.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/evieext/1.1.1/Makefile
===================================================================
--- X.org/proto/evieext/1.1.1/Makefile	(revision 646)
+++ X.org/proto/evieext/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/evieext/1.1.1/PATCHES
===================================================================
--- X.org/proto/evieext/1.1.1/PATCHES	(revision 646)
+++ X.org/proto/evieext/1.1.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/evieext/patches/evieext-1.1.1-automake.patch -p0
Index: X.org/proto/evieext/1.1.1-x86_32/Makefile
===================================================================
--- X.org/proto/evieext/1.1.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/evieext/1.1.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/evieext/1.1.1-x86_32/PATCHES
===================================================================
--- X.org/proto/evieext/1.1.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/evieext/1.1.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/evieext/patches/evieext-1.1.1-automake.patch -p0
Index: X.org/proto/fixesproto/5.0/Makefile
===================================================================
--- X.org/proto/fixesproto/5.0/Makefile	(revision 646)
+++ X.org/proto/fixesproto/5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/fixesproto/5.0/PATCHES
===================================================================
--- X.org/proto/fixesproto/5.0/PATCHES	(revision 646)
+++ X.org/proto/fixesproto/5.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/fixesproto/patches/fixesproto-5.0-automake.patch -p0
Index: X.org/proto/fixesproto/5.0-x86_32/Makefile
===================================================================
--- X.org/proto/fixesproto/5.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/fixesproto/5.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/fixesproto/5.0-x86_32/PATCHES
===================================================================
--- X.org/proto/fixesproto/5.0-x86_32/PATCHES	(revision 646)
+++ X.org/proto/fixesproto/5.0-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/fixesproto/patches/fixesproto-5.0-automake.patch -p0
Index: X.org/proto/fontcacheproto/0.1.3/Makefile
===================================================================
--- X.org/proto/fontcacheproto/0.1.3/Makefile	(revision 646)
+++ X.org/proto/fontcacheproto/0.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/fontcacheproto/0.1.3/PATCHES
===================================================================
--- X.org/proto/fontcacheproto/0.1.3/PATCHES	(revision 646)
+++ X.org/proto/fontcacheproto/0.1.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/fontcacheproto/patches/fontcacheproto-0.1.3-automake.patch -p0
Index: X.org/proto/fontcacheproto/0.1.3-x86_32/Makefile
===================================================================
--- X.org/proto/fontcacheproto/0.1.3-x86_32/Makefile	(revision 646)
+++ X.org/proto/fontcacheproto/0.1.3-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/fontcacheproto/0.1.3-x86_32/PATCHES
===================================================================
--- X.org/proto/fontcacheproto/0.1.3-x86_32/PATCHES	(revision 646)
+++ X.org/proto/fontcacheproto/0.1.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/fontcacheproto/patches/fontcacheproto-0.1.3-automake.patch -p0
Index: X.org/proto/fontsproto/2.1.3/Makefile
===================================================================
--- X.org/proto/fontsproto/2.1.3/Makefile	(revision 646)
+++ X.org/proto/fontsproto/2.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/fontsproto/2.1.3-x86_32/Makefile
===================================================================
--- X.org/proto/fontsproto/2.1.3-x86_32/Makefile	(revision 646)
+++ X.org/proto/fontsproto/2.1.3-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/glproto/1.4.17/Makefile
===================================================================
--- X.org/proto/glproto/1.4.17/Makefile	(revision 646)
+++ X.org/proto/glproto/1.4.17/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/glproto/1.4.17-x86_32/Makefile
===================================================================
--- X.org/proto/glproto/1.4.17-x86_32/Makefile	(revision 646)
+++ X.org/proto/glproto/1.4.17-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/inputproto/2.3.1/Makefile
===================================================================
--- X.org/proto/inputproto/2.3.1/Makefile	(revision 646)
+++ X.org/proto/inputproto/2.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/inputproto/2.3.1-x86_32/Makefile
===================================================================
--- X.org/proto/inputproto/2.3.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/inputproto/2.3.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/inputproto/2.3.2/Makefile
===================================================================
--- X.org/proto/inputproto/2.3.2/Makefile	(revision 646)
+++ X.org/proto/inputproto/2.3.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/inputproto/2.3.2-x86_32/Makefile
===================================================================
--- X.org/proto/inputproto/2.3.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/inputproto/2.3.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/kbproto/1.0.6/Makefile
===================================================================
--- X.org/proto/kbproto/1.0.6/Makefile	(revision 646)
+++ X.org/proto/kbproto/1.0.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/kbproto/1.0.6-x86_32/Makefile
===================================================================
--- X.org/proto/kbproto/1.0.6-x86_32/Makefile	(revision 646)
+++ X.org/proto/kbproto/1.0.6-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/kbproto/1.0.7/Makefile
===================================================================
--- X.org/proto/kbproto/1.0.7/Makefile	(revision 646)
+++ X.org/proto/kbproto/1.0.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/kbproto/1.0.7-x86_32/Makefile
===================================================================
--- X.org/proto/kbproto/1.0.7-x86_32/Makefile	(revision 646)
+++ X.org/proto/kbproto/1.0.7-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/presentproto/1.0/Makefile
===================================================================
--- X.org/proto/presentproto/1.0/Makefile	(revision 646)
+++ X.org/proto/presentproto/1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -171,4 +178,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/presentproto/1.0-x86_32/Makefile
===================================================================
--- X.org/proto/presentproto/1.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/presentproto/1.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/printproto/1.0.5/Makefile
===================================================================
--- X.org/proto/printproto/1.0.5/Makefile	(revision 646)
+++ X.org/proto/printproto/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/printproto/1.0.5/PATCHES
===================================================================
--- X.org/proto/printproto/1.0.5/PATCHES	(revision 646)
+++ X.org/proto/printproto/1.0.5/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/printproto/patches/printproto-1.0.5-automake.patch -p0
Index: X.org/proto/printproto/1.0.5-x86_32/Makefile
===================================================================
--- X.org/proto/printproto/1.0.5-x86_32/Makefile	(revision 646)
+++ X.org/proto/printproto/1.0.5-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/printproto/1.0.5-x86_32/PATCHES
===================================================================
--- X.org/proto/printproto/1.0.5-x86_32/PATCHES	(revision 646)
+++ X.org/proto/printproto/1.0.5-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/printproto/patches/printproto-1.0.5-automake.patch -p0
Index: X.org/proto/randrproto/1.4.0/Makefile
===================================================================
--- X.org/proto/randrproto/1.4.0/Makefile	(revision 646)
+++ X.org/proto/randrproto/1.4.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/randrproto/1.4.0-x86_32/Makefile
===================================================================
--- X.org/proto/randrproto/1.4.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/randrproto/1.4.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/randrproto/1.5.0/Makefile
===================================================================
--- X.org/proto/randrproto/1.5.0/Makefile	(revision 646)
+++ X.org/proto/randrproto/1.5.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/randrproto/1.5.0-x86_32/Makefile
===================================================================
--- X.org/proto/randrproto/1.5.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/randrproto/1.5.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/recordproto/1.14.2/Makefile
===================================================================
--- X.org/proto/recordproto/1.14.2/Makefile	(revision 646)
+++ X.org/proto/recordproto/1.14.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/recordproto/1.14.2/PATCHES
===================================================================
--- X.org/proto/recordproto/1.14.2/PATCHES	(revision 646)
+++ X.org/proto/recordproto/1.14.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/recordproto/patches/recordproto-1.14.2-automake.patch -p0
Index: X.org/proto/recordproto/1.14.2-x86_32/Makefile
===================================================================
--- X.org/proto/recordproto/1.14.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/recordproto/1.14.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/recordproto/1.14.2-x86_32/PATCHES
===================================================================
--- X.org/proto/recordproto/1.14.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/recordproto/1.14.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/recordproto/patches/recordproto-1.14.2-automake.patch -p0
Index: X.org/proto/renderproto/0.11.1/Makefile
===================================================================
--- X.org/proto/renderproto/0.11.1/Makefile	(revision 646)
+++ X.org/proto/renderproto/0.11.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/renderproto/0.11.1/PATCHES
===================================================================
--- X.org/proto/renderproto/0.11.1/PATCHES	(revision 646)
+++ X.org/proto/renderproto/0.11.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/renderproto/patches/renderproto-0.11.1-automake.patch -p0
Index: X.org/proto/renderproto/0.11.1-x86_32/Makefile
===================================================================
--- X.org/proto/renderproto/0.11.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/renderproto/0.11.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/renderproto/0.11.1-x86_32/PATCHES
===================================================================
--- X.org/proto/renderproto/0.11.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/renderproto/0.11.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/renderproto/patches/renderproto-0.11.1-automake.patch -p0
Index: X.org/proto/resourceproto/1.2.0/Makefile
===================================================================
--- X.org/proto/resourceproto/1.2.0/Makefile	(revision 646)
+++ X.org/proto/resourceproto/1.2.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/resourceproto/1.2.0/PATCHES
===================================================================
--- X.org/proto/resourceproto/1.2.0/PATCHES	(revision 646)
+++ X.org/proto/resourceproto/1.2.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/resourceproto/patches/resourceproto-1.2.0-automake.patch -p0
Index: X.org/proto/resourceproto/1.2.0-x86_32/Makefile
===================================================================
--- X.org/proto/resourceproto/1.2.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/resourceproto/1.2.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/resourceproto/1.2.0-x86_32/PATCHES
===================================================================
--- X.org/proto/resourceproto/1.2.0-x86_32/PATCHES	(revision 646)
+++ X.org/proto/resourceproto/1.2.0-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/resourceproto/patches/resourceproto-1.2.0-automake.patch -p0
Index: X.org/proto/scrnsaverproto/1.2.2/Makefile
===================================================================
--- X.org/proto/scrnsaverproto/1.2.2/Makefile	(revision 646)
+++ X.org/proto/scrnsaverproto/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/scrnsaverproto/1.2.2/PATCHES
===================================================================
--- X.org/proto/scrnsaverproto/1.2.2/PATCHES	(revision 646)
+++ X.org/proto/scrnsaverproto/1.2.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/scrnsaverproto/patches/scrnsaverproto-1.2.2-automake.patch -p0
Index: X.org/proto/scrnsaverproto/1.2.2-x86_32/Makefile
===================================================================
--- X.org/proto/scrnsaverproto/1.2.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/scrnsaverproto/1.2.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/scrnsaverproto/1.2.2-x86_32/PATCHES
===================================================================
--- X.org/proto/scrnsaverproto/1.2.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/scrnsaverproto/1.2.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/scrnsaverproto/patches/scrnsaverproto-1.2.2-automake.patch -p0
Index: X.org/proto/videoproto/2.3.2/Makefile
===================================================================
--- X.org/proto/videoproto/2.3.2/Makefile	(revision 646)
+++ X.org/proto/videoproto/2.3.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/videoproto/2.3.2-x86_32/Makefile
===================================================================
--- X.org/proto/videoproto/2.3.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/videoproto/2.3.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/videoproto/2.3.3/Makefile
===================================================================
--- X.org/proto/videoproto/2.3.3/Makefile	(revision 646)
+++ X.org/proto/videoproto/2.3.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/videoproto/2.3.3-x86_32/Makefile
===================================================================
--- X.org/proto/videoproto/2.3.3-x86_32/Makefile	(revision 646)
+++ X.org/proto/videoproto/2.3.3-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/windowswmproto/1.0.4/Makefile
===================================================================
--- X.org/proto/windowswmproto/1.0.4/Makefile	(revision 646)
+++ X.org/proto/windowswmproto/1.0.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/windowswmproto/1.0.4/PATCHES
===================================================================
--- X.org/proto/windowswmproto/1.0.4/PATCHES	(revision 646)
+++ X.org/proto/windowswmproto/1.0.4/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/windowswmproto/patches/windowswmproto-1.0.4-automake.patch -p0
Index: X.org/proto/windowswmproto/1.0.4-x86_32/Makefile
===================================================================
--- X.org/proto/windowswmproto/1.0.4-x86_32/Makefile	(revision 646)
+++ X.org/proto/windowswmproto/1.0.4-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/windowswmproto/1.0.4-x86_32/PATCHES
===================================================================
--- X.org/proto/windowswmproto/1.0.4-x86_32/PATCHES	(revision 646)
+++ X.org/proto/windowswmproto/1.0.4-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/windowswmproto/patches/windowswmproto-1.0.4-automake.patch -p0
Index: X.org/proto/xcmiscproto/1.2.2/Makefile
===================================================================
--- X.org/proto/xcmiscproto/1.2.2/Makefile	(revision 646)
+++ X.org/proto/xcmiscproto/1.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xcmiscproto/1.2.2/PATCHES
===================================================================
--- X.org/proto/xcmiscproto/1.2.2/PATCHES	(revision 646)
+++ X.org/proto/xcmiscproto/1.2.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xcmiscproto/patches/xcmiscproto-1.2.2-automake.patch -p0
Index: X.org/proto/xcmiscproto/1.2.2-x86_32/Makefile
===================================================================
--- X.org/proto/xcmiscproto/1.2.2-x86_32/Makefile	(revision 646)
+++ X.org/proto/xcmiscproto/1.2.2-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xcmiscproto/1.2.2-x86_32/PATCHES
===================================================================
--- X.org/proto/xcmiscproto/1.2.2-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xcmiscproto/1.2.2-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xcmiscproto/patches/xcmiscproto-1.2.2-automake.patch -p0
Index: X.org/proto/xextproto/7.3.0/Makefile
===================================================================
--- X.org/proto/xextproto/7.3.0/Makefile	(revision 646)
+++ X.org/proto/xextproto/7.3.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xextproto/7.3.0/PATCHES
===================================================================
--- X.org/proto/xextproto/7.3.0/PATCHES	(revision 646)
+++ X.org/proto/xextproto/7.3.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xextproto/patches/xextproto-7.3.0-automake.patch -p0
Index: X.org/proto/xextproto/7.3.0-x86_32/Makefile
===================================================================
--- X.org/proto/xextproto/7.3.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/xextproto/7.3.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xextproto/7.3.0-x86_32/PATCHES
===================================================================
--- X.org/proto/xextproto/7.3.0-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xextproto/7.3.0-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xextproto/patches/xextproto-7.3.0-automake.patch -p0
Index: X.org/proto/xf86bigfontproto/1.2.0/Makefile
===================================================================
--- X.org/proto/xf86bigfontproto/1.2.0/Makefile	(revision 646)
+++ X.org/proto/xf86bigfontproto/1.2.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86bigfontproto/1.2.0-x86_32/Makefile
===================================================================
--- X.org/proto/xf86bigfontproto/1.2.0-x86_32/Makefile	(revision 646)
+++ X.org/proto/xf86bigfontproto/1.2.0-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86dgaproto/2.1/Makefile
===================================================================
--- X.org/proto/xf86dgaproto/2.1/Makefile	(revision 646)
+++ X.org/proto/xf86dgaproto/2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86dgaproto/2.1/PATCHES
===================================================================
--- X.org/proto/xf86dgaproto/2.1/PATCHES	(revision 646)
+++ X.org/proto/xf86dgaproto/2.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86dgaproto/patches/xf86dgaproto-2.1-automake.patch -p0
Index: X.org/proto/xf86dgaproto/2.1-x86_32/Makefile
===================================================================
--- X.org/proto/xf86dgaproto/2.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/xf86dgaproto/2.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86dgaproto/2.1-x86_32/PATCHES
===================================================================
--- X.org/proto/xf86dgaproto/2.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xf86dgaproto/2.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86dgaproto/patches/xf86dgaproto-2.1-automake.patch -p0
Index: X.org/proto/xf86driproto/2.1.1/Makefile
===================================================================
--- X.org/proto/xf86driproto/2.1.1/Makefile	(revision 646)
+++ X.org/proto/xf86driproto/2.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86driproto/2.1.1/PATCHES
===================================================================
--- X.org/proto/xf86driproto/2.1.1/PATCHES	(revision 646)
+++ X.org/proto/xf86driproto/2.1.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86driproto/patches/xf86driproto-2.1.1-automake.patch -p0
Index: X.org/proto/xf86driproto/2.1.1-x86_32/Makefile
===================================================================
--- X.org/proto/xf86driproto/2.1.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/xf86driproto/2.1.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86driproto/2.1.1-x86_32/PATCHES
===================================================================
--- X.org/proto/xf86driproto/2.1.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xf86driproto/2.1.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86driproto/patches/xf86driproto-2.1.1-automake.patch -p0
Index: X.org/proto/xf86miscproto/0.9.3/Makefile
===================================================================
--- X.org/proto/xf86miscproto/0.9.3/Makefile	(revision 646)
+++ X.org/proto/xf86miscproto/0.9.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86miscproto/0.9.3/PATCHES
===================================================================
--- X.org/proto/xf86miscproto/0.9.3/PATCHES	(revision 646)
+++ X.org/proto/xf86miscproto/0.9.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86miscproto/patches/xf86miscproto-0.9.3-automake.patch -p0
Index: X.org/proto/xf86miscproto/0.9.3-x86_32/Makefile
===================================================================
--- X.org/proto/xf86miscproto/0.9.3-x86_32/Makefile	(revision 646)
+++ X.org/proto/xf86miscproto/0.9.3-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86miscproto/0.9.3-x86_32/PATCHES
===================================================================
--- X.org/proto/xf86miscproto/0.9.3-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xf86miscproto/0.9.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86miscproto/patches/xf86miscproto-0.9.3-automake.patch -p0
Index: X.org/proto/xf86vidmodeproto/2.3.1/Makefile
===================================================================
--- X.org/proto/xf86vidmodeproto/2.3.1/Makefile	(revision 646)
+++ X.org/proto/xf86vidmodeproto/2.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86vidmodeproto/2.3.1/PATCHES
===================================================================
--- X.org/proto/xf86vidmodeproto/2.3.1/PATCHES	(revision 646)
+++ X.org/proto/xf86vidmodeproto/2.3.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86vidmodeproto/patches/xf86vidmodeproto-2.3.1-automake.patch -p0
Index: X.org/proto/xf86vidmodeproto/2.3.1-x86_32/Makefile
===================================================================
--- X.org/proto/xf86vidmodeproto/2.3.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/xf86vidmodeproto/2.3.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xf86vidmodeproto/2.3.1-x86_32/PATCHES
===================================================================
--- X.org/proto/xf86vidmodeproto/2.3.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xf86vidmodeproto/2.3.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xf86vidmodeproto/patches/xf86vidmodeproto-2.3.1-automake.patch -p0
Index: X.org/proto/xineramaproto/1.2.1/Makefile
===================================================================
--- X.org/proto/xineramaproto/1.2.1/Makefile	(revision 646)
+++ X.org/proto/xineramaproto/1.2.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xineramaproto/1.2.1/PATCHES
===================================================================
--- X.org/proto/xineramaproto/1.2.1/PATCHES	(revision 646)
+++ X.org/proto/xineramaproto/1.2.1/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xineramaproto/patches/xineramaproto-1.2.1-automake.patch -p0
Index: X.org/proto/xineramaproto/1.2.1-x86_32/Makefile
===================================================================
--- X.org/proto/xineramaproto/1.2.1-x86_32/Makefile	(revision 646)
+++ X.org/proto/xineramaproto/1.2.1-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xineramaproto/1.2.1-x86_32/PATCHES
===================================================================
--- X.org/proto/xineramaproto/1.2.1-x86_32/PATCHES	(revision 646)
+++ X.org/proto/xineramaproto/1.2.1-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/proto/xineramaproto/patches/xineramaproto-1.2.1-automake.patch -p0
Index: X.org/proto/xproto/7.0.26/Makefile
===================================================================
--- X.org/proto/xproto/7.0.26/Makefile	(revision 646)
+++ X.org/proto/xproto/7.0.26/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xproto/7.0.26-x86_32/Makefile
===================================================================
--- X.org/proto/xproto/7.0.26-x86_32/Makefile	(revision 646)
+++ X.org/proto/xproto/7.0.26-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xproto/7.0.29/Makefile
===================================================================
--- X.org/proto/xproto/7.0.29/Makefile	(revision 646)
+++ X.org/proto/xproto/7.0.29/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto/xproto/7.0.29-x86_32/Makefile
===================================================================
--- X.org/proto/xproto/7.0.29-x86_32/Makefile	(revision 646)
+++ X.org/proto/xproto/7.0.29-x86_32/Makefile	(revision 647)
@@ -133,4 +133,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/proto-headers/Makefile
===================================================================
--- X.org/proto-headers/Makefile	(revision 646)
+++ X.org/proto-headers/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
Index: X.org/util/gccmakedep/1.0.3/Makefile
===================================================================
--- X.org/util/gccmakedep/1.0.3/Makefile	(revision 646)
+++ X.org/util/gccmakedep/1.0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/util/makedepend/1.0.5/Makefile
===================================================================
--- X.org/util/makedepend/1.0.5/Makefile	(revision 646)
+++ X.org/util/makedepend/1.0.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -175,4 +182,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/util/util-macros/1.19.0/Makefile
===================================================================
--- X.org/util/util-macros/1.19.0/Makefile	(revision 646)
+++ X.org/util/util-macros/1.19.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -27,9 +34,9 @@
 REQUIRES           = dev/gcc/5.3.0
 else
 ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES           = libs/glibc/2.23
+REQUIRES           = libs/glibc/2.24
 else
-REQUIRES           = libs/glibc/2.23-x86_32
+REQUIRES           = libs/glibc/2.24-x86_32
 endif
 endif
 
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libpthread-stubs/0.3/Makefile
===================================================================
--- X.org/xcb/libpthread-stubs/0.3/Makefile	(revision 646)
+++ X.org/xcb/libpthread-stubs/0.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -23,7 +30,15 @@
 
 SOURCE_REQUIRES    = sources/X.org/xcb/libpthread-stubs
 
-REQUIRES           = X11/X.org/xcb/libxcb/1.11.1
+ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
+REQUIRES           = dev/gcc/5.3.0
+else
+ifneq ($(HARDWARE),$(HARDWARE_PC64))
+REQUIRES           = libs/glibc/2.24
+else
+REQUIRES           = libs/glibc/2.24-x86_32
+endif
+endif
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -179,4 +194,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libpthread-stubs/0.3/PATCHES
===================================================================
--- X.org/xcb/libpthread-stubs/0.3/PATCHES	(revision 646)
+++ X.org/xcb/libpthread-stubs/0.3/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/xcb/libpthread-stubs/patches/libpthread-stubs-0.3-automake.patch -p0
Index: X.org/xcb/libpthread-stubs/0.3-x86_32/Makefile
===================================================================
--- X.org/xcb/libpthread-stubs/0.3-x86_32/Makefile	(revision 646)
+++ X.org/xcb/libpthread-stubs/0.3-x86_32/Makefile	(revision 647)
@@ -13,7 +13,6 @@
 SOURCE_REQUIRES    = sources/X.org/xcb/libpthread-stubs
 
 REQUIRES           = X11/X.org/xcb/libpthread-stubs/0.3
-REQUIRES          += X11/X.org/xcb/libxcb/1.11.1-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -139,4 +138,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libpthread-stubs/0.3-x86_32/PATCHES
===================================================================
--- X.org/xcb/libpthread-stubs/0.3-x86_32/PATCHES	(revision 646)
+++ X.org/xcb/libpthread-stubs/0.3-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/xcb/libpthread-stubs/patches/libpthread-stubs-0.3-automake.patch -p0
Index: X.org/xcb/libxcb/1.11/Makefile
===================================================================
--- X.org/xcb/libxcb/1.11/Makefile	(revision 646)
+++ X.org/xcb/libxcb/1.11/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -253,4 +260,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libxcb/1.11-x86_32/Makefile
===================================================================
--- X.org/xcb/libxcb/1.11-x86_32/Makefile	(revision 646)
+++ X.org/xcb/libxcb/1.11-x86_32/Makefile	(revision 647)
@@ -203,4 +203,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libxcb/1.11.1/Makefile
===================================================================
--- X.org/xcb/libxcb/1.11.1/Makefile	(revision 646)
+++ X.org/xcb/libxcb/1.11.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,6 +31,7 @@
 SOURCE_REQUIRES    = sources/X.org/xcb/libxcb
 
 REQUIRES           = X11/X.org/xcb/xcb-proto/1.11
+REQUIRES          += X11/X.org/xcb/libpthread-stubs/0.3
 REQUIRES          += X11/X.org/lib/libXau/1.0.8
 REQUIRES          += X11/X.org/lib/libXdmcp/1.1.2
 
@@ -253,4 +261,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/libxcb/1.11.1-x86_32/Makefile
===================================================================
--- X.org/xcb/libxcb/1.11.1-x86_32/Makefile	(revision 646)
+++ X.org/xcb/libxcb/1.11.1-x86_32/Makefile	(revision 647)
@@ -14,6 +14,7 @@
 
 REQUIRES           = X11/X.org/xcb/libxcb/1.11.1
 REQUIRES          += X11/X.org/xcb/xcb-proto/1.11-x86_32
+REQUIRES          += X11/X.org/xcb/libpthread-stubs/0.3-x86_32
 REQUIRES          += X11/X.org/lib/libXau/1.0.8-x86_32
 REQUIRES          += X11/X.org/lib/libXdmcp/1.1.2-x86_32
 
@@ -203,4 +204,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-proto/1.11/Makefile
===================================================================
--- X.org/xcb/xcb-proto/1.11/Makefile	(revision 646)
+++ X.org/xcb/xcb-proto/1.11/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-proto/1.11-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-proto/1.11-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-proto/1.11-x86_32/Makefile	(revision 647)
@@ -142,4 +142,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util/0.4.0/Makefile
===================================================================
--- X.org/xcb/xcb-util/0.4.0/Makefile	(revision 646)
+++ X.org/xcb/xcb-util/0.4.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util/0.4.0-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util/0.4.0-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util/0.4.0-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-cursor/0.1.1/Makefile
===================================================================
--- X.org/xcb/xcb-util-cursor/0.1.1/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-cursor/0.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -209,4 +216,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-cursor/0.1.1-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-cursor/0.1.1-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-cursor/0.1.1-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-cursor/0.1.3/Makefile
===================================================================
--- X.org/xcb/xcb-util-cursor/0.1.3/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-cursor/0.1.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -209,4 +216,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-cursor/0.1.3-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-cursor/0.1.3-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-cursor/0.1.3-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-image/0.4.0/Makefile
===================================================================
--- X.org/xcb/xcb-util-image/0.4.0/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-image/0.4.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-image/0.4.0-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-image/0.4.0-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-image/0.4.0-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-keysyms/0.4.0/Makefile
===================================================================
--- X.org/xcb/xcb-util-keysyms/0.4.0/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-keysyms/0.4.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-keysyms/0.4.0-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-keysyms/0.4.0-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-keysyms/0.4.0-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-renderutil/0.3.9/Makefile
===================================================================
--- X.org/xcb/xcb-util-renderutil/0.3.9/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-renderutil/0.3.9/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-renderutil/0.3.9-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-renderutil/0.3.9-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-renderutil/0.3.9-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-wm/0.4.1/Makefile
===================================================================
--- X.org/xcb/xcb-util-wm/0.4.1/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-wm/0.4.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -208,4 +215,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xcb-util-wm/0.4.1-x86_32/Makefile
===================================================================
--- X.org/xcb/xcb-util-wm/0.4.1-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xcb-util-wm/0.4.1-x86_32/Makefile	(revision 647)
@@ -168,4 +168,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xpyb/1.3.1/Makefile
===================================================================
--- X.org/xcb/xpyb/1.3.1/Makefile	(revision 646)
+++ X.org/xcb/xpyb/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -223,4 +230,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xcb/xpyb/1.3.1-x86_32/Makefile
===================================================================
--- X.org/xcb/xpyb/1.3.1-x86_32/Makefile	(revision 646)
+++ X.org/xcb/xpyb/1.3.1-x86_32/Makefile	(revision 647)
@@ -183,4 +183,4 @@
 	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.12.2/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.12.2/Makefile	(revision 646)
+++ X.org/xserver/xorg-server/1.12.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -347,7 +354,7 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && \
-	                    chown -R root:root     . && \
-	                    chmod 04755 usr/bin/Xorg && \
-	                    $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+	                  chown -R root:root     . && \
+	                  chmod 04755 usr/bin/Xorg && \
+	                  $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.16.2/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.16.2/Makefile	(revision 646)
+++ X.org/xserver/xorg-server/1.16.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -342,7 +349,7 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && \
-	                    chown -R root:root     . && \
-	                    chmod 04755 usr/bin/Xorg && \
-	                    $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+	                  chown -R root:root     . && \
+	                  chmod 04755 usr/bin/Xorg && \
+	                  $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.16.4/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.16.4/Makefile	(revision 646)
+++ X.org/xserver/xorg-server/1.16.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -342,7 +349,7 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && \
-	                    chown -R root:root     . && \
-	                    chmod 04755 usr/bin/Xorg && \
-	                    $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+	                  chown -R root:root     . && \
+	                  chmod 04755 usr/bin/Xorg && \
+	                  $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.18.3/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.18.3/Makefile	(revision 646)
+++ X.org/xserver/xorg-server/1.18.3/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -47,11 +54,14 @@
 REQUIRES          += X11/X.org/lib/libXaw/1.0.13
 REQUIRES          += X11/X.org/lib/libXft/2.3.2
 REQUIRES          += X11/X.org/lib/libXfont/1.5.1
-REQUIRES          += X11/X.org/lib/libXi/1.7.6
 REQUIRES          += X11/X.org/lib/libXdamage/1.1.4
 REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.4
+REQUIRES          += X11/X.org/lib/libXres/1.0.7
+REQUIRES          += X11/X.org/lib/libXtst/1.2.2
+REQUIRES          += X11/X.org/lib/libdmx/1.1.3
 REQUIRES          += X11/X.org/lib/pixman/0.34.0
 REQUIRES          += X11/X.org/lib/libxshmfence/1.2
+REQUIRES          += X11/X.org/lib/libxkbfile/1.0.9
 
 REQUIRES          += X11/X.org/xcb/xcb-util-cursor/0.1.3
 REQUIRES          += X11/X.org/xcb/xcb-util-keysyms/0.4.0
@@ -79,11 +89,20 @@
 
 PATCHES = PATCHES
 
+ifeq ($(TOOLCHAIN),$(TOOLCHAIN_S9XX_GLIBC))
+OPT_PATCHES = PATCHES.aarch64
+endif
+
 build_dir          = $(TARGET_BUILD_DIR)/build
 build_target       = $(TARGET_BUILD_DIR)/.build_done
 install_target     = $(TARGET_BUILD_DIR)/.install_done
 
 
+ifeq ($(TOOLCHAIN),$(TOOLCHAIN_S9XX_GLIBC))
+OPTIMIZATION_FLAGS  = -O2
+endif
+
+
 ####### Targets
 
 PKG_GROUP = xorg
@@ -190,6 +209,13 @@
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
 	$(UNPACK_SRC_ARCHIVE)
 	$(APPLY_PATCHES)
+ifeq ($(TOOLCHAIN),$(TOOLCHAIN_S9XX_GLIBC))
+	$(call apply-opt-patches, $(SRC_DIR))
+	# ======= touch to prevent autoreconf =======
+	@( cd $(SRC_DIR) ; \
+	   touch configure configure.ac -r aclocal.m4 ; \
+	 )
+endif
 	@touch $@
 
 $(build_target): $(src_done)
@@ -339,7 +365,7 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && \
-	                    chown -R root:root     . && \
-	                    chmod 04755 usr/bin/Xorg && \
-	                    $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+	                  chown -R root:root     . && \
+	                  chmod 04755 usr/bin/Xorg && \
+	                  $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.18.3/PATCHES.aarch64
===================================================================
--- X.org/xserver/xorg-server/1.18.3/PATCHES.aarch64	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.3/PATCHES.aarch64	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-1.18.3-aarch64-backtrace.patch -p0
Index: X.org/xserver/xorg-server/1.18.4/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.18.4/Makefile	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.4/Makefile	(revision 647)
@@ -0,0 +1,375 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/xserver/xorg-server
+
+REQUIRES           = libs/eudev/3.1.5
+REQUIRES          += net/nettle/3.2
+REQUIRES          += X11/app/dbus-x11-launch/1.11.2
+
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/proto/dri2proto/2.8
+REQUIRES          += X11/X.org/proto/dri3proto/1.0
+REQUIRES          += X11/X.org/proto/xf86driproto/2.1.1
+REQUIRES          += X11/X.org/proto/randrproto/1.5.0
+REQUIRES          += X11/X.org/proto/renderproto/0.11.1
+REQUIRES          += X11/X.org/proto/videoproto/2.3.3
+REQUIRES          += X11/X.org/proto/xineramaproto/1.2.1
+REQUIRES          += X11/X.org/proto/presentproto/1.0
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2
+REQUIRES          += X11/X.org/proto/kbproto/1.0.7
+REQUIRES          += X11/X.org/proto/scrnsaverproto/1.2.2
+REQUIRES          += X11/X.org/proto/xextproto/7.3.0
+REQUIRES          += X11/X.org/proto/fontsproto/2.1.3
+REQUIRES          += X11/X.org/proto/glproto/1.4.17
+REQUIRES          += X11/X.org/proto/resourceproto/1.2.0
+
+REQUIRES          += X11/X.org/lib/libXaw/1.0.13
+REQUIRES          += X11/X.org/lib/libXft/2.3.2
+REQUIRES          += X11/X.org/lib/libXfont/1.5.1
+REQUIRES          += X11/X.org/lib/libXdamage/1.1.4
+REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.4
+REQUIRES          += X11/X.org/lib/libXres/1.0.7
+REQUIRES          += X11/X.org/lib/libXtst/1.2.2
+REQUIRES          += X11/X.org/lib/libdmx/1.1.3
+REQUIRES          += X11/X.org/lib/pixman/0.34.0
+REQUIRES          += X11/X.org/lib/libxshmfence/1.2
+REQUIRES          += X11/X.org/lib/libxkbfile/1.0.9
+
+REQUIRES          += X11/X.org/xcb/xcb-util-cursor/0.1.3
+REQUIRES          += X11/X.org/xcb/xcb-util-keysyms/0.4.0
+REQUIRES          += X11/X.org/xcb/xcb-util-wm/0.4.1
+
+REQUIRES          += X11/X.org/lib/libpciaccess/0.13.4
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+REQUIRES          += libs/libunwind/1.2
+endif
+
+REQUIRES          += X11/libs/libdrm/2.4.68
+REQUIRES          += X11/libs/libepoxy/1.3.1
+REQUIRES          += Wayland/wayland/1.11.0
+
+REQUIRES          += X11/libs/opengl-collection
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.18.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/xserver/xorg-server/xorg-server-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xorg-server-$(version)
+src_dir_name       = xorg-server-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+kbd_layout         = $(CURDIR)/kbd-layout/90-keyboard-layout.conf
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+ifeq ($(TOOLCHAIN),$(TOOLCHAIN_S9XX_GLIBC))
+OPTIMIZATION_FLAGS  = -O2
+endif
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xorg-server
+XORG_PKG_VERSION             = 1.18.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = The Xorg server
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+#
+# Servers to build:
+#
+BUILD_SERVERS  = --enable-xorg
+BUILD_SERVERS += --enable-dmx
+BUILD_SERVERS += --enable-xvfb
+BUILD_SERVERS += --enable-xnest
+BUILD_SERVERS += --enable-xwayland
+ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
+BUILD_SERVERS += --enable-kdrive
+BUILD_SERVERS += --enable-kdrive-evdev
+BUILD_SERVERS += --enable-kdrive-kbd
+BUILD_SERVERS += --enable-kdrive-mouse
+BUILD_SERVERS += --enable-xephyr
+BUILD_SERVERS += --enable-xfbdev
+endif
+BUILD_SERVERS += --enable-config-udev
+BUILD_SERVERS += --disable-config-hal
+
+#
+# Default font paths to be used by the X server:
+#
+DEF_FONTPATH = "/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+extra_configure_switches += --enable-ipv6
+extra_configure_switches += --enable-dri
+extra_configure_switches += --enable-dri2
+extra_configure_switches += --enable-dri3
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+extra_configure_switches += --enable-libunwind
+endif
+
+extra_configure_switches += --with-pic
+extra_configure_switches += --with-int10=x86emu
+extra_configure_switches += --with-default-font-path="$(DEF_FONTPATH)"
+extra_configure_switches += --with-module-dir=/usr/lib$(LIBSUFFIX)/xorg/modules
+extra_configure_switches += --with-xkb-path=/etc/X11/xkb
+extra_configure_switches += --with-xkb-output=/var/lib/xkb
+extra_configure_switches += --with-fontrootdir=/usr/share/fonts
+
+extra_configure_switches += --with-os-name="$(DISTRO_CAPTION) $(DISTRO_VERSION)"
+extra_configure_switches += --with-os-vendor="$(DISTRO_CAPTION) Linux Project"
+extra_configure_switches += --with-vendor-web="$(BUG_URL)"
+
+extra_configure_switches += --without-systemd-daemon
+extra_configure_switches += --enable-systemd-logind=no
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches) \
+	  $(BUILD_SERVERS)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_PKG)/var/log
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   rm -rf modules ; \
+	   ln -sf xorg/modules . ; \
+	 )
+	@mkdir -p $(XORG_PKG)/etc/X11/xorg.conf.d $(XORG_PKG)/usr/share/X11/xorg.conf.d
+	@cp -a $(kbd_layout) $(XORG_PKG)/usr/share/X11/xorg.conf.d
+	@chmod u+s $(XORG_PKG)/usr/bin/Xorg
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man5 ; \
+	   for file in *.5 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libexa.la libfb.la libfbdevhw.la        \
+	                                    libint10.la libshadow.la libshadowfb.la \
+	                                    libvbe.la libvgahw.la libwfb.la ; \
+	 )
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" modesetting_drv.la ; \
+	 )
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/extensions ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libglx.la ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libexa.la libfb.la libfbdevhw.la        \
+	                                            libint10.la libshadow.la libshadowfb.la \
+	                                            libvbe.la libvgahw.la libwfb.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libexa.la libfb.la libfbdevhw.la        \
+	                                              libint10.la libshadow.la libshadowfb.la \
+	                                              libvbe.la libvgahw.la libwfb.la ; \
+	 )
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" modesetting_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" modesetting_drv.la ; \
+	 )
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/extensions ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libglx.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libglx.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xorg-server.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(XORG_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && \
+	                  chown -R root:root     . && \
+	                  chmod 04755 usr/bin/Xorg && \
+	                  $(MAKE_PACKAGE) --linkadd yes .."
Index: X.org/xserver/xorg-server/1.18.4/PATCHES
===================================================================
--- X.org/xserver/xorg-server/1.18.4/PATCHES	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.4/PATCHES	(revision 647)
@@ -0,0 +1,3 @@
+
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-1.18.4-black.patch              -p0
+../../../../../sources/X.org/xserver/xorg-server/patches/xorg-server-1.18.4-mouse-kbd-layout.patch   -p0
Index: X.org/xserver/xorg-server/1.18.4/kbd-layout/90-keyboard-layout.conf
===================================================================
--- X.org/xserver/xorg-server/1.18.4/kbd-layout/90-keyboard-layout.conf	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.4/kbd-layout/90-keyboard-layout.conf	(revision 647)
@@ -0,0 +1,42 @@
+
+Section "InputClass"
+	Identifier "keyboard-all"
+	MatchIsKeyboard "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "evdev"
+	Option "XkbLayout"  "us,ru"
+	Option "XkbVariant" ",winkeys"
+	Option "XkbModel"   "pc104"
+	Option "XkbOptions" "grp:alt_shift_toggle,terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+#  If you want to add a custom model/layout/variant to X, you will need to COPY
+#  this file to /etc/X11/xorg.conf.d/ and edit that copy.  After editing it to
+#  suit, you will need to restart X.
+#
+#  Here's an example of the lines from above:
+#
+# Section "InputClass"
+#	Identifier "keyboard-all"
+#	MatchIsKeyboard "on"
+#	MatchDevicePath "/dev/input/event*"
+#	Driver "evdev"
+#	Option "XkbLayout" "us"
+#	Option "XkbVariant" "intl"
+#	Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+#  Many desktop environments, including KDE and Xfce, have their own methods to
+#  configure keyboard layouts and such if you'd like to use them.
+#
+#  If you prefer to use the "old" way of configuring keyboards (without input 
+#  device hotplugging), then you'll need to add the following lines to the 
+#  ServerFlags section of /etc/X11/xorg.conf:
+#    Option   "AllowEmptyInput"     "false"
+#    Option   "AutoAddDevices"      "false"
+#    Option   "AutoEnableDevices"   "false"
+#  Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+#  directory, but that's your call.  Assuming you elect to keep a monolithic 
+#  /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
Index: X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-description.in
===================================================================
--- X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-description.in	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+xorg-server: xorg-server @VERSION@ (The Xorg server - core of the X Window System)
+xorg-server:
+xorg-server: Xorg is a full featured X server that was originally designed for
+xorg-server: UNIX and UNIX-like operating systems running on Intel x86 hardware.
+xorg-server: It now runs on a wider range of hardware and OS platforms. This work
+xorg-server: was derived by the X.Org Foundation from the XFree86 Project's
+xorg-server: XFree86 4.4rc2 release. The XFree86 release was originally derived
+xorg-server: from X386 1.2 by Thomas Roell which was contributed to X11R5 by
+xorg-server: Snitily Graphics Consulting Service. [see: http://www.x.org]
+xorg-server:
+xorg-server:
Index: X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-install.sh
===================================================================
--- X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-install.sh	(nonexistent)
+++ X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: X.org/xserver/xorg-server/1.18.4/xorg-server-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: app/WindowMaker/0.95.6/Makefile
===================================================================
--- app/WindowMaker/0.95.6/Makefile	(revision 646)
+++ app/WindowMaker/0.95.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -274,4 +281,4 @@
 	 echo "short_description=\"$(WMAKER_PKG_SHORT_DESCRIPTION)\"" >> $(WMAKER_PKG)/.PKGINFO ; \
 	 echo "url=$(WMAKER_PKG_URL)"                                 >> $(WMAKER_PKG)/.PKGINFO ; \
 	 echo "license=$(WMAKER_PKG_LICENSE)"                         >> $(WMAKER_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(WMAKER_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(WMAKER_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/WindowMaker/0.95.7/Makefile
===================================================================
--- app/WindowMaker/0.95.7/Makefile	(revision 646)
+++ app/WindowMaker/0.95.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -275,4 +282,4 @@
 	 echo "short_description=\"$(WMAKER_PKG_SHORT_DESCRIPTION)\"" >> $(WMAKER_PKG)/.PKGINFO ; \
 	 echo "url=$(WMAKER_PKG_URL)"                                 >> $(WMAKER_PKG)/.PKGINFO ; \
 	 echo "license=$(WMAKER_PKG_LICENSE)"                         >> $(WMAKER_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(WMAKER_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(WMAKER_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/avahi-ui/0.6.31/Makefile
===================================================================
--- app/avahi-ui/0.6.31/Makefile	(revision 646)
+++ app/avahi-ui/0.6.31/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -294,4 +301,4 @@
 	 echo "short_description=\"$(AVAHIUI_PKG_SHORT_DESCRIPTION)\"" >> $(AVAHIUI_PKG)/.PKGINFO ; \
 	 echo "url=$(AVAHIUI_PKG_URL)"                                 >> $(AVAHIUI_PKG)/.PKGINFO ; \
 	 echo "license=$(AVAHIUI_PKG_LICENSE)"                         >> $(AVAHIUI_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(AVAHIUI_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(AVAHIUI_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/avahi-ui/0.6.31/PATCHES
===================================================================
--- app/avahi-ui/0.6.31/PATCHES	(revision 646)
+++ app/avahi-ui/0.6.31/PATCHES	(revision 647)
@@ -1,3 +1,4 @@
 
 ../../../../sources/packages/n/avahi/patches/avahi-0.6.31-browser-icons.patch -p0
 ../../../../sources/packages/n/avahi/patches/avahi-0.6.31-dnsconfd.patch      -p0
+../../../../sources/packages/n/avahi/patches/avahi-0.6.31-automake.patch      -p0
Index: app/avahi-ui/0.6.31-x86_32/Makefile
===================================================================
--- app/avahi-ui/0.6.31-x86_32/Makefile	(revision 646)
+++ app/avahi-ui/0.6.31-x86_32/Makefile	(revision 647)
@@ -233,4 +233,4 @@
 	 echo "short_description=\"$(AVAHIUI_32_PKG_SHORT_DESCRIPTION)\"" >> $(AVAHIUI_32_PKG)/.PKGINFO ; \
 	 echo "url=$(AVAHIUI_32_PKG_URL)"                                 >> $(AVAHIUI_32_PKG)/.PKGINFO ; \
 	 echo "license=$(AVAHIUI_32_PKG_LICENSE)"                         >> $(AVAHIUI_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(AVAHIUI_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(AVAHIUI_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/avahi-ui/0.6.31-x86_32/PATCHES
===================================================================
--- app/avahi-ui/0.6.31-x86_32/PATCHES	(revision 646)
+++ app/avahi-ui/0.6.31-x86_32/PATCHES	(revision 647)
@@ -1,3 +1,4 @@
 
 ../../../../sources/packages/n/avahi/patches/avahi-0.6.31-browser-icons.patch -p0
 ../../../../sources/packages/n/avahi/patches/avahi-0.6.31-dnsconfd.patch      -p0
+../../../../sources/packages/n/avahi/patches/avahi-0.6.31-automake.patch      -p0
Index: app/dbus-x11-launch/1.11.2/Makefile
===================================================================
--- app/dbus-x11-launch/1.11.2/Makefile	(revision 646)
+++ app/dbus-x11-launch/1.11.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -191,4 +198,4 @@
 	 echo "short_description=\"$(DBUS_PKG_SHORT_DESCRIPTION)\"" >> $(DBUS_PKG)/.PKGINFO ; \
 	 echo "url=$(DBUS_PKG_URL)"                                 >> $(DBUS_PKG)/.PKGINFO ; \
 	 echo "license=$(DBUS_PKG_LICENSE)"                         >> $(DBUS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DBUS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DBUS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/dbus-x11-launch/1.11.2-x86_32/Makefile
===================================================================
--- app/dbus-x11-launch/1.11.2-x86_32/Makefile	(revision 646)
+++ app/dbus-x11-launch/1.11.2-x86_32/Makefile	(revision 647)
@@ -174,4 +174,4 @@
 	 echo "short_description=\"$(DBUS_32_PKG_SHORT_DESCRIPTION)\"" >> $(DBUS_32_PKG)/.PKGINFO ; \
 	 echo "url=$(DBUS_32_PKG_URL)"                                 >> $(DBUS_32_PKG)/.PKGINFO ; \
 	 echo "license=$(DBUS_32_PKG_LICENSE)"                         >> $(DBUS_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DBUS_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DBUS_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/dbus-x11-launch/1.8.10/Makefile
===================================================================
--- app/dbus-x11-launch/1.8.10/Makefile	(revision 646)
+++ app/dbus-x11-launch/1.8.10/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -191,4 +198,4 @@
 	 echo "short_description=\"$(DBUS_PKG_SHORT_DESCRIPTION)\"" >> $(DBUS_PKG)/.PKGINFO ; \
 	 echo "url=$(DBUS_PKG_URL)"                                 >> $(DBUS_PKG)/.PKGINFO ; \
 	 echo "license=$(DBUS_PKG_LICENSE)"                         >> $(DBUS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DBUS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DBUS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/dbus-x11-launch/1.8.10-x86_32/Makefile
===================================================================
--- app/dbus-x11-launch/1.8.10-x86_32/Makefile	(revision 646)
+++ app/dbus-x11-launch/1.8.10-x86_32/Makefile	(revision 647)
@@ -174,4 +174,4 @@
 	 echo "short_description=\"$(DBUS_32_PKG_SHORT_DESCRIPTION)\"" >> $(DBUS_32_PKG)/.PKGINFO ; \
 	 echo "url=$(DBUS_32_PKG_URL)"                                 >> $(DBUS_32_PKG)/.PKGINFO ; \
 	 echo "license=$(DBUS_32_PKG_LICENSE)"                         >> $(DBUS_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DBUS_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DBUS_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/desktop-file-utils/0.22/Makefile
===================================================================
--- app/desktop-file-utils/0.22/Makefile	(revision 646)
+++ app/desktop-file-utils/0.22/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -171,4 +178,4 @@
 	 echo "short_description=\"$(DFUTILS_PKG_SHORT_DESCRIPTION)\"" >> $(DFUTILS_PKG)/.PKGINFO ; \
 	 echo "url=$(DFUTILS_PKG_URL)"                                 >> $(DFUTILS_PKG)/.PKGINFO ; \
 	 echo "license=$(DFUTILS_PKG_LICENSE)"                         >> $(DFUTILS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DFUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DFUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/glade2/2.12.2/Makefile
===================================================================
--- app/glade2/2.12.2/Makefile	(revision 646)
+++ app/glade2/2.12.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -190,4 +197,4 @@
 	 echo "short_description=\"$(GLADE2_PKG_SHORT_DESCRIPTION)\"" >> $(GLADE2_PKG)/.PKGINFO ; \
 	 echo "url=$(GLADE2_PKG_URL)"                                 >> $(GLADE2_PKG)/.PKGINFO ; \
 	 echo "license=$(GLADE2_PKG_LICENSE)"                         >> $(GLADE2_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLADE2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLADE2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/glade2/2.12.2/PATCHES
===================================================================
--- app/glade2/2.12.2/PATCHES	(revision 646)
+++ app/glade2/2.12.2/PATCHES	(revision 647)
@@ -2,3 +2,4 @@
 ../../../../sources/GNOME/apps/glade2/patches/glade-2.12.2-c-style.patch      -p0
 ../../../../sources/GNOME/apps/glade2/patches/glade-2.12.2-e-deprecated.patch -p0
 ../../../../sources/GNOME/apps/glade2/patches/glade-2.12.2-posix.patch        -p0
+../../../../sources/GNOME/apps/glade2/patches/glade-2.12.2-automake.patch     -p0
Index: app/lxappearance/0.6.1/Makefile
===================================================================
--- app/lxappearance/0.6.1/Makefile	(revision 646)
+++ app/lxappearance/0.6.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(LXAPP_PKG_SHORT_DESCRIPTION)\"" >> $(LXAPP_PKG)/.PKGINFO ; \
 	 echo "url=$(LXAPP_PKG_URL)"                                 >> $(LXAPP_PKG)/.PKGINFO ; \
 	 echo "license=$(LXAPP_PKG_LICENSE)"                         >> $(LXAPP_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LXAPP_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LXAPP_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/lxappearance/0.6.2/Makefile
===================================================================
--- app/lxappearance/0.6.2/Makefile	(revision 646)
+++ app/lxappearance/0.6.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -182,4 +189,4 @@
 	 echo "short_description=\"$(LXAPP_PKG_SHORT_DESCRIPTION)\"" >> $(LXAPP_PKG)/.PKGINFO ; \
 	 echo "url=$(LXAPP_PKG_URL)"                                 >> $(LXAPP_PKG)/.PKGINFO ; \
 	 echo "license=$(LXAPP_PKG_LICENSE)"                         >> $(LXAPP_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LXAPP_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LXAPP_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/xdg-user-dirs/0.15/Makefile
===================================================================
--- app/xdg-user-dirs/0.15/Makefile	(revision 646)
+++ app/xdg-user-dirs/0.15/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -173,4 +180,4 @@
 	 echo "short_description=\"$(XDGUDIRS_PKG_SHORT_DESCRIPTION)\"" >> $(XDGUDIRS_PKG)/.PKGINFO ; \
 	 echo "url=$(XDGUDIRS_PKG_URL)"                                 >> $(XDGUDIRS_PKG)/.PKGINFO ; \
 	 echo "license=$(XDGUDIRS_PKG_LICENSE)"                         >> $(XDGUDIRS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XDGUDIRS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XDGUDIRS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/xdg-utils/1.1.0/Makefile
===================================================================
--- app/xdg-utils/1.1.0/Makefile	(revision 646)
+++ app/xdg-utils/1.1.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -167,4 +174,4 @@
 	 echo "short_description=\"$(XDGUTILS_PKG_SHORT_DESCRIPTION)\"" >> $(XDGUTILS_PKG)/.PKGINFO ; \
 	 echo "url=$(XDGUTILS_PKG_URL)"                                 >> $(XDGUTILS_PKG)/.PKGINFO ; \
 	 echo "license=$(XDGUTILS_PKG_LICENSE)"                         >> $(XDGUTILS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XDGUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XDGUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/xdg-utils/1.1.1/Makefile
===================================================================
--- app/xdg-utils/1.1.1/Makefile	(revision 646)
+++ app/xdg-utils/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -167,4 +174,4 @@
 	 echo "short_description=\"$(XDGUTILS_PKG_SHORT_DESCRIPTION)\"" >> $(XDGUTILS_PKG)/.PKGINFO ; \
 	 echo "url=$(XDGUTILS_PKG_URL)"                                 >> $(XDGUTILS_PKG)/.PKGINFO ; \
 	 echo "license=$(XDGUTILS_PKG_LICENSE)"                         >> $(XDGUTILS_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XDGUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XDGUTILS_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/xterm/313/Makefile
===================================================================
--- app/xterm/313/Makefile	(revision 646)
+++ app/xterm/313/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XTERM_PKG_SHORT_DESCRIPTION)\"" >> $(XTERM_PKG)/.PKGINFO ; \
 	 echo "url=$(XTERM_PKG_URL)"                                 >> $(XTERM_PKG)/.PKGINFO ; \
 	 echo "license=$(XTERM_PKG_LICENSE)"                         >> $(XTERM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XTERM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XTERM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: app/xterm/324/Makefile
===================================================================
--- app/xterm/324/Makefile	(revision 646)
+++ app/xterm/324/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(XTERM_PKG_SHORT_DESCRIPTION)\"" >> $(XTERM_PKG)/.PKGINFO ; \
 	 echo "url=$(XTERM_PKG_URL)"                                 >> $(XTERM_PKG)/.PKGINFO ; \
 	 echo "license=$(XTERM_PKG_LICENSE)"                         >> $(XTERM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XTERM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XTERM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: font/dejavu-fonts-ttf/2.34/Makefile
===================================================================
--- font/dejavu-fonts-ttf/2.34/Makefile	(revision 646)
+++ font/dejavu-fonts-ttf/2.34/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/packages/x/dejavu-fonts-ttf
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -148,4 +155,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: font/dejavu-fonts-ttf/2.35/Makefile
===================================================================
--- font/dejavu-fonts-ttf/2.35/Makefile	(revision 646)
+++ font/dejavu-fonts-ttf/2.35/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/packages/x/dejavu-fonts-ttf
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -148,4 +155,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: font/thaixfonts/1.2.6/Makefile
===================================================================
--- font/thaixfonts/1.2.6/Makefile	(revision 646)
+++ font/thaixfonts/1.2.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/packages/x/thaixfonts
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: font/thaixfonts/1.2.7/Makefile
===================================================================
--- font/thaixfonts/1.2.7/Makefile	(revision 646)
+++ font/thaixfonts/1.2.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -24,7 +31,7 @@
 SOURCE_REQUIRES    = sources/packages/x/thaixfonts
 
 REQUIRES           = X11/libs/fontconfig/2.11.95
-REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
+REQUIRES          += X11/X.org/font/font-util/1.3.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -174,4 +181,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/aml-mali/4.0.1.0/Makefile
===================================================================
--- libs/aml-mali/4.0.1.0/Makefile	(revision 646)
+++ libs/aml-mali/4.0.1.0/Makefile	(revision 647)
@@ -1,6 +1,6 @@
 
 COMPONENT_TARGETS  = $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 
 
 NEED_ABS_PATH      = true
@@ -155,4 +155,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/aml-mali/5.0.1.0/Makefile
===================================================================
--- libs/aml-mali/5.0.1.0/Makefile	(revision 646)
+++ libs/aml-mali/5.0.1.0/Makefile	(revision 647)
@@ -1,6 +1,6 @@
 
 COMPONENT_TARGETS  = $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 
 
 NEED_ABS_PATH      = true
@@ -158,4 +158,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/aml-mali/5.1.1.0/Makefile
===================================================================
--- libs/aml-mali/5.1.1.0/Makefile	(nonexistent)
+++ libs/aml-mali/5.1.1.0/Makefile	(revision 647)
@@ -0,0 +1,162 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/aml-mali
+
+REQUIRES           = hal/ump/DX/5.1.1.0
+REQUIRES          += X11/libs/libdrm/2.4.68
+REQUIRES          += X11/X.org/lib/libXext/1.3.3
+REQUIRES          += X11/X.org/lib/libXfixes/5.0.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 5.1.1.0
+timestamp          = 20160818
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/hal/Mali/aml-mali/aml-mali-$(timestamp).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/aml-mali-$(timestamp)
+src_dir_name       = aml-mali-$(timestamp)
+doc_dir_name       = aml-mali-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+license            = $(CURDIR)/license/COPYING
+pkgconfigs_dir     = $(CURDIR)/pkgconfigs
+
+PATCHES = PATCHES
+
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xlibs
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = aml-mali
+XORG_PKG_VERSION             = 5.1.1.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Mali userspace driver for X11
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+AML_CPU_ARCH            = arm64
+AML_GPU_VERSION         = r5p1
+AML_OPENGL_MALI_DIR     = m450-X
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(install_target): $(src_done)
+	@mkdir -p $(XORG_PKG)/usr
+	@mkdir -p $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@( cd $(SRC_DIR) ;                 \
+	   cp -a include $(XORG_PKG)/usr ; \
+	   cp -a lib/$(AML_CPU_ARCH)/$(AML_GPU_VERSION)/$(AML_OPENGL_MALI_DIR)/libMali.so \
+	         $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	 )
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   chmod 755 lib* ; \
+	   ln -sf libMali.so          libEGL.so.1.4       ; \
+	   ln -sf libEGL.so.1.4       libEGL.so.1         ; \
+	   ln -sf libEGL.so.1         libEGL.so           ; \
+	   ln -sf libMali.so          libGLESv1_CM.so.1.1 ; \
+	   ln -sf libGLESv1_CM.so.1.1 libGLESv1_CM.so.1   ; \
+	   ln -sf libGLESv1_CM.so.1   libGLESv1_CM.so     ; \
+	   ln -sf libMali.so          libGLESv2.so.2.0    ; \
+	   ln -sf libGLESv2.so.2.0    libGLESv2.so.2      ; \
+	   ln -sf libGLESv2.so.2      libGLESv2.so        ; \
+	 )
+	# ======= Install pkg-config *.pc files to the target destination for development =======
+	@mkdir -p $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/egl.pc       $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/glesv1_cm.pc $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/glesv2.pc    $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	# ======= Install Documentation =======
+	@mkdir -p $(XORG_PKG)/usr/doc/$(doc_dir_name)
+	@cp -a $(license) \
+	       $(XORG_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(doc_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a $(license) \
+	         $(XORG_PKG)/usr/share/doc/$(doc_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(doc_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" egl.pc          \
+	                                            glesv1_cm.pc    \
+	                                            glesv2.pc     ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/aml-mali/5.1.1.0/PATCHES
===================================================================
--- libs/aml-mali/5.1.1.0/PATCHES	(nonexistent)
+++ libs/aml-mali/5.1.1.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../sources/hal/Mali/aml-mali/patches/aml-mali-20160818-no_x11.patch  -p0
Index: libs/aml-mali/5.1.1.0/aml-mali-pkg-description.in
===================================================================
--- libs/aml-mali/5.1.1.0/aml-mali-pkg-description.in	(nonexistent)
+++ libs/aml-mali/5.1.1.0/aml-mali-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+aml-mali: aml-mali @VERSION@ (Mali userspace driver for X11)
+aml-mali:
+aml-mali: aml-mali is provided as a complete set of Mali userspace drivers,
+aml-mali: including proprietary OpenGLESv2/EGL binaries.
+aml-mali:
+aml-mali: See: http://openlinux.amlogic.com
+aml-mali:
+aml-mali:
+aml-mali:
+aml-mali:
+aml-mali:
Index: libs/aml-mali/5.1.1.0/aml-mali-pkg-install.sh
===================================================================
--- libs/aml-mali/5.1.1.0/aml-mali-pkg-install.sh	(nonexistent)
+++ libs/aml-mali/5.1.1.0/aml-mali-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: libs/aml-mali/5.1.1.0/aml-mali-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: libs/aml-mali/5.1.1.0/license/COPYING
===================================================================
--- libs/aml-mali/5.1.1.0/license/COPYING	(nonexistent)
+++ libs/aml-mali/5.1.1.0/license/COPYING	(revision 647)
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) 2016 ARM Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
Index: libs/aml-mali/5.1.1.0/pkgconfigs/egl.pc
===================================================================
--- libs/aml-mali/5.1.1.0/pkgconfigs/egl.pc	(nonexistent)
+++ libs/aml-mali/5.1.1.0/pkgconfigs/egl.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: Amlogic implementation of Mali EGL library
+Requires.private:  libdrm >= 2.4.38 x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence >= 1.1 xxf86vm
+Version: 5.1.1.0
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} 
Index: libs/aml-mali/5.1.1.0/pkgconfigs/glesv1_cm.pc
===================================================================
--- libs/aml-mali/5.1.1.0/pkgconfigs/glesv1_cm.pc	(nonexistent)
+++ libs/aml-mali/5.1.1.0/pkgconfigs/glesv1_cm.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: glesv1_cm
+Description: Amlogic implementation of Mali OpenGL ES 1.1 CM library
+Requires.private:
+Version: 5.1.1.0
+Libs: -L${libdir} -lGLESv1_CM
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
Index: libs/aml-mali/5.1.1.0/pkgconfigs/glesv2.pc
===================================================================
--- libs/aml-mali/5.1.1.0/pkgconfigs/glesv2.pc	(nonexistent)
+++ libs/aml-mali/5.1.1.0/pkgconfigs/glesv2.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: Amlogic implementation of Mali OpenGL ES 2.0 library
+Requires.private:
+Version: 5.1.1.0
+Libs: -L${libdir} -lGLESv2
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
Index: libs/aml-mali/6.1.1.0/Makefile
===================================================================
--- libs/aml-mali/6.1.1.0/Makefile	(nonexistent)
+++ libs/aml-mali/6.1.1.0/Makefile	(revision 647)
@@ -0,0 +1,170 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/aml-mali
+
+REQUIRES           = hal/ump/DX/6.1.1.0
+REQUIRES          += X11/libs/libdrm/2.4.68
+REQUIRES          += X11/X.org/lib/libXext/1.3.3
+REQUIRES          += X11/X.org/lib/libXfixes/5.0.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 6.1.1.0
+timestamp          = 20160818
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/hal/Mali/aml-mali/aml-mali-$(timestamp).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/aml-mali-$(timestamp)
+src_dir_name       = aml-mali-$(timestamp)
+doc_dir_name       = aml-mali-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+license            = $(CURDIR)/license/COPYING
+pkgconfigs_dir     = $(CURDIR)/pkgconfigs
+
+PATCHES = PATCHES
+
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xlibs
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = aml-mali
+XORG_PKG_VERSION             = 6.1.1.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Mali userspace driver for X11
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+AML_CPU_ARCH            = arm64
+ifneq ($(filter $(HARDWARE),$(HARDWARE_ODROID_C2)),)
+AML_GPU_VERSION         = r6p1-odroidc2
+else
+AML_GPU_VERSION         = r6p1
+endif
+AML_OPENGL_MALI_DIR     = m450-X
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(install_target): $(src_done)
+	@mkdir -p $(XORG_PKG)/usr
+	@mkdir -p $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@( cd $(SRC_DIR) ;                 \
+	   cp -a include $(XORG_PKG)/usr ; \
+	   cp -a lib/$(AML_CPU_ARCH)/$(AML_GPU_VERSION)/$(AML_OPENGL_MALI_DIR)/libMali.so \
+	         $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	 )
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   chmod 755 lib* ; \
+	   ln -sf libMali.so          libEGL.so.1.4       ; \
+	   ln -sf libEGL.so.1.4       libEGL.so.1         ; \
+	   ln -sf libEGL.so.1         libEGL.so           ; \
+	   ln -sf libMali.so          libGLESv1_CM.so.1.1 ; \
+	   ln -sf libGLESv1_CM.so.1.1 libGLESv1_CM.so.1   ; \
+	   ln -sf libGLESv1_CM.so.1   libGLESv1_CM.so     ; \
+	   ln -sf libMali.so          libGLESv2.so.2.0    ; \
+	   ln -sf libGLESv2.so.2.0    libGLESv2.so.2      ; \
+	   ln -sf libGLESv2.so.2      libGLESv2.so        ; \
+	 )
+	# ======= Install pkg-config *.pc files to the target destination for development =======
+	@mkdir -p $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/egl.pc       $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/glesv1_cm.pc $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	@cp -a $(pkgconfigs_dir)/glesv2.pc    $(XORG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig
+	# ======= Install Documentation =======
+	@mkdir -p $(XORG_PKG)/usr/doc/$(doc_dir_name)
+	@cp -a $(license) \
+	       $(XORG_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(doc_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a $(license) \
+	         $(XORG_PKG)/usr/share/doc/$(doc_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(doc_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" egl.pc          \
+	                                            glesv1_cm.pc    \
+	                                            glesv2.pc     ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/aml-mali/6.1.1.0/PATCHES
===================================================================
--- libs/aml-mali/6.1.1.0/PATCHES	(nonexistent)
+++ libs/aml-mali/6.1.1.0/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../sources/hal/Mali/aml-mali/patches/aml-mali-20160818-no_x11.patch  -p0
Index: libs/aml-mali/6.1.1.0/aml-mali-pkg-description.in
===================================================================
--- libs/aml-mali/6.1.1.0/aml-mali-pkg-description.in	(nonexistent)
+++ libs/aml-mali/6.1.1.0/aml-mali-pkg-description.in	(revision 647)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+aml-mali: aml-mali @VERSION@ (Mali userspace driver for X11)
+aml-mali:
+aml-mali: aml-mali is provided as a complete set of Mali userspace drivers,
+aml-mali: including proprietary OpenGLESv2/EGL binaries.
+aml-mali:
+aml-mali: See: http://openlinux.amlogic.com
+aml-mali:
+aml-mali:
+aml-mali:
+aml-mali:
+aml-mali:
Index: libs/aml-mali/6.1.1.0/aml-mali-pkg-install.sh
===================================================================
--- libs/aml-mali/6.1.1.0/aml-mali-pkg-install.sh	(nonexistent)
+++ libs/aml-mali/6.1.1.0/aml-mali-pkg-install.sh	(revision 647)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: libs/aml-mali/6.1.1.0/aml-mali-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: libs/aml-mali/6.1.1.0/license/COPYING
===================================================================
--- libs/aml-mali/6.1.1.0/license/COPYING	(nonexistent)
+++ libs/aml-mali/6.1.1.0/license/COPYING	(revision 647)
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) 2016 ARM Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
Index: libs/aml-mali/6.1.1.0/pkgconfigs/egl.pc
===================================================================
--- libs/aml-mali/6.1.1.0/pkgconfigs/egl.pc	(nonexistent)
+++ libs/aml-mali/6.1.1.0/pkgconfigs/egl.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: Amlogic implementation of Mali EGL library
+Requires.private:  libdrm >= 2.4.38 x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence >= 1.1 xxf86vm
+Version: 6.1.1.0
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} 
Index: libs/aml-mali/6.1.1.0/pkgconfigs/glesv1_cm.pc
===================================================================
--- libs/aml-mali/6.1.1.0/pkgconfigs/glesv1_cm.pc	(nonexistent)
+++ libs/aml-mali/6.1.1.0/pkgconfigs/glesv1_cm.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: glesv1_cm
+Description: Amlogic implementation of Mali OpenGL ES 1.1 CM library
+Requires.private:
+Version: 6.1.1.0
+Libs: -L${libdir} -lGLESv1_CM
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
Index: libs/aml-mali/6.1.1.0/pkgconfigs/glesv2.pc
===================================================================
--- libs/aml-mali/6.1.1.0/pkgconfigs/glesv2.pc	(nonexistent)
+++ libs/aml-mali/6.1.1.0/pkgconfigs/glesv2.pc	(revision 647)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: Amlogic implementation of Mali OpenGL ES 2.0 library
+Requires.private:
+Version: 6.1.1.0
+Libs: -L${libdir} -lGLESv2
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
Index: libs/cairo/1.14.0/Makefile
===================================================================
--- libs/cairo/1.14.0/Makefile	(revision 646)
+++ libs/cairo/1.14.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -113,7 +120,7 @@
 extra_configure_switches += --enable-xcb
 extra_configure_switches += --enable-xcb-shm
 extra_configure_switches += --enable-xlib-xcb
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 extra_configure_switches += --disable-gl
 endif
 extra_configure_switches += --enable-egl
@@ -281,4 +288,4 @@
 	 echo "short_description=\"$(CAIRO_PKG_SHORT_DESCRIPTION)\"" >> $(CAIRO_PKG)/.PKGINFO ; \
 	 echo "url=$(CAIRO_PKG_URL)"                                 >> $(CAIRO_PKG)/.PKGINFO ; \
 	 echo "license=$(CAIRO_PKG_LICENSE)"                         >> $(CAIRO_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(CAIRO_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(CAIRO_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/cairo/1.14.0-x86_32/Makefile
===================================================================
--- libs/cairo/1.14.0-x86_32/Makefile	(revision 646)
+++ libs/cairo/1.14.0-x86_32/Makefile	(revision 647)
@@ -229,4 +229,4 @@
 	 echo "short_description=\"$(CAIRO_32_PKG_SHORT_DESCRIPTION)\"" >> $(CAIRO_32_PKG)/.PKGINFO ; \
 	 echo "url=$(CAIRO_32_PKG_URL)"                                 >> $(CAIRO_32_PKG)/.PKGINFO ; \
 	 echo "license=$(CAIRO_32_PKG_LICENSE)"                         >> $(CAIRO_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(CAIRO_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(CAIRO_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/cairo/1.14.6/Makefile
===================================================================
--- libs/cairo/1.14.6/Makefile	(revision 646)
+++ libs/cairo/1.14.6/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -113,7 +120,7 @@
 extra_configure_switches += --enable-xcb
 extra_configure_switches += --enable-xcb-shm
 extra_configure_switches += --enable-xlib-xcb
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 extra_configure_switches += --disable-gl
 endif
 extra_configure_switches += --enable-egl
@@ -281,4 +288,4 @@
 	 echo "short_description=\"$(CAIRO_PKG_SHORT_DESCRIPTION)\"" >> $(CAIRO_PKG)/.PKGINFO ; \
 	 echo "url=$(CAIRO_PKG_URL)"                                 >> $(CAIRO_PKG)/.PKGINFO ; \
 	 echo "license=$(CAIRO_PKG_LICENSE)"                         >> $(CAIRO_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(CAIRO_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(CAIRO_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/cairo/1.14.6-x86_32/Makefile
===================================================================
--- libs/cairo/1.14.6-x86_32/Makefile	(revision 646)
+++ libs/cairo/1.14.6-x86_32/Makefile	(revision 647)
@@ -229,4 +229,4 @@
 	 echo "short_description=\"$(CAIRO_32_PKG_SHORT_DESCRIPTION)\"" >> $(CAIRO_32_PKG)/.PKGINFO ; \
 	 echo "url=$(CAIRO_32_PKG_URL)"                                 >> $(CAIRO_32_PKG)/.PKGINFO ; \
 	 echo "license=$(CAIRO_32_PKG_LICENSE)"                         >> $(CAIRO_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(CAIRO_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(CAIRO_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/ci20-sgx-um/1.13.3341330/Makefile
===================================================================
--- libs/ci20-sgx-um/1.13.3341330/Makefile	(revision 646)
+++ libs/ci20-sgx-um/1.13.3341330/Makefile	(revision 647)
@@ -172,4 +172,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/ci20-sgx-um/1.14.3759903/Makefile
===================================================================
--- libs/ci20-sgx-um/1.14.3759903/Makefile	(revision 646)
+++ libs/ci20-sgx-um/1.14.3759903/Makefile	(revision 647)
@@ -174,4 +174,4 @@
 	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
 	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.11.1/Makefile
===================================================================
--- libs/fontconfig/2.11.1/Makefile	(revision 646)
+++ libs/fontconfig/2.11.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -234,4 +241,4 @@
 	 echo "short_description=\"$(FONTCFG_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_PKG)/.PKGINFO ; \
 	 echo "url=$(FONTCFG_PKG_URL)"                                 >> $(FONTCFG_PKG)/.PKGINFO ; \
 	 echo "license=$(FONTCFG_PKG_LICENSE)"                         >> $(FONTCFG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(FONTCFG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(FONTCFG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.11.1-x86_32/Makefile
===================================================================
--- libs/fontconfig/2.11.1-x86_32/Makefile	(revision 646)
+++ libs/fontconfig/2.11.1-x86_32/Makefile	(revision 647)
@@ -196,4 +196,4 @@
 	 echo "short_description=\"$(FONTCFG_32_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(FONTCFG_32_PKG_URL)"                                 >> $(FONTCFG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(FONTCFG_32_PKG_LICENSE)"                         >> $(FONTCFG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(FONTCFG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(FONTCFG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.11.95/Makefile
===================================================================
--- libs/fontconfig/2.11.95/Makefile	(revision 646)
+++ libs/fontconfig/2.11.95/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -234,4 +241,4 @@
 	 echo "short_description=\"$(FONTCFG_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_PKG)/.PKGINFO ; \
 	 echo "url=$(FONTCFG_PKG_URL)"                                 >> $(FONTCFG_PKG)/.PKGINFO ; \
 	 echo "license=$(FONTCFG_PKG_LICENSE)"                         >> $(FONTCFG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(FONTCFG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(FONTCFG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.11.95-x86_32/Makefile
===================================================================
--- libs/fontconfig/2.11.95-x86_32/Makefile	(revision 646)
+++ libs/fontconfig/2.11.95-x86_32/Makefile	(revision 647)
@@ -195,4 +195,4 @@
 	 echo "short_description=\"$(FONTCFG_32_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(FONTCFG_32_PKG_URL)"                                 >> $(FONTCFG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(FONTCFG_32_PKG_LICENSE)"                         >> $(FONTCFG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(FONTCFG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(FONTCFG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/freeglut/2.8.1/Makefile
===================================================================
--- libs/freeglut/2.8.1/Makefile	(revision 646)
+++ libs/freeglut/2.8.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -202,4 +209,4 @@
 	 echo "short_description=\"$(GLUT_PKG_SHORT_DESCRIPTION)\"" >> $(GLUT_PKG)/.PKGINFO ; \
 	 echo "url=$(GLUT_PKG_URL)"                                 >> $(GLUT_PKG)/.PKGINFO ; \
 	 echo "license=$(GLUT_PKG_LICENSE)"                         >> $(GLUT_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/freeglut/2.8.1-x86_32/Makefile
===================================================================
--- libs/freeglut/2.8.1-x86_32/Makefile	(revision 646)
+++ libs/freeglut/2.8.1-x86_32/Makefile	(revision 647)
@@ -163,4 +163,4 @@
 	 echo "short_description=\"$(GLUT_32_PKG_SHORT_DESCRIPTION)\"" >> $(GLUT_32_PKG)/.PKGINFO ; \
 	 echo "url=$(GLUT_32_PKG_URL)"                                 >> $(GLUT_32_PKG)/.PKGINFO ; \
 	 echo "license=$(GLUT_32_PKG_LICENSE)"                         >> $(GLUT_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gdk-pixbuf2/2.31.1/Makefile
===================================================================
--- libs/gdk-pixbuf2/2.31.1/Makefile	(revision 646)
+++ libs/gdk-pixbuf2/2.31.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -271,4 +278,4 @@
 	 echo "short_description=\"$(PIXBUF2_PKG_SHORT_DESCRIPTION)\"" >> $(PIXBUF2_PKG)/.PKGINFO ; \
 	 echo "url=$(PIXBUF2_PKG_URL)"                                 >> $(PIXBUF2_PKG)/.PKGINFO ; \
 	 echo "license=$(PIXBUF2_PKG_LICENSE)"                         >> $(PIXBUF2_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(PIXBUF2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(PIXBUF2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gdk-pixbuf2/2.31.1-x86_32/Makefile
===================================================================
--- libs/gdk-pixbuf2/2.31.1-x86_32/Makefile	(revision 646)
+++ libs/gdk-pixbuf2/2.31.1-x86_32/Makefile	(revision 647)
@@ -228,4 +228,4 @@
 	 echo "short_description=\"$(PIXBUF2_32_PKG_SHORT_DESCRIPTION)\"" >> $(PIXBUF2_32_PKG)/.PKGINFO ; \
 	 echo "url=$(PIXBUF2_32_PKG_URL)"                                 >> $(PIXBUF2_32_PKG)/.PKGINFO ; \
 	 echo "license=$(PIXBUF2_32_PKG_LICENSE)"                         >> $(PIXBUF2_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(PIXBUF2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(PIXBUF2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gdk-pixbuf2/2.35.1/Makefile
===================================================================
--- libs/gdk-pixbuf2/2.35.1/Makefile	(revision 646)
+++ libs/gdk-pixbuf2/2.35.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -138,7 +145,11 @@
 $(install_target): $(build_target)
 	@mkdir -p $(PIXBUF2_PKG)
 	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
-ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64)                         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(PIXBUF2_PKG)/usr/bin ; mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 ; ln -sf gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders )
 else
 	@( cd $(PIXBUF2_PKG)/usr/bin ; mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 ; ln -sf gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders )
@@ -268,4 +279,4 @@
 	 echo "short_description=\"$(PIXBUF2_PKG_SHORT_DESCRIPTION)\"" >> $(PIXBUF2_PKG)/.PKGINFO ; \
 	 echo "url=$(PIXBUF2_PKG_URL)"                                 >> $(PIXBUF2_PKG)/.PKGINFO ; \
 	 echo "license=$(PIXBUF2_PKG_LICENSE)"                         >> $(PIXBUF2_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(PIXBUF2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(PIXBUF2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gdk-pixbuf2/2.35.1/update-loaders/update-gdk-pixbuf-loaders.in
===================================================================
--- libs/gdk-pixbuf2/2.35.1/update-loaders/update-gdk-pixbuf-loaders.in	(revision 646)
+++ libs/gdk-pixbuf2/2.35.1/update-loaders/update-gdk-pixbuf-loaders.in	(revision 647)
@@ -6,7 +6,7 @@
 host=@HOST_TRIPLET@
 
 case "$host" in
-  s390x*|x86_64*)
+  aarch64*|s390x*|x86_64*)
    if [ -x /usr/bin/gdk-pixbuf-query-loaders-64 ]; then
      if [ "$1" = "--verbose" ]; then
        echo "Updating gdk-pixbuf.loaders for ${host}:"
Index: libs/gdk-pixbuf2/2.35.1-x86_32/Makefile
===================================================================
--- libs/gdk-pixbuf2/2.35.1-x86_32/Makefile	(revision 646)
+++ libs/gdk-pixbuf2/2.35.1-x86_32/Makefile	(revision 647)
@@ -119,7 +119,8 @@
 
 $(build_target): $(src_done)
 	@mkdir -p $(build_dir)
-	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
 	  --prefix=/usr               \
 	  --build=$(BUILD)            \
 	  --host=$(TARGET32)          \
@@ -225,4 +226,4 @@
 	 echo "short_description=\"$(PIXBUF2_32_PKG_SHORT_DESCRIPTION)\"" >> $(PIXBUF2_32_PKG)/.PKGINFO ; \
 	 echo "url=$(PIXBUF2_32_PKG_URL)"                                 >> $(PIXBUF2_32_PKG)/.PKGINFO ; \
 	 echo "license=$(PIXBUF2_32_PKG_LICENSE)"                         >> $(PIXBUF2_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(PIXBUF2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(PIXBUF2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glew/1.12.0/Makefile
===================================================================
--- libs/glew/1.12.0/Makefile	(revision 646)
+++ libs/glew/1.12.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(GLEW_PKG_SHORT_DESCRIPTION)\"" >> $(GLEW_PKG)/.PKGINFO ; \
 	 echo "url=$(GLEW_PKG_URL)"                                 >> $(GLEW_PKG)/.PKGINFO ; \
 	 echo "license=$(GLEW_PKG_LICENSE)"                         >> $(GLEW_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLEW_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLEW_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glew/1.12.0-x86_32/Makefile
===================================================================
--- libs/glew/1.12.0-x86_32/Makefile	(revision 646)
+++ libs/glew/1.12.0-x86_32/Makefile	(revision 647)
@@ -139,4 +139,4 @@
 	 echo "short_description=\"$(GLEW_32_PKG_SHORT_DESCRIPTION)\"" >> $(GLEW_32_PKG)/.PKGINFO ; \
 	 echo "url=$(GLEW_32_PKG_URL)"                                 >> $(GLEW_32_PKG)/.PKGINFO ; \
 	 echo "license=$(GLEW_32_PKG_LICENSE)"                         >> $(GLEW_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLEW_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLEW_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glew/1.13.0/Makefile
===================================================================
--- libs/glew/1.13.0/Makefile	(revision 646)
+++ libs/glew/1.13.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -180,4 +187,4 @@
 	 echo "short_description=\"$(GLEW_PKG_SHORT_DESCRIPTION)\"" >> $(GLEW_PKG)/.PKGINFO ; \
 	 echo "url=$(GLEW_PKG_URL)"                                 >> $(GLEW_PKG)/.PKGINFO ; \
 	 echo "license=$(GLEW_PKG_LICENSE)"                         >> $(GLEW_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLEW_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLEW_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glew/1.13.0-x86_32/Makefile
===================================================================
--- libs/glew/1.13.0-x86_32/Makefile	(revision 646)
+++ libs/glew/1.13.0-x86_32/Makefile	(revision 647)
@@ -139,4 +139,4 @@
 	 echo "short_description=\"$(GLEW_32_PKG_SHORT_DESCRIPTION)\"" >> $(GLEW_32_PKG)/.PKGINFO ; \
 	 echo "url=$(GLEW_32_PKG_URL)"                                 >> $(GLEW_32_PKG)/.PKGINFO ; \
 	 echo "license=$(GLEW_32_PKG_LICENSE)"                         >> $(GLEW_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLEW_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLEW_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glu/9.0.0/Makefile
===================================================================
--- libs/glu/9.0.0/Makefile	(revision 646)
+++ libs/glu/9.0.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -204,4 +211,4 @@
 	 echo "short_description=\"$(GLU_PKG_SHORT_DESCRIPTION)\"" >> $(GLU_PKG)/.PKGINFO ; \
 	 echo "url=$(GLU_PKG_URL)"                                 >> $(GLU_PKG)/.PKGINFO ; \
 	 echo "license=$(GLU_PKG_LICENSE)"                         >> $(GLU_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLU_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLU_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/glu/9.0.0-x86_32/Makefile
===================================================================
--- libs/glu/9.0.0-x86_32/Makefile	(revision 646)
+++ libs/glu/9.0.0-x86_32/Makefile	(revision 647)
@@ -166,4 +166,4 @@
 	 echo "short_description=\"$(GLU_32_PKG_SHORT_DESCRIPTION)\"" >> $(GLU_32_PKG)/.PKGINFO ; \
 	 echo "url=$(GLU_32_PKG_URL)"                                 >> $(GLU_32_PKG)/.PKGINFO ; \
 	 echo "license=$(GLU_32_PKG_LICENSE)"                         >> $(GLU_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GLU_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GLU_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gtk+2/2.24.25/Makefile
===================================================================
--- libs/gtk+2/2.24.25/Makefile	(revision 646)
+++ libs/gtk+2/2.24.25/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -148,7 +155,11 @@
 	@cp -a $(profile_dir)/* $(GTK2_PKG)/etc/profile.d
 	@chmod 0755 $(GTK2_PKG)/etc/profile.d/*
 	# ======= Install wrappers for the 'gtk-query-immodules' binary =======
-ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64)                         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(GTK2_PKG)/usr/bin ; mv gtk-query-immodules-2.0{,-64} ; ln -sf gtk-query-immodules-2.0-64 gtk-query-immodules-2.0 )
 else
 	@( cd $(GTK2_PKG)/usr/bin ; mv gtk-query-immodules-2.0{,-32} ; ln -sf gtk-query-immodules-2.0-32 gtk-query-immodules-2.0 )
@@ -307,4 +318,4 @@
 	 echo "short_description=\"$(GTK2_PKG_SHORT_DESCRIPTION)\"" >> $(GTK2_PKG)/.PKGINFO ; \
 	 echo "url=$(GTK2_PKG_URL)"                                 >> $(GTK2_PKG)/.PKGINFO ; \
 	 echo "license=$(GTK2_PKG_LICENSE)"                         >> $(GTK2_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GTK2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GTK2_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gtk+2/2.24.25/PATCHES
===================================================================
--- libs/gtk+2/2.24.25/PATCHES	(revision 646)
+++ libs/gtk+2/2.24.25/PATCHES	(revision 647)
@@ -1,3 +1,4 @@
 
 ../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25.patch            -p0
 ../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25-gdk-pixbuf.patch -p0
+../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25-geninclude.patch -p0
Index: libs/gtk+2/2.24.25/update-immodules/update-gtk-immodules-2.0.in
===================================================================
--- libs/gtk+2/2.24.25/update-immodules/update-gtk-immodules-2.0.in	(revision 646)
+++ libs/gtk+2/2.24.25/update-immodules/update-gtk-immodules-2.0.in	(revision 647)
@@ -6,7 +6,7 @@
 host=@HOST_TRIPLET@
 
 case "$host" in
-  s390x*|x86_64*)
+  aarch64*|s390x*|x86_64*)
    if [ -x /usr/bin/gtk-query-immodules-2.0-64 ]; then
      if [ "$1" = "--verbose" ]; then
        echo "Updating gtk.immodules for ${host}:"
Index: libs/gtk+2/2.24.25-x86_32/Makefile
===================================================================
--- libs/gtk+2/2.24.25-x86_32/Makefile	(revision 646)
+++ libs/gtk+2/2.24.25-x86_32/Makefile	(revision 647)
@@ -238,4 +238,4 @@
 	 echo "short_description=\"$(GTK2_32_PKG_SHORT_DESCRIPTION)\"" >> $(GTK2_32_PKG)/.PKGINFO ; \
 	 echo "url=$(GTK2_32_PKG_URL)"                                 >> $(GTK2_32_PKG)/.PKGINFO ; \
 	 echo "license=$(GTK2_32_PKG_LICENSE)"                         >> $(GTK2_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GTK2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GTK2_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gtk+2/2.24.25-x86_32/PATCHES
===================================================================
--- libs/gtk+2/2.24.25-x86_32/PATCHES	(revision 646)
+++ libs/gtk+2/2.24.25-x86_32/PATCHES	(revision 647)
@@ -1,3 +1,4 @@
 
 ../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25.patch            -p0
 ../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25-gdk-pixbuf.patch -p0
+../../../../sources/GNOME/core/gtk+2/patches/gtk+-2.24.25-geninclude.patch -p0
Index: libs/gtk-engines/2.20.2/Makefile
===================================================================
--- libs/gtk-engines/2.20.2/Makefile	(revision 646)
+++ libs/gtk-engines/2.20.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -218,4 +225,4 @@
 	 echo "short_description=\"$(GTKENGINES_PKG_SHORT_DESCRIPTION)\"" >> $(GTKENGINES_PKG)/.PKGINFO ; \
 	 echo "url=$(GTKENGINES_PKG_URL)"                                 >> $(GTKENGINES_PKG)/.PKGINFO ; \
 	 echo "license=$(GTKENGINES_PKG_LICENSE)"                         >> $(GTKENGINES_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(GTKENGINES_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(GTKENGINES_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/gtk-engines/2.20.2/PATCHES
===================================================================
--- libs/gtk-engines/2.20.2/PATCHES	(revision 646)
+++ libs/gtk-engines/2.20.2/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../sources/GNOME/core/gtk-engines/patches/gtk-engines-2.20.2-automake.patch -p0
Index: libs/harfbuzz/0.9.36/Makefile
===================================================================
--- libs/harfbuzz/0.9.36/Makefile	(revision 646)
+++ libs/harfbuzz/0.9.36/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -253,4 +260,4 @@
 	 echo "short_description=\"$(HARFBUZZ_PKG_SHORT_DESCRIPTION)\"" >> $(HARFBUZZ_PKG)/.PKGINFO ; \
 	 echo "url=$(HARFBUZZ_PKG_URL)"                                 >> $(HARFBUZZ_PKG)/.PKGINFO ; \
 	 echo "license=$(HARFBUZZ_PKG_LICENSE)"                         >> $(HARFBUZZ_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(HARFBUZZ_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(HARFBUZZ_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/harfbuzz/0.9.36-x86_32/Makefile
===================================================================
--- libs/harfbuzz/0.9.36-x86_32/Makefile	(revision 646)
+++ libs/harfbuzz/0.9.36-x86_32/Makefile	(revision 647)
@@ -208,4 +208,4 @@
 	 echo "short_description=\"$(HARFBUZZ_32_PKG_SHORT_DESCRIPTION)\"" >> $(HARFBUZZ_32_PKG)/.PKGINFO ; \
 	 echo "url=$(HARFBUZZ_32_PKG_URL)"                                 >> $(HARFBUZZ_32_PKG)/.PKGINFO ; \
 	 echo "license=$(HARFBUZZ_32_PKG_LICENSE)"                         >> $(HARFBUZZ_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(HARFBUZZ_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(HARFBUZZ_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/harfbuzz/1.2.7/Makefile
===================================================================
--- libs/harfbuzz/1.2.7/Makefile	(revision 646)
+++ libs/harfbuzz/1.2.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -253,4 +260,4 @@
 	 echo "short_description=\"$(HARFBUZZ_PKG_SHORT_DESCRIPTION)\"" >> $(HARFBUZZ_PKG)/.PKGINFO ; \
 	 echo "url=$(HARFBUZZ_PKG_URL)"                                 >> $(HARFBUZZ_PKG)/.PKGINFO ; \
 	 echo "license=$(HARFBUZZ_PKG_LICENSE)"                         >> $(HARFBUZZ_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(HARFBUZZ_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(HARFBUZZ_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/harfbuzz/1.2.7-x86_32/Makefile
===================================================================
--- libs/harfbuzz/1.2.7-x86_32/Makefile	(revision 646)
+++ libs/harfbuzz/1.2.7-x86_32/Makefile	(revision 647)
@@ -208,4 +208,4 @@
 	 echo "short_description=\"$(HARFBUZZ_32_PKG_SHORT_DESCRIPTION)\"" >> $(HARFBUZZ_32_PKG)/.PKGINFO ; \
 	 echo "url=$(HARFBUZZ_32_PKG_URL)"                                 >> $(HARFBUZZ_32_PKG)/.PKGINFO ; \
 	 echo "license=$(HARFBUZZ_32_PKG_LICENSE)"                         >> $(HARFBUZZ_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(HARFBUZZ_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(HARFBUZZ_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/hicolor-icon-theme/0.14/Makefile
===================================================================
--- libs/hicolor-icon-theme/0.14/Makefile	(revision 646)
+++ libs/hicolor-icon-theme/0.14/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -166,4 +173,4 @@
 	 echo "short_description=\"$(DITHEME_PKG_SHORT_DESCRIPTION)\"" >> $(DITHEME_PKG)/.PKGINFO ; \
 	 echo "url=$(DITHEME_PKG_URL)"                                 >> $(DITHEME_PKG)/.PKGINFO ; \
 	 echo "license=$(DITHEME_PKG_LICENSE)"                         >> $(DITHEME_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DITHEME_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DITHEME_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/hicolor-icon-theme/0.15/Makefile
===================================================================
--- libs/hicolor-icon-theme/0.15/Makefile	(revision 646)
+++ libs/hicolor-icon-theme/0.15/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -166,4 +173,4 @@
 	 echo "short_description=\"$(DITHEME_PKG_SHORT_DESCRIPTION)\"" >> $(DITHEME_PKG)/.PKGINFO ; \
 	 echo "url=$(DITHEME_PKG_URL)"                                 >> $(DITHEME_PKG)/.PKGINFO ; \
 	 echo "license=$(DITHEME_PKG_LICENSE)"                         >> $(DITHEME_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(DITHEME_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(DITHEME_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.58/Makefile
===================================================================
--- libs/libdrm/2.4.58/Makefile	(revision 646)
+++ libs/libdrm/2.4.58/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -27,9 +34,9 @@
 REQUIRES           = dev/gcc/5.3.0
 else
 ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES           = libs/glibc/2.23
+REQUIRES           = libs/glibc/2.24
 else
-REQUIRES           = libs/glibc/2.23-x86_32
+REQUIRES           = libs/glibc/2.24-x86_32
 endif
 endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
@@ -253,4 +260,4 @@
 	 echo "short_description=\"$(LIBDRM_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_PKG_URL)"                                 >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_PKG_LICENSE)"                         >> $(LIBDRM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.58-x86_32/Makefile
===================================================================
--- libs/libdrm/2.4.58-x86_32/Makefile	(revision 646)
+++ libs/libdrm/2.4.58-x86_32/Makefile	(revision 647)
@@ -179,4 +179,4 @@
 	 echo "short_description=\"$(LIBDRM_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_32_PKG_URL)"                                 >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_32_PKG_LICENSE)"                         >> $(LIBDRM_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.64/Makefile
===================================================================
--- libs/libdrm/2.4.64/Makefile	(revision 646)
+++ libs/libdrm/2.4.64/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -27,9 +34,9 @@
 REQUIRES           = dev/gcc/5.3.0
 else
 ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES           = libs/glibc/2.23
+REQUIRES           = libs/glibc/2.24
 else
-REQUIRES           = libs/glibc/2.23-x86_32
+REQUIRES           = libs/glibc/2.24-x86_32
 endif
 endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
@@ -253,4 +260,4 @@
 	 echo "short_description=\"$(LIBDRM_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_PKG_URL)"                                 >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_PKG_LICENSE)"                         >> $(LIBDRM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.64-x86_32/Makefile
===================================================================
--- libs/libdrm/2.4.64-x86_32/Makefile	(revision 646)
+++ libs/libdrm/2.4.64-x86_32/Makefile	(revision 647)
@@ -179,4 +179,4 @@
 	 echo "short_description=\"$(LIBDRM_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_32_PKG_URL)"                                 >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_32_PKG_LICENSE)"                         >> $(LIBDRM_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.68/Makefile
===================================================================
--- libs/libdrm/2.4.68/Makefile	(revision 646)
+++ libs/libdrm/2.4.68/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -27,14 +34,15 @@
 REQUIRES           = dev/gcc/5.3.0
 else
 ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES           = libs/glibc/2.23
+REQUIRES           = libs/glibc/2.24
 else
-REQUIRES           = libs/glibc/2.23-x86_32
+REQUIRES           = libs/glibc/2.24-x86_32
 endif
 endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
 REQUIRES          += X11/X.org/lib/libpciaccess/0.13.4
 endif
+REQUIRES          += X11/X.org/xcb/libpthread-stubs/0.3
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -179,6 +187,7 @@
 	# ======= remove toolchain path from target libtool *.la files =======
 	@( cd $(LIBDRM_PKG)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libdrm.la          \
+	                                    libdrm_amdgpu.la   \
 	                                    libdrm_exynos.la   \
 	                                    libdrm_nouveau.la  \
 	                                    libdrm_omap.la     \
@@ -190,11 +199,17 @@
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libdrm_intel.la ; \
 	 )
 endif
+ifeq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32) $(HARDWARE_CI20) $(HARDWARE_BT1)),)
+	@( cd $(LIBDRM_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libdrm_freedreno.la ; \
+	 )
+endif
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(LIBDRM_PKG))
 	# ======= tune libtool *.la search path to the target destination for development =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libdrm.la          \
+	                                            libdrm_amdgpu.la   \
 	                                            libdrm_exynos.la   \
 	                                            libdrm_nouveau.la  \
 	                                            libdrm_omap.la     \
@@ -201,6 +216,7 @@
 	                                            libdrm_radeon.la   \
 	                                            libkms.la        ; \
 	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libdrm.la          \
+	                                              libdrm_amdgpu.la   \
 	                                              libdrm_exynos.la   \
 	                                              libdrm_nouveau.la  \
 	                                              libdrm_omap.la     \
@@ -213,9 +229,16 @@
 	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libdrm_intel.la ; \
 	 )
 endif
+ifeq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32) $(HARDWARE_CI20) $(HARDWARE_BT1)),)
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libdrm_freedreno.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libdrm_freedreno.la ; \
+	 )
+endif
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libdrm.pc          \
+	                                            libdrm_amdgpu.pc   \
 	                                            libdrm_exynos.pc   \
 	                                            libdrm_nouveau.pc  \
 	                                            libdrm_omap.pc     \
@@ -227,6 +250,11 @@
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libdrm_intel.pc ; \
 	 )
 endif
+ifeq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32) $(HARDWARE_CI20) $(HARDWARE_BT1)),)
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libdrm_freedreno.pc libdrm_vc4.pc ; \
+	 )
+endif
 	# ======= Strip binaries =======
 	@( cd $(LIBDRM_PKG); \
 	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
@@ -254,4 +282,4 @@
 	 echo "short_description=\"$(LIBDRM_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_PKG_URL)"                                 >> $(LIBDRM_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_PKG_LICENSE)"                         >> $(LIBDRM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libdrm/2.4.68-x86_32/Makefile
===================================================================
--- libs/libdrm/2.4.68-x86_32/Makefile	(revision 646)
+++ libs/libdrm/2.4.68-x86_32/Makefile	(revision 647)
@@ -14,6 +14,7 @@
 
 REQUIRES           = X11/libs/libdrm/2.4.68
 REQUIRES          += X11/X.org/lib/libpciaccess/0.13.4-x86_32
+REQUIRES          += X11/X.org/xcb/libpthread-stubs/0.3-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -180,4 +181,4 @@
 	 echo "short_description=\"$(LIBDRM_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBDRM_32_PKG_URL)"                                 >> $(LIBDRM_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBDRM_32_PKG_LICENSE)"                         >> $(LIBDRM_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBDRM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libepoxy/1.2/Makefile
===================================================================
--- libs/libepoxy/1.2/Makefile	(revision 646)
+++ libs/libepoxy/1.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -188,4 +195,4 @@
 	 echo "short_description=\"$(LIBEPOXY_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEPOXY_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEPOXY_PKG_URL)"                                 >> $(LIBEPOXY_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEPOXY_PKG_LICENSE)"                         >> $(LIBEPOXY_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEPOXY_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEPOXY_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libepoxy/1.2-x86_32/Makefile
===================================================================
--- libs/libepoxy/1.2-x86_32/Makefile	(revision 646)
+++ libs/libepoxy/1.2-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(LIBEPOXY_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEPOXY_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEPOXY_32_PKG_URL)"                                 >> $(LIBEPOXY_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEPOXY_32_PKG_LICENSE)"                         >> $(LIBEPOXY_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEPOXY_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEPOXY_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libepoxy/1.3.1/Makefile
===================================================================
--- libs/libepoxy/1.3.1/Makefile	(revision 646)
+++ libs/libepoxy/1.3.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -188,4 +195,4 @@
 	 echo "short_description=\"$(LIBEPOXY_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEPOXY_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEPOXY_PKG_URL)"                                 >> $(LIBEPOXY_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEPOXY_PKG_LICENSE)"                         >> $(LIBEPOXY_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEPOXY_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEPOXY_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libepoxy/1.3.1-x86_32/Makefile
===================================================================
--- libs/libepoxy/1.3.1-x86_32/Makefile	(revision 646)
+++ libs/libepoxy/1.3.1-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(LIBEPOXY_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEPOXY_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEPOXY_32_PKG_URL)"                                 >> $(LIBEPOXY_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEPOXY_32_PKG_LICENSE)"                         >> $(LIBEPOXY_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEPOXY_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEPOXY_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libevdev/1.3.2/Makefile
===================================================================
--- libs/libevdev/1.3.2/Makefile	(revision 646)
+++ libs/libevdev/1.3.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -188,4 +195,4 @@
 	 echo "short_description=\"$(LIBEVDEV_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEVDEV_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEVDEV_PKG_URL)"                                 >> $(LIBEVDEV_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEVDEV_PKG_LICENSE)"                         >> $(LIBEVDEV_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEVDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEVDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libevdev/1.3.2-x86_32/Makefile
===================================================================
--- libs/libevdev/1.3.2-x86_32/Makefile	(revision 646)
+++ libs/libevdev/1.3.2-x86_32/Makefile	(revision 647)
@@ -152,4 +152,4 @@
 	 echo "short_description=\"$(LIBEVDEV_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEVDEV_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEVDEV_32_PKG_URL)"                                 >> $(LIBEVDEV_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEVDEV_32_PKG_LICENSE)"                         >> $(LIBEVDEV_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEVDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEVDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libevdev/1.5.1/Makefile
===================================================================
--- libs/libevdev/1.5.1/Makefile	(revision 646)
+++ libs/libevdev/1.5.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -192,4 +199,4 @@
 	 echo "short_description=\"$(LIBEVDEV_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEVDEV_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEVDEV_PKG_URL)"                                 >> $(LIBEVDEV_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEVDEV_PKG_LICENSE)"                         >> $(LIBEVDEV_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEVDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEVDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libevdev/1.5.1-x86_32/Makefile
===================================================================
--- libs/libevdev/1.5.1-x86_32/Makefile	(revision 646)
+++ libs/libevdev/1.5.1-x86_32/Makefile	(revision 647)
@@ -152,4 +152,4 @@
 	 echo "short_description=\"$(LIBEVDEV_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBEVDEV_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBEVDEV_32_PKG_URL)"                                 >> $(LIBEVDEV_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBEVDEV_32_PKG_LICENSE)"                         >> $(LIBEVDEV_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBEVDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBEVDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libglade/2.6.4/Makefile
===================================================================
--- libs/libglade/2.6.4/Makefile	(revision 646)
+++ libs/libglade/2.6.4/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -206,4 +213,4 @@
 	 echo "short_description=\"$(LIBGLADE_PKG_SHORT_DESCRIPTION)\"" >> $(LIBGLADE_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBGLADE_PKG_URL)"                                 >> $(LIBGLADE_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBGLADE_PKG_LICENSE)"                         >> $(LIBGLADE_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBGLADE_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBGLADE_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libglade/2.6.4/PATCHES
===================================================================
--- libs/libglade/2.6.4/PATCHES	(revision 646)
+++ libs/libglade/2.6.4/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
-../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4.patch -p0
+../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4.patch          -p0
+../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4-automake.patch -p0
Index: libs/libglade/2.6.4-x86_32/Makefile
===================================================================
--- libs/libglade/2.6.4-x86_32/Makefile	(revision 646)
+++ libs/libglade/2.6.4-x86_32/Makefile	(revision 647)
@@ -169,4 +169,4 @@
 	 echo "short_description=\"$(LIBGLADE_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBGLADE_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBGLADE_32_PKG_URL)"                                 >> $(LIBGLADE_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBGLADE_32_PKG_LICENSE)"                         >> $(LIBGLADE_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBGLADE_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBGLADE_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libglade/2.6.4-x86_32/PATCHES
===================================================================
--- libs/libglade/2.6.4-x86_32/PATCHES	(revision 646)
+++ libs/libglade/2.6.4-x86_32/PATCHES	(revision 647)
@@ -1,2 +1,3 @@
 
-../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4.patch -p0
+../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4.patch          -p0
+../../../../sources/GNOME/core/libglade/patches/libglade-2.6.4-automake.patch -p0
Index: libs/libinput/0.7.0/Makefile
===================================================================
--- libs/libinput/0.7.0/Makefile	(revision 646)
+++ libs/libinput/0.7.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -207,4 +214,4 @@
 	 echo "short_description=\"$(LIBINPUT_PKG_SHORT_DESCRIPTION)\"" >> $(LIBINPUT_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBINPUT_PKG_URL)"                                 >> $(LIBINPUT_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBINPUT_PKG_LICENSE)"                         >> $(LIBINPUT_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBINPUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBINPUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libinput/0.7.0-x86_32/Makefile
===================================================================
--- libs/libinput/0.7.0-x86_32/Makefile	(revision 646)
+++ libs/libinput/0.7.0-x86_32/Makefile	(revision 647)
@@ -167,4 +167,4 @@
 	 echo "short_description=\"$(LIBINPUT_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBINPUT_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBINPUT_32_PKG_URL)"                                 >> $(LIBINPUT_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBINPUT_32_PKG_LICENSE)"                         >> $(LIBINPUT_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBINPUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBINPUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libinput/1.3.0/Makefile
===================================================================
--- libs/libinput/1.3.0/Makefile	(revision 646)
+++ libs/libinput/1.3.0/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -221,4 +228,4 @@
 	 echo "short_description=\"$(LIBINPUT_PKG_SHORT_DESCRIPTION)\"" >> $(LIBINPUT_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBINPUT_PKG_URL)"                                 >> $(LIBINPUT_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBINPUT_PKG_LICENSE)"                         >> $(LIBINPUT_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBINPUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBINPUT_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libinput/1.3.0-x86_32/Makefile
===================================================================
--- libs/libinput/1.3.0-x86_32/Makefile	(revision 646)
+++ libs/libinput/1.3.0-x86_32/Makefile	(revision 647)
@@ -183,4 +183,4 @@
 	 echo "short_description=\"$(LIBINPUT_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBINPUT_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBINPUT_32_PKG_URL)"                                 >> $(LIBINPUT_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBINPUT_32_PKG_LICENSE)"                         >> $(LIBINPUT_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBINPUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBINPUT_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/librsvg/2.40.15/Makefile
===================================================================
--- libs/librsvg/2.40.15/Makefile	(revision 646)
+++ libs/librsvg/2.40.15/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -236,4 +243,4 @@
 	 echo "short_description=\"$(LIBRSVG_PKG_SHORT_DESCRIPTION)\"" >> $(LIBRSVG_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBRSVG_PKG_URL)"                                 >> $(LIBRSVG_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBRSVG_PKG_LICENSE)"                         >> $(LIBRSVG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBRSVG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBRSVG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/librsvg/2.40.15-x86_32/Makefile
===================================================================
--- libs/librsvg/2.40.15-x86_32/Makefile	(revision 646)
+++ libs/librsvg/2.40.15-x86_32/Makefile	(revision 647)
@@ -194,4 +194,4 @@
 	 echo "short_description=\"$(LIBRSVG_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBRSVG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBRSVG_32_PKG_URL)"                                 >> $(LIBRSVG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBRSVG_32_PKG_LICENSE)"                         >> $(LIBRSVG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBRSVG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBRSVG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/librsvg/2.40.5/Makefile
===================================================================
--- libs/librsvg/2.40.5/Makefile	(revision 646)
+++ libs/librsvg/2.40.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -236,4 +243,4 @@
 	 echo "short_description=\"$(LIBRSVG_PKG_SHORT_DESCRIPTION)\"" >> $(LIBRSVG_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBRSVG_PKG_URL)"                                 >> $(LIBRSVG_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBRSVG_PKG_LICENSE)"                         >> $(LIBRSVG_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBRSVG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBRSVG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/librsvg/2.40.5-x86_32/Makefile
===================================================================
--- libs/librsvg/2.40.5-x86_32/Makefile	(revision 646)
+++ libs/librsvg/2.40.5-x86_32/Makefile	(revision 647)
@@ -194,4 +194,4 @@
 	 echo "short_description=\"$(LIBRSVG_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBRSVG_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBRSVG_32_PKG_URL)"                                 >> $(LIBRSVG_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBRSVG_32_PKG_LICENSE)"                         >> $(LIBRSVG_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBRSVG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBRSVG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva/1.7.2/Makefile
===================================================================
--- libs/libva/1.7.2/Makefile	(revision 646)
+++ libs/libva/1.7.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -255,4 +262,4 @@
 	 echo "short_description=\"$(LIBVA_PKG_SHORT_DESCRIPTION)\"" >> $(LIBVA_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBVA_PKG_URL)"                                 >> $(LIBVA_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBVA_PKG_LICENSE)"                         >> $(LIBVA_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBVA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBVA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva/1.7.2-x86_32/Makefile
===================================================================
--- libs/libva/1.7.2-x86_32/Makefile	(revision 646)
+++ libs/libva/1.7.2-x86_32/Makefile	(revision 647)
@@ -219,4 +219,4 @@
 	 echo "short_description=\"$(LIBVA_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBVA_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBVA_32_PKG_URL)"                                 >> $(LIBVA_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBVA_32_PKG_LICENSE)"                         >> $(LIBVA_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBVA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBVA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva-intel-driver/1.7.2/Makefile
===================================================================
--- libs/libva-intel-driver/1.7.2/Makefile	(revision 646)
+++ libs/libva-intel-driver/1.7.2/Makefile	(revision 647)
@@ -193,4 +193,4 @@
 	 echo "short_description=\"$(INTEL_DRV_PKG_SHORT_DESCRIPTION)\"" >> $(INTEL_DRV_PKG)/.PKGINFO ; \
 	 echo "url=$(INTEL_DRV_PKG_URL)"                                 >> $(INTEL_DRV_PKG)/.PKGINFO ; \
 	 echo "license=$(INTEL_DRV_PKG_LICENSE)"                         >> $(INTEL_DRV_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(INTEL_DRV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(INTEL_DRV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva-intel-driver/1.7.2-x86_32/Makefile
===================================================================
--- libs/libva-intel-driver/1.7.2-x86_32/Makefile	(revision 646)
+++ libs/libva-intel-driver/1.7.2-x86_32/Makefile	(revision 647)
@@ -164,4 +164,4 @@
 	 echo "short_description=\"$(INTEL_DRV_32_PKG_SHORT_DESCRIPTION)\"" >> $(INTEL_DRV_32_PKG)/.PKGINFO ; \
 	 echo "url=$(INTEL_DRV_32_PKG_URL)"                                 >> $(INTEL_DRV_32_PKG)/.PKGINFO ; \
 	 echo "license=$(INTEL_DRV_32_PKG_LICENSE)"                         >> $(INTEL_DRV_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(INTEL_DRV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(INTEL_DRV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva-vdpau-driver/0.7.4/Makefile
===================================================================
--- libs/libva-vdpau-driver/0.7.4/Makefile	(revision 646)
+++ libs/libva-vdpau-driver/0.7.4/Makefile	(revision 647)
@@ -192,4 +192,4 @@
 	 echo "short_description=\"$(VDPAU_DRV_PKG_SHORT_DESCRIPTION)\"" >> $(VDPAU_DRV_PKG)/.PKGINFO ; \
 	 echo "url=$(VDPAU_DRV_PKG_URL)"                                 >> $(VDPAU_DRV_PKG)/.PKGINFO ; \
 	 echo "license=$(VDPAU_DRV_PKG_LICENSE)"                         >> $(VDPAU_DRV_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(VDPAU_DRV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(VDPAU_DRV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libva-vdpau-driver/0.7.4-x86_32/Makefile
===================================================================
--- libs/libva-vdpau-driver/0.7.4-x86_32/Makefile	(revision 646)
+++ libs/libva-vdpau-driver/0.7.4-x86_32/Makefile	(revision 647)
@@ -163,4 +163,4 @@
 	 echo "short_description=\"$(VDPAU_DRV_32_PKG_SHORT_DESCRIPTION)\"" >> $(VDPAU_DRV_32_PKG)/.PKGINFO ; \
 	 echo "url=$(VDPAU_DRV_32_PKG_URL)"                                 >> $(VDPAU_DRV_32_PKG)/.PKGINFO ; \
 	 echo "license=$(VDPAU_DRV_32_PKG_LICENSE)"                         >> $(VDPAU_DRV_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(VDPAU_DRV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(VDPAU_DRV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libvdpau/1.1.1/Makefile
===================================================================
--- libs/libvdpau/1.1.1/Makefile	(revision 646)
+++ libs/libvdpau/1.1.1/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -224,4 +231,4 @@
 	 echo "short_description=\"$(LIBVDPAU_PKG_SHORT_DESCRIPTION)\"" >> $(LIBVDPAU_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBVDPAU_PKG_URL)"                                 >> $(LIBVDPAU_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBVDPAU_PKG_LICENSE)"                         >> $(LIBVDPAU_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBVDPAU_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBVDPAU_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/libvdpau/1.1.1-x86_32/Makefile
===================================================================
--- libs/libvdpau/1.1.1-x86_32/Makefile	(revision 646)
+++ libs/libvdpau/1.1.1-x86_32/Makefile	(revision 647)
@@ -180,4 +180,4 @@
 	 echo "short_description=\"$(LIBVDPAU_32_PKG_SHORT_DESCRIPTION)\"" >> $(LIBVDPAU_32_PKG)/.PKGINFO ; \
 	 echo "url=$(LIBVDPAU_32_PKG_URL)"                                 >> $(LIBVDPAU_32_PKG)/.PKGINFO ; \
 	 echo "license=$(LIBVDPAU_32_PKG_LICENSE)"                         >> $(LIBVDPAU_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(LIBVDPAU_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(LIBVDPAU_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mesa/10.3.4/Makefile
===================================================================
--- libs/mesa/10.3.4/Makefile	(revision 646)
+++ libs/mesa/10.3.4/Makefile	(revision 647)
@@ -6,7 +6,7 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -133,7 +133,7 @@
 #
 extra_configure_switches += --with-gallium-drivers=nouveau,r300,r600,svga,swrast
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 extra_configure_switches += --disable-egl
 extra_configure_switches += --disable-gles1
 extra_configure_switches += --disable-gles2
@@ -239,7 +239,7 @@
 	   fi \
 	 )
 	# ======= remove toolchain path from target libtool *.la files =======
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(MESA_PKG)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libGL.la           \
 	                                    libOSMesa.la       \
@@ -264,7 +264,7 @@
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(MESA_PKG))
 	# ======= tune libtool *.la search path to the target destination for development =======
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libGL.la           \
 	                                            libOSMesa.la       \
@@ -302,7 +302,7 @@
 	 )
 endif
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" gl.pc           \
 	                                            osmesa.pc       \
@@ -362,4 +362,4 @@
 	 echo "short_description=\"$(MESA_PKG_SHORT_DESCRIPTION)\"" >> $(MESA_PKG)/.PKGINFO ; \
 	 echo "url=$(MESA_PKG_URL)"                                 >> $(MESA_PKG)/.PKGINFO ; \
 	 echo "license=$(MESA_PKG_LICENSE)"                         >> $(MESA_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MESA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MESA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mesa/10.3.4-x86_32/Makefile
===================================================================
--- libs/mesa/10.3.4-x86_32/Makefile	(revision 646)
+++ libs/mesa/10.3.4-x86_32/Makefile	(revision 647)
@@ -266,4 +266,4 @@
 	 echo "short_description=\"$(MESA_32_PKG_SHORT_DESCRIPTION)\"" >> $(MESA_32_PKG)/.PKGINFO ; \
 	 echo "url=$(MESA_32_PKG_URL)"                                 >> $(MESA_32_PKG)/.PKGINFO ; \
 	 echo "license=$(MESA_32_PKG_LICENSE)"                         >> $(MESA_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MESA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MESA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mesa/11.2.2/Makefile
===================================================================
--- libs/mesa/11.2.2/Makefile	(revision 646)
+++ libs/mesa/11.2.2/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -139,7 +146,12 @@
 
 extra_configure_switches += --with-sha1=libgcrypt
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 extra_configure_switches += --disable-egl
 extra_configure_switches += --disable-gles1
 extra_configure_switches += --disable-gles2
@@ -246,7 +258,12 @@
 	@( cd $(MESA_PKG)/usr/lib$(LIBSUFFIX)/dri ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" gallium_drv_video.la ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(MESA_PKG)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libGL.la           \
 	                                    libOSMesa.la       \
@@ -279,7 +296,12 @@
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"   gallium_drv_video.la ; \
 	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" gallium_drv_video.la ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libGL.la           \
 	                                            libOSMesa.la       \
@@ -317,7 +339,12 @@
 	 )
 endif
 	# ======= tune pkg-config *.pc search path to the target destination for development =======
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
 	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" d3d.pc          \
 	                                            gl.pc           \
@@ -379,4 +406,4 @@
 	 echo "short_description=\"$(MESA_PKG_SHORT_DESCRIPTION)\"" >> $(MESA_PKG)/.PKGINFO ; \
 	 echo "url=$(MESA_PKG_URL)"                                 >> $(MESA_PKG)/.PKGINFO ; \
 	 echo "license=$(MESA_PKG_LICENSE)"                         >> $(MESA_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MESA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MESA_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mesa/11.2.2-x86_32/Makefile
===================================================================
--- libs/mesa/11.2.2-x86_32/Makefile	(revision 646)
+++ libs/mesa/11.2.2-x86_32/Makefile	(revision 647)
@@ -282,4 +282,4 @@
 	 echo "short_description=\"$(MESA_32_PKG_SHORT_DESCRIPTION)\"" >> $(MESA_32_PKG)/.PKGINFO ; \
 	 echo "url=$(MESA_32_PKG_URL)"                                 >> $(MESA_32_PKG)/.PKGINFO ; \
 	 echo "license=$(MESA_32_PKG_LICENSE)"                         >> $(MESA_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MESA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MESA_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mtdev/1.1.5/Makefile
===================================================================
--- libs/mtdev/1.1.5/Makefile	(revision 646)
+++ libs/mtdev/1.1.5/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -27,9 +34,9 @@
 REQUIRES           = dev/gcc/5.3.0
 else
 ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES           = libs/glibc/2.23
+REQUIRES           = libs/glibc/2.24
 else
-REQUIRES           = libs/glibc/2.23-x86_32
+REQUIRES           = libs/glibc/2.24-x86_32
 endif
 endif
 
@@ -199,4 +206,4 @@
 	 echo "short_description=\"$(MTDEV_PKG_SHORT_DESCRIPTION)\"" >> $(MTDEV_PKG)/.PKGINFO ; \
 	 echo "url=$(MTDEV_PKG_URL)"                                 >> $(MTDEV_PKG)/.PKGINFO ; \
 	 echo "license=$(MTDEV_PKG_LICENSE)"                         >> $(MTDEV_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MTDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MTDEV_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mtdev/1.1.5/PATCHES
===================================================================
--- libs/mtdev/1.1.5/PATCHES	(revision 646)
+++ libs/mtdev/1.1.5/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/x/mtdev/patches/mtdev-1.1.5-automake.patch -p0
Index: libs/mtdev/1.1.5-x86_32/Makefile
===================================================================
--- libs/mtdev/1.1.5-x86_32/Makefile	(revision 646)
+++ libs/mtdev/1.1.5-x86_32/Makefile	(revision 647)
@@ -151,4 +151,4 @@
 	 echo "short_description=\"$(MTDEV_32_PKG_SHORT_DESCRIPTION)\"" >> $(MTDEV_32_PKG)/.PKGINFO ; \
 	 echo "url=$(MTDEV_32_PKG_URL)"                                 >> $(MTDEV_32_PKG)/.PKGINFO ; \
 	 echo "license=$(MTDEV_32_PKG_LICENSE)"                         >> $(MTDEV_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(MTDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(MTDEV_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/mtdev/1.1.5-x86_32/PATCHES
===================================================================
--- libs/mtdev/1.1.5-x86_32/PATCHES	(revision 646)
+++ libs/mtdev/1.1.5-x86_32/PATCHES	(revision 647)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/x/mtdev/patches/mtdev-1.1.5-automake.patch -p0
Index: libs/netpbm/10.68.01/Makefile
===================================================================
--- libs/netpbm/10.68.01/Makefile	(revision 646)
+++ libs/netpbm/10.68.01/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -202,4 +209,4 @@
 	 echo "short_description=\"$(NETPBM_PKG_SHORT_DESCRIPTION)\"" >> $(NETPBM_PKG)/.PKGINFO ; \
 	 echo "url=$(NETPBM_PKG_URL)"                                 >> $(NETPBM_PKG)/.PKGINFO ; \
 	 echo "license=$(NETPBM_PKG_LICENSE)"                         >> $(NETPBM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(NETPBM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(NETPBM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/netpbm/10.68.01-x86_32/Makefile
===================================================================
--- libs/netpbm/10.68.01-x86_32/Makefile	(revision 646)
+++ libs/netpbm/10.68.01-x86_32/Makefile	(revision 647)
@@ -181,4 +181,4 @@
 	 echo "short_description=\"$(NETPBM_32_PKG_SHORT_DESCRIPTION)\"" >> $(NETPBM_32_PKG)/.PKGINFO ; \
 	 echo "url=$(NETPBM_32_PKG_URL)"                                 >> $(NETPBM_32_PKG)/.PKGINFO ; \
 	 echo "license=$(NETPBM_32_PKG_LICENSE)"                         >> $(NETPBM_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(NETPBM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(NETPBM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/netpbm/10.74.03/Makefile
===================================================================
--- libs/netpbm/10.74.03/Makefile	(revision 646)
+++ libs/netpbm/10.74.03/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -202,4 +209,4 @@
 	 echo "short_description=\"$(NETPBM_PKG_SHORT_DESCRIPTION)\"" >> $(NETPBM_PKG)/.PKGINFO ; \
 	 echo "url=$(NETPBM_PKG_URL)"                                 >> $(NETPBM_PKG)/.PKGINFO ; \
 	 echo "license=$(NETPBM_PKG_LICENSE)"                         >> $(NETPBM_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(NETPBM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(NETPBM_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/netpbm/10.74.03-x86_32/Makefile
===================================================================
--- libs/netpbm/10.74.03-x86_32/Makefile	(revision 646)
+++ libs/netpbm/10.74.03-x86_32/Makefile	(revision 647)
@@ -181,4 +181,4 @@
 	 echo "short_description=\"$(NETPBM_32_PKG_SHORT_DESCRIPTION)\"" >> $(NETPBM_32_PKG)/.PKGINFO ; \
 	 echo "url=$(NETPBM_32_PKG_URL)"                                 >> $(NETPBM_32_PKG)/.PKGINFO ; \
 	 echo "license=$(NETPBM_32_PKG_LICENSE)"                         >> $(NETPBM_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(NETPBM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(NETPBM_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/opengl-collection/Makefile
===================================================================
--- libs/opengl-collection/Makefile	(revision 646)
+++ libs/opengl-collection/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -51,11 +58,21 @@
 REQUIRES += X11/libs/aml-mali/4.0.1.0
 endif
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_MXV)),)
 REQUIRES += X11/libs/aml-mali/5.0.1.0
 endif
 
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X)),)
+REQUIRES += X11/libs/aml-mali/5.1.1.0
+endif
 
+ifneq ($(filter $(HARDWARE),                 $(HARDWARE_ODROID_C2)  \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM) \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+REQUIRES += X11/libs/aml-mali/6.1.1.0
+endif
+
+
 # ======= __END_OF_REQUIRES__ =======
 
 
Index: libs/qt4/4.8.6/Makefile
===================================================================
--- libs/qt4/4.8.6/Makefile	(revision 646)
+++ libs/qt4/4.8.6/Makefile	(revision 647)
@@ -6,7 +6,7 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -26,7 +26,7 @@
 ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
 REQUIRES           = dev/gcc/5.3.0
 endif
-REQUIRES          += net/ca-certificates/45.0.2
+REQUIRES          += net/ca-certificates/52.0
 REQUIRES          += X11/app/desktop-file-utils/0.22
 REQUIRES          += X11/libs/hicolor-icon-theme/0.15
 REQUIRES          += X11/app/xdg-utils/1.1.1
@@ -52,7 +52,7 @@
 REQUIRES          += libs/gst-plugins-base0/0.10.36
 
 REQUIRES          += app/sqlite/3.12.2.0
-REQUIRES          += app/mariadb/10.0.25
+REQUIRES          += app/mariadb/10.0.30
 REQUIRES          += libs/libiodbc/3.52.10
 
 REQUIRES          += X11/libs/opengl-collection
@@ -132,7 +132,7 @@
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
                             $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_MXV)       \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -180,7 +180,7 @@
 
 configure_switches += -graphicssystem raster
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 configure_switches += -opengl es2
 else
 configure_switches += -opengl
@@ -401,7 +401,7 @@
 	                                    libQtXml.prl         libQtXmlPatterns.prl        \
 	                                    libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt4/lib ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libQtMeeGoGraphicsSystemHelper.la  ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libQtMeeGoGraphicsSystemHelper.prl ; \
@@ -422,7 +422,7 @@
 	           libQtXml.prl         libQtXmlPatterns.prl        \
 	           libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt4/lib ; \
 	   sed -i "s,$(CURDIR)/$(SRC_DIR),/usr/lib$(LIBSUFFIX)/qt-$(version),g" \
 	           libQtMeeGoGraphicsSystemHelper.prl             ; \
@@ -442,7 +442,7 @@
 	                                    QtXml.pc         QtXmlPatterns.pc        \
 	                                    phonon.pc                              ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt4/lib/pkgconfig ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" QtMeeGoGraphicsSystemHelper.pc ; \
 	 )
@@ -479,7 +479,7 @@
 	                                                    libQtXml.prl         libQtXmlPatterns.prl        \
 	                                                    libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/qt4/lib ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" libQtMeeGoGraphicsSystemHelper.la  ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" libQtMeeGoGraphicsSystemHelper.prl ; \
@@ -499,7 +499,7 @@
 	                                                    QtXml.pc         QtXmlPatterns.pc        \
 	                                                    phonon.pc                              ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/qt4/lib/pkgconfig ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" QtMeeGoGraphicsSystemHelper.pc ; \
 	 )
@@ -542,4 +542,4 @@
 	 echo "short_description=\"$(QT4_PKG_SHORT_DESCRIPTION)\"" >> $(QT4_PKG)/.PKGINFO ; \
 	 echo "url=$(QT4_PKG_URL)"                                 >> $(QT4_PKG)/.PKGINFO ; \
 	 echo "license=$(QT4_PKG_LICENSE)"                         >> $(QT4_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT4_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT4_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt4/4.8.6-x86_32/Makefile
===================================================================
--- libs/qt4/4.8.6-x86_32/Makefile	(revision 646)
+++ libs/qt4/4.8.6-x86_32/Makefile	(revision 647)
@@ -35,7 +35,7 @@
 REQUIRES          += libs/gst-plugins-base0/0.10.36-x86_32
 
 REQUIRES          += app/sqlite/3.12.2.0-x86_32
-REQUIRES          += app/mariadb/10.0.25-x86_32
+REQUIRES          += app/mariadb/10.0.30-x86_32
 REQUIRES          += libs/libiodbc/3.52.10-x86_32
 
 REQUIRES          += X11/libs/opengl-collection
@@ -437,4 +437,4 @@
 	 echo "short_description=\"$(QT4_32_PKG_SHORT_DESCRIPTION)\"" >> $(QT4_32_PKG)/.PKGINFO ; \
 	 echo "url=$(QT4_32_PKG_URL)"                                 >> $(QT4_32_PKG)/.PKGINFO ; \
 	 echo "license=$(QT4_32_PKG_LICENSE)"                         >> $(QT4_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT4_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT4_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt4/4.8.7/Makefile
===================================================================
--- libs/qt4/4.8.7/Makefile	(revision 646)
+++ libs/qt4/4.8.7/Makefile	(revision 647)
@@ -6,7 +6,14 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -26,7 +33,7 @@
 ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
 REQUIRES           = dev/gcc/5.3.0
 endif
-REQUIRES          += net/ca-certificates/45.0.2
+REQUIRES          += net/ca-certificates/52.0
 REQUIRES          += X11/app/desktop-file-utils/0.22
 REQUIRES          += X11/libs/hicolor-icon-theme/0.15
 REQUIRES          += X11/app/xdg-utils/1.1.1
@@ -54,7 +61,7 @@
 
 REQUIRES          += app/sqlite/3.12.2.0
 REQUIRES          += app/postgresql/9.6.0
-REQUIRES          += app/mariadb/10.0.25
+REQUIRES          += app/mariadb/10.0.30
 REQUIRES          += libs/libiodbc/3.52.10
 
 REQUIRES          += X11/libs/opengl-collection
@@ -134,8 +141,7 @@
                             $(HARDWARE_CB2X)      \
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
-                            $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_M201) $(HARDWARE_MXV) \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -142,6 +148,13 @@
 ARCH   = arm
 ABI    = gnueabihf
 endif
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+ARCH   = aarch64
+ABI    = gnu
+endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC32)),)
 ARCH   = i386
 ABI    = gnu
@@ -183,7 +196,12 @@
 
 configure_switches += -graphicssystem raster
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 configure_switches += -opengl es2
 else
 configure_switches += -opengl
@@ -426,7 +444,12 @@
 	                                    libQtXml.prl         libQtXmlPatterns.prl        \
 	                                    libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt-$(version)/lib ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libQtMeeGoGraphicsSystemHelper.la  ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" libQtMeeGoGraphicsSystemHelper.prl ; \
@@ -447,7 +470,12 @@
 	           libQtXml.prl         libQtXmlPatterns.prl        \
 	           libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt-$(version)/lib ; \
 	   sed -i "s,$(CURDIR)/$(SRC_DIR),/usr/lib$(LIBSUFFIX)/qt-$(version),g" \
 	           libQtMeeGoGraphicsSystemHelper.prl             ; \
@@ -472,7 +500,12 @@
 	   sed -i "s,$(CURDIR)/$(SRC_DIR),/usr/lib$(LIBSUFFIX)/qt-$(version),g" QtDesigner.pc    \
 	                                    QtDesignerComponents.pc QtUiTools.pc   ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(QT4_PKG)/usr/lib$(LIBSUFFIX)/qt-$(version)/lib/pkgconfig ; \
 	   sed -i "s,$(TARGET_DEST_DIR),,g" QtMeeGoGraphicsSystemHelper.pc ; \
 	 )
@@ -509,7 +542,12 @@
 	                                                    libQtXml.prl         libQtXmlPatterns.prl        \
 	                                                    libphonon.prl                                  ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/qt-$(version)/lib ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" libQtMeeGoGraphicsSystemHelper.la  ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" libQtMeeGoGraphicsSystemHelper.prl ; \
@@ -529,7 +567,12 @@
 	                                                    QtXml.pc         QtXmlPatterns.pc        \
 	                                                    phonon.pc                              ; \
 	 )
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                                             $(HARDWARE_ODROID_C2)   \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/qt-$(version)/lib/pkgconfig ; \
 	   sed -i "s,/usr/lib,$(TARGET_DEST_DIR)/usr/lib,g" QtMeeGoGraphicsSystemHelper.pc ; \
 	 )
@@ -572,4 +615,4 @@
 	 echo "short_description=\"$(QT4_PKG_SHORT_DESCRIPTION)\"" >> $(QT4_PKG)/.PKGINFO ; \
 	 echo "url=$(QT4_PKG_URL)"                                 >> $(QT4_PKG)/.PKGINFO ; \
 	 echo "license=$(QT4_PKG_LICENSE)"                         >> $(QT4_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT4_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT4_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt4/4.8.7/PATCHES
===================================================================
--- libs/qt4/4.8.7/PATCHES	(revision 646)
+++ libs/qt4/4.8.7/PATCHES	(revision 647)
@@ -8,3 +8,4 @@
 ../../../../sources/packages/x/qt4/patches/qt4-4.8.7-settings.patch           -p0
 ../../../../sources/packages/x/qt4/patches/qt4-4.8.7-systemtrayicon.patch     -p0
 ../../../../sources/packages/x/qt4/patches/qt4-4.8.7-webkit-werror.patch      -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-aarch64.patch            -p0
Index: libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(nonexistent)
+++ libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,45 @@
+#
+# qmake configuration for building with -xplatform linux-aarch-gnu-g++
+#
+
+MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+QT                      += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @CCACHE@ @CROSS_COMPILE@gcc --sysroot=@SYSROOT@
+QMAKE_CXX               = @CCACHE@ @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK              = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK_SHLIB        = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+
+# modifications to linux.conf
+QMAKE_AR                = @CROSS_COMPILE@ar cqs
+QMAKE_OBJCOPY           = @CROSS_COMPILE@objcopy
+QMAKE_STRIP             = @CROSS_COMPILE@strip
+
+QMAKE_INCDIR            = @SYSROOT@/usr/include
+QMAKE_LIBDIR            = @SYSROOT@/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG
+
+
+QMAKE_LFLAGS           += -L@SYSROOT@/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+QMAKE_LFLAGS_RELEASE   += -L@SYSROOT@/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++0x $$TARGET_HW_CFLAGS
+
+load(qt_config)
Index: libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h
===================================================================
--- libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt4/4.8.7/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"
Index: libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in	(nonexistent)
+++ libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,45 @@
+#
+# qmake configuration for building with -xplatform linux-aarch64-gnu-g++
+#
+
+MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+QT                      += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG
+
+
+QMAKE_LFLAGS           += -L@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+QMAKE_LFLAGS_RELEASE   += -L@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++0x $$TARGET_HW_CFLAGS
+
+load(qt_config)
Index: libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h
===================================================================
--- libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt4/4.8.7/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"
Index: libs/qt4/4.8.7-x86_32/Makefile
===================================================================
--- libs/qt4/4.8.7-x86_32/Makefile	(revision 646)
+++ libs/qt4/4.8.7-x86_32/Makefile	(revision 647)
@@ -37,7 +37,7 @@
 
 REQUIRES          += app/sqlite/3.12.2.0-x86_32
 REQUIRES          += app/postgresql/9.6.0-x86_32
-REQUIRES          += app/mariadb/10.0.25-x86_32
+REQUIRES          += app/mariadb/10.0.30-x86_32
 REQUIRES          += libs/libiodbc/3.52.10-x86_32
 
 REQUIRES          += X11/libs/opengl-collection
@@ -465,4 +465,4 @@
 	 echo "short_description=\"$(QT4_32_PKG_SHORT_DESCRIPTION)\"" >> $(QT4_32_PKG)/.PKGINFO ; \
 	 echo "url=$(QT4_32_PKG_URL)"                                 >> $(QT4_32_PKG)/.PKGINFO ; \
 	 echo "license=$(QT4_32_PKG_LICENSE)"                         >> $(QT4_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT4_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT4_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.4.0/Makefile
===================================================================
--- libs/qt5/5.4.0/Makefile	(revision 646)
+++ libs/qt5/5.4.0/Makefile	(revision 647)
@@ -6,7 +6,7 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -26,7 +26,7 @@
 ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
 REQUIRES           = dev/gcc/5.3.0
 endif
-REQUIRES          += net/ca-certificates/45.0.2
+REQUIRES          += net/ca-certificates/52.0
 REQUIRES          += X11/app/desktop-file-utils/0.22
 REQUIRES          += X11/libs/hicolor-icon-theme/0.15
 REQUIRES          += X11/app/xdg-utils/1.1.1
@@ -56,7 +56,7 @@
 REQUIRES          += libs/gst-plugins-base/1.8.2
 
 REQUIRES          += app/sqlite/3.12.2.0
-REQUIRES          += app/mariadb/10.0.25
+REQUIRES          += app/mariadb/10.0.30
 REQUIRES          += libs/libiodbc/3.52.10
 
 REQUIRES          += X11/libs/opengl-collection
@@ -142,7 +142,7 @@
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
                             $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_MXV)       \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -209,7 +209,7 @@
 configure_switches += -no-largefile
 endif
 configure_switches += -no-gtkstyle
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 configure_switches += -opengl es2
 else
 configure_switches += -opengl
@@ -250,7 +250,7 @@
 ENABLE_EGLFS_SUPPORT = yes
 ENABLE_KMS_SUPPORT   = yes
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXV)),)
 ENABLE_KMS_SUPPORT = no
 endif
 
@@ -696,4 +696,4 @@
 	 echo "short_description=\"$(QT5_PKG_SHORT_DESCRIPTION)\"" >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "url=$(QT5_PKG_URL)"                                 >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "license=$(QT5_PKG_LICENSE)"                         >> $(QT5_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(revision 646)
+++ libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(nonexistent)
@@ -1,40 +0,0 @@
-#
-# qmake configuration for the Amlogic S805 boards
-#
-
-include(../common/linux_device_pre.conf)
-
-
-# modifications to g++.conf
-QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
-QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
-QMAKE_LINK              = $${CROSS_COMPILE}g++
-QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
-
-# modifications to linux.conf
-QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-QMAKE_STRIP             = $${CROSS_COMPILE}strip
-
-
-QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
-QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
-
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
-
-DISTRO_OPTS            += hard-float
-
-TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
-
-QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
-QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS
-
-include(../common/linux_arm_device_post.conf)
-
-load(qt_config)
Index: libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(revision 646)
+++ libs/qt5/5.4.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(nonexistent)
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S805 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+DISTRO_OPTS            += hard-float
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS
+
+include(../common/linux_arm_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.0-x86_32/Makefile
===================================================================
--- libs/qt5/5.4.0-x86_32/Makefile	(revision 646)
+++ libs/qt5/5.4.0-x86_32/Makefile	(revision 647)
@@ -39,7 +39,7 @@
 REQUIRES          += libs/gst-plugins-base/1.8.2-x86_32
 
 REQUIRES          += app/sqlite/3.12.2.0-x86_32
-REQUIRES          += app/mariadb/10.0.25-x86_32
+REQUIRES          += app/mariadb/10.0.30-x86_32
 REQUIRES          += libs/libiodbc/3.52.10-x86_32
 
 REQUIRES          += X11/libs/opengl-collection
@@ -578,4 +578,4 @@
 	 echo "short_description=\"$(QT5_32_PKG_SHORT_DESCRIPTION)\"" >> $(QT5_32_PKG)/.PKGINFO ; \
 	 echo "url=$(QT5_32_PKG_URL)"                                 >> $(QT5_32_PKG)/.PKGINFO ; \
 	 echo "license=$(QT5_32_PKG_LICENSE)"                         >> $(QT5_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT5_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT5_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.4.2/Makefile
===================================================================
--- libs/qt5/5.4.2/Makefile	(revision 646)
+++ libs/qt5/5.4.2/Makefile	(revision 647)
@@ -6,7 +6,13 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -30,7 +36,7 @@
 ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
 REQUIRES           = dev/gcc/5.3.0
 endif
-REQUIRES          += net/ca-certificates/45.0.2
+REQUIRES          += net/ca-certificates/52.0
 REQUIRES          += X11/app/desktop-file-utils/0.22
 REQUIRES          += X11/libs/hicolor-icon-theme/0.15
 REQUIRES          += X11/app/xdg-utils/1.1.1
@@ -64,7 +70,7 @@
 
 REQUIRES          += app/sqlite/3.12.2.0
 REQUIRES          += app/postgresql/9.6.0
-REQUIRES          += app/mariadb/10.0.25
+REQUIRES          += app/mariadb/10.0.30
 REQUIRES          += libs/libiodbc/3.52.10
 
 REQUIRES          += libs/botan/1.10.13
@@ -156,8 +162,7 @@
                             $(HARDWARE_CB2X)      \
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
-                            $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_M201) $(HARDWARE_MXV) \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -164,6 +169,12 @@
 ARCH   = arm
 ABI    = gnueabihf
 endif
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+ARCH   = aarch64
+ABI    = gnu
+endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC32)),)
 ARCH   = i386
 ABI    = gnu
@@ -224,7 +235,11 @@
 configure_switches += -no-largefile
 endif
 configure_switches += -no-gtkstyle
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 configure_switches += -opengl es2
 else
 configure_switches += -opengl
@@ -266,7 +281,11 @@
 ENABLE_EGLFS_SUPPORT = yes
 ENABLE_KMS_SUPPORT   = yes
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 ENABLE_KMS_SUPPORT = no
 endif
 
@@ -801,4 +820,4 @@
 	 echo "short_description=\"$(QT5_PKG_SHORT_DESCRIPTION)\"" >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "url=$(QT5_PKG_URL)"                                 >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "license=$(QT5_PKG_LICENSE)"                         >> $(QT5_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.4.2/PATCHES
===================================================================
--- libs/qt5/5.4.2/PATCHES	(revision 646)
+++ libs/qt5/5.4.2/PATCHES	(revision 647)
@@ -1,2 +1,4 @@
 
-../../../../sources/packages/x/qt5/patches/qt5-5.4.2-configure.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-configure.patch         -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-webkit-arm-softfp.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-webkit-aarch64.patch    -p0
Index: libs/qt5/5.4.2/PATCHES.qtc-3.5.1
===================================================================
--- libs/qt5/5.4.2/PATCHES.qtc-3.5.1	(revision 646)
+++ libs/qt5/5.4.2/PATCHES.qtc-3.5.1	(revision 647)
@@ -1,7 +1,8 @@
 
-../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-ext-tools.patch -p0
-../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-sdk-libs.patch  -p0
-../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-docs.patch      -p0
+../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-ext-tools.patch    -p0
+../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-sdk-libs.patch     -p0
+../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-botan-on-arm.patch -p0
+../../../../sources/packages/d/qt-creator/patches/qt-creator-3.5.1-docs.patch         -p0
 
 #
 # USE_SYSTEM_BOTAN = 1 in the .qmake.conf file instead following patch
Index: libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(revision 646)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(nonexistent)
@@ -1,43 +0,0 @@
-#
-# qmake configuration for the Amlogic S805 boards
-#
-
-include(../common/linux_device_pre.conf)
-
-
-# modifications to g++.conf
-QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
-QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
-QMAKE_LINK              = $${CROSS_COMPILE}g++
-QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
-QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
-
-# modifications to linux.conf
-QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-QMAKE_STRIP             = $${CROSS_COMPILE}strip
-
-
-QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
-QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
-
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
-
-DISTRO_OPTS            += hard-float
-
-TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
-
-QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
-QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
-
-
-include(../common/linux_arm_device_post.conf)
-
-load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(revision 646)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(nonexistent)
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S912 boards (Enybox X2)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905X boards (Khadas VIM)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,43 @@
+#
+# qmake configuration for the Amlogic S805 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+DISTRO_OPTS            += hard-float
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_arm_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905 boards (NEXBOX A95X)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-p201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905X boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-p212-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S912 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+QMAKE_LINK_C            = $${CROSS_COMPILE}gcc
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/botan-1.10
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/devices/linux-q201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for building with aarch64-{s9xx}-linux-gnu-g++
+#
+
+MAKEFILE_GENERATOR       = UNIX
+CONFIG                  += incremental
+QMAKE_INCREMENTAL_STYLE  = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                 = @CCACHE@ @CROSS_COMPILE@gcc --sysroot=@SYSROOT@
+QMAKE_CXX                = @CCACHE@ @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK               = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK_SHLIB         = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK_C             = @CROSS_COMPILE@gcc --sysroot=@SYSROOT@
+
+# modifications to linux.conf
+QMAKE_AR                 = @CROSS_COMPILE@ar cqs
+QMAKE_OBJCOPY            = @CROSS_COMPILE@objcopy
+QMAKE_NM                 = @CROSS_COMPILE@nm -P
+QMAKE_STRIP              = @CROSS_COMPILE@strip
+
+QMAKE_INCDIR             = @SYSROOT@/usr/include
+QMAKE_LIBDIR             = @SYSROOT@/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL          += -lEGL
+QMAKE_LIBS_OPENGL_ES2   += -lGLESv2
+QMAKE_LIBS_OPENVG       += -lOpenVG
+
+QMAKE_LFLAGS            += -Wl,-rpath-link,@SYSROOT@/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS         = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS            += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS          += $$TARGET_HW_CFLAGS
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in	(revision 646)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in	(nonexistent)
@@ -1,43 +0,0 @@
-#
-# qmake configuration for the Amlogic S805 boards
-#
-
-include(../common/linux_device_pre.conf)
-
-
-# modifications to g++.conf
-QMAKE_CC                = @TARGET_BINDIR@/gcc
-QMAKE_CXX               = @TARGET_BINDIR@/g++
-QMAKE_LINK              = @TARGET_BINDIR@/g++
-QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
-QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
-
-# modifications to linux.conf
-QMAKE_AR                = @TARGET_BINDIR@/ar cqs
-QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
-QMAKE_STRIP             = @TARGET_BINDIR@/strip
-
-
-QMAKE_INCDIR            = @TARGET_PREFIX@/include
-QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
-QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
-QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
-QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
-
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
-
-DISTRO_OPTS            += hard-float
-
-TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
-
-QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
-QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
-
-
-include(../common/linux_arm_device_post.conf)
-
-load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h	(revision 646)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h	(nonexistent)
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S912 boards (Enybox X2)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905X boards (Khadas VIM)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,43 @@
+#
+# qmake configuration for the Amlogic S805 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+DISTRO_OPTS            += hard-float
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_arm_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905 boards (NEXBOX A95X)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S905X boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for the Amlogic S912 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/botan-1.10
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS -Wno-deprecated-declarations
+
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/devices/linux-q201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,41 @@
+#
+# qmake configuration for building with aarch64-{s9xx}-linux-gnu-g++
+#
+
+MAKEFILE_GENERATOR       = UNIX
+CONFIG                  += incremental
+QMAKE_INCREMENTAL_STYLE  = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+QMAKE_LINK_C            = @TARGET_BINDIR@/gcc
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_NM                = @TARGET_BINDIR@/nm -P
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS
+
+load(qt_config)
Index: libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.4.2/mkspecs-pkg/linux-aarch64-gnu-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.4.2-x86_32/Makefile
===================================================================
--- libs/qt5/5.4.2-x86_32/Makefile	(revision 646)
+++ libs/qt5/5.4.2-x86_32/Makefile	(revision 647)
@@ -43,7 +43,7 @@
 
 REQUIRES          += app/sqlite/3.12.2.0-x86_32
 REQUIRES          += app/postgresql/9.6.0-x86_32
-REQUIRES          += app/mariadb/10.0.25-x86_32
+REQUIRES          += app/mariadb/10.0.30-x86_32
 REQUIRES          += libs/libiodbc/3.52.10-x86_32
 
 REQUIRES          += libs/botan/1.10.13-x86_32
@@ -618,4 +618,4 @@
 	 echo "short_description=\"$(QT5_32_PKG_SHORT_DESCRIPTION)\"" >> $(QT5_32_PKG)/.PKGINFO ; \
 	 echo "url=$(QT5_32_PKG_URL)"                                 >> $(QT5_32_PKG)/.PKGINFO ; \
 	 echo "license=$(QT5_32_PKG_LICENSE)"                         >> $(QT5_32_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT5_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT5_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.4.2-x86_32/PATCHES
===================================================================
--- libs/qt5/5.4.2-x86_32/PATCHES	(revision 646)
+++ libs/qt5/5.4.2-x86_32/PATCHES	(revision 647)
@@ -1,2 +1,4 @@
 
-../../../../sources/packages/x/qt5/patches/qt5-5.4.2-configure.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-configure.patch         -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-webkit-arm-softfp.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.4.2-webkit-aarch64.patch    -p0
Index: libs/qt5/5.7.0/PATCHES.mxq
===================================================================
--- libs/qt5/5.7.0/PATCHES.mxq	(revision 646)
+++ libs/qt5/5.7.0/PATCHES.mxq	(nonexistent)
@@ -1,3 +0,0 @@
-
-../../../../sources/packages/x/qt5/patches/qt5-5.7.0-arm-neon-thumb.patch  -p0
-../../../../sources/packages/x/qt5/patches/qt5-5.7.0-ffmpeg-no-thumb.patch -p0
Index: libs/qt5/5.7.0/Makefile
===================================================================
--- libs/qt5/5.7.0/Makefile	(revision 646)
+++ libs/qt5/5.7.0/Makefile	(revision 647)
@@ -6,7 +6,13 @@
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
 COMPONENT_TARGETS += $(HARDWARE_M201)
-COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
 COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
 COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
@@ -26,7 +32,7 @@
 ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
 REQUIRES           = dev/gcc/5.3.0
 endif
-REQUIRES          += net/ca-certificates/45.0.2
+REQUIRES          += net/ca-certificates/52.0
 REQUIRES          += X11/app/desktop-file-utils/0.22
 REQUIRES          += X11/libs/hicolor-icon-theme/0.15
 REQUIRES          += X11/app/xdg-utils/1.1.1
@@ -58,7 +64,7 @@
 REQUIRES          += libs/gst-plugins-base/1.8.2
 
 REQUIRES          += app/sqlite/3.12.2.0
-REQUIRES          += app/mariadb/10.0.25
+REQUIRES          += app/mariadb/10.0.30
 REQUIRES          += libs/libiodbc/3.52.10
 
 REQUIRES          += X11/libs/opengl-collection
@@ -85,8 +91,7 @@
                             $(HARDWARE_CB2X)      \
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
-                            $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_M201) $(HARDWARE_MXV) \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -153,8 +158,7 @@
                             $(HARDWARE_CB2X)      \
                             $(HARDWARE_CB3X)      \
                             $(HARDWARE_FFRK3288)  \
-                            $(HARDWARE_M201)      \
-                            $(HARDWARE_MXQ)       \
+                            $(HARDWARE_M201) $(HARDWARE_MXV) \
                             $(HARDWARE_NIT6Q)     \
                             $(HARDWARE_OMAP5UEVM) \
                             $(HARDWARE_DRA7XXEVM)),)
@@ -161,6 +165,12 @@
 ARCH   = arm
 ABI    = gnueabihf
 endif
+ifneq ($(filter $(HARDWARE),$(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
+ARCH   = aarch64
+ABI    = gnu
+endif
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC32)),)
 ARCH   = i386
 ABI    = gnu
@@ -213,7 +223,11 @@
 configure_switches += -no-largefile
 endif
 configure_switches += -no-gtk
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 configure_switches += -opengl es2
 else
 configure_switches += -opengl
@@ -255,7 +269,11 @@
 ENABLE_EGLFS_SUPPORT = yes
 ENABLE_KMS_SUPPORT   = yes
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20) $(HARDWARE_M201) $(HARDWARE_MXQ)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CI20)        \
+                            $(HARDWARE_M201) $(HARDWARE_MXV)         \
+                            $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
+                            $(HARDWARE_P212) $(HARDWARE_KHADAS_VIM)  \
+                            $(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
 ENABLE_KMS_SUPPORT = no
 endif
 
@@ -649,6 +667,7 @@
 	                                    Qt5Widgets.pc           Qt5X11Extras.pc         \
 	                                    Qt5Xml.pc               Qt5XmlPatterns.pc     ; \
 	 )
+	exit 1
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(QT5_PKG))
 	# ======= Remove build-machine tools from target package =======
@@ -799,4 +818,4 @@
 	 echo "short_description=\"$(QT5_PKG_SHORT_DESCRIPTION)\"" >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "url=$(QT5_PKG_URL)"                                 >> $(QT5_PKG)/.PKGINFO ; \
 	 echo "license=$(QT5_PKG_LICENSE)"                         >> $(QT5_PKG)/.PKGINFO
-	@$(FAKEROOT) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
+	@$(PSEUDO) sh -c "cd $(QT5_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/qt5/5.7.0/PATCHES.mxv
===================================================================
--- libs/qt5/5.7.0/PATCHES.mxv	(nonexistent)
+++ libs/qt5/5.7.0/PATCHES.mxv	(revision 647)
@@ -0,0 +1,3 @@
+
+../../../../sources/packages/x/qt5/patches/qt5-5.7.0-arm-neon-thumb.patch  -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.7.0-ffmpeg-no-thumb.patch -p0
Index: libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(revision 646)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qmake.conf.in	(nonexistent)
@@ -1,42 +0,0 @@
-#
-# qmake configuration for the Amlogic S805 boards
-#
-
-include(../common/linux_device_pre.conf)
-
-
-# modifications to g++.conf
-QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
-QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
-QMAKE_LINK              = $${CROSS_COMPILE}g++
-QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
-
-# modifications to linux.conf
-QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-QMAKE_STRIP             = $${CROSS_COMPILE}strip
-
-
-QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
-QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
-QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
-
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
-
-DISTRO_OPTS            += hard-float
-
-TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
-
-QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
-QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS
-
-WEBENGINE_CONFIG       += use_proprietary_codecs
-
-include(../common/linux_arm_device_post.conf)
-
-load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(revision 646)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-mxq-g++/qplatformdefs.h	(nonexistent)
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S912 boards (Enybox X2)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-enybox-x2-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905X boards (Khadas VIM)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-khadas-vim-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,42 @@
+#
+# qmake configuration for the Amlogic S805 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+DISTRO_OPTS            += hard-float
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_arm_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-mxv-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905 boards (NEXBOX A95X)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-p201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905X boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-p212-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S912 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = $${CCACHE} $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CCACHE} $${CROSS_COMPILE}g++
+QMAKE_LINK              = $${CROSS_COMPILE}g++
+QMAKE_LINK_SHLIB        = $${CROSS_COMPILE}g++
+
+# modifications to linux.conf
+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP             = $${CROSS_COMPILE}strip
+
+
+QMAKE_INCDIR            = $$[QT_SYSROOT]/usr/include
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/include/gstreamer-1.0
+QMAKE_INCDIR           += $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = $$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/devices/linux-q201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for building with aarch64-{s9xx}-linux-gnu-g++
+#
+
+MAKEFILE_GENERATOR       = UNIX
+CONFIG                  += incremental
+QMAKE_INCREMENTAL_STYLE  = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                 = @CCACHE@ @CROSS_COMPILE@gcc --sysroot=@SYSROOT@
+QMAKE_CXX                = @CCACHE@ @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK               = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+QMAKE_LINK_SHLIB         = @CROSS_COMPILE@g++ --sysroot=@SYSROOT@
+
+# modifications to linux.conf
+QMAKE_AR                 = @CROSS_COMPILE@ar cqs
+QMAKE_OBJCOPY            = @CROSS_COMPILE@objcopy
+QMAKE_NM                 = @CROSS_COMPILE@nm -P
+QMAKE_STRIP              = @CROSS_COMPILE@strip
+
+QMAKE_INCDIR             = @SYSROOT@/usr/include
+QMAKE_LIBDIR             = @SYSROOT@/usr/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL          += -lEGL
+QMAKE_LIBS_OPENGL_ES2   += -lGLESv2
+QMAKE_LIBS_OPENVG       += -lOpenVG
+
+QMAKE_LFLAGS            += -Wl,-rpath-link,@SYSROOT@/usr/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS         = @ARCH_FLAGS@ @ARCH_DEFS@ @HW_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS            += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS          += $$TARGET_HW_CFLAGS
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in	(revision 646)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qmake.conf.in	(nonexistent)
@@ -1,42 +0,0 @@
-#
-# qmake configuration for the Amlogic S805 boards
-#
-
-include(../common/linux_device_pre.conf)
-
-
-# modifications to g++.conf
-QMAKE_CC                = @TARGET_BINDIR@/gcc
-QMAKE_CXX               = @TARGET_BINDIR@/g++
-QMAKE_LINK              = @TARGET_BINDIR@/g++
-QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
-
-# modifications to linux.conf
-QMAKE_AR                = @TARGET_BINDIR@/ar cqs
-QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
-QMAKE_STRIP             = @TARGET_BINDIR@/strip
-
-
-QMAKE_INCDIR            = @TARGET_PREFIX@/include
-QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
-QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
-QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
-
-QMAKE_LIBS_EGL         += -lEGL
-QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
-QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
-
-QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
-
-DISTRO_OPTS            += hard-float
-
-TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
-
-QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
-QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
-
-WEBENGINE_CONFIG       += use_proprietary_codecs
-
-include(../common/linux_arm_device_post.conf)
-
-load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h	(revision 646)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxq-g++/qplatformdefs.h	(nonexistent)
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S912 boards (Enybox X2)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-enybox-x2-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905X boards (Khadas VIM)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-khadas-vim-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,42 @@
+#
+# qmake configuration for the Amlogic S805 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+DISTRO_OPTS            += hard-float
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_arm_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-mxv-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905 boards (NEXBOX A95X)
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-nexbox-a95x-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905 boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p201-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qmake.conf.in	(revision 647)
@@ -0,0 +1,40 @@
+#
+# qmake configuration for the Amlogic S905X boards
+#
+
+include(../common/linux_device_pre.conf)
+
+
+# modifications to g++.conf
+QMAKE_CC                = @TARGET_BINDIR@/gcc
+QMAKE_CXX               = @TARGET_BINDIR@/g++
+QMAKE_LINK              = @TARGET_BINDIR@/g++
+QMAKE_LINK_SHLIB        = @TARGET_BINDIR@/g++
+
+# modifications to linux.conf
+QMAKE_AR                = @TARGET_BINDIR@/ar cqs
+QMAKE_OBJCOPY           = @TARGET_BINDIR@/objcopy
+QMAKE_STRIP             = @TARGET_BINDIR@/strip
+
+
+QMAKE_INCDIR            = @TARGET_PREFIX@/include
+QMAKE_INCDIR           += @TARGET_PREFIX@/include/gstreamer-1.0
+QMAKE_INCDIR           += @TARGET_PREFIX@/lib@LIBDIRSUFFIX@/glib-2.0/include
+QMAKE_LIBDIR            = @TARGET_PREFIX@/lib@LIBDIRSUFFIX@
+
+QMAKE_LIBS_EGL         += -lEGL
+QMAKE_LIBS_OPENGL_ES2  += -lGLESv2
+QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL
+
+QMAKE_LFLAGS           += -Wl,-rpath-link,@TARGET_PREFIX@/lib@LIBDIRSUFFIX@ -Wl,--export-dynamic
+
+TARGET_HW_CFLAGS        = @ARCH_FLAGS@ -DLINUX=1
+
+QMAKE_CFLAGS           += $$TARGET_HW_CFLAGS
+QMAKE_CXXFLAGS         += -std=c++11 $$TARGET_HW_CFLAGS
+
+WEBENGINE_CONFIG       += use_proprietary_codecs
+
+include(../common/linux_device_post.conf)
+
+load(qt_config)
Index: libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h	(nonexistent)
+++ libs/qt5/5.7.0/mkspecs-pkg/devices/linux-p212-g++/qplatformdefs.h	(revision 647)
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between yo