summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2020-06-09 11:40:59 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2020-06-24 12:06:20 +0200
commit90786d605f7856a40d8d59f4cad153e383ad8d84 (patch)
tree521fe233699ef7c55926d04d1dc5a17321bf712e
parent8ae83b8038a62cf6e3d9f13f1b47820b40cdbb4d (diff)
downloadmeta-phytec-90786d605f7856a40d8d59f4cad153e383ad8d84.tar.bz2
meta-phytec-90786d605f7856a40d8d59f4cad153e383ad8d84.zip
scripts: Update scripts for NXP release imx-5.4.3-2.0.0
NXP no longer use the layer meta-fsl-bsp. The new layer is meta-imx. Update the scripts for the new layer. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Reviewed-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rwxr-xr-xscripts/copy_file_by_priority.py2
-rwxr-xr-xscripts/init8
-rwxr-xr-xscripts/init_bblayers.py4
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/copy_file_by_priority.py b/scripts/copy_file_by_priority.py
index 3a8396e..daeff0e 100755
--- a/scripts/copy_file_by_priority.py
+++ b/scripts/copy_file_by_priority.py
@@ -19,7 +19,7 @@ class BSP_BBLayerFile(BoardSupportPackage):
super(BSP_BBLayerFile, self).__init__()
project_priority = []
# ignore repos with layer.conf in unusual places
- project_filter = ["poky", "meta-openembedded", "meta-fsl-bsp-release", "base"]
+ project_filter = ["poky", "meta-openembedded", "meta-imx", "base"]
for p in set(self.project_paths).difference(project_filter):
abs_project_path = os.path.join(self.src.bsp_dir, 'sources', p)
layer_conf = os.path.join(abs_project_path, 'conf/layer.conf')
diff --git a/scripts/init b/scripts/init
index 1dd26c2..f95f4db 100755
--- a/scripts/init
+++ b/scripts/init
@@ -51,7 +51,7 @@ if [ -z "${TEMPLATECONF}" ]; then
case "$RELEASE_UID" in
*FSL* | *"IoTEdge-i.MX8"*)
# copy new EULA to meta-freescale
- cp ${ROOTDIR}/sources/meta-fsl-bsp-release/imx/EULA.txt ${ROOTDIR}/sources/meta-freescale/EULA
+ cp ${ROOTDIR}/sources/meta-imx/EULA.txt ${ROOTDIR}/sources/meta-freescale/EULA
# add commented line in local.conf.sample (for easy acceptable NXP EULA)
echo "" >> ${PHYTEC_DIR}/conf/local.conf.sample
@@ -67,9 +67,9 @@ if [ -z "${TEMPLATECONF}" ]; then
echo "# Adding sublayer because of \"$RELEASE_UID\" release" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
echo "BBLAYERS += \"\\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
echo " \${OEROOT}/../meta-openembedded/meta-gnome \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
- echo " \${OEROOT}/../meta-fsl-bsp-release/imx/meta-bsp \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
- echo " \${OEROOT}/../meta-fsl-bsp-release/imx/meta-sdk \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
- echo " \${OEROOT}/../meta-fsl-bsp-release/imx/meta-ml \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
+ echo " \${OEROOT}/../meta-imx/meta-bsp \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
+ echo " \${OEROOT}/../meta-imx/meta-sdk \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
+ echo " \${OEROOT}/../meta-imx/meta-ml \\" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
echo " \"" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
echo "" >> ${PHYTEC_DIR}/conf/bblayers.conf.sample
;;
diff --git a/scripts/init_bblayers.py b/scripts/init_bblayers.py
index 3d3e0f1..5e026c9 100755
--- a/scripts/init_bblayers.py
+++ b/scripts/init_bblayers.py
@@ -15,7 +15,7 @@ class BSP_BBLayer(BoardSupportPackage):
super(BSP_BBLayer, self).__init__()
self.bblayers_conf = os.path.join(self.src.bsp_dir, "build/conf/bblayers.conf")
#layers in those project dirs will be controlled by the bblayers.conf.sample
- self.project_filter = ["poky", "meta-openembedded", "meta-fsl-bsp-release", "base"]
+ self.project_filter = ["poky", "meta-openembedded", "meta-imx", "base"]
def init_bblayers(self):
layers_to_add = set(self.project_paths).difference(self.project_filter)
@@ -33,7 +33,7 @@ class BSP_BBLayer(BoardSupportPackage):
##############
def main():
- parser = argparse.ArgumentParser(description='Init the bblayers.conf. Poky, meta-openembedded and meta-fsl-bsp-release will be handled by the bblayers.conf.sample. The other layers will be added from the repo manifest.xml')
+ parser = argparse.ArgumentParser(description='Init the bblayers.conf. Poky, meta-openembedded and meta-imx will be handled by the bblayers.conf.sample. The other layers will be added from the repo manifest.xml')
args = parser.parse_args()