summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-07-17 13:51:37 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-07-17 15:21:22 +0200
commit9497584735fda4fa084d2dcf032e65e65439d9ab (patch)
treeaebc82dd21dfa49c875d14d3e0b62660d5842905
parent69c0e452e97dfff3c5913bbda342f5dce4dbc428 (diff)
downloadmeta-phytec-9497584735fda4fa084d2dcf032e65e65439d9ab.tar.bz2
meta-phytec-9497584735fda4fa084d2dcf032e65e65439d9ab.zip
kernel/barebox/u-boot: Fix COMPATIBLE_MACHINE expressions
COMPATIBLE_MACHINE is matched as regular expression. Thus phyflex-imx6-1 matches phyflex-imx6-1 but also phyflex-imx6-11, phyflex-imx6-12 and so forth. In kernel, barebox and u-boot recipes we only want to match the exact machine. Surround the COMPATIBLE_MACHINE expressions with '^(' at the beginning and with ')$' at the end to achieve this. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--classes/phygittag.bbclass4
-rw-r--r--recipes-bsp/barebox/barebox_2016.07.0-phy4.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2016.11.0-phy4.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2017.10.0-phy3.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2017.12.0-phy3.bb4
-rw-r--r--recipes-bsp/barebox/barebox_2018.04.0-phy1.bb4
-rw-r--r--recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_4.1.15-phy3.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.14.78-phy2.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb4
-rw-r--r--recipes-kernel/linux/linux-mainline_4.9.98-rt76-phy1.bb4
-rw-r--r--recipes-kernel/linux/linux-vanilla_4.12.8.bb4
14 files changed, 42 insertions, 14 deletions
diff --git a/classes/phygittag.bbclass b/classes/phygittag.bbclass
index 322f526..44945fa 100644
--- a/classes/phygittag.bbclass
+++ b/classes/phygittag.bbclass
@@ -41,13 +41,15 @@
# # NOTE: Keep version in filename in sync with commit id!
# SRCREV = "57b87aedbf0b6ae0eb0b858dd0c83411097c777a"
#
-# COMPATIBLE_MACHINE = "phyflex-imx6-1"
+# COMPATIBLE_MACHINE = "^("
+# COMPATIBLE_MACHINE .= "phyflex-imx6-1"
# COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
# COMPATIBLE_MACHINE .= "|phycard-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-1"
# COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-2"
+# COMPATIBLE_MACHINE .= ")$"
#
# External assumptions and constraints:
#
diff --git a/recipes-bsp/barebox/barebox_2016.07.0-phy4.bb b/recipes-bsp/barebox/barebox_2016.07.0-phy4.bb
index be8435c..48c03b4 100644
--- a/recipes-bsp/barebox/barebox_2016.07.0-phy4.bb
+++ b/recipes-bsp/barebox/barebox_2016.07.0-phy4.bb
@@ -91,4 +91,6 @@ python do_env_append_phycore-rk3288-3() {
INTREE_DEFCONFIG = "rk3288_defconfig"
-COMPATIBLE_MACHINE = "phycore-rk3288-3"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb b/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
index 56a5d04..8b4c849 100644
--- a/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
+++ b/recipes-bsp/barebox/barebox_2016.11.0-phy4.bb
@@ -536,9 +536,11 @@ of_fixup_status /soc/aips-bus@02000000/pwm@02088000/
INTREE_DEFCONFIG = "imx_v7_defconfig"
-COMPATIBLE_MACHINE = "phycard-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycard-imx6-1"
COMPATIBLE_MACHINE .= "|phycard-imx6-2"
COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-2"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2017.10.0-phy3.bb b/recipes-bsp/barebox/barebox_2017.10.0-phy3.bb
index 77da3af..2e7dc02 100644
--- a/recipes-bsp/barebox/barebox_2017.10.0-phy3.bb
+++ b/recipes-bsp/barebox/barebox_2017.10.0-phy3.bb
@@ -323,7 +323,8 @@ global.linux.bootargs.dyn.root="root=/dev/mmcblk1p4 rootflags='data=journal'"
INTREE_DEFCONFIG = "am335x_defconfig"
-COMPATIBLE_MACHINE = "beagleboneblack-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "beagleboneblack-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-3"
@@ -344,3 +345,4 @@ COMPATIBLE_MACHINE .= "|phycore-r2-am335x-4"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-5"
COMPATIBLE_MACHINE .= "|phycore-r2-am335x-6"
COMPATIBLE_MACHINE .= "|phycore-emmc-am335x-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2017.12.0-phy3.bb b/recipes-bsp/barebox/barebox_2017.12.0-phy3.bb
index cc98f78..f4012b3 100644
--- a/recipes-bsp/barebox/barebox_2017.12.0-phy3.bb
+++ b/recipes-bsp/barebox/barebox_2017.12.0-phy3.bb
@@ -555,7 +555,8 @@ cp /mnt/tftp/root.ubifs /dev/nand0.root.ubi.root2
INTREE_DEFCONFIG = "imx_v7_defconfig"
-COMPATIBLE_MACHINE = "phyflex-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
COMPATIBLE_MACHINE .= "|phyflex-imx6-3"
COMPATIBLE_MACHINE .= "|phyflex-imx6-4"
@@ -581,3 +582,4 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-14"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-15"
COMPATIBLE_MACHINE .= "|phyboard-nunki-imx6-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/barebox/barebox_2018.04.0-phy1.bb b/recipes-bsp/barebox/barebox_2018.04.0-phy1.bb
index df54836..add7e3f 100644
--- a/recipes-bsp/barebox/barebox_2018.04.0-phy1.bb
+++ b/recipes-bsp/barebox/barebox_2018.04.0-phy1.bb
@@ -208,7 +208,9 @@ python do_env_append_phyboard-segin-imx6ul-5() {
INTREE_DEFCONFIG = "imx_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-5"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb b/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
index 8c92092..8b60859 100644
--- a/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
+++ b/recipes-bsp/u-boot/u-boot-spl_2016.01-phy3.bb
@@ -18,7 +18,9 @@ SRC_URI += " file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.pa
PR = "r0"
-COMPATIBLE_MACHINE = "phycore-rk3288-3"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
UBOOT_SUFFIX = "img"
UBOOT_BINARY = "u-boot-dtb.${UBOOT_SUFFIX}"
diff --git a/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb b/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
index a1256d9..0c89940 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15-phy3.bb
@@ -18,7 +18,9 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "imx_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-5"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb b/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
index d5a4457..1a53c24 100644
--- a/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
+++ b/recipes-kernel/linux/linux-mainline_4.1.36-phy3.bb
@@ -18,9 +18,11 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "imx_v6_v7_defconfig"
-COMPATIBLE_MACHINE = "phycard-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phycard-imx6-1"
COMPATIBLE_MACHINE .= "|phycard-imx6-2"
COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-2"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb b/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
index 5f7f5f5..014a07a 100644
--- a/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
+++ b/recipes-kernel/linux/linux-mainline_4.12.4-phy4.bb
@@ -18,6 +18,8 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "imx_v6_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-segin-imx6ul-2"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-segin-imx6ul-2"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-3"
COMPATIBLE_MACHINE .= "|phyboard-segin-imx6ul-4"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.14.78-phy2.bb b/recipes-kernel/linux/linux-mainline_4.14.78-phy2.bb
index 7aa55dd..85f678d 100644
--- a/recipes-kernel/linux/linux-mainline_4.14.78-phy2.bb
+++ b/recipes-kernel/linux/linux-mainline_4.14.78-phy2.bb
@@ -18,7 +18,8 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "imx_v6_v7_defconfig"
-COMPATIBLE_MACHINE = "phyflex-imx6-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
COMPATIBLE_MACHINE .= "|phyflex-imx6-3"
COMPATIBLE_MACHINE .= "|phyflex-imx6-4"
@@ -44,3 +45,4 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-14"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-15"
COMPATIBLE_MACHINE .= "|phyboard-nunki-imx6-1"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb b/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
index 0006ab8..a9d2424 100644
--- a/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
+++ b/recipes-kernel/linux/linux-mainline_4.9.98-phy2.bb
@@ -41,7 +41,8 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG_ti33x = "am335x_phytec_defconfig"
INTREE_DEFCONFIG_rk3288 = "rk3288_phytec_defconfig"
-COMPATIBLE_MACHINE = "beagleboneblack-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "beagleboneblack-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-3"
@@ -64,3 +65,4 @@ COMPATIBLE_MACHINE .= "|phycore-r2-am335x-6"
COMPATIBLE_MACHINE .= "|phycore-emmc-am335x-1"
COMPATIBLE_MACHINE .= "|phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-mainline_4.9.98-rt76-phy1.bb b/recipes-kernel/linux/linux-mainline_4.9.98-rt76-phy1.bb
index 9b914e6..a1bb0aa 100644
--- a/recipes-kernel/linux/linux-mainline_4.9.98-rt76-phy1.bb
+++ b/recipes-kernel/linux/linux-mainline_4.9.98-rt76-phy1.bb
@@ -37,7 +37,8 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG_ti33x = "am335x_rt_phytec_defconfig"
INTREE_DEFCONFIG_rk3288 = "rk3288_rt_phytec_defconfig"
-COMPATIBLE_MACHINE = "beagleboneblack-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "beagleboneblack-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-3"
@@ -60,3 +61,4 @@ COMPATIBLE_MACHINE .= "|phycore-r2-am335x-6"
COMPATIBLE_MACHINE .= "|phycore-emmc-am335x-1"
COMPATIBLE_MACHINE .= "|phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"
diff --git a/recipes-kernel/linux/linux-vanilla_4.12.8.bb b/recipes-kernel/linux/linux-vanilla_4.12.8.bb
index 198afa9..1c22912 100644
--- a/recipes-kernel/linux/linux-vanilla_4.12.8.bb
+++ b/recipes-kernel/linux/linux-vanilla_4.12.8.bb
@@ -19,7 +19,9 @@ S = "${WORKDIR}/git"
INTREE_DEFCONFIG = "multi_v7_defconfig"
-COMPATIBLE_MACHINE = "phyboard-wega-am335x-1"
+COMPATIBLE_MACHINE = "^("
+COMPATIBLE_MACHINE .= "phyboard-wega-am335x-1"
COMPATIBLE_MACHINE .= "|phyboard-wega-am335x-2"
COMPATIBLE_MACHINE .= "|phycore-am335x-1"
COMPATIBLE_MACHINE .= "|phycore-rk3288-3"
+COMPATIBLE_MACHINE .= ")$"