From patchwork Sat Apr 13 06:06:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 42297 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 711CBC04FF6 for ; Sat, 13 Apr 2024 06:07:06 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.5642.1712988416874573401 for ; Fri, 12 Apr 2024 23:06:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=U8g83UUr; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1e4bf0b3e06so15594865ad.1 for ; Fri, 12 Apr 2024 23:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712988416; x=1713593216; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kK1pL04xJIbAIzeREzIyLls8CZysSWAYT/KhYIS96Yc=; b=U8g83UUrRwX05DLEu3KIMgBExL8GwIyb7gFRaOHdiADO1J+Rs8etIUoyEcXXNQdU5O t0oiPk9+OSjtbl+iwwmX8lRR7JPMS/cNJP1bUR+Z5qIwuZI1c3D4i0kbrOqaYgvZGJ9O ENJq14VO+DuU4GZYwl2W5YA/+ygoOu7PTZnw+nN3tyMu0xI7TChz2bZGORe/Ycr3VqOO NB5DUeteoiXF4i/fY0yTCnEgvzIcrFIfW1DxpbQAFEYIdDBHcoYT2y/D62wgQRNT/Nb6 hYJV8RDG3ikiiUPc/ZvgVmaNkhbhNmsLbQZiUuG+vtIe3BBFUrNzNScLc2mdqb0VZ6ig vhWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712988416; x=1713593216; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kK1pL04xJIbAIzeREzIyLls8CZysSWAYT/KhYIS96Yc=; b=RMH0KpSB+9oAzkT5YMWcwHh/LJ3Ex5JtZKEasHkQxnU8p2JANdClRK0WoRM+j1s5Vj gfoMXWhzomk28SEC0WeFVlxtEm6I8RyfY7wP/1HimG2hfE3TSnvQnSfd5XWwQoIdKRgl 6bTWI9CYs+qR5+V0S16jgndndwUmQfsjsGO9+wvjkKGz7w4s36oqhuY/1xpitaoUfzhD S6bcJ3teV7JgGZqInDVIjZjRzUYMba3huXPVflvrn59Cfs+taBuapO2NlUkTjl0QCptp 8IP8kVf9PF6HqeF7bjoKjtaN8dDT0hDeyyGC3xygJBWtgHtgLp1ofVxgs5qYtCDAGqny nzKQ== X-Gm-Message-State: AOJu0YwYtfYLMY0HFwaL2PPDf3f/863HYOt7gIl9uecIzCYZnXZfvil+ yoAHPF9Z7BPWZW4bwpAx9z+1AUXeOWKHBd8d7qDohp9EKwu+EieM5zMlOcl+ X-Google-Smtp-Source: AGHT+IES2FxXggxOY+m41SVnz3UhxeP8tGbLn0LnKPTNWUXSYF3Vtpz648PWS6q/6a1pKb7aXGdQTA== X-Received: by 2002:a17:903:184:b0:1e4:3f8c:93ec with SMTP id z4-20020a170903018400b001e43f8c93ecmr5673211plg.60.1712988415835; Fri, 12 Apr 2024 23:06:55 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::d35b]) by smtp.gmail.com with ESMTPSA id ju17-20020a170903429100b001e49428f313sm3953366plb.261.2024.04.12.23.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:06:55 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/4] unixodbc: Upgrade to 2.3.12 Date: Fri, 12 Apr 2024 23:06:50 -0700 Message-ID: <20240413060653.2147909-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 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 ; Sat, 13 Apr 2024 06:07:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109945 Brings Fix iconv handle leak with pooling Add windows encoding patch Avoid failed build if clock_gettime() is not available Allow passing in a entire connection string into iusql Allow isql to handle SQL_SUCCESS_WITH_INFO from SQLPrepare Add extra logging for ODBCINST connect settings Allow allocated copy (instead of fixed length) for the connection string with pooling to allow any length Export __clear_ini_cache() from odbcinst to allow explicitly clearing the ini cache Fix seg fault when used with SQLAPI Add --enable-utf8ini flag to add utf8 to WCHAR conversions in SQLGetPrivateProfileStringW Allow longer error messages via GetDiag functions Add --enable-singleenv to enable single shared env handle when using pooling Signed-off-by: Khem Raj --- .../unixodbc/{unixodbc_2.3.11.bb => unixodbc_2.3.12.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/unixodbc/{unixodbc_2.3.11.bb => unixodbc_2.3.12.bb} (89%) diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb similarity index 89% rename from meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb rename to meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index 0ab4f8864d..ccdd666408 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -12,7 +12,7 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ " -SRC_URI[sha256sum] = "d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c" +SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" UPSTREAM_CHECK_REGEX = "unixODBC-(?P\d+(\.\d+)+)\.tar" @@ -44,5 +44,5 @@ do_install:prepend() { } do_install:append() { - oe_multilib_header unixodbc.h unixODBC/config.h unixODBC/unixodbc_conf.h + oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h } From patchwork Sat Apr 13 06:06:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 42296 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 9C922C41513 for ; Sat, 13 Apr 2024 06:07:06 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.5629.1712988418064543312 for ; Fri, 12 Apr 2024 23:06:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=i5qc/EP1; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1e2178b2cf2so13818105ad.0 for ; Fri, 12 Apr 2024 23:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712988417; x=1713593217; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8x6IxeILevBsx0VLQjBrHk6xVX7j3S26wFfwJOLfZ00=; b=i5qc/EP1ZrejwmZiJkqeVFpskYmbEwTUotC5ztyxpHx3Cw7atHeq1UmoeyEAex5MoQ 9X+UIQ/7mAKT1asJ+2JZLTBgwbc+QI7IEv/WyM3+FA4Hx3Ngxh4nBvLy8B1VEY1XqQmq EUfd3A4p6F/epBvLOZoB4NzZqR51vET9cns0PJQJxys0l2U6aaj08CHjcRirS//HOQAN pwcACjOo8sd5hd3x2SQHRM6cxaA0YAMpKB05lTIbPJelKk5mEX/bLLi5hMfe6MFATBze ExAQBILizXytLWc912IyBl9PI14TrRIps5/5F/W8x1bMSqqjH4FJSt7FC+5gQfDAquQa lVmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712988417; x=1713593217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8x6IxeILevBsx0VLQjBrHk6xVX7j3S26wFfwJOLfZ00=; b=XoLquFGxiOMy8AAr3m0anNAg/hWU2yhShMFqLqGz/eyF8dA9do3dJmCi8nkxXwMqWf /v81qU/XIrajiIEcu9/lGudqK8YgtFghOloSyh+czTZ5F0mkKW9pvRuZGdN4aiaLKqcD Lm2cVLQR7dttQYpV+D1w0BwwhctnR0P6fiMG86fEYyw494zUKw65EYDLr+Eni1ZXrQXZ R7cguQhkSWlXCknXH1OMxYWjswA42Fir05ceaZgzj7kgAxXP/29oPUXIugTVlENHajT2 s1AwCczPbygtqrQul89BOx8AHHEuqv4qh78xHj3WGxioKeT3gMZf2G4/xsOvDjLmEB3h yqhw== X-Gm-Message-State: AOJu0YzUkGQypEG+nWE2BV80B9RnYbPf8i+5TIAHfpEOSb27yeEwWvR+ mUphlCvSaNSmHcIAVFfmpaw8OTlGJx72YntGtdBtrm1ssqqDGC3lqz8faOY9 X-Google-Smtp-Source: AGHT+IFJ5PFRdG3XyfWJXMD3RUKM0n+CrY4g4n5Z9bs/MK0sPEMq/1i6b0J0b5tKRE3a4bZY3r5wmA== X-Received: by 2002:a17:902:b187:b0:1e0:b62c:460d with SMTP id s7-20020a170902b18700b001e0b62c460dmr4264901plr.38.1712988417096; Fri, 12 Apr 2024 23:06:57 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::d35b]) by smtp.gmail.com with ESMTPSA id ju17-20020a170903429100b001e49428f313sm3953366plb.261.2024.04.12.23.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:06:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/4] pv: Fix ptest failures Date: Fri, 12 Apr 2024 23:06:51 -0700 Message-ID: <20240413060653.2147909-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240413060653.2147909-1-raj.khem@gmail.com> References: <20240413060653.2147909-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sat, 13 Apr 2024 06:07:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109946 Signed-off-by: Khem Raj --- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 2 +- meta-oe/recipes-support/pv/pv_1.6.20.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index f5c7b9b719..a29408a822 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -35,6 +35,7 @@ PTESTS_FAST_META_OE = "\ onig \ oprofile \ protobuf \ + pv \ sdbus-c++ \ uthash \ xmlsec1 \ @@ -68,5 +69,4 @@ PTESTS_PROBLEMS_META_OE ="\ libteam \ ostree \ psqlodbc \ - pv \ " diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb index 6d449a945b..6a739af927 100644 --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -18,7 +18,7 @@ inherit autotools ptest LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" export LDEMULATION -RDEPENDS:${PN}-ptest = "coreutils" +RDEPENDS:${PN}-ptest += "coreutils ${PN}" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests From patchwork Sat Apr 13 06:06:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 42294 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 7D9D4C04FF0 for ; Sat, 13 Apr 2024 06:07:06 +0000 (UTC) Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by mx.groups.io with SMTP id smtpd.web11.5630.1712988419561549921 for ; Fri, 12 Apr 2024 23:06:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HmjlWn3O; spf=pass (domain: gmail.com, ip: 209.85.161.52, mailfrom: raj.khem@gmail.com) Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-5aa27dba8a1so997919eaf.0 for ; Fri, 12 Apr 2024 23:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712988418; x=1713593218; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SMvBox8x6vE2N7uJBEnFI8kuulj/0gxbbTB1Ao9SAwY=; b=HmjlWn3OhYF7jjtYqCQyUzzMyRIaOTrpxYLdBCqTCPikEW6tAQwPpJeCBCycNeblaj NM1MwLY9C6IE7jZbPDIEUjesxgF0HTw6p5sJOISupR8b+o7qRBwLEA3wo+ITuO3/57lF BK9JWbNSlKiFmzBk2CmSVMe9W5gq04Z8y/tHD6hi3+lv8piXyOu/Kg/h75z7G1SWuY2F 8TOF/k6g4kjrYfiwvtqa7tSmERPBkTyCxU3wxRHlx0TSTBfN+oDZv0PRXuThF77uwZ87 Qgy6hYTlwSuqJsT1wZpJZSuyGeg8pN1bd6XN+NrSh+2r2WM4oHoWOvEO+rVhBgsAck7j zihg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712988418; x=1713593218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SMvBox8x6vE2N7uJBEnFI8kuulj/0gxbbTB1Ao9SAwY=; b=wDByTzyNsWLMQ4asr0MFrTYLm5Hmz8g2M2yQDCIYagFKDqc+cKsYq45W/UunpdzxF6 3CTxwodP//RnY49qJQQc2cb7FMqEIPlNbebGEIs2YVgZkR0pbYmFEkTdHbWKQfCM13Dx eS411zYwJJKrP71v3jIAeuywQa/azoAefsfHYPLkpS1N/66t9mm/rPSHY6NCjGvVUcDG UF5bXp+KMpw67dRdA/9olJtZVdruts/NA7uaFmNBvvwSFkGmQ/9W3g1NgFHGeeVfmVlA yQjOH+IzumtwbPTTYGGfx7oNjfF3yz2Xr7klzEBu2n/EXuOiiw6nqqC3PGXhVQBl5c9v Sz+A== X-Gm-Message-State: AOJu0Yw9dvAc9ehb8iqWIR5A3uAPVhaWyBOQsr8cNdpkKEYYLnxIpjQ1 ZzgVjAZ0EWDZHVdfFMBR4epeVEiBOg7cEs+DADnYxT+KuDTi9aoiwnbweuL4 X-Google-Smtp-Source: AGHT+IHSEbzzsQcVT5bgop/+HqTdfxMjVZAn/0qQW447uMZekregmleY5c8skq8zgE2TMKe0p7hLFQ== X-Received: by 2002:a05:6359:4a43:b0:186:162b:50b5 with SMTP id nb3-20020a0563594a4300b00186162b50b5mr7459232rwb.4.1712988418369; Fri, 12 Apr 2024 23:06:58 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::d35b]) by smtp.gmail.com with ESMTPSA id ju17-20020a170903429100b001e49428f313sm3953366plb.261.2024.04.12.23.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:06:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 3/4] unixodbc: Enable UTF8 init Date: Fri, 12 Apr 2024 23:06:52 -0700 Message-ID: <20240413060653.2147909-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240413060653.2147909-1-raj.khem@gmail.com> References: <20240413060653.2147909-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sat, 13 Apr 2024 06:07:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109947 Signed-off-by: Khem Raj --- meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index ccdd666408..7819387c39 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -21,7 +21,7 @@ inherit autotools-brokensep multilib_header qemu S = "${WORKDIR}/unixODBC-${PV}" EXTRA_OEMAKE += "LIBS=-lltdl" - +EXTRA_OECONF += "--enable-utf8ini" DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" From patchwork Sat Apr 13 06:06:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 42295 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 7032FC4345F for ; Sat, 13 Apr 2024 06:07:06 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.5643.1712988420755119299 for ; Fri, 12 Apr 2024 23:07:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mx4TYT2A; spf=pass (domain: gmail.com, ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1e40042c13eso11619805ad.2 for ; Fri, 12 Apr 2024 23:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712988420; x=1713593220; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JkVBa9ujnufDfg3/RcvOJsfBS9sip+Qmj7Hj3qkxgag=; b=mx4TYT2APYQL/DlFPPCuWWuEC4Ip+I+dAK2/+2qseYlaz3PJqNiZMdVutDeWGEElpv 0RwvzkW8qAHHnY2TSfIoh4oX/zLdMvAM5QwRyxyYZO6ZQDxJQc8Fw8C2mMhDWkjhDdSj QvChp7AqWbH79qH50ci9gpYXHmMlPB+0yfiQ0RhxE8afJemsEwYfuc1sZLBz3hzCbade ojiCnbwqd2JOf0ilDwajGuiKTr9q8hrEs3SzaYBHuzzpKiWhXaLgs8G8KC1Wg5HDCvbF 1gNg8CMZ9NoVQWWitmSL25TZjvw5pFavbJvRvUvl0ehQDig59aaSH5oPZnOhUXSEuLWn vhNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712988420; x=1713593220; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JkVBa9ujnufDfg3/RcvOJsfBS9sip+Qmj7Hj3qkxgag=; b=ZriGVztzjpux6HtNKhEDvdS47Bp1sH4hCOAjks0kDV02EnfaR83XnUYG/KmEeyKWlb LZkReifNh4kLSnFYTTIMhP1n5wYeYPlfkRXvCwJV95B77EX9ObVNoLK9o54Od5UnzNFI +AOYrn5njKAcmwDaMudYpJBx22ivO+GebFnYVp5PGovdvjOjh5PIsFbfxUGhHci04e6v Fc8o8X0gWmcwT2WjeayAvVpfAct7qWIuakJaQT4NeMnNNf2BBsG5LIRVCeXbTUfl3wEc 3/10dreKTYfvxQzaTJJfOXSpROyA3r7hg7rpjcZ0CmfJV3Z1Mq1zv45glgAhkX/LSpDV xpxA== X-Gm-Message-State: AOJu0YxyZCCzAL8LIl1SsPmbMB41PqEdCgC0/s2sLfzEiQMsUwheIP+2 Grk+L6E+t0ajCD8HMBXhNLtXRcqIs0U5tuo6TeeHuGhZ0oyDaNpepB4u69Lt X-Google-Smtp-Source: AGHT+IH0cXOs8oKaR6BWSPP844KK7wkfNYDHJAEYf8C5Byx1nTx5NRlzylilMSboXoPdFjjlcxIhLQ== X-Received: by 2002:a17:903:2b0c:b0:1e4:196b:bb77 with SMTP id mc12-20020a1709032b0c00b001e4196bbb77mr4741061plb.69.1712988419670; Fri, 12 Apr 2024 23:06:59 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::d35b]) by smtp.gmail.com with ESMTPSA id ju17-20020a170903429100b001e49428f313sm3953366plb.261.2024.04.12.23.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 23:06:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 4/4] psqlodbc: Fix ptests Date: Fri, 12 Apr 2024 23:06:53 -0700 Message-ID: <20240413060653.2147909-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240413060653.2147909-1-raj.khem@gmail.com> References: <20240413060653.2147909-1-raj.khem@gmail.com> MIME-Version: 1.0 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 ; Sat, 13 Apr 2024 06:07:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109948 There are two still left Failed ptests: {'psqlodbc': ['30_-_lfconversion', '43_-_result-conversions']} These need using unicode postgresql driver perhaps Signed-off-by: Khem Raj --- .../psqlodbc-fix-for-ptest-support.patch | 19 +++++++++++-------- .../psqlodbc/psqlodbc_16.00.0000.bb | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch index 30e67b7dfb..081c6d0fd0 100644 --- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch @@ -19,8 +19,6 @@ Signed-off-by: Jackie Huang test/runsuite.c | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) -diff --git a/test/Makefile.in b/test/Makefile.in -index 3f9a9af..09406ae 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I.. # config.h @@ -32,8 +30,6 @@ index 3f9a9af..09406ae 100644 all: $(TESTBINS) runsuite reset-db -diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh -index 2eaba35..6555cdb 100755 --- a/test/odbcini-gen.sh +++ b/test/odbcini-gen.sh @@ -6,7 +6,7 @@ @@ -45,6 +41,15 @@ index 2eaba35..6555cdb 100755 driver=${drvr}.so if test ! -e $driver ; then driver=${drvr}.dll +@@ -16,7 +16,7 @@ if test ! -e $driver ; then + fi + fi + +-drvra=../.libs/psqlodbca ++drvra=@LIBDIR@/psqlodbca + drivera=${drvra}.so + if test ! -e $drivera ; then + drivera=${drvra}.dll @@ -52,10 +52,10 @@ Driver = PostgreSQL Unicode Trace = No TraceFile = @@ -59,8 +64,6 @@ index 2eaba35..6555cdb 100755 ReadOnly = No RowVersioning = No ShowSystemTables = No -diff --git a/test/runsuite.c b/test/runsuite.c -index 3be5732..cd842dc 100644 --- a/test/runsuite.c +++ b/test/runsuite.c @@ -55,7 +55,7 @@ bailout(const char *fmt, ...) @@ -72,7 +75,7 @@ index 3be5732..cd842dc 100644 { const char *basename; #ifdef WIN32 -@@ -69,7 +69,7 @@ parse_argument(const char *in, char *testname, char *binname) +@@ -69,7 +69,7 @@ parse_argument(const char *in, char *tes if (strchr(in, DIR_SEP) == NULL) { strcpy(testname, in); @@ -90,7 +93,7 @@ index 3be5732..cd842dc 100644 if (runtest(binname, testname, i, inputdir) != 0) failures++; } -@@ -161,29 +161,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input +@@ -161,29 +161,29 @@ runtest(const char *binname, const char #ifndef WIN32 snprintf(cmdline, sizeof(cmdline), "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini " diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb index 97333f679d..a1ef8e75e9 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb @@ -58,5 +58,5 @@ do_install_ptest() { FILES:${PN} += "${libdir}" # The tests need a local PostgreSQL server running -RDEPENDS:${PN}-ptest = "postgresql" - +RDEPENDS:${PN}-ptest += "psqlodbc postgresql diffutils" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils locale-base-en-us glibc-gconv glibc-charmaps"