From cb50b1aedd40d91c709aa89140a7705009f22dee Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 3 Oct 2015 21:04:08 +0100 Subject: [PATCH 01/12] [RBP] Add SDIO config option --- projects/RPi/linux/linux.arm.conf | 2 +- projects/RPi2/linux/linux.arm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 0de50ca38d..66d273146c 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1198,7 +1198,7 @@ CONFIG_BRCMUTIL=m # CONFIG_BRCMSMAC is not set CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PROTO_BCDC=y -# CONFIG_BRCMFMAC_SDIO is not set +CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf index 4515d35ac5..26f74f839d 100644 --- a/projects/RPi2/linux/linux.arm.conf +++ b/projects/RPi2/linux/linux.arm.conf @@ -1250,7 +1250,7 @@ CONFIG_BRCMUTIL=m # CONFIG_BRCMSMAC is not set CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PROTO_BCDC=y -# CONFIG_BRCMFMAC_SDIO is not set +CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set From f831f7713270493084f2999f13b26c7cf83a76c5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 3 Oct 2015 21:04:54 +0100 Subject: [PATCH 02/12] [RBP] Add touchscreen support, in line with Raspbian --- projects/RPi/linux/linux.arm.conf | 67 +++++++++++++++++++++++++++++- projects/RPi2/linux/linux.arm.conf | 67 +++++++++++++++++++++++++++++- 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 66d273146c..3f1487f701 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1294,7 +1294,72 @@ CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +CONFIG_TOUCHSCREEN_RPI_FT5406=m +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ARIZONA_HAPTICS is not set diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf index 26f74f839d..d3d17ea315 100644 --- a/projects/RPi2/linux/linux.arm.conf +++ b/projects/RPi2/linux/linux.arm.conf @@ -1346,7 +1346,72 @@ CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_JOYSTICK_RPISENSE is not set # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_OF_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +CONFIG_TOUCHSCREEN_RPI_FT5406=m +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ARIZONA_HAPTICS is not set From b0827d037413e4b57d4842d7cafefe0b2346e511 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 13:02:14 +0200 Subject: [PATCH 03/12] kodi-theme-Confluence: update to kodi-theme-Confluence-15.2-rc3-cf72616 Signed-off-by: Stephan Raue --- packages/mediacenter/kodi-theme-Confluence/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk index 8087a7d570..80371b266b 100644 --- a/packages/mediacenter/kodi-theme-Confluence/package.mk +++ b/packages/mediacenter/kodi-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi-theme-Confluence" -PKG_VERSION="15.2-rc2-4ed3eb6" +PKG_VERSION="15.2-rc3-cf72616" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 1ab42d368870ca1a0142d60507ddab34222ef853 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 13:02:14 +0200 Subject: [PATCH 04/12] kodi: update to kodi-15.2-rc3-cf72616 Signed-off-by: Stephan Raue --- packages/mediacenter/kodi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 97ffc98958..5a6891ad4b 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="15.2-rc2-4ed3eb6" +PKG_VERSION="15.2-rc3-cf72616" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 4bfb721783a5c76a7458a28b367fc8abd82e7b29 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 13:04:57 +0200 Subject: [PATCH 05/12] imx-vpu: update to imx-vpu-5.4.31 Signed-off-by: Stephan Raue --- packages/multimedia/imx-vpu/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/imx-vpu/package.mk b/packages/multimedia/imx-vpu/package.mk index 4cb91e2e32..c30341b31b 100644 --- a/packages/multimedia/imx-vpu/package.mk +++ b/packages/multimedia/imx-vpu/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="imx-vpu" -PKG_VERSION="5.4.28" +PKG_VERSION="5.4.31" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="other" From 9f3409e450a882ea1705596afc62c8ab456391ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 13:04:57 +0200 Subject: [PATCH 06/12] libXi: update to libXi-1.7.5 Signed-off-by: Stephan Raue --- packages/x11/lib/libXi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk index b404834d8a..98d15d6b0a 100644 --- a/packages/x11/lib/libXi/package.mk +++ b/packages/x11/lib/libXi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libXi" -PKG_VERSION="1.7.4" +PKG_VERSION="1.7.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From dbf14ed5ad142bb6027bceec6903c1dbd808f49e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 13:06:47 +0200 Subject: [PATCH 07/12] pixman: update to pixman-0.32.8 Signed-off-by: Stephan Raue --- packages/x11/lib/pixman/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk index 903c578364..deffd6a2db 100644 --- a/packages/x11/lib/pixman/package.mk +++ b/packages/x11/lib/pixman/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pixman" -PKG_VERSION="0.32.6" +PKG_VERSION="0.32.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 94fc979e17673fa2b6b160425fbc3e0d1795cffe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 22:58:40 +0200 Subject: [PATCH 08/12] pvr.mythtv: update to pvr.mythtv-8cb158c Signed-off-by: Stephan Raue --- packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk index a66ba1367c..a6827cd605 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="pvr.mythtv" -PKG_VERSION="ce6b801" +PKG_VERSION="8cb158c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 456c875268a8238e3680491a569eb1a7ddc8eecb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Oct 2015 23:17:00 +0200 Subject: [PATCH 09/12] projects/*/linux: sync kernel config for basic touchscreen support Signed-off-by: Stephan Raue --- projects/Generic/linux/linux.x86_64.conf | 58 ++++++++++++++++- .../Nvidia_Legacy/linux/linux.x86_64.conf | 58 ++++++++++++++++- projects/WeTek_Play/linux/linux.arm.conf | 57 ++++++++++++++++- projects/imx6/linux/linux.arm.conf | 63 ++++++++++++++++++- 4 files changed, 230 insertions(+), 6 deletions(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 9a2da0d53e..3280f0fd31 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.1.8 Kernel Configuration +# Linux/x86_64 4.1.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1836,7 +1836,61 @@ CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_BMA150 is not set diff --git a/projects/Nvidia_Legacy/linux/linux.x86_64.conf b/projects/Nvidia_Legacy/linux/linux.x86_64.conf index a82b97fdce..2ae98cf6b4 100644 --- a/projects/Nvidia_Legacy/linux/linux.x86_64.conf +++ b/projects/Nvidia_Legacy/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.1.6 Kernel Configuration +# Linux/x86_64 4.1.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1818,7 +1818,61 @@ CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_BMA150 is not set diff --git a/projects/WeTek_Play/linux/linux.arm.conf b/projects/WeTek_Play/linux/linux.arm.conf index e9fe72cab7..a398d6a5da 100644 --- a/projects/WeTek_Play/linux/linux.arm.conf +++ b/projects/WeTek_Play/linux/linux.arm.conf @@ -1815,7 +1815,62 @@ CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_BMA150 is not set diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf index 0e8c89e262..f0ce2234f7 100644 --- a/projects/imx6/linux/linux.arm.conf +++ b/projects/imx6/linux/linux.arm.conf @@ -1807,7 +1807,68 @@ CONFIG_JOYSTICK_XPAD=m CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DA9052 is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +CONFIG_TOUCHSCREEN_EGALAX=m +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +# CONFIG_TOUCHSCREEN_MC13783 is not set +CONFIG_TOUCHSCREEN_USB_EGALAX=y +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +# CONFIG_TOUCHSCREEN_USB_E2I is not set +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SUR40 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_BMA150 is not set From d690ffa4de572c740ebce8fd09c2c62a947e32a3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 30 Sep 2015 12:28:26 +0300 Subject: [PATCH 10/12] scripts/checkdeps improvements - when available, use etc/os-release - on debian/ubuntu do not require aptitude --- scripts/checkdeps | 74 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 26f8b536ee..c9c88b1d16 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -77,62 +77,42 @@ if [ -n "$need" ]; then echo $need if [ -f /etc/lsb-release ]; then - DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2) + DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z) fi - if [ "$DISTRO" = "Ubuntu" ]; then - echo "**** You seem to use a $DISTRO system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - if ( ! [ -z "`which aptitude 2>/dev/null`" ] && [ "$ans" = "y" ]); then - sudo aptitude install $need_pkg - elif [ "$ans" = "y" ]; then - echo "**** The recommended Package-Manager Aptitude is not installed" - read -p "(y) install Aptitude :: (n) use APT " ans + if [ -f /etc/os-release ]; then + DISTRO=$(grep ^ID= /etc/os-release | cut -d "=" -f 2 | tr A-Z a-z) + fi + + echo "**** You seem to use a $DISTRO system ****" + + case "$DISTRO" in + ubuntu|debian) + read -p "would you like to install the needed tools ? (y/n) " ans if [ "$ans" = "y" ]; then - sudo apt-get -y install aptitude - sudo aptitude install $need_pkg - elif [ "$ans" = "n" ]; then sudo apt-get install $need_pkg else echo "********" exit 1 fi - else - echo "********" + ;; + fedora|centos|rhel) + read -p "would you like to install the needed tools ? (y/n) " ans + [ "$ans" = "y" ] && sudo yum install $need_pkg + ;; + gentoo) + read -p "would you like to install the needed tools ? (y/n) " ans + [ "$ans" = "y" ] && sudo emerge -D $need_pkg + ;; + mageia) + read -p "would you like to install the needed tools ? (y/n) " ans + [ "$ans" = "y" ] && sudo urpmi $need_pkg + ;; + *) + echo "**** unsupported distro $DISTRO ****" exit 1 - fi - elif ( ! [ -z "`which aptitude 2>/dev/null`" ]); then - DISTRO="a Debian" - echo "**** You seem to use $DISTRO system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - if ([ "$ans" = "y" ] && ! [ $(sudo -n uptime 2>&1|grep "load"|wc -l) ]); then - sudo aptitude install $need_pkg - elif [ "$ans" = "y" ]; then - su -c "aptitude install $need_pkg" - else - echo "********" - exit 1 - fi - elif [ -f /etc/mandrake-release -a -n "`which urpmi 2>/dev/null`" ]; then - echo "**** You seem to use a mandrake system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo urpmi $need_pkg - elif [ -f /etc/gentoo-release -a -n "`which emerge 2>/dev/null`" ]; then - echo "**** You seem to use a gentoo system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo emerge -D $need_pkg - elif [ -f /etc/fedora-release -a -n "`which yum 2>/dev/null`" ]; then - echo "**** You seem to use a fedora system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo yum install $need_pkg - elif [ -f /etc/redhat-release -a "`which yum 2>/dev/null`" ]; then - echo "**** You seem to use a RedHat or clone (CentOS) system ****" - read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo yum install $need_pkg - else - echo "********" - exit 1 - fi + ;; + esac fi From fd31d5d95816f65a7923a8ae18155ff9e9a10398 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 30 Sep 2015 15:49:57 +0300 Subject: [PATCH 11/12] buildsys: clean up checkdeps --- scripts/checkdeps | 62 ++++++++++++++++++----------------------------- scripts/get | 2 -- scripts/image | 2 +- 3 files changed, 24 insertions(+), 42 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index c9c88b1d16..e618e975b3 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -20,32 +20,30 @@ . config/options $1 -deps= -deps_pkg= -files= -files_pkg= +if [ -f /etc/lsb-release ]; then + DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z) +fi -case $1 in - get) - deps="wget" - deps_pkg="wget" - ;; - build) - deps="bash bc gcc g++ sed patch touch tar bzip2 gzip perl cp gawk makeinfo gperf zip unzip mkfontscale mkfontdir bdftopcf diff xsltproc java md5deep" - deps_pkg="bash bc gcc g++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf zip unzip xfonts-utils xfonts-utils xfonts-utils diff xsltproc default-jre md5deep" - files="/usr/include/stdio.h /usr/include/ncurses.h" - files_pkg="libc6-dev libncurses5-dev" - if [ -f /etc/redhat-release ]; then - deps_pkg="bash bc gcc gcc-c++ sed patch fileutils tar bzip2 gzip perl coreutils gawk texinfo gperf zip unzip xorg-x11-font-utils xorg-x11-font-utils diffutils libxslt java-1.7.0-openjdk" +if [ -f /etc/os-release ]; then + DISTRO=$(grep ^ID= /etc/os-release | cut -d "=" -f 2 | tr A-Z a-z) +fi + +deps="wget bash bc gcc sed patch tar bzip2 gzip perl gawk md5deep gperf zip unzip diff makeinfo" +deps_pkg="wget bash bc gcc sed patch tar bzip2 gzip perl gawk md5deep gperf zip unzip diffutils texinfo" + +files="/usr/include/stdio.h /usr/include/ncurses.h" +files_pkg="libc6-dev libncurses5-dev" + +case "$DISTRO" in + fedora|centos|rhel) + deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" + deps_pkg="$deps_pkg gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk" files_pkg="glibc-headers ncurses-devel" - fi - ;; - qemu) - if [ ! `which qemu` ]; then - echo "Your system doesn't seem to have QEMU installed" - exit 1 - fi - ;; + ;; + *) + deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" + deps_pkg="$deps_pkg g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre" + ;; esac # project specific dependencies @@ -75,26 +73,12 @@ done if [ -n "$need" ]; then echo "**** Your system lacks the following tools needed to $1 $DISTRONAME ****" echo $need - - if [ -f /etc/lsb-release ]; then - DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z) - fi - - if [ -f /etc/os-release ]; then - DISTRO=$(grep ^ID= /etc/os-release | cut -d "=" -f 2 | tr A-Z a-z) - fi - echo "**** You seem to use a $DISTRO system ****" case "$DISTRO" in ubuntu|debian) read -p "would you like to install the needed tools ? (y/n) " ans - if [ "$ans" = "y" ]; then - sudo apt-get install $need_pkg - else - echo "********" - exit 1 - fi + [ "$ans" = "y" ] && sudo apt-get install $need_pkg ;; fedora|centos|rhel) read -p "would you like to install the needed tools ? (y/n) " ans diff --git a/scripts/get b/scripts/get index 739735b598..8efee23a46 100755 --- a/scripts/get +++ b/scripts/get @@ -47,8 +47,6 @@ if [ -n "$PKG_URL" ]; then fi DL="yes" - $SCRIPTS/checkdeps get - rm -f $STAMP printf "%${BUILD_INDENT}c ${boldcyan}GET${endcolor} $1\n" ' '>&$SILENT_OUT diff --git a/scripts/image b/scripts/image index 3147c463c0..93361f0bc9 100755 --- a/scripts/image +++ b/scripts/image @@ -22,7 +22,7 @@ show_config -$SCRIPTS/checkdeps build +$SCRIPTS/checkdeps $SCRIPTS/build toolchain $SCRIPTS/build squashfs:host $SCRIPTS/build fakeroot:host From dc340f537421665ce7ef76528654e4318355f2fc Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Fri, 2 Oct 2015 11:58:11 +0300 Subject: [PATCH 12/12] scripts/checkdeps: fixup fedora / gentoo / arch --- scripts/checkdeps | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index e618e975b3..1a5ff04fa0 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -38,8 +38,19 @@ case "$DISTRO" in fedora|centos|rhel) deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" deps_pkg="$deps_pkg gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk" + [[ ! `rpm -qa glibc-static` ]] && deps="$deps glibc-static" && deps_pkg="$deps_pkg glibc-static" + [[ ! `rpm -qa libstdc++-static` ]] && deps="$deps libstdc++-static" && deps_pkg="$deps_pkg libstdc++-static" files_pkg="glibc-headers ncurses-devel" ;; + gentoo) + deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" + deps_pkg="$deps_pkg g++ mkfontscale mkfontdir bdftopcf libxslt jre" + ;; + arch) + # md5deep is only available in the aur + deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" + deps_pkg="$deps_pkg g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt java-runtime-common" + ;; *) deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" deps_pkg="$deps_pkg g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre" @@ -71,7 +82,7 @@ while file=`getarg $i $files` && [ -n "$file" ]; do done if [ -n "$need" ]; then - echo "**** Your system lacks the following tools needed to $1 $DISTRONAME ****" + echo "**** Your system lacks the following tools needed to build $DISTRONAME ****" echo $need echo "**** You seem to use a $DISTRO system ****" @@ -81,17 +92,22 @@ if [ -n "$need" ]; then [ "$ans" = "y" ] && sudo apt-get install $need_pkg ;; fedora|centos|rhel) + if [ `which dnf` ]; then YUM=dnf; else YUM=yum; fi read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo yum install $need_pkg + [ "$ans" = "y" ] && sudo $YUM install $need_pkg ;; gentoo) read -p "would you like to install the needed tools ? (y/n) " ans - [ "$ans" = "y" ] && sudo emerge -D $need_pkg + [ "$ans" = "y" ] && sudo emerge --ask --deep $need_pkg ;; mageia) read -p "would you like to install the needed tools ? (y/n) " ans [ "$ans" = "y" ] && sudo urpmi $need_pkg ;; + arch) + read -p "would you like to install the needed tools ? (y/n) " ans + [ "$ans" = "y" ] && sudo pacman -Sy $need_pkg + ;; *) echo "**** unsupported distro $DISTRO ****" exit 1