From d04ac04af57e18707b0eaaced806f89bf9842c84 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 17 Nov 2016 11:30:35 +0100 Subject: [PATCH] Changing desktop targets for automated build - next images will be Xenial except on imx6 boards and added Pine64 default desktop (need to be tested) --- config/boards/{aw-som-a20.conf => aw-som-a20.conf.disabled} | 2 +- config/boards/bananapi.conf | 2 +- config/boards/bananapim2.conf | 2 +- config/boards/bananapim2plus.conf | 2 +- config/boards/bananapipro.conf | 2 +- config/boards/beelinkx2.conf | 2 +- config/boards/cubieboard.conf | 2 +- config/boards/cubieboard2.conf | 2 +- config/boards/cubietruck.conf | 2 +- config/boards/guitar.conf | 2 +- config/boards/lime-a10.conf | 2 +- config/boards/lime.conf | 2 +- config/boards/lime2.conf | 2 +- config/boards/micro.conf | 2 +- config/boards/odroidc1.conf | 2 +- config/boards/odroidc2.conf | 2 +- config/boards/odroidxu4.conf | 2 +- config/boards/orangepi2.conf | 2 +- config/boards/orangepilite.conf | 2 +- config/boards/orangepione.conf | 2 +- config/boards/orangepipc.conf | 2 +- config/boards/orangepipcplus.conf | 2 +- config/boards/orangepiplus.conf | 2 +- config/boards/orangepiplus2e.conf | 2 +- config/boards/pine64.conf | 2 +- config/boards/roseapple.conf | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) rename config/boards/{aw-som-a20.conf => aw-som-a20.conf.disabled} (83%) diff --git a/config/boards/aw-som-a20.conf b/config/boards/aw-som-a20.conf.disabled similarity index 83% rename from config/boards/aw-som-a20.conf rename to config/boards/aw-som-a20.conf.disabled index 1007741e2f..8bffeef906 100644 --- a/config/boards/aw-som-a20.conf +++ b/config/boards/aw-som-a20.conf.disabled @@ -1,6 +1,6 @@ # A20 dual core SoM BOARD_NAME="AW-SoM" -KERNEL_TARGET="default,next,dev" +KERNEL_TARGET="" LINUXFAMILY=sun7i BOOTCONFIG=Awsom_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i" diff --git a/config/boards/bananapi.conf b/config/boards/bananapi.conf index aba979f0aa..01ddeec7fb 100644 --- a/config/boards/bananapi.conf +++ b/config/boards/bananapi.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Bananapi_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp #ap6211" MODULES_NEXT="brcmfmac bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/bananapim2.conf b/config/boards/bananapim2.conf index eac79677da..dd2e3bd3a3 100644 --- a/config/boards/bananapim2.conf +++ b/config/boards/bananapim2.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Sinovoip_BPI_M2_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp" MODULES_NEXT="brcmfmac bonding" CLI_TARGET="jessie:next" -DESKTOP_TARGET="jessie:next" +DESKTOP_TARGET="xenial:next" KERNEL_TARGET="next,dev" diff --git a/config/boards/bananapim2plus.conf b/config/boards/bananapim2plus.conf index ed97d67690..08d57e0c4f 100644 --- a/config/boards/bananapim2plus.conf +++ b/config/boards/bananapim2plus.conf @@ -7,5 +7,5 @@ MODULES_NEXT="brcmfmac" CPUMIN=240000 CPUMAX=1200000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf index d8835ac47f..147db26d56 100644 --- a/config/boards/bananapipro.conf +++ b/config/boards/bananapipro.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Bananapro_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp ap6211" MODULES_NEXT="brcmfmac bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/beelinkx2.conf b/config/boards/beelinkx2.conf index 3b6fe0ea16..2175d56c0e 100644 --- a/config/boards/beelinkx2.conf +++ b/config/boards/beelinkx2.conf @@ -7,5 +7,5 @@ MODULES_NEXT="" CPUMIN=240000 CPUMAX=1200000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/cubieboard.conf b/config/boards/cubieboard.conf index b4dc68c3ed..e03c559f2e 100644 --- a/config/boards/cubieboard.conf +++ b/config/boards/cubieboard.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Cubieboard_config MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi" MODULES_NEXT="bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/cubieboard2.conf b/config/boards/cubieboard2.conf index 4d5d105479..7d2a93b3aa 100644 --- a/config/boards/cubieboard2.conf +++ b/config/boards/cubieboard2.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Cubieboard2_config MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i" MODULES_NEXT="bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/cubietruck.conf b/config/boards/cubietruck.conf index b3f7f04a31..cab7a331dd 100644 --- a/config/boards/cubietruck.conf +++ b/config/boards/cubietruck.conf @@ -5,5 +5,5 @@ BOOTCONFIG=Cubietruck_config MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210" MODULES_NEXT="brcmfmac rfcomm hidp bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/guitar.conf b/config/boards/guitar.conf index 376089ad4d..1b57e65adf 100644 --- a/config/boards/guitar.conf +++ b/config/boards/guitar.conf @@ -5,5 +5,5 @@ BOOTCONFIG=s500_defconfig MODULES="ethernet wlan_8723bs" MODULES_NEXT="" CLI_TARGET="jessie:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default" diff --git a/config/boards/lime-a10.conf b/config/boards/lime-a10.conf index d3db84be7b..efbf2528ae 100644 --- a/config/boards/lime-a10.conf +++ b/config/boards/lime-a10.conf @@ -5,5 +5,5 @@ BOOTCONFIG=A10-OLinuXino-Lime_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp" MODULES_NEXT="bonding" CLI_TARGET="jessie:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/lime.conf b/config/boards/lime.conf index c4e88f45a6..6c43e4015b 100644 --- a/config/boards/lime.conf +++ b/config/boards/lime.conf @@ -5,5 +5,5 @@ BOOTCONFIG=A20-OLinuXino-Lime_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp" MODULES_NEXT="bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/lime2.conf b/config/boards/lime2.conf index 8f2dd9e478..4de1256a24 100644 --- a/config/boards/lime2.conf +++ b/config/boards/lime2.conf @@ -5,5 +5,5 @@ BOOTCONFIG=A20-OLinuXino-Lime2_defconfig MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp" MODULES_NEXT="bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/micro.conf b/config/boards/micro.conf index df677ff30b..23e03bda15 100644 --- a/config/boards/micro.conf +++ b/config/boards/micro.conf @@ -5,5 +5,5 @@ BOOTCONFIG=A20-OLinuXino_MICRO_config MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp" MODULES_NEXT="bonding" CLI_TARGET="jessie,xenial:default,next" -DESKTOP_TARGET="jessie:default,next" +DESKTOP_TARGET="xenial:default,next" KERNEL_TARGET="default,next,dev" diff --git a/config/boards/odroidc1.conf b/config/boards/odroidc1.conf index 93a567278d..1fac024e2a 100644 --- a/config/boards/odroidc1.conf +++ b/config/boards/odroidc1.conf @@ -6,4 +6,4 @@ BOOTCONFIG=odroidc_config MODULES="bonding" MODULES_NEXT="" CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf index 04f8386e21..6ff4ba2982 100644 --- a/config/boards/odroidc2.conf +++ b/config/boards/odroidc2.conf @@ -5,5 +5,5 @@ BOOTCONFIG=odroidc2_config MODULES="bonding" MODULES_NEXT="" CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default" diff --git a/config/boards/odroidxu4.conf b/config/boards/odroidxu4.conf index a5ff607b1e..c45aa96752 100644 --- a/config/boards/odroidxu4.conf +++ b/config/boards/odroidxu4.conf @@ -5,5 +5,5 @@ BOOTCONFIG=odroid_config MODULES="bonding" MODULES_NEXT="" CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,next" diff --git a/config/boards/orangepi2.conf b/config/boards/orangepi2.conf index 26b0e872a5..163f5c9d09 100644 --- a/config/boards/orangepi2.conf +++ b/config/boards/orangepi2.conf @@ -7,5 +7,5 @@ MODULES_NEXT="" CPUMIN=480000 CPUMAX=1296000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepilite.conf b/config/boards/orangepilite.conf index c8ca4c00aa..16ef83a648 100644 --- a/config/boards/orangepilite.conf +++ b/config/boards/orangepilite.conf @@ -7,5 +7,5 @@ MODULES_NEXT="8189fs" CPUMIN=480000 CPUMAX=1200000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepione.conf b/config/boards/orangepione.conf index 02c07e141e..7ef89ce5a2 100644 --- a/config/boards/orangepione.conf +++ b/config/boards/orangepione.conf @@ -7,5 +7,5 @@ MODULES_NEXT="" CPUMIN=480000 CPUMAX=1200000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepipc.conf b/config/boards/orangepipc.conf index 266c56abda..4a7f1f10a6 100644 --- a/config/boards/orangepipc.conf +++ b/config/boards/orangepipc.conf @@ -7,5 +7,5 @@ MODULES_NEXT="" CPUMIN=480000 CPUMAX=1296000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepipcplus.conf b/config/boards/orangepipcplus.conf index 2138f49cca..05dabf5429 100644 --- a/config/boards/orangepipcplus.conf +++ b/config/boards/orangepipcplus.conf @@ -7,5 +7,5 @@ MODULES_NEXT="8189fs" CPUMIN=480000 CPUMAX=1296000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepiplus.conf b/config/boards/orangepiplus.conf index 10259498ec..80f254adec 100644 --- a/config/boards/orangepiplus.conf +++ b/config/boards/orangepiplus.conf @@ -7,5 +7,5 @@ MODULES_NEXT="8189es" CPUMIN=480000 CPUMAX=1296000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/orangepiplus2e.conf b/config/boards/orangepiplus2e.conf index 92617db482..a561a825d6 100644 --- a/config/boards/orangepiplus2e.conf +++ b/config/boards/orangepiplus2e.conf @@ -7,5 +7,5 @@ MODULES_NEXT="8189fs" CPUMIN=480000 CPUMAX=1296000 CLI_TARGET="jessie,xenial:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default,dev" diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf index 1f5127c7d0..d4851a79e2 100644 --- a/config/boards/pine64.conf +++ b/config/boards/pine64.conf @@ -6,4 +6,4 @@ BOOTCONFIG=pine64_plus_defconfig MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs gt9xxf_ts" MODULES_NEXT="" CLI_TARGET="jessie,xenial:default,dev" -DESKTOP_TARGET="" +DESKTOP_TARGET="xenial:default" diff --git a/config/boards/roseapple.conf b/config/boards/roseapple.conf index 1c5658559e..f025ca628d 100644 --- a/config/boards/roseapple.conf +++ b/config/boards/roseapple.conf @@ -5,5 +5,5 @@ BOOTCONFIG=actduino_bubble_gum_v10_defconfig MODULES="ethernet" MODULES_NEXT="" CLI_TARGET="jessie:default" -DESKTOP_TARGET="jessie:default" +DESKTOP_TARGET="xenial:default" KERNEL_TARGET="default"