From b86f3f1eefef61d93111856a0ee2cf1f4f14bddd Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Mon, 3 Oct 2022 13:35:52 +0530 Subject: Updated SRCREV for 2022.2 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 90cb0cb7..bb794f2b 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -21,7 +21,7 @@ ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7" ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03" ESW_REV[2022.1] = "b3d8b420b421730ea505da55b42174dc90f885c1" -ESW_REV[2022.2] = "ec008a170356179fee87fa2c1b9f2d7add1c80bc" +ESW_REV[2022.2] = "2b3e4358bae5ee86686742c8cfcb10f41d40eeb3" ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" -- cgit v1.2.3-54-g00ecf From 04f40d905ed9252542d83a508e1fd5eb0d3c5176 Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Tue, 4 Oct 2022 13:29:28 +0530 Subject: Updated SRCREV for 2022.2 Signed-off-by: Siva Addepalli --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb | 2 +- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb index d9758f19..260224b8 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "5.15.36" KBRANCH="xlnx_rebase_v5.15_LTS" -SRCREV = "d677bf9fa4cb6987fe90e720fdd8ee5c6e15e809" +SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index bb794f2b..b3c98678 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -21,7 +21,7 @@ ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7" ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03" ESW_REV[2022.1] = "b3d8b420b421730ea505da55b42174dc90f885c1" -ESW_REV[2022.2] = "2b3e4358bae5ee86686742c8cfcb10f41d40eeb3" +ESW_REV[2022.2] = "85ba9a0ec77ff43f28e97672ed298442cc734088" ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" -- cgit v1.2.3-54-g00ecf From a7b7b49dac0c038b8699f4d13aa8c26e5148a2be Mon Sep 17 00:00:00 2001 From: Sivaprasad Addepalli Date: Thu, 6 Oct 2022 11:31:20 +0530 Subject: Updated SRCREV for 2022.2 Signed-off-by: Siva Addepalli --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index b3c98678..5251a7eb 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -21,7 +21,7 @@ ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7" ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03" ESW_REV[2022.1] = "b3d8b420b421730ea505da55b42174dc90f885c1" -ESW_REV[2022.2] = "85ba9a0ec77ff43f28e97672ed298442cc734088" +ESW_REV[2022.2] = "cc19f6bcbae2846b2394b583314ec1dbcbe02a62" ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" -- cgit v1.2.3-54-g00ecf From 9d3787bbb0ff1846f1434dc337101ca98b685835 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 7 Oct 2022 10:42:14 -0500 Subject: xlnx-embeddedsw: Move to 2022.2 release Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 5251a7eb..a1ecf1ae 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -10,7 +10,7 @@ ESW_BRANCH[2020.2] = "master-rel-2020.2" ESW_BRANCH[2021.1] = "xlnx_rel_v2021.1" ESW_BRANCH[2021.2] = "xlnx_rel_v2021.2" ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1" -ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2-next" +ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" ESW_BRANCH[git] = "master-next" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" @@ -21,7 +21,7 @@ ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7" ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03" ESW_REV[2022.1] = "b3d8b420b421730ea505da55b42174dc90f885c1" -ESW_REV[2022.2] = "cc19f6bcbae2846b2394b583314ec1dbcbe02a62" +ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" @@ -36,7 +36,7 @@ LIC_FILES_CHKSUM[master-rel-2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8' LIC_FILES_CHKSUM[xlnx_rel_v2021.1] = "73e8997d53c2137fdeea4331a73f40fa" LIC_FILES_CHKSUM[xlnx_rel_v2021.2] = 'ba23909a4bcaf754a2e1ba996f1ca1b0' LIC_FILES_CHKSUM[xlnx_rel_v2022.1] = 'e62cb7a722c4430999e0a55a7234035d' -LIC_FILES_CHKSUM[xlnx_rel_v2022.2-next] = 'ce611484168a6000bd35df68fc4f4290' +LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM[master-next] = '7b5fc0b2a22e2882e1506436b3293e5d' LIC_FILES_CHKSUM[master] = 'e62cb7a722c4430999e0a55a7234035d' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" -- cgit v1.2.3-54-g00ecf From 7009b62508816c4dc0c018ed2c512647e3e46b9a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 11 Oct 2022 08:47:58 -0700 Subject: xlnx-embeddedsw: Move PV to append It is possible for a recipe that uses this class to have a different version then ESW_VER. Instead of replacing the defined version, just append out git information. This ensures that PREFERRED_VERSION and other version specific behavior remain as intented. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 7a9b4686..13837a3e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -20,4 +20,4 @@ LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -PV = "${ESW_VER}+git${SRCPV}" +PV .= "+git${SRCPV}" -- cgit v1.2.3-54-g00ecf