From patchwork Wed Mar 8 13:49:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20592 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46DFDC64EC4 for ; Wed, 8 Mar 2023 13:49:51 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.7317.1678283381591127359 for ; Wed, 08 Mar 2023 05:49:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=R0MQzaui; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=24318e24f8=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 328AmgjX017287 for ; Wed, 8 Mar 2023 05:49:41 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=AjCPcaLgpQM4GuXPMeml0bz7w8G1t6cuyznMhp23dl4=; b=R0MQzauiwP1eYu6XSJ2A1bOA3qkW1X5UQaYPA5K5Mue38jXR197yMTkNDQnAQraTpx9s as3qUZcqIZD69HuCDnwCOPkVFQKYkDAgVIzTkgyynSS3g/sp5QAhnXS/c0qQTHG48HGt xAR1xvXiQFuRqtU7+jEFBJkc4mcXu0auwsJAahJiHXyDYcK2yW+X9bEeB4874KnJTzV/ 8iUMV+tf4kSM7PZK5UM02Y3Givk5Sk4enOvD/4uGR2JxpkIBASF7u41bW3pdLt2XAe45 mXKDIf8zi7Zz+pb+Pgu4qVLuvcJv4tEzzSxdMaOhNJoTbuKxpflvM0q4urxvv1OAuCC9 kw== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p6ffd0h59-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 08 Mar 2023 05:49:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tx+ovWnjicKjvEzE38vXWjdhytPai7i2gqc/Ns1vZkuJICpOsI5WyKHnr2jWwLFTkeZYIcVIk0JlfGY+Xrw84tOYHzeRBHOVY6ifx6n3GzfoAD1K7mwwZxDdbS4uqtE+pAABI0cLNk6Bzn0M2OEjpTkKbsGtUPezFo1e5BVN0Gq0cV5n3USsd2CAAl1AwAphF2bGfhUgzlr1lrS57RYAZgk9xDJ5KOGmdnR3MHVJUHeOQWW6ssom6L84iTpKiBVV7LWDD/UFGHDsmDL5JvUTQdKxJPmI0ka9fn/9/CSgfzzRBVvaGLmyLLF8Gj902KhYn67EssKSydc4d73zGddhTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AjCPcaLgpQM4GuXPMeml0bz7w8G1t6cuyznMhp23dl4=; b=NHvO22HK1uoqbuKZTCHfrzsFjezgE+tcoNxXBNOVFQnwbiZ9CdlgeP9BheaBn5DZfgZQ4Xl3xywFMk/OOfTjqspAP5cTVz1htKWhYw4OEzUTWT7NfrOrXlWao76B0Nzkc23jBaHbkmPoiP4H+I15oukrM0hmh0h0USFzE3Fe91X1ntaJgOdte7Ey2XszYNBfUJIVb86UwkEc3NXwxVkDIQOkKnRnVIKkLLktkcovp8gOkf5TBy4zGGuy1QRbgQdEck4u5HWzlszJw8dVHl8/0XFxVllPYEJvtua6p4MJ44kKp+1N1ole5i9APJ8V1CiyUMx3a8LPGsZOj6C5IS32cQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SJ0PR11MB4847.namprd11.prod.outlook.com (2603:10b6:a03:2d9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 13:49:35 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3%4]) with mapi id 15.20.6178.016; Wed, 8 Mar 2023 13:49:35 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 1/3] libyang: fix ptest Date: Wed, 8 Mar 2023 21:49:21 +0800 Message-Id: <20230308134923.783985-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SG2PR04CA0160.apcprd04.prod.outlook.com (2603:1096:4::22) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|SJ0PR11MB4847:EE_ X-MS-Office365-Filtering-Correlation-Id: e88e5ac3-2fc1-4188-9897-08db1fdbf3ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fx105ZUKcrab3/UULWSuMEhPk6sFMo2G0gNsjcC9zMpzf06w6xrIbu+dzKGSEzWds0mymWoW/BrFNahVPkoKeUb7ESknE2vUjDvQ3NXJ6uvTLJgksIhk/EI31CzlsQu4Tj5/mKS75erd+qcNrbtI5DJjfQDQ2iOinbTYY+ErC/AagU7qZG3Dd/yV5UEmrapE9sJULARq1Jkr5+YAEU/NSYViShxAsdCwmLx7YhiAkTBxxKr8kimdXuwm3yPJ5hvmOCPhVs9EKOLPZLYy2ztZzuYk7fRbGwCJrgHtHXO40EqqcmoZMz+PJHPx/zjR+t6X6/RRxcQvyAq2kI26mos7GQY5Z5SNB0djmaRQmTpRMK48ivFpxYwKYDLLXdfaDhdiS7D5LkSmmPFUMIWixKwfg8W5+Iou4xWVsob8E7zzv/noHUbWjbb8CJjYpRFg0y4SpfGMbf9BnKtbegm/pjcmVlI7hY0Wwdec76xWxk3JqLl7kEiwB/vCMv8JoJ0r74O08uf3ADTKKt7oVAUMZtdHXjg4aRpkmdXCwpUV3BCPC8QDDXkaft7wLr2c9ufcqKf8jOxG54hMLtuIR19L9KcqEWwuAI8IUpYKkDk7vL6cgEHvleDisXB7ZEIhzrSrx2IwmZpW6KNvAYOd4LQOJi7Zn1j9vf+bKbCAcqnDV+qpi8L9mZHIQsNUkS0M5d8hEdWNtjkU64JleHZ6luMcEo4m6g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(366004)(39850400004)(346002)(136003)(451199018)(66476007)(66946007)(66556008)(8676002)(44832011)(6916009)(2616005)(6666004)(6486002)(36756003)(5660300002)(52116002)(83380400001)(316002)(86362001)(8936002)(38100700002)(478600001)(38350700002)(186003)(2906002)(41300700001)(26005)(1076003)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qBy8TdFS4GQOjIn2a15nDV5Tg/OkqcB+T0nUSx8RrRkrMivUwjzWCmuWtRMJ9AE4bmFQTS7bgSPXRxZ2tQ12rBxG1X1RWnqRR49zi0xWAlZLkfzCg65h601qFr5opXtOimZmHRPq0iigH2wmmtS5j4tm9VzLxyIdwFy0IMGFt1HT43h2W4QUTJNfqzksbA4D/sKX8gw3DIoAeJmkqG4ADGLn3Gt2iaAMjC9pLzNyhUKSrcCrc/Wx3fpmOi+mn0T0bFn/fIziQb3g665uJ88ezb3yTv00mA+ydMmNnBDGdY+hjfOqM1DkXClLI+k662no63iIV+Ss6wdEU5dRWXQqIksq45oAHbvpq3J1UW3AzHdFY7LmwLYq1JfKVtwHzwYtDTpnSavwLX4c+QEKBcSjopz0/ZbiKnbACzN8S7a8CZjvtHg2JhgoTPxYKP08RKB0C1EJ0f953Rv8JZpQPHnUNC2ifclyZtP5WYcsjGVFLGoArnI0c72esze3MDZLgMb7Q2Rcu4UvNyikSF/zUJRuqdQrroUycsaLGUWB7Bf3P2ITogZXgKcyowVuoTTmODCV8yee2rRu7pywU9ejg+aN1LBVlPPwwkC5VMsylpEaYhkP4VyPxxjPy2vHw1sk2HRETu4kNmJ/PLVnzFdKGpf3R9pxL7VNN/1ZiaAOWfPWTFBGWvzgjtuYKaZvWtyWF3uIuBzM7jllaxVBxHCN2PLZlsWeRUzae7a2uCCxBnpb7IZk507dJ6yn6KUXv7hv8rzfHoEPoNEwgy69okM/yohaTOw0g4ilPOmIDDwaueD4CRNHdx6uejIROps7Lf9P7hr3rWEua2h25sGsDwe4n+hjsPToyhjo4nC+b4CPGnmSl2nMrxlwpelSTueeuaGD/+C3q79z7JBePvyqchkRZ5PaQXpBVywdFglQ+ak8XUY0twTSpQlB5wS6l697hzTR4pnWIrIIwIjHX5bCvEdPRUijTapvYSj8NFdYixEmOF1w+Z7QBbTR2OTdwiZskJavWMiV/s22WpgZAX30rMr+/N4GgtFMAao74laJ6cLUfMhS3l3uj+uTE+Iy/Kvdk8RsIz5ljcQn0aLaHKA6+FDBf8x1Sc+e8C90Wh4TB0IVx09SlLy6MSzPaqTrzYwCEQYofCI4YOov1wkn85LVeZUPyD+MnrqaH+By91ZyHXFMMkaBZUWKfroXwHCG4lr700Q5YgRXLMMR44zAjldzJxM9Eaq64wAGcse6kBNJphy+bhnAEccdt8HhZS1f8Qca8cjAagfPkYDsAXYAtAWxuZIV5++1Pqg98tCX1AXGWNMO0B4YM5RxM+4VZj3L8/8DlROh08T43Hb4nyriKZQYkVNSfn6iWJ8ECL37fJFr0roS1GNLYg/QGBvrS0VKsHl1kVyokKnLWOW3fv94gKKLDVGCPE0P0JS99S/QChlIiQBbuMI+9tWwAOdKm69M4UxVJeMoTVvA96RNDx9VWHQUEW+tsbx+Zdjy+p/zXaZJpwEIxvMeODc/7I5GEoPDDqdC/tZ7YufgJI/sJo4ZXq8WEJhFmwcBOOKhlz4VB4EP7v0z4Z9h8B7KAoYzQlXEG2Pxlwh04o09 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e88e5ac3-2fc1-4188-9897-08db1fdbf3ee X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 13:49:35.5731 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wW4cnsMSFeCtcktXnkPR5SIMIkN0l8lDTpkr7jtRrQgPmkNkz3Gg7xj/HlA8Lg3YULA+dNmVEKctRpvEC7anNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4847 X-Proofpoint-GUID: XQuBnC5vw2cKXXTav1JJibFzw4TGe5VZ X-Proofpoint-ORIG-GUID: XQuBnC5vw2cKXXTav1JJibFzw4TGe5VZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-08_08,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 malwarescore=0 clxscore=1015 phishscore=0 priorityscore=1501 spamscore=0 mlxlogscore=983 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303080118 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 13:49:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101422 * Disable valgrind tests to get rid of valgrind runtime dependency. Then libyang can support more arches. * Only copy test cases to ptest directory, not the entire build directory. * Fix buildpaths issue for test cases. * Update ptest cases list Result: $ ptest-runner libyang START: ptest-runner 2023-03-08T07:10 BEGIN: /usr/lib/libyang/ptest PASS: utest_binary PASS: utest_bits PASS: utest_boolean PASS: utest_common PASS: utest_decimal64 PASS: utest_diff PASS: utest_empty PASS: utest_enumeration PASS: utest_hash_table PASS: utest_identityref PASS: utest_inet_types PASS: utest_inout PASS: utest_instanceid PASS: utest_int16 PASS: utest_int32 PASS: utest_int64 PASS: utest_int8 PASS: utest_json PASS: utest_leafref PASS: utest_list PASS: utest_lyb PASS: utest_merge PASS: utest_metadata PASS: utest_nacm PASS: utest_new PASS: utest_parser_json PASS: utest_parser_xml PASS: utest_parser_yang PASS: utest_parser_yin PASS: utest_pattern PASS: utest_printer_tree PASS: utest_printer_xml PASS: utest_printer_yang PASS: utest_printer_yin PASS: utest_plugins PASS: utest_range PASS: utest_schema PASS: utest_schema_mount PASS: utest_set PASS: utest_string PASS: utest_tree_data PASS: utest_tree_schema_compile PASS: utest_uint16 PASS: utest_uint32 PASS: utest_uint64 PASS: utest_uint8 PASS: utest_union PASS: utest_validation PASS: utest_xml PASS: utest_xpath PASS: utest_yangdata PASS: utest_yang_types PASS: utest_yanglib DURATION: 12 END: /usr/lib/libyang/ptest 2023-03-08T07:10 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Yi Zhao --- .../libyang/libyang/run-ptest | 29 ++++++++++++++++++- .../libyang/libyang_2.0.194.bb | 24 ++++++++------- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-oe/recipes-extended/libyang/libyang/run-ptest index 1c9f8f47f..4517725b4 100644 --- a/meta-oe/recipes-extended/libyang/libyang/run-ptest +++ b/meta-oe/recipes-extended/libyang/libyang/run-ptest @@ -2,28 +2,55 @@ # Valid tests to run tests="utest_binary \ utest_bits \ + utest_boolean \ utest_common \ + utest_decimal64 \ + utest_diff \ + utest_empty \ + utest_enumeration \ utest_hash_table \ + utest_identityref \ utest_inet_types \ + utest_inout \ + utest_instanceid \ + utest_int16 \ + utest_int32 \ + utest_int64 \ utest_int8 \ utest_json \ + utest_leafref \ utest_list \ + utest_lyb \ utest_merge \ utest_metadata \ + utest_nacm \ + utest_new \ + utest_parser_json \ + utest_parser_xml \ utest_parser_yang \ utest_parser_yin \ utest_pattern \ + utest_printer_tree \ + utest_printer_xml \ utest_printer_yang \ utest_printer_yin \ + utest_plugins \ utest_range \ utest_schema \ + utest_schema_mount \ utest_set \ utest_string \ utest_tree_data \ utest_tree_schema_compile \ - utest_types \ + utest_uint16 \ + utest_uint32 \ + utest_uint64 \ + utest_uint8 \ + utest_union \ + utest_validation \ utest_xml \ utest_xpath \ + utest_yangdata \ utest_yang_types \ utest_yanglib" diff --git a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb b/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb index 548dcdd2f..16630a715 100644 --- a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb +++ b/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb @@ -15,23 +15,25 @@ SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ S = "${WORKDIR}/git" -# Due to valgrind not supported on these arches: -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:armv5 = "null" -COMPATIBLE_HOST:riscv64 = "null" - # Main dependencies inherit cmake pkgconfig lib_package ptest DEPENDS = "libpcre2" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" -# Ptest dependencies -RDEPENDS:${PN}-ptest += "valgrind" - EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" -EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON', '', d)}" +EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF', '', d)}" -do_install_ptest () { - cp -fR ${B}/tests/ ${D}${PTEST_PATH}/ +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/tests/tests_config.h + fi } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/utest_* ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/tests/modules ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/plugins + cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ +} From patchwork Wed Mar 8 13:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5070AC6FD20 for ; Wed, 8 Mar 2023 13:49:51 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.7316.1678283381042760524 for ; Wed, 08 Mar 2023 05:49:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=RQMb9cWF; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=24318e24f8=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 328AmgjW017287 for ; Wed, 8 Mar 2023 05:49:40 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=NBQ0ofjLZsoitUT+nm+wbeVtV2iEQicIhQE0rlPiU2Q=; b=RQMb9cWFH/NOu/L1LuzBSue+EYanr3CmZcdBXLEUhnCkNl/0QqzvxlXKXQh8CdslZpvp pfDZaVc+ZjFYQWxExOTVyjdhHKuBK2RJHpYvjaqR3eI8ciuFl6D8bmM2zVj6n8cwyj8c 8rFxhwiSn5IhV3ARcoKA+5NOww9qYEFw9uJHMdN997F7Nm3Pu3m6YjyQrnPBYRVyrVaz zP45T44o7zNx+eg8ewOb9wahlhIb/PsHBQ5DrRmcL9pFVtqrnYXVjUNGYAbX1d4G4AJa gwzY9VrXdOsqVDSNzd2RLChNIXwP6cHbKaACCWRsVO0rP4ggw5bRqcwtqtuvJt/yDuYG sw== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p6ffd0h59-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 08 Mar 2023 05:49:40 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DmQybejAn7NmZvhO2/35HiWXheJX8kKOOZWHYVDdpEZGodnu816fOAM3KIsfQGV2xOhl5eGfoksq5sm91bCC5ZsFBWumvr9U2aYVrB46c5MdYfS1bRBiu2cf9H4eXqt7mFJkT0ElxfdOXxk1EKdksnmOEGkASfcNstzN+4+xRAMyd4yA7pTmx0jmLglOlBumh26kvVGMPudhEzayJXUtbk9MO78HB0mTmiTscDIsmhiC1lPbka1KRYRzaETO5wXO6ZSHxt+ynBQT69s+Kyqtav3SBwUHGZ4yP27dsMaptGUkcHJAFoII0XZ0p4B8n55l26jg2L8Lsvs3idv1UL+dDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NBQ0ofjLZsoitUT+nm+wbeVtV2iEQicIhQE0rlPiU2Q=; b=hu5jwFR78HnUVEssxlcVcjVyT/pq7Jfeaj5iu7fsDKqTOh8czde1c3I7qyyjvR2eburvBioCIWlSmTMzPU2RFPCfSQUos/YNnsFALZZPlYoLxrcL1bc+s5xoM6mNyGFo37y3Ob3f8zmaAsiq/yREKS+aGTc1qrKQLLrtUPP1kqic2FNkkz1JLvbWo9krYO6k34U3Nf6NpdwqnTY7OoEOvupqG8quauHgb2bDuW2NmCmbepiwp6k6D+4mSyNdsHk4lBGTN1TxkX6dAzXStP5U+2ZAq6yHweXI/a5YWtsU2PrdYwsHzeDu9NjIbNe1jJ21jeR62zq+4eoOXNXZC4oy6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SJ0PR11MB4847.namprd11.prod.outlook.com (2603:10b6:a03:2d9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 13:49:36 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3%4]) with mapi id 15.20.6178.016; Wed, 8 Mar 2023 13:49:36 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-oe][PATCH 2/3] libyang: upgrade 2.0.194 -> 2.1.30 Date: Wed, 8 Mar 2023 21:49:22 +0800 Message-Id: <20230308134923.783985-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230308134923.783985-1-yi.zhao@windriver.com> References: <20230308134923.783985-1-yi.zhao@windriver.com> X-ClientProxiedBy: SG2PR04CA0160.apcprd04.prod.outlook.com (2603:1096:4::22) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|SJ0PR11MB4847:EE_ X-MS-Office365-Filtering-Correlation-Id: e0fbdd39-3dc2-4852-ed00-08db1fdbf4aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LXNfMvKsnBBfOK1ASkQGjXVRUKft90xKH9NCMXAKQ80iQcBfmdybF/lSjgzlH+v+igzDN8ij2EcXPWdss44JWWNnOL33sMUEPGL8eVtxBTbpYmz28t9BGCja8QBRm0I+88k0V5mDeeNl5Nw94nt6mdqkakDuFeu8PjHDgflmt/RLVSk2oN1CBfKuYXU0tytLT88eHtgSlyxTCKWZqTfVIM/IIUBeYV6QFExzoIbK/d+gzRrEIbfmiESOyTr463ZpYMwGWzlvwp2J+70YrVeUqKEKbjztu82vrPFzimVNZSyfv2yaZ0DdnvfOz9peTmLqY1hxMiMro1O/ZelzhuN/0Vku0PsxweVb+fToVuhuW3d7BOTvtvaUkoLcdaNl1DUXAfLAPbeGDF3EgANEMWfy/UDFJnDDQaIKOjMwpMm9QWuurHA+n1SyuNtzeL0rSN8acaImwmVkvrnRIuudhGdh5/JhEcB5Jlab4GVcl9+WMeLRMs/Iy14r+rEeWkV0noFPHT9GpREELmpPyUCZfHB0Nq5DNIxi1e9tdOh3pjrMGT/EuNk7VTBUW2SYVMVsfP7hedkl4zfOUmsfOykrEP5BKMB1YeSuJxHE2hGVkx+nPC1w9A1tJR9YhXn3fcikpJ4Ll9tErQEHtWBQtDslGOnw/o5oNJfjOYo2PaXfyPRGVP+S/j8pKu4Db9TXp266xzAR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(366004)(39850400004)(346002)(136003)(451199018)(66476007)(66946007)(66556008)(8676002)(44832011)(6916009)(2616005)(6666004)(966005)(6486002)(36756003)(5660300002)(52116002)(83380400001)(316002)(86362001)(8936002)(38100700002)(478600001)(38350700002)(186003)(2906002)(41300700001)(26005)(1076003)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SHiTA5RaTK5QKW5Ek6y4cyHY8wMAhIPQtqeiWN9mtaTj8XH6ybo+mczZ6c9Uzh7k75rLYChSESgUWIn31Cl/mMl38LWPWvKmZ+A6sq3AA5hSs6Qq0XHXCK9hazm8ej8w4dPbdh7tr6P+xD6cDiaBA0wIMFQ89DJVSvPHO/2QXKuSCp3EgybhrDyWDvoLSh+KN5mdX26gv6UhQ4a+TX4jZrwLmt/sUvLi1yFqXQ2vQ0EvhJqgPJmg/KewF7qpPQZXVyIrK6r5EN+AVvr0jiWZuQzSlMGFtAb5jFPoMnwWu5M+gNNYeKxUTXWlbV4VPbjZgoG4E84e1NUir5AX2jsQCYNAcm24l4mM3Ewj2PF8IHAlKmiQHBxsOW21xqB3S840JbKEmRj4YgFU8nQYaVSRNTl08RJi62pWIbrs5te3WZOeS72ix/MuqrM2r2OQ6N6o8rL2UzMSsM73Kd3ObaiSVdu7v1OAxQYmj/GSGQZj7sJkfsPrhoEOgJIxdg0DzktXHm3QD1Eko4bNuOH43C9tsDWkrp4FctRGCFfB/iFqITWguVGGWeklCJhmtfiTk1yZVK09FebxwWjv66jBzfGJ9TxpdCXzesuYXwwrAtBiPobaYd075NIqXXGDNsUgrkb3zdisbv9BPCAl7+0XWdpaJBlQhekUfGi2GmT/5453ervtiaub2cT0GFofzXrgWZRJHYQqay++E2kJZVV+m0s53dbj5G0d4iNBBQ7pEVcR6FIG5NIxpkkCJGZSLRzkNl1vYrZ2lq2YdKcvrSvi2xhzLfToQmiC8TS34Lkp4QYIVg04y2+zA0gEUscUh4hBNobhYly2v1US4lbb5WGxrFrWayoiwl0r67FrcA8zS48YPTz5+TZ8Ny3crRCuz7NCR6DevDdUbZKIDe+jGE6EZ0WLCVeG764mCP/qkBgMdrFfZCAUYOch4YPtL/0xKYbVccClvIYpe9B4KDpLhCGOObZ/QFSz9+DyVEGzaSJ1oLGhotgED4Qn0vl7XRKGUZqWao3x8mxBvGsd/SIWohkvqr2BpU9yj8TYi5n1e83PuSrOHjWav4fjYx9u+oUrBdw+OjZOT/wHiMn+vBEjV0BiiLZkQ1E8wBtqahEkfL31N+hcS39g7XrTeGwbQhoCwjG2gcYMXmUqs+SfjK3y7f4lhsWmR2afNV+VHQD851k2iiONHFlJFjAZiGWFkDpCEJLTxNhShLtRVVhSAqunuiXM3mm/1Kh/jSzSstggkyiQi3/suvPHTmZthVJIu7QeG/+M6rWXKhTGwhj5BzU4vPnNGHqL8ynNyXWCuZ1MCckdVvp1ikSIrPS5wv0Gb8CEAUgSV8Mz6PZRA86DxCuS9xG9urba1qPvIqRb/QewkN4n7llykGhZ7xls7FQ0zNe+Vo5kfHv9YDqMPKVSEuA83Ii9loDvHpi5hyz0sEcbApqdfh62UW7D9QiKTGAY/nGI/PDahYtMLo6WRTSVN9hnFpmlmlWZS7BmygjyNlTGS0y+LhOVzj3LpKpycoiY9XZJN68U/5leIgbdwcDpEkY3E+CsvGPNhJTOUw8B6DTJr6bBJFLoqoFvD8g/I4cv/RKmFHn+ERRXhK/me/6THadUBuVVff3Isw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0fbdd39-3dc2-4852-ed00-08db1fdbf4aa X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 13:49:36.7916 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Hd7bI/X8DDvEWp2+hMSSlTmdfOlIzXLlXQyzwMCIaVCMxhfz9d6ebkompEvT0j/bNKfKId/ouYMxakdIuw1zdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4847 X-Proofpoint-GUID: aZX1moYlU_AorynalPycVz98KsMqBERN X-Proofpoint-ORIG-GUID: aZX1moYlU_AorynalPycVz98KsMqBERN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-08_08,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 malwarescore=0 clxscore=1015 phishscore=0 priorityscore=1501 spamscore=0 mlxlogscore=956 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303080118 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 13:49:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101421 * Drop local patch that has been merged upstream. * Update ptest cases list. Ptest Result: $ ptest-runner libyang START: ptest-runner 2023-03-08T08:25 BEGIN: /usr/lib/libyang/ptest PASS: utest_binary PASS: utest_bits PASS: utest_boolean PASS: utest_common PASS: utest_decimal64 PASS: utest_diff PASS: utest_empty PASS: utest_enumeration PASS: utest_hash_table PASS: utest_identityref PASS: utest_inet_types PASS: utest_inout PASS: utest_instanceid PASS: utest_instanceid_keys PASS: utest_int16 PASS: utest_int32 PASS: utest_int64 PASS: utest_int8 PASS: utest_json PASS: utest_leafref PASS: utest_list PASS: utest_lyb PASS: utest_merge PASS: utest_metadata PASS: utest_nacm PASS: utest_new PASS: utest_parser_json PASS: utest_parser_xml PASS: utest_pattern PASS: utest_printer_tree PASS: utest_printer_xml PASS: utest_plugins PASS: utest_range PASS: utest_schema PASS: utest_schema_mount PASS: utest_set PASS: utest_string PASS: utest_structure PASS: utest_tree_data PASS: utest_tree_schema_compile PASS: utest_uint16 PASS: utest_uint32 PASS: utest_uint64 PASS: utest_uint8 PASS: utest_union PASS: utest_validation PASS: utest_xml PASS: utest_xpath PASS: utest_yang PASS: utest_yangdata PASS: utest_yang_types PASS: utest_yanglib PASS: utest_yin DURATION: 11 END: /usr/lib/libyang/ptest 2023-03-08T08:26 STOP: ptest-runner TOTAL: 1 FAIL: 0 Signed-off-by: Yi Zhao --- .../libyang/libyang-add-stdint-h.patch | 35 ------------------- .../libyang/libyang/run-ptest | 10 +++--- .../{libyang_2.0.194.bb => libyang_2.1.30.bb} | 5 +-- 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch rename meta-oe/recipes-extended/libyang/{libyang_2.0.194.bb => libyang_2.1.30.bb} (92%) diff --git a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch b/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch deleted file mode 100644 index d35741114..000000000 --- a/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001 -From: Tony Tascioglu -Date: Mon, 21 Jun 2021 12:34:22 -0400 -Subject: [PATCH] libyang: fix initial build errors - -This patch addresses build errors seen when integrating libyang as a -recipe. - -There is a missing include statement for stdint.h in utests.h which -causes build problems. stdint.h is required to be imported by cmocka.h -prior to the cmocka file. Adding the stdint allows it to build the -tests correctly - -Upstream-Status: Submitted [ https://github.com/CESNET/libyang/pull/1819 ] - -Signed-off-by: Tony Tascioglu -Signed-off-by: Randy MacLeod ---- - tests/utests/utests.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/utests/utests.h b/tests/utests/utests.h -index 7e85a66e..8eee26ce 100644 ---- a/tests/utests/utests.h -+++ b/tests/utests/utests.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - --- -2.32.0 diff --git a/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-oe/recipes-extended/libyang/libyang/run-ptest index 4517725b4..9682540e2 100644 --- a/meta-oe/recipes-extended/libyang/libyang/run-ptest +++ b/meta-oe/recipes-extended/libyang/libyang/run-ptest @@ -13,6 +13,7 @@ tests="utest_binary \ utest_inet_types \ utest_inout \ utest_instanceid \ + utest_instanceid_keys \ utest_int16 \ utest_int32 \ utest_int64 \ @@ -27,19 +28,16 @@ tests="utest_binary \ utest_new \ utest_parser_json \ utest_parser_xml \ - utest_parser_yang \ - utest_parser_yin \ utest_pattern \ utest_printer_tree \ utest_printer_xml \ - utest_printer_yang \ - utest_printer_yin \ utest_plugins \ utest_range \ utest_schema \ utest_schema_mount \ utest_set \ utest_string \ + utest_structure \ utest_tree_data \ utest_tree_schema_compile \ utest_uint16 \ @@ -50,9 +48,11 @@ tests="utest_binary \ utest_validation \ utest_xml \ utest_xpath \ + utest_yang \ utest_yangdata \ utest_yang_types \ - utest_yanglib" + utest_yanglib \ + utest_yin" # cd into right directory ptestdir=$(dirname "$(readlink -f "$0")") diff --git a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb b/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb similarity index 92% rename from meta-oe/recipes-extended/libyang/libyang_2.0.194.bb rename to meta-oe/recipes-extended/libyang/libyang_2.1.30.bb index 16630a715..5adfc1d80 100644 --- a/meta-oe/recipes-extended/libyang/libyang_2.0.194.bb +++ b/meta-oe/recipes-extended/libyang/libyang_2.1.30.bb @@ -6,10 +6,9 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "87375f15159545a87a1e0de200f5d9d67e9091d7" +SRCREV = "35131b9396a965e01f899127763fb4e0871b845a" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ - file://libyang-add-stdint-h.patch \ file://run-ptest \ " @@ -37,3 +36,5 @@ do_install_ptest () { install -d ${D}${PTEST_PATH}/tests/plugins cp -f ${B}/tests/plugins/plugin_*.so ${D}${PTEST_PATH}/tests/plugins/ } + +FILES:${PN} += "${datadir}/yang/*" From patchwork Wed Mar 8 13:49:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 20593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54E5EC678D5 for ; Wed, 8 Mar 2023 13:49:51 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.7319.1678283382213446801 for ; Wed, 08 Mar 2023 05:49:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=JwgAcBBW; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=24318e24f8=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 328AmgjY017287 for ; Wed, 8 Mar 2023 05:49:42 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=BYEAPUX/Y12rNFyV+N0vYcNZHy6HADhWM1InC02kHSc=; b=JwgAcBBWmiJ/u9tEbS2ppxnxAvNMvvUFZ4CxpD6F/f2OXYWur5EISupCggj7zGmLWuO2 w+ANKQpeRcUMfzRrWDr4ZpJl0YNepNorC8PjeckhQ/IGLGkKe/GxkubFJTHykKkiK5XV aatK1oC/Ssk/XTc3UnGpkzgqIUFBVizhnbCHvyaXk34/f70GxGmxCtrJrYMXdnlYTlMt eRWQAgWWlulMKhO1iTORiSM2KmG/9M6ZB8rWQ6CN83S2SFAdIJxhe5aKUAJ+es1ivw7p JykuLE/OtqCh63rTUM6AX6BV77WElAQAfbAhXKO7zx2duoeBKzNaDYUf20QwSwicER70 gw== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3p6ffd0h59-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 08 Mar 2023 05:49:41 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g0vj8Zc3oqQGJ+et7337GUtBwXL+vUx4a5jOYrd+re9U77bU/H74EGMD+rmlGBYq1DII00uphjd8QaCxMnTczBVs3X3QP5oItTQ6UZu8ZMFMgQ0uYfgVGKmrBbPyYdC1x3iuxpUBWk3oHfn3bmgScSOuywmp+uK7/ar2fPy9YnFyvE3u2BecEgaTzjsV/3ROQD592U5d0CSiagJs1y4Z0h4dw62jzCwzHKh4hXq1nd5qNpghu/6OKZTxFsfg5/jBA1LBJbNtSqILefnLcGKNfXa4w+QL/tguhkO5kOanCdk4jwwFEgtF3Z0b49eTlEvL0B6VIwnSRuXEt0/sbFHvgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BYEAPUX/Y12rNFyV+N0vYcNZHy6HADhWM1InC02kHSc=; b=ayjJks20aY8CYa2cXlv2jTbgWrfPmo+PJJJuKpm/4TTmtvrrVmADFvO+o0RRqqyLra6CFTGjgJI34sNDmWEQJipTrY+3aa0dAxE/XUrYqYRtYteLpkjZn2BK8tjnQ7rZISAhUKyoUNbJAJeSqpvrVeDHoxgwnkfwTeyWnCGTGnQrLRsXI2hUPF4PdHFXqc38rE0ceITc62jT/ZlHhwnfLIXxTCLyycrt53tTTX2BsTXwKsyYkNDDGgiEieYJXTX1v08m5LcHvFb+nrGgvUx486SQpCn4MQIxkhLo1uhzYizvwPsFQS5aqsUffpihratNXuZAsueSsqyfo7R5lPSgog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by SJ0PR11MB4847.namprd11.prod.outlook.com (2603:10b6:a03:2d9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Wed, 8 Mar 2023 13:49:38 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::42a3:f515:f89b:4eb3%4]) with mapi id 15.20.6178.016; Wed, 8 Mar 2023 13:49:38 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/3] frr: support more arches Date: Wed, 8 Mar 2023 21:49:23 +0800 Message-Id: <20230308134923.783985-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230308134923.783985-1-yi.zhao@windriver.com> References: <20230308134923.783985-1-yi.zhao@windriver.com> X-ClientProxiedBy: SG2PR04CA0160.apcprd04.prod.outlook.com (2603:1096:4::22) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PR11MB4867:EE_|SJ0PR11MB4847:EE_ X-MS-Office365-Filtering-Correlation-Id: 06930053-11e6-4490-f03c-08db1fdbf55f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TfUmgWiSct9n463H+Y1rqNpcLCRUDhnJ2cNuEb2lULesV/eQTu32iYT4ADg9Vv/pmJp0JCvCGmkF5HDcyv640H/hnl7WoDc5jCRvwfpiHA3T6+mM09sRlN2BL7vKg3eNSSBzzc4C/3mrxwhqVBZdzWfMhHnkLwR1vBHz8ERzygDP/GDYdU2G/g+85eXXElbtOBa3rSa0ZzXCaD0z6Q9MV4VDVPHL+TfLyZ7M5kLyxJ9TCW9EzDRNqwumd0G0UdH1CxIhpETv7X0to8ftmHhWj2cEpAilrkqdmMOa66tcmLMAE7aWDkBRkprvk/+/j9nk3osohJWgEkD9k4HZwVkuLvq9lbk0AudvJGKNywq4F62gpqZy0F0YGbPuerksTQQ+8sACiQFgLYByh8T6jOROn5bT5n48SeuDsoJQ6nhWZpJCLZTZsXeeEEm1gHyxa5Lppu1H0fvqHqS6CsH0fMY5LZiOxvkcw3eQm5rubLwz7tYB/jExbnUz9BDWEj0myzRfUydmlg5q+c419SZFCpMnwzpTui1RbNQxGMv8y2CpulViMMtYOXs1x9yOj8LNMb4WzPow3cCwhw5uHXEF8OdRiypA6sdgEnXhlAGdKODxJ5V65PmXQdd8k3O3klVNOTseok7gJUiLizzNGQsLxOMoui2Lf/cgRIjWalg08MMyEMDWOoLc0e0YMyGSXaTuG7tq0hLPFbKJl4OlGKlqRhAYcA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(366004)(39850400004)(346002)(136003)(451199018)(66476007)(66946007)(66556008)(8676002)(44832011)(6916009)(2616005)(6666004)(6486002)(36756003)(5660300002)(52116002)(83380400001)(316002)(86362001)(8936002)(38100700002)(478600001)(38350700002)(186003)(2906002)(41300700001)(26005)(1076003)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3CC+19M4H0h5skxTQpiBOxz6+RpvfB9PX/SFaVHInWXsp1YqCfFW3gSOW/SusZ7D0Oz1QZ89U18HG6s40yuydi6Y95f/Q1Rm1XO51AGpEMf7wol79BsVZl+D6HH15CmXaLZquWHOO8Q8+HufeUICRaLz4+DO5nm/zaGYDjsDno2BI8mT7KbOMND98M9T0TlpdRqWBykgjgL4mzbgYm2Ms7Agn1TjUXrcIlWB5rVTSJ8jOxSya8UE5N1P3rA53Z07MQJttZbj8VFkqRIm/36aOYDQ5a5cWwKlB1M6Q6aUo4Y8uENlePphSHygEAsWDZMPyvMoujExbFQpC7ehE2Ssd1YHiqueIkWMaJ+Jdf27sKD0q4QeUx1rNKT1YBFKc8IQoHTutQLkxd+Vw5ZQh+55oVXB9q8agmY+buRVZX56fjbwDifep2c0/jlZ6A/wFX+2ddH+SfJQsBFEkFLIQqinys7EFn4p7BOyurcCqopd3mpTf5dIhx2EhVaZPP0Gro4VUUzfBck95iA2S9VuhipTxNO0b6CFd+V/QkTSWWLIVtC5R7O/JiJlHPhNQVgxkqEibHZzy4QF/ivbMstaXkHsK7ba2xfg+BQ9GvBVwG+csupYyY4P4UAsEE+Io3OJdP2xdzdbHZja75XIHtrJ7DLzXjDvaRHgpPvV5RYn7ISfPe1uA9GhRlnRcsw5BIUtLgaRjjCkhHdPUefNsDI6b3gK7cAu3ui5N4iNDF0G8lzfCISsVadE6lmjhfB1zjaA9ueQ4jtrN7vlq/S11tjvC9bc8yh1rLNAtjYVuBAudjtGJuz/l9AGUr0bjKYon3mBa3GbXknPdlYUSUEwSNHMGHgw6H1kul4p5vK4acY1kj3k3mDgrCu2GoWIFsq4kZuxHo0bocEjJ/MASNilDpusMlGnt/jxliQnBZkTpEae+Kzw5SMv0DrnQBxBKZt8oxvS62AFz92+3DX7IB65kK403ZSlgsoC1w9hK3F8m0Q9wRMzU4U839U/KGY3nU9vE4fbncZEZclboxdLYzpDJWy8FSbEOxytDOk3Run17q+ZgTrusoaNdcwstdQqy5EOvHXsLj8DchNnLITDeaQInHTWqZkSOFei3C/u/o19E3eSMlyS+OEyq3ENYxJqc9wBxgyUqDexQ31HSpIJG6283mccIV/c97g8U7leMghqEiKYGJra6uwtmhZU0OrukgmvIZCOUoXgkWr7nTBFrbq6T1lw9VCM7SZWtn1LDtIsIPpTmXXzuSYZ2ekUhccBwWK+20CuoTISUx2OFkNaSvN3UXNqX6fR7oocjLvIno69RWwJQ5za4ya8OKUH5Myp7ZH26R0GiYOmw7h0jetpS41iTcZgBZtbc7nPJN3nOssoezqEObX9eM1lFiXkHIbFyiCM0LtmsUISZSLnf9x7/oESNUgj9KgD/stSH66At/GhgPtUOVAH2yikWaAGpzVTMLnMk2EKs2zvSy8th8t2yfcFUms56BH4A5TqszJdCLSHm4MNEr+yx1WFJqdWTiO7HJWsHifKo6A846LJFL2bS2pfkO97bcQoBdzK6YzVP+tUpULi4X3aiJnh6bofAmyf8xoqdYXnXb38ypsjdQg3pHMx/0WE2KSv5A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06930053-11e6-4490-f03c-08db1fdbf55f X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 13:49:38.1341 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3fTTUfkkooOb94fLl3f07ELf6ISC0E4rBdMZGbffqYpzpTGQUGRkUS7EPPjnWtQ+IWhFXvrCseHwEzzGp3jI8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4847 X-Proofpoint-GUID: JQlUm8XuGvSCefHg9nqWHw_0bY_2NdcN X-Proofpoint-ORIG-GUID: JQlUm8XuGvSCefHg9nqWHw_0bY_2NdcN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-08_08,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 malwarescore=0 clxscore=1015 phishscore=0 priorityscore=1501 spamscore=0 mlxlogscore=546 mlxscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303080118 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 13:49:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101423 Now frr can support more arches as libyang can be built on all arches. Signed-off-by: Yi Zhao --- meta-networking/recipes-protocols/frr/frr_8.4.2.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-networking/recipes-protocols/frr/frr_8.4.2.bb b/meta-networking/recipes-protocols/frr/frr_8.4.2.bb index e5082e2e6..d01d895a8 100644 --- a/meta-networking/recipes-protocols/frr/frr_8.4.2.bb +++ b/meta-networking/recipes-protocols/frr/frr_8.4.2.bb @@ -20,15 +20,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$" S = "${WORKDIR}/git" -# Due to libyang not supported on these arches: -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:armv5 = "null" - -# Fail to build on mips64 with error: -# Error: PC-relative reference to a different section -COMPATIBLE_HOST:mips64 = "null" - inherit autotools-brokensep python3native pkgconfig useradd systemd DEPENDS:class-native = "bison-native elfutils-native" @@ -71,6 +62,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" LDFLAGS:append:mips = " -latomic" LDFLAGS:append:mipsel = " -latomic" LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service"