From patchwork Fri Apr 19 12:19:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42674 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 88422C04FF6 for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web10.19241.1713529191179312333 for ; Fri, 19 Apr 2024 05:19:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fdFyvVXX; spf=pass (domain: gmail.com, ip: 209.85.208.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-56e6a1edecfso2986367a12.1 for ; Fri, 19 Apr 2024 05:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529189; x=1714133989; 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=P/5TcMmyyxJ3Ih6yok2ehG0roIInYSodKy5wP4Wa2M4=; b=fdFyvVXX2+x8OPWiJ0/TX2X8OmB1amiOwOs3NqXi6OcI/euF29JharC4v6a4JLRc7N Wp3h9TyZ7tkZjLZstmExBEydiYF5zQmR9pgLNhed275e3gTjz6sxB/K9vm15YbmNk9VX MpugRfEHjSjVk1OsiBhVheiftJ00IqF6RIJ4v+QJa4eJ8mPkCY1TfvT2XV6g0UMAyCMs I5TsIYrlXm7ZuY7je3VH0Ru0uG9P9mXnQLtQC6AB3cGFh6kNC1/LLr+vHKHb79JO4Zm4 M5x5TC5A4kuPnReDknvALSYHV3713QKuxNwgr3ANOxw4mCcQMXEIgW5c0jl8ke1Gmr6B bPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529189; x=1714133989; 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=P/5TcMmyyxJ3Ih6yok2ehG0roIInYSodKy5wP4Wa2M4=; b=J+XfPxqwR9bAOWZIQN7FtFPdaBhcWaczJ4x9MBmUOFxNqNENWmMfim/IbAkr9BT7Iz MWSUXOAwfPq+CeQn8tmyKxlPOJHgrLc6yW9sWQL8BtpDW1oVwEwwnfYGX1VYuA49ljB6 6dL2ZCQPcWzxcr/XpLD9a+DNdrXXDOQYemIj+eXbeVxRNUoB8MVFT+CnHlFKuvUQsqys xfZc99EdduPVcD06/ZYirUHmHK46UvOWIUNAQX1PILoiphrCmlc7C2QWd62ftpfR+xe9 FNhiavk/P2HAmeTYJVILUU+7l5Bjq/xAUkwTbxcghkzvS8Xu7D4m+TVZISrjDOm3f0Bo MhPw== X-Gm-Message-State: AOJu0Yy31Un+a+sBnHiu/ImxhduXn3kKTOkT4bVzjL2BJIfOdcFJbe4y GM+GASDv/IXjcx7zNaJf7VUdkx8s9KVoVhZ5wgKDXc+wm9jQ/Em6q4D+nw== X-Google-Smtp-Source: AGHT+IHQY0vGXCy45cG5/tf10S/3SqkEw4RtlFeAPvOs0gzCcW03nwR9sz81KceiAVIBbi9YcYrwgg== X-Received: by 2002:a50:cd12:0:b0:56e:2c1d:1174 with SMTP id z18-20020a50cd12000000b0056e2c1d1174mr1612691edi.4.1713529189146; Fri, 19 Apr 2024 05:19:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:48 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/19] liba52: remove the recipe Date: Fri, 19 Apr 2024 14:19:27 +0200 Message-Id: <20240419121945.1920944-1-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198529 The component has been superseded by ffmpeg long ago, tarballs have disappeared from sourceforge, no work on it has happened in over 10 years. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../gstreamer1.0-plugins-ugly_1.22.11.bb | 2 +- .../liba52/liba52/buildcleanup.patch | 89 ------------------- .../recipes-multimedia/liba52/liba52_0.7.4.bb | 28 ------ 5 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 meta/recipes-multimedia/liba52/liba52/buildcleanup.patch delete mode 100644 meta/recipes-multimedia/liba52/liba52_0.7.4.bb diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e6131c815a0..2b579339b2c 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -123,7 +123,6 @@ DISTRO_PN_ALIAS:pn-keymaps = "OE-Core" DISTRO_PN_ALIAS:pn-kf = "OSPDT" DISTRO_PN_ALIAS:pn-lame = "Debian=lame Ubuntu=lame" DISTRO_PN_ALIAS:pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" -DISTRO_PN_ALIAS:pn-liba52 = "Mandriva=a52dec Debian=a52dec" DISTRO_PN_ALIAS:pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" DISTRO_PN_ALIAS:pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops" DISTRO_PN_ALIAS:pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 20eb3a04468..52bb542483d 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -305,7 +305,6 @@ RECIPE_MAINTAINER:pn-l3afpad = "Anuj Mittal " RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker " RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj " RECIPE_MAINTAINER:pn-less = "Yi Zhao " -RECIPE_MAINTAINER:pn-liba52 = "Unassigned " RECIPE_MAINTAINER:pn-libacpi = "Anuj Mittal " RECIPE_MAINTAINER:pn-libadwaita = "Alexander Kanavin " RECIPE_MAINTAINER:pn-libaio = "Alexander Kanavin " diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb index 61f46fbf7e5..d89442d7893 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb @@ -25,7 +25,7 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - a52dec mpeg2dec \ + mpeg2dec \ " PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" diff --git a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch deleted file mode 100644 index 5168100f3ad..00000000000 --- a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch +++ /dev/null @@ -1,89 +0,0 @@ -It makes much more sense to control our own CFLAGS and avoiding fPIC breaks -some arches too. Assume we know what we're doing and remove all the messing -around. - -RP 23/2/10 - -Upstream-Status: Inappropriate [configuration] - -Index: a52dec-0.7.4/configure.in -=================================================================== ---- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000 -+++ a52dec-0.7.4/configure.in 2010-02-23 14:52:36.000000000 +0000 -@@ -14,62 +14,6 @@ - AC_PROG_CC - AC_PROG_GCC_TRADITIONAL - --if test x"$GCC" = x"yes"; then -- -- dnl GCC-specific flags - try to optimize them sometime -- dnl -Wall -Werror moved to the end to not disturb the configure script -- -- dnl -O3 -- changequote(<<,>>) -- OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"` -- changequote([,]) -- OPT_CFLAGS="$OPT_CFLAGS -O3" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) -- -- dnl -fomit-frame-pointer -- OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) -- -- dnl arch-specific flags -- case "$host" in -- i?86-* | k?-*) -- case "$host" in -- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; -- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; -- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; -- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; -- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; -- esac -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-* | sparc64-*) -- OPT_CFLAGS="$CFLAGS -mtune=ultrasparc" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- mips-sgi-irix6.*) dnl do we need to be that specific ? -- OPT_CFLAGS="$CFLAGS -mabi=64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac --elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then -- dnl TenDRA portability checking compiler -- TENDRA=yes -- CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE" -- enable_mlib=no -- enable_oss=no -- enable_solaris_audio=no --elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then -- dnl Intel C++ compiler -- CFLAGS="-g -O3 -unroll -ip" --else -- dnl non-gcc flags - we probably need exact configuration triplets here. -- case "$host" in -- mips-sgi-irix6.*) -- OPT_CFLAGS="$CFLAGS -64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-sun-solaris*) -- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac --fi -- - dnl Checks for libtool - this must be done after we set cflags - AC_DISABLE_SHARED - AC_LIBTOOL_WIN32_DLL -Index: a52dec-0.7.4/liba52/configure.incl -=================================================================== ---- a52dec-0.7.4.orig/liba52/configure.incl 2010-02-23 14:51:44.000000000 +0000 -+++ a52dec-0.7.4/liba52/configure.incl 2010-02-23 14:51:59.000000000 +0000 -@@ -1,9 +1,6 @@ - AC_SUBST([LIBA52_CFLAGS]) - AC_SUBST([LIBA52_LIBS]) - --dnl avoid -fPIC when possible --LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" -- - AC_ARG_ENABLE([double], - [ --enable-double use double-precision samples]) - if test x"$enable_double" = x"yes"; then diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb deleted file mode 100644 index 7a3b4a43c8d..00000000000 --- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "ATSC A/52 surround sound stream decoder" -DESCRIPTION = "Library for decoding ATSC A/52 streams. The A/52 standard \ -is used in a variety of applications, including digital television \ -and DVD. It is also known as AC-3." -HOMEPAGE = "http://liba52.sourceforge.net/" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1" -SECTION = "libs" - -inherit autotools - -SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ - file://buildcleanup.patch" - -SRC_URI[md5sum] = "caa9f5bc44232dc8aeea773fea56be80" -SRC_URI[sha256sum] = "a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33" - -UPSTREAM_CHECK_URI = "http://liba52.sourceforge.net/downloads.html" - -S = "${WORKDIR}/a52dec-${PV}" - -EXTRA_OECONF = " --enable-shared " - -PACKAGES =+ "a52dec a52dec-doc" - -FILES:a52dec = " ${bindir}/* " -FILES:a52dec-doc = " ${mandir}/man1/* " From patchwork Fri Apr 19 12:19:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42686 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 32853C10F19 for ; Fri, 19 Apr 2024 12:20:02 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web11.19148.1713529191868610547 for ; Fri, 19 Apr 2024 05:19:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dxRPhAll; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-571bddddbc2so1605320a12.1 for ; Fri, 19 Apr 2024 05:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529190; x=1714133990; 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=rILufnBvPTdYWl1SCq7e13Mz3ZczWMIi2MjGTRZZkQo=; b=dxRPhAllruNCj3pNOkJcnh84MjubFljB7TqheRjltAhBljvI2hQ0RzjGkQ/3VzIoay q7+QgIGfJNhy/yuQNRXj1yr3lNPh8qlO52Qrmpnfty184VujQlzum8w6K2ZzIUg+ek6K XrxdaZOK2eC/B2yVLmtRTK0UQXx7VawSWbfwDhaOUmc8NA0H5q+3ETFwlrg8h6jMYh7j cXjeoV623IlHjpjMts0e8/TO/9ktmKbuAsjG5ZYYFapYcUgB5TvXBc3p1VLfVT12IU/w gkcT7XfIXl0aq++QC8nktQ77G0hiWqLCS9vdJO3R5yRJDXCnOfLm+wpgRw6pW2bn6R20 f0gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529190; x=1714133990; 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=rILufnBvPTdYWl1SCq7e13Mz3ZczWMIi2MjGTRZZkQo=; b=kYO/DH3RuBX+pXhuxzg6JmVVW30U0nIaJlGxx4jp2SHHRuRcJX9OusKVKPM8altLB+ +bXJcGcmXX7sWnPihltdfVAMbW8r9i2IOs4iHwykVAWYGsfKRvsfZLQqy81wPZg/EbSv oHMw0AB+lpZsvMKqZKRDaayBDtjNxs3H9T0NhmTwAi/QU+Erjr3jqeB280juHMXkrqmI OcZucCKbmXqMqHp/8jE/FtqG6mdY67aUQ0eTrSQFJaCihoXILy0F+1rTThYFc+7LKWhm l7NOZz4iCV/c2kkaG8njd7yGrLBCCA/aA817MEAhaZuqGCETWDlyqOYs7X6JH8XT9WqZ HvgQ== X-Gm-Message-State: AOJu0YxG7moD9ZYwVrNUJywnyxS5zrhEx27zevkqrJIL135Y9E0y1A35 MJ4hY81q6bh9Wof5gbzgJb60G+lZlQzzjhPBxiDStWAd6g2UObIGNBgQOw== X-Google-Smtp-Source: AGHT+IHy9WYH6rA284PWYOyGl3yotlCD31yrbLzXpQjEKZZZgIsFea1hI5S3pl0GrkKJOaJM++nQmQ== X-Received: by 2002:a50:ccc7:0:b0:56e:23db:3e87 with SMTP id b7-20020a50ccc7000000b0056e23db3e87mr1556536edj.11.1713529189782; Fri, 19 Apr 2024 05:19:49 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:49 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 02/19] package_rpm: remove support for DIRFILES Date: Fri, 19 Apr 2024 14:19:28 +0200 Message-Id: <20240419121945.1920944-2-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198530 This was added here: https://git.yoctoproject.org/poky/commit/?id=2f42ef8d8fb1febf28252b98884cebabc931f720 It's undocumented, untested, rpm-specific, and currently broken, and to begin with looks like a workaround for Tizen/smack security label conflicts elsewhere. Signed-off-by: Alexander Kanavin --- meta/classes-global/package_rpm.bbclass | 31 +++++++------------------ 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 2e3e4e8c790..790ccbfaf0c 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -191,7 +191,7 @@ python write_specfile () { if not len(depends_dict[dep]): array.append("%s: %s" % (tag, dep)) - def walk_files(walkpath, target, conffiles, dirfiles): + def walk_files(walkpath, target, conffiles): # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories # when packaging. We just ignore these files which are created in # packages-split/ and not package/ @@ -233,22 +233,12 @@ python write_specfile () { return False dirs[:] = [dir for dir in dirs if not move_to_files(dir)] - # Directory handling can happen in two ways, either DIRFILES is not set at all - # in which case we fall back to the older behaviour of packages owning all their - # directories - if dirfiles is None: - for dir in dirs: - if dir == "CONTROL" or dir == "DEBIAN": - continue - p = path + '/' + dir - # All packages own the directories their files are in... - target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') - elif path: - # packages own only empty directories or explict directory. - # This will prevent the overlapping of security permission. - attr = get_attr(path) - if (not files and not dirs) or path in dirfiles: - target.append(attr + '%dir "' + escape_chars(path) + '"') + for dir in dirs: + if dir == "CONTROL" or dir == "DEBIAN": + continue + p = path + '/' + dir + # All packages own the directories their files are in... + target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') for file in files: if file == "CONTROL" or file == "DEBIAN": @@ -363,9 +353,6 @@ python write_specfile () { localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) conffiles = oe.package.get_conffiles(pkg, d) - dirfiles = localdata.getVar('DIRFILES') - if dirfiles is not None: - dirfiles = dirfiles.split() splitname = pkgname @@ -430,7 +417,7 @@ python write_specfile () { srcrpostrm = splitrpostrm file_list = [] - walk_files(root, file_list, conffiles, dirfiles) + walk_files(root, file_list, conffiles) if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty RPM package for %s" % splitname) else: @@ -522,7 +509,7 @@ python write_specfile () { # Now process files file_list = [] - walk_files(root, file_list, conffiles, dirfiles) + walk_files(root, file_list, conffiles) if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty RPM package for %s" % splitname) else: From patchwork Fri Apr 19 12:19:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42673 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 956DDC4345F for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.19149.1713529192250343484 for ; Fri, 19 Apr 2024 05:19:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jyOurfnR; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a55692e09c9so110684466b.0 for ; Fri, 19 Apr 2024 05:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529190; x=1714133990; 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=6CxZJzGR350Q26Y46nawNxGLNswAlcKGjJH2CAMZzJs=; b=jyOurfnRAw25pBBctU7PLMmFtyfJxXurGmCj07O02XjnVthqgF63Sm1pNhk2GBT6tp 5vyB3RAwGrtmMYqi1vfpZyXd3RPR5okOlFJsmx1luBxlW8HWTueL2PYkqFKAgDubbQqR rvENZPpRBhYFa/MkmCJJtvbYBN7z5HhIvrE1wB5Qor8HxEpJBZbHun4fs/u4COpgxEg5 ODIQo7y7U4aKZG1OcPsKZl6wSyJg+vX55PGmtzt61YtSLpZS8MlM5jqIX7wNHQm0DwNm Z9pCOsHhLUX2GS3cLX+cAyib8eOLl/9WQoAmu47oNm/qt9cfjVOq3g4BNRCidQP+6kF2 a7nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529190; x=1714133990; 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=6CxZJzGR350Q26Y46nawNxGLNswAlcKGjJH2CAMZzJs=; b=ZpnLbz9irqI0zzLrwCd/2DgvXJjbxeCPX0i6pb/jN/ZxGW3M9nSl0DHsfMtEPzjvqZ DK6hsAePWz+PjUhawaHEFjmGO64StwJwTR7gHxFNKzlP5Toi0xCZg6COJUp5j98dm1Lh fyXLzOB7nx/YNO8f8/BuNB4JpizmwBDKY+iZqjewM+f4Qa0K5dMA+gq1Lwc6PXAeiE9U b0fJKJeZ2fUB0cIRVCLTpZCUDHFe4bMNXB3YJppFlSSJJFIdjahURqJC/j/f8Y8tnn2G wnpbZykwTpsVkihJdgfJzDz4xnDHjczFnOaSz2p6LXGieH4z281NeBc0mjhGoHZsusaz I3CQ== X-Gm-Message-State: AOJu0YwqrcGY/kjsCfy/Yn/hOD7W75mopE2e0H8fVLke6Mq3DedWVBan bUJKxAVRV1ocdi4J7AD7mMM4uexfP2gAVvxFBaRDNllQSAFDnBN0i+vUvw== X-Google-Smtp-Source: AGHT+IHkP5yOaQvw9dnUFfGJH+vAPQ1KQblQtNv9cT3GPNaCDbepaMkR4lc8hDRElMJlaNEBShrMZw== X-Received: by 2002:a50:8d17:0:b0:56e:1010:cd7c with SMTP id s23-20020a508d17000000b0056e1010cd7cmr1518022eds.12.1713529190377; Fri, 19 Apr 2024 05:19:50 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/19] serf: mark patch as inappropriate for upstream submission Date: Fri, 19 Apr 2024 14:19:29 +0200 Message-Id: <20240419121945.1920944-3-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198531 What the patch does is not suitable, as upstream would surely want the issue with the code fixed, not removal of that code altogether. I'd also note that serf is still semi-ummaintained, and the only consumer of it is subversion, which is slowly but steadily fading away in favor of git and artifact-specific solutions. Signed-off-by: Alexander Kanavin --- ...op.creating.directories.without.sandbox-install.prefix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d60443..c8e6eddfeca 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch @@ -31,7 +31,7 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Pending +Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] Signed-off-by: Martin Jansa From patchwork Fri Apr 19 12:19:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42681 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 EA044C10F15 for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mx.groups.io with SMTP id smtpd.web11.19150.1713529193227109598 for ; Fri, 19 Apr 2024 05:19:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GPnCMUAb; spf=pass (domain: gmail.com, ip: 209.85.208.179, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d895e2c6efso27846741fa.0 for ; Fri, 19 Apr 2024 05:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529191; x=1714133991; 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=gtwEgtchS+DznfJWbs/L6nvFqxaOpeTJysZMF2nqUpQ=; b=GPnCMUAbNYcHPmKXkC/eH7iWzmngvVA/EugouZAmGFeCJNfpdUHiOp7/RIrAeFwrm3 fkfj/c7AxxCkRRka/5Qy2c/o3iDQR7FT9RdItY9CZK5dc7/anxDpVeca3ekpLEKkUhoL soJa/0Botzh66l4BM3b4AAe0x+7g/0ZhUOk6j7Ult2Jt6oz8w4XWDO0G9wkZfieY8NSI VXrv8oMwPFXXZfAcyg/n3fhJL0C5qiR7ZQtWKgcKZ2wwaIK3JD5aGHANBQ2+3fdCQQ5S WnZj3lUru0WjzghFHU+yDpiJO2nXNF+Y0K0kVynV1tmzOUZ2NTKOV+KEEqpMKOM4VAlw 10rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529191; x=1714133991; 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=gtwEgtchS+DznfJWbs/L6nvFqxaOpeTJysZMF2nqUpQ=; b=ffFjLcLNofMsAAU0PU4g0mZLbfxgeR+tXDr+Svxbi6vebTE7664conlEO8ol0F4QYW zkgk9nvuNekXqwX6qUyA2odddwjUMtlyQoTmlDxJXbmZ3iRs2kb0DDClMoIU531+nUWE aQEVznAa5jhIY9ztKOrDXKafDrTYG0032gH/sKmzyrSnLymwv546/b/uiHftTbLdZnBQ ZP7V4w73Ej45s09K20Px40p9fTeuweHAW+4cjwS9p0SeDuIPKSnzoKJeWYHpoD+XA55P 1oU3leO7nBGWicpxGfNdH6UiMn9P1FcQ2WM+yblHh53ZabjbNQ7a3p4it9NgLfD4TYaH XICA== X-Gm-Message-State: AOJu0Yw9Lr1vZm+zIb/9doKx5enyLIi2oFbEGp1eIAjhQuUKUouTlEu8 jKf1trp9Z6v9cfO75Z0EfraBD60Jv+3XgVnqg7BgisWmyr5Wn/uHZANBIw== X-Google-Smtp-Source: AGHT+IEJzvkoYlBUzIqKtAqDrXKYJmNKkm0JudjoCo+Fc9gzy9tTTdNNox4AMqiXFymreFb/vkTuAQ== X-Received: by 2002:a2e:9c46:0:b0:2d8:2799:fbcf with SMTP id t6-20020a2e9c46000000b002d82799fbcfmr1146493ljj.34.1713529191119; Fri, 19 Apr 2024 05:19:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:50 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/19] swig: merge .inc into .bb Date: Fri, 19 Apr 2024 14:19:30 +0200 Message-Id: <20240419121945.1920944-4-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198532 Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/swig/swig.inc | 67 ----------------------- meta/recipes-devtools/swig/swig_4.2.1.bb | 69 +++++++++++++++++++++++- 2 files changed, 67 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/swig/swig.inc diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc deleted file mode 100644 index 7a6c4d7359c..00000000000 --- a/meta/recipes-devtools/swig/swig.inc +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" -DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ -code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ -Mzscheme, Chicken, OCaml, Pike, and C#." -HOMEPAGE = "http://swig.sourceforge.net/" -LICENSE = "BSD-3-Clause & GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ - file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" - -SECTION = "devel" - -DEPENDS = "libpcre2 bison-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" -UPSTREAM_CHECK_REGEX = "swig-(?P\d+(\.\d+)+)" - -inherit autotools python3native pkgconfig - -EXTRA_OECONF = " \ - --with-python3=${PYTHON} \ - --without-allegrocl \ - --without-android \ - --without-boost \ - --without-chicken \ - --without-clisp \ - --without-csharp \ - --without-d \ - --without-gcj \ - --without-go \ - --without-guile \ - --without-java \ - --without-lua \ - --without-mzscheme \ - --without-ocaml \ - --without-octave \ - --without-perl5 \ - --without-pike \ - --without-php \ - --without-r \ - --without-ruby \ - --without-tcl \ -" - -EXTRA_AUTORECONF += "-I Tools/config" - -BBCLASSEXTEND = "native nativesdk" - -# necessary together with bison dependency until a new upstream version after -# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch -do_configure:append() { - mkdir -p ${B}/Source/CParse -} - -do_install:append:class-nativesdk() { - cd ${D}${bindir} - ln -s swig swig2.0 -} - -def swiglib_relpath(d): - swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') - return os.path.relpath(swiglib, d.getVar('bindir')) - -do_install:append:class-native() { - create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} -} diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb index 4b438a72982..7062d4e9aa3 100644 --- a/meta/recipes-devtools/swig/swig_4.2.1.bb +++ b/meta/recipes-devtools/swig/swig_4.2.1.bb @@ -1,7 +1,72 @@ -require ${BPN}.inc +SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" +DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ +code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ +Mzscheme, Chicken, OCaml, Pike, and C#." +HOMEPAGE = "http://swig.sourceforge.net/" +LICENSE = "BSD-3-Clause & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ + file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" -SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ +SECTION = "devel" + +DEPENDS = "libpcre2 bison-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ file://0001-configure-use-pkg-config-for-pcre-detection.patch \ file://determinism.patch \ " SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" +UPSTREAM_CHECK_REGEX = "swig-(?P\d+(\.\d+)+)" + +inherit autotools python3native pkgconfig + +EXTRA_OECONF = " \ + --with-python3=${PYTHON} \ + --without-allegrocl \ + --without-android \ + --without-boost \ + --without-chicken \ + --without-clisp \ + --without-csharp \ + --without-d \ + --without-gcj \ + --without-go \ + --without-guile \ + --without-java \ + --without-lua \ + --without-mzscheme \ + --without-ocaml \ + --without-octave \ + --without-perl5 \ + --without-pike \ + --without-php \ + --without-r \ + --without-ruby \ + --without-tcl \ +" + +EXTRA_AUTORECONF += "-I Tools/config" + +BBCLASSEXTEND = "native nativesdk" + +# necessary together with bison dependency until a new upstream version after +# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch +do_configure:append() { + mkdir -p ${B}/Source/CParse +} + +do_install:append:class-nativesdk() { + cd ${D}${bindir} + ln -s swig swig2.0 +} + +def swiglib_relpath(d): + swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') + return os.path.relpath(swiglib, d.getVar('bindir')) + +do_install:append:class-native() { + create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} +} From patchwork Fri Apr 19 12:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42683 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 018D7C07E8E for ; Fri, 19 Apr 2024 12:20:02 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web11.19151.1713529193784408517 for ; Fri, 19 Apr 2024 05:19:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RbQNTZ0i; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-571be483ccaso2230684a12.2 for ; Fri, 19 Apr 2024 05:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529192; x=1714133992; 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=ww/IV3rhHXdVTUdLf71ob1P61xYE9y4Liux4QE1iWWk=; b=RbQNTZ0iwW8x9vUILPtsGIhbNjIEhJHeYuYeRr2MRnHcxnoGxTt+Flh73GzQPUj0RQ OBggSQX5caRmuiHD+cgBfEZia2EQMdxu9RSQACp6/NSI7hY20OopSgDw0LcADmpO67Uh T8FAPAalrveprdSwM7y28e+hxuXO3pMrdVy4VpUdey8UbbTmzIA5DBFSynAvC0BwPd2X P2l30GHeb8TYVsyi3XXCQ2gfST6n7MlYuNjT4iYyqy7qhQ+e53Z2fnroLTsenKocxln2 UZP2kjaWMqbC9Jxk/ZVaLjDEz9qp/9lrRvig2Yyb2XGMzeMfpsQchrROuP7UXiWl1mNn MxWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529192; x=1714133992; 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=ww/IV3rhHXdVTUdLf71ob1P61xYE9y4Liux4QE1iWWk=; b=Xp6Srxy+V/rcv9FzRLaGx1RoXb0Y+oC2bKm+HXgPptOUipBedUpcrlme7cLe97WTKn VT2n8icWRdpAO5m9SZ970Z6ZQunWuKbdNaRW097gZy8AMsmMYP7UWTvLMHSP5Smvl1If 9aFcG388zxSeLJyvgun6sgWmwBGzB9/oxjLqWh3zFdEd7OB7N15xEmOwVw9e+Bdm4U3G 32A9Q/8qs+OpU3qZBUkD6aurcvZKdCzhpkUvgO1j5ZoonS/AIrj+oKWfiJHA8ZNdy2oD RRM8NjfXm8dh6KF3obTL7bIQR4hZNDin4g9IfiL6ZFM48nLTPcbk6jh2mzgraf++RoX2 y57g== X-Gm-Message-State: AOJu0Yx1TER1l1H6wmjWxiO81eKt/4V1tqGrglU0QNMaBAab04AEB4/I BTrBNqyRePfrDdNgagDsCKRQmwG+wOMc/ynchwG9KKDzIrcnfJUGvIzsuw== X-Google-Smtp-Source: AGHT+IEu0PbbFbyPUiXFbRvXCnUJ8GWfN/BOSn2nVhBHZFjXk/RHUKLFR4PGunyYD9agXnLXy2Dw5A== X-Received: by 2002:a50:955e:0:b0:570:3b8:a990 with SMTP id v30-20020a50955e000000b0057003b8a990mr1405898eda.39.1713529191943; Fri, 19 Apr 2024 05:19:51 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:51 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/19] swig: convert from autotools to cmake Date: Fri, 19 Apr 2024 14:19:31 +0200 Message-Id: <20240419121945.1920944-5-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198533 Drop patches: 0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch (superseded long time ago by native wrapper) 0001-configure-use-pkg-config-for-pcre-detection.patch (autotools-specific) Drop all autoconf options and native python dependency as cmake configuration doesn't contain those. Signed-off-by: Alexander Kanavin --- ...e-for-swig-swiglib-on-non-Win32-plat.patch | 65 ------------------- ...re-use-pkg-config-for-pcre-detection.patch | 63 ------------------ meta/recipes-devtools/swig/swig_4.2.1.bb | 44 +++---------- 3 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch delete mode 100644 meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch deleted file mode 100644 index 5e83e92725e..00000000000 --- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b88a98348b3841f0b702e314631883d46f9f362d Mon Sep 17 00:00:00 2001 -From: "NODA, Kai" -Date: Sun, 22 Apr 2012 17:01:02 +0900 -Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32 - platforms. - -If it wasn't found, then fall back to a fixed string just as before. - -Upstream-Status: Submitted -http://sourceforge.net/mailarchive/message.php?msg_id=29179733 ---- - Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx -index 76b4f9d..de0a512 100644 ---- a/Source/Modules/main.cxx -+++ b/Source/Modules/main.cxx -@@ -25,6 +25,11 @@ - #include - #include - #include // for INT_MAX -+#ifndef _WIN32 -+#include -+#include // for readlink -+#include // for stat -+#endif - - // Global variables - -@@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { - - // Check for SWIG_LIB environment variable - if ((c = getenv("SWIG_LIB")) == (char *) 0) { -+ char *p; - #if defined(_WIN32) - char buf[MAX_PATH]; -- char *p; - if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) { - *(p + 1) = '\0'; - SwigLib = NewStringf("%sLib", buf); // Native windows installation path -@@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { - if (Len(SWIG_LIB_WIN_UNIX) > 0) - SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw) - #else -- SwigLib = NewString(SWIG_LIB); -+ char buf[PATH_MAX]; -+ if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) && -+ (p = ::strstr(buf, "/bin/swig"))) { -+ int major, minor, patch; -+ const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch); -+ if (3 == ret) { -+ const ::ptrdiff_t dir_part_len = p - buf; -+ ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch); -+ struct ::stat stat_res; -+ if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) { -+ SwigLib = NewString(buf); -+ } -+ } -+ } -+ if (NULL == SwigLib) -+ SwigLib = NewString(SWIG_LIB); - #endif - } else { - SwigLib = NewString(c); diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch deleted file mode 100644 index 9e16caecca1..00000000000 --- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Tue, 17 Jun 2014 08:18:17 +0200 -Subject: [PATCH] configure: use pkg-config for pcre detection - -Signed-off-by: Koen Kooi -Upstream-Status: Pending - ---- - configure.ac | 39 +++++++-------------------------------- - 1 file changed, 7 insertions(+), 32 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c060028..a330266 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre]) - - dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script - if test x"${with_pcre}" = xyes ; then -- AC_MSG_CHECKING([whether to use local PCRE2]) -- local_pcre_config=no -- if test -z "$PCRE2_CONFIG"; then -- if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then -- PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config -- local_pcre_config=$PCRE2_CONFIG -- fi -- fi -- AC_MSG_RESULT([$local_pcre_config]) --fi --AS_IF([test "x$with_pcre" != xno], -- [AX_PATH_GENERIC([pcre2], -- [], dnl Minimal version of PCRE we need -- accept any -- [], dnl custom sed script for version parsing is not needed -- [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library]) -- LIBS="$LIBS $PCRE2_LIBS" -- CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" -- ], -- [AC_MSG_FAILURE([ -- Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions) -- library package. This dependency is needed for configure to complete, -- Either: -- - Install the PCRE2 developer package on your system (preferred approach). -- - Download the PCRE2 source tarball, build and install on your system -- as you would for any package built from source distribution. -- - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically -- link against. Run 'Tools/pcre-build.sh --help' for instructions. -- (quite easy and does not require privileges to install PCRE2 on your system) -- - Use configure --without-pcre to disable regular expressions support in SWIG -- (not recommended).]) -- ], -- [],[],[--libs8]) -+ PKG_CHECK_MODULES([PCRE], [libpcre2], [ -+ AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) -+ LIBS="$LIBS $PCRE_LIBS" -+ CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" -+ ], [ -+ AC_MSG_WARN([$PCRE_PKG_ERRORS]) - ]) -+fi - - - dnl CCache diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb index 7062d4e9aa3..5f9c1fe10be 100644 --- a/meta/recipes-devtools/swig/swig_4.2.1.bb +++ b/meta/recipes-devtools/swig/swig_4.2.1.bb @@ -13,51 +13,16 @@ SECTION = "devel" DEPENDS = "libpcre2 bison-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ - file://0001-configure-use-pkg-config-for-pcre-detection.patch \ file://determinism.patch \ " SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" UPSTREAM_CHECK_REGEX = "swig-(?P\d+(\.\d+)+)" -inherit autotools python3native pkgconfig - -EXTRA_OECONF = " \ - --with-python3=${PYTHON} \ - --without-allegrocl \ - --without-android \ - --without-boost \ - --without-chicken \ - --without-clisp \ - --without-csharp \ - --without-d \ - --without-gcj \ - --without-go \ - --without-guile \ - --without-java \ - --without-lua \ - --without-mzscheme \ - --without-ocaml \ - --without-octave \ - --without-perl5 \ - --without-pike \ - --without-php \ - --without-r \ - --without-ruby \ - --without-tcl \ -" - -EXTRA_AUTORECONF += "-I Tools/config" +inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" -# necessary together with bison dependency until a new upstream version after -# 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch -do_configure:append() { - mkdir -p ${B}/Source/CParse -} - do_install:append:class-nativesdk() { cd ${D}${bindir} ln -s swig swig2.0 @@ -70,3 +35,10 @@ def swiglib_relpath(d): do_install:append:class-native() { create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} } + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/Source/CParse/parser.* +} From patchwork Fri Apr 19 12:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42687 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 16336C10F16 for ; Fri, 19 Apr 2024 12:20:02 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web10.19243.1713529194369173229 for ; Fri, 19 Apr 2024 05:19:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=V0JVI72m; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-571d6d1943fso541917a12.2 for ; Fri, 19 Apr 2024 05:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529193; x=1714133993; 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=oWOnP54oHWOpQ2IEpPofPFk7fnAn85aBjZ62tRuvBA8=; b=V0JVI72mNmQZNy7h5c0AApUc71sNuIRWC1NFwmdxbKNhJsrvRu9tQO/MJjtAlr1xRz NoixTK9GvDh3bmDW66j0Wp8FN6wQUvCN1N/Vy49JK/SQGTW6UxP1bvmmHRsKMjHRksw+ aPlYOjbPco3FbUREYltn8DBv6wPqLkWLXzf48HMPuIMs3dz1IDNQ1JxA186S+eZaQ7wP XcE8IkP7aNrnORLUNPJa2cA7sZJ/BbNjARz5+FgPUcyUANni/aRGj1VJUZYhkMKzspfZ lkoZpI+axwVV4cO0sqUK+kHOhY+K5r9n7XtPHcJfc8c1kTXP1WCGMFtbRSZTwix4GoB4 G5Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529193; x=1714133993; 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=oWOnP54oHWOpQ2IEpPofPFk7fnAn85aBjZ62tRuvBA8=; b=htc9krHcb0Qj2HKwVv2kOJS7alw1St6dLNRoRaqyvT5DGaYRq0CZdL3ZeyfuX0jGVG +h8O8cGR+8BuonZbsJ90qlzKy47boJ0+pvlQLGU1hfBLsic5Pq2CZp3iq68z9CQik0ds /U8I6EZaFGVQQJpsCff8nTvtPXX7aDxSsBnheSVL+7Td1qHtMvOK3VgEE+EIIqgUheIp w4erutlE1qNituSBzaiscGw34wrZ1g1kRszwlqKHNFxRXiv3RSAs6RJhyXwCXJK4e1bX G5JVcFCfeAtxbfpxtPTh6eLMN6G0GGQ3hVz2kX6TJu0MvnMLBVRwzLCGoK83WRGqG0un uEXw== X-Gm-Message-State: AOJu0YzoHFOFFzWeNmzL819Ab7SZA2WTMTqoQcfmSaesirmMGnUbc1Ph UuzHezEl5iD1lPE+7gZRqYXGLWiMO9s59ZCGnLzUAj3PNwwvTWhhNWEgWQ== X-Google-Smtp-Source: AGHT+IFW1xwBOlQLvYnMiMcPVhNXeQiJMi0VlWeUf/nM782X5wS9VEqAjf7Ocxsa/pdYudzO0O5xIg== X-Received: by 2002:a50:d658:0:b0:56e:34db:f5ef with SMTP id c24-20020a50d658000000b0056e34dbf5efmr1310856edj.28.1713529192603; Fri, 19 Apr 2024 05:19:52 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:52 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/19] kea: remove unnecessary reproducibility patch Date: Fri, 19 Apr 2024 14:19:32 +0200 Message-Id: <20240419121945.1920944-6-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198534 Rather, adjust the sed invocation to do the correct thing directly. Signed-off-by: Alexander Kanavin --- ...1-kea-fix-reproducible-build-failure.patch | 62 ------------------- meta/recipes-connectivity/kea/kea_2.4.1.bb | 3 +- 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch deleted file mode 100644 index 8a5bd00302a..00000000000 --- a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 -From: Sudip Mukherjee -Date: Tue, 8 Aug 2023 19:03:13 +0100 -Subject: [PATCH] kea: fix reproducible build failure - -New version of Kea has started using path of build-dir instead of -src-dir which results in reproducible builds failure. -Use src-dir as is used in v2.2.0 - -Upstream-Status: Pending -https://gitlab.isc.org/isc-projects/kea/-/issues/3007 - -Upstream has confirmed the patch will not be accepted but discussions -with upstream is still going on, we might have a proper solution later. - -Signed-off-by: Sudip Mukherjee ---- - src/bin/admin/kea-admin.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in -index 034a0ee..8ab11ab 100644 ---- a/src/bin/admin/kea-admin.in -+++ b/src/bin/admin/kea-admin.in -@@ -51,14 +51,14 @@ dump_qry="" - if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then - . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" - else -- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" -+ . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" - fi - - # Find the installed kea-lfc if available. Fallback to sources otherwise. - if test -x "@sbindir@/kea-lfc"; then - kea_lfc="@sbindir@/kea-lfc" - else -- kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" -+ kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" - fi - - # Prints out usage version. -@@ -355,7 +355,7 @@ mysql_upgrade() { - # Check if there are any files in it - num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) - if [ "$num_files" -eq 0 ]; then -- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql -+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql - - # Check if the scripts directory exists at all. - if [ ! -d ${upgrade_scripts_dir} ]; then -@@ -405,7 +405,7 @@ pgsql_upgrade() { - # Check if there are any files in it - num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) - if [ "$num_files" -eq 0 ]; then -- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql -+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql - - # Check if the scripts directory exists at all. - if [ ! -d ${upgrade_scripts_dir} ]; then --- -2.39.2 - diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb index c3aa4dc8f06..9f8758f3791 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb @@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - file://0001-kea-fix-reproducible-build-failure.patch \ " SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" @@ -47,7 +46,7 @@ do_configure:prepend() { # replace abs_top_builddir to avoid introducing the build path # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" - sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in + sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in } # patch out build host paths for reproducibility From patchwork Fri Apr 19 12:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42685 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 2271AC10F1A for ; Fri, 19 Apr 2024 12:20:02 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web10.19244.1713529195162971008 for ; Fri, 19 Apr 2024 05:19:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AgaCzj1u; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-571d6d1943fso541930a12.2 for ; Fri, 19 Apr 2024 05:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529193; x=1714133993; 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=TCgvdfhiAf+O0n6dAewDU88nC9L4Fp1eoCQXkneMJWk=; b=AgaCzj1ucdcR6+GtmYQyRgM9UBcduwy7xEhx15pqb1ABPkRLF8YYZfXEn21AARau7j HvjCjRibkXvAoSetWwE4xpqK5/dU60K2tgQjmLr4ljm6a7HwoAqpxlULmU8IuaX4bIJd e/pPzEKg3/GU6NJRInWFlJlAFNYtC3AwvwSBFLMmAh6qTYjK/buUph6tgbVXkq2YrhR6 TElwAkWa+NINiSStN+YVHzjwe0vgLaHdQlq1WI7752ulrzyhrKJdsCGODOhapRojfniz L4pTrf1Jf6fLlCB785X0cjxiHVwl85AfAECEWLJ3418UDNd3lklAAH6DmD80DBx91QLG /J5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529193; x=1714133993; 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=TCgvdfhiAf+O0n6dAewDU88nC9L4Fp1eoCQXkneMJWk=; b=ZlP/r0ipcEMjUDH2O+/QjJEM2D8Qy5eacWWVJWJGC7xn0o6OZRgn5WN1PALDOePW3m R1DVwUIzSbZBmTLuOqDr0dY1voIaCJcikO9mJiZ648VxOuK1iyqAoCfV/2vBq+nHikjo WVwsXNFQyC/cA/5yPfu+4rOlh64stjvGcUsTA+buZWXCPKH5q4qtLUEyPeTtGrHBchnF qFMoGOsohB9Bw8g5KNKtJ4ZgGTXfGCHsRoZO9nwB1761duSUBotrKHyeYvYzSufMyfqo 7f/jXq6ZuLwji62W0d1riGJHn3V+hwKmS774V6+LVESbJY0YLtCsLCQkOa9SxaK1CTwU UwcA== X-Gm-Message-State: AOJu0YwHZxhZf31TDzjIJ/gI5RO6mE5e2topiiVzi4YI0CILMovALyLF 7kQqlRGiahL4l/b2FQ0EQUxMDwKfTTsTHrcCgm0As9QCgxwOdQmVlBMZ+A== X-Google-Smtp-Source: AGHT+IHzCIbS7U7KcRxODxUlkbsiwHCyI2OzFZt2RsZsQWKmwzIAy+Waf6qOhR3DA2Vr3zOdhqwhSA== X-Received: by 2002:a50:d74b:0:b0:56e:2b0b:58 with SMTP id i11-20020a50d74b000000b0056e2b0b0058mr1466621edj.10.1713529193301; Fri, 19 Apr 2024 05:19:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/19] expect: mark patches as Inactive-Upstream Date: Fri, 19 Apr 2024 14:19:33 +0200 Message-Id: <20240419121945.1920944-7-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198535 There's every indication that this is an ex-expect: last release in 2018, stale tickets, cvs server gone. Signed-off-by: Alexander Kanavin --- .../expect/expect/0001-Resolve-string-formatting-issues.patch | 2 +- meta/recipes-devtools/expect/expect/0001-configure.in.patch | 2 +- .../expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | 2 +- ...1-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch | 2 +- meta/recipes-devtools/expect/expect/0002-tcl.m4.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch index af1d8c626c2..bfb6dcd89ae 100644 --- a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch +++ b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch @@ -3,7 +3,7 @@ From: Alexander Kanavin Date: Thu, 23 Mar 2017 13:44:41 +0200 Subject: [PATCH] Resolve string formatting issues. -Upstream-Status: Inappropriate [upstream seems dead] +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] Signed-off-by: Alexander Kanavin --- exp_clib.c | 4 ++-- diff --git a/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/meta/recipes-devtools/expect/expect/0001-configure.in.patch index 7595a254a8f..618c4bee8eb 100644 --- a/meta/recipes-devtools/expect/expect/0001-configure.in.patch +++ b/meta/recipes-devtools/expect/expect/0001-configure.in.patch @@ -1,7 +1,7 @@ Allow cross compiling. Signed-off-by: Anders Roxell -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] --- diff -uNr a/configure.in b/configure.in --- a/configure.in 2012-12-14 15:31:32.623180450 +0100 diff --git a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch index 37512fb9bc8..d73f4c34215 100644 --- a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch +++ b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch @@ -10,7 +10,7 @@ Aborted (core dumped) Use PATH_MAX to fix the problem. -Upstream-Status: Pending [Upstream seems dead] +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] Signed-off-by: Robert Yang --- diff --git a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch index b1d322d5c95..40f7f3bd85a 100644 --- a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch +++ b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch @@ -42,7 +42,7 @@ Example: } Author: Sergei Golovan -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] This patch is backported from fedora changes for expect: http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3 diff --git a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch index dc4c6ba4066..eb178f462ac 100644 --- a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch +++ b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch @@ -1,7 +1,7 @@ Use proper -L path when cross compiling. Signed-off-by: Anders Roxell -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] --- diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100 From patchwork Fri Apr 19 12:19:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42684 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 E9ADEC10F00 for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by mx.groups.io with SMTP id smtpd.web11.19152.1713529195610783244 for ; Fri, 19 Apr 2024 05:19:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=D3lRa0k3; spf=pass (domain: gmail.com, ip: 209.85.208.49, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-563cb3ba9daso1761456a12.3 for ; Fri, 19 Apr 2024 05:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529194; x=1714133994; 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=IKzP/QUxqOds3tEgQpl+N4R316z10IA3wMTQxNdsrMs=; b=D3lRa0k3HnV7rU3SBNSbqCaV5lOL/n3ASXSL3dT7eXW25oDkCcXmM9RNck1J14vjNo fEoKBPr1zLcVvyrQfNAAbXm1p/oY6UPyowvx2bb4z6HHpeEfT12/OPHY2bLGF2BBT7xm PdKPAg5ODOJBsV6docqegBcRmur3M/Enx2kb5J1ACkS1Ztlvs5E26KdJXR40TuoS9Axk eslQlxM43QoXZPBfJzmKSHE8lnq7clxl2Tb5p81I1sPG6ttd9yg1GrzCcbu4XjOLZAod We2dVGDQD41Vgqg/gxFb9KfR9phdHxq+Qlvt0/KYfX2qYv5QdqtX67SoutEe5H2JBA7k fhgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529194; x=1714133994; 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=IKzP/QUxqOds3tEgQpl+N4R316z10IA3wMTQxNdsrMs=; b=esFm3S0EiY3B2QtW+jw/KwwpvgihHbS8wTQ9Ix8f1i2m31T1wEXqdibM2kcWXpG5ac BcDhAxsMBVhVM72amnVF38Uj9f3l+w4eNjqgKa4I1khPzg6lqaDN44j157ob19s5T1Ck DvKqEp55hfIaAIgxk7t7g0Ri+Q6UA/TrvCMM9aODLmQLhQuvqlNmZT6Mor6lTMZFIkKG 5aNaWC0ADvSmFLi5jsX67F9GCD9XgmU0K4Fns5QtQzyFt4DfJfFdJUMV5asdDOjEomMe 1kQLVQDXJMFTILEYmRkhiRWUa6PLSAbIv+1/GIv/aqBk5x41jq/TCIF5RVBrzIYikfZH 3iJQ== X-Gm-Message-State: AOJu0Yzzrty+awDrB7NcyheAZzV/yruANhXbV8XsSGIhVE7SjXm/AaFO BfaZ0wsL/WuZufYrrfrNhJNRsqdwnp+xiyGyXfooKJ3wseQK5MDplc//EA== X-Google-Smtp-Source: AGHT+IEuFrrJpG9P6kA+Grsa6WZAiEpq8uqMkc9Jg+sCJRI2SXzzO7vvQPHtrQ6UbEkftjjF1ZcmHw== X-Received: by 2002:a50:d542:0:b0:568:cdd8:cf60 with SMTP id f2-20020a50d542000000b00568cdd8cf60mr1884176edj.8.1713529193974; Fri, 19 Apr 2024 05:19:53 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:53 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/19] apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream Date: Fri, 19 Apr 2024 14:19:34 +0200 Message-Id: <20240419121945.1920944-8-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198536 Signed-off-by: Alexander Kanavin --- .../apr/0001-Add-option-to-disable-timed-dependant-tests.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index a274f3a16e3..b46dc76a863 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized system under heavy load, these tests randomly fail because they miss a timer or other timing related issues. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] Signed-off-by: Jeremy Puhlman --- From patchwork Fri Apr 19 12:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42680 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 DBDDAC07E8F for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.19153.1713529196346520034 for ; Fri, 19 Apr 2024 05:19:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jISKwXEV; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-571d7b39c30so398243a12.0 for ; Fri, 19 Apr 2024 05:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529195; x=1714133995; 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=BKO5m7qEsLsvtrBK6MGvZC0NnRc2kLQGCqB0ZLYoyCU=; b=jISKwXEV2l+VtwLc43rFzd4Gyt7weagr9S2saFK4xaAgCQLw8vF4nxl20Ts78+sNwZ QoxeJIC8PYSpUrMKhPvxTMdI4Ue3GvIiJPSvEGaDKhsoJvrSsX3aICEaN2UnXK9bOeKQ wfWRZri/D3UiRar6zOLPfYrQ4Q9xJoHIxr1en/CJ+CSMu2yEYlWQ/Ztm4846F8zY88YE 2UCcgytq7to+n404Fz3JswFjWtPNtNs1urJmqn9XDVTatg3omJEFmxF63VvW6YJxStUf g3V9C42/gbbLpNaysh/pf4OUgw8o+6NeLXMM3reZqr+eigYhcEFRD4EKJF4ny3Uq9jKr sELQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529195; x=1714133995; 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=BKO5m7qEsLsvtrBK6MGvZC0NnRc2kLQGCqB0ZLYoyCU=; b=ofNM7Y4C+e00Xc6SBLrK3tahpU4SXaOY84GZfOHWLgf6eJeOdzvqvYGrEFUPO4KANB xWNDKINEgCtMspWFqaebe5vF32whmzfhfm5hUgetsbkEIVzIc5rCWYxWO7YGsSWqfLJH Z+rAH6Ny+i5BaZSxFpHa9vKlU5OB0Z/CHFryWQB9fqptgeL64t9lRNhtJ3r32Wap2gMN jkFtXVwxzlvb7AydcMjLjhfzrLqwAcmpsunt1NuAaariqeONod4h0F+FRUZnL/F/XC9T V3Jr+L5n2ez1mYTYNSNS/q4xXOS9Tul9fgtE6jhLSvIn7hUnNs3gcDJyLGvSkA6sV2J3 JSpw== X-Gm-Message-State: AOJu0Yyz6SMNF+hYnpWjPzKjvzYyKbE1f8/Cu8iYizkXrOVHITKXkrtT H3s70wnk3gPpACot2WHsK0gs4VWGkr1Gz1FfjQVvtlrwKXR/o5pukNWqWw== X-Google-Smtp-Source: AGHT+IHMGz7eMiaQ62dxUcQzdN8sdphSEHezJME/uSh7MjOB2v6XayvGMQPHsbJoPHEUvxkJ8EfeNw== X-Received: by 2002:a50:f696:0:b0:56d:fa24:8ab3 with SMTP id d22-20020a50f696000000b0056dfa248ab3mr1942412edn.13.1713529194650; Fri, 19 Apr 2024 05:19:54 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:54 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/19] busybox: submit CVE-2022-28391 patches upstream Date: Fri, 19 Apr 2024 14:19:35 +0200 Message-Id: <20240419121945.1920944-9-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198537 Signed-off-by: Alexander Kanavin --- ...1-libbb-sockaddr2str-ensure-only-printable-characters-.patch | 2 +- ...2-nslookup-sanitize-all-printed-strings-with-printable.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch index 46352501707..ceb3ad7250f 100644 --- a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch +++ b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are returned for the hostname part CVE: CVE-2022-28391 -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] Signed-off-by: Ariadne Conill Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch index 0d7409ddc3c..1dbc3388a46 100644 --- a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch +++ b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch @@ -8,7 +8,7 @@ Otherwise, terminal sequences can be injected, which enables various terminal in attacks from DNS results. CVE: CVE-2022-28391 -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] Signed-off-by: Ariadne Conill Signed-off-by: Steve Sakoman --- From patchwork Fri Apr 19 12:19:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42682 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 D3AFCC07E8D for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by mx.groups.io with SMTP id smtpd.web10.19245.1713529197452202032 for ; Fri, 19 Apr 2024 05:19:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jP85fEFQ; spf=pass (domain: gmail.com, ip: 209.85.208.179, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d717603aa5so24004301fa.0 for ; Fri, 19 Apr 2024 05:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529195; x=1714133995; 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=1At+IHOlH7GduliDiXdU7UYfbzA9H/Y8A26LgnLCoUE=; b=jP85fEFQq+F2v/5uD7zDP5MOSMvV9bWKHvhjdQYx7AF8WYZzqSj0+2WHbJQ+eDYRcZ ekkZw72HNRLGM9m8BoLYHSD/1s1uBqsazmzLXSLU5XuJh15WnKuH7yJVjSdn9QRC86Vm vWQFRNHwYxps2LN+FRJ3E6Ru0pRXlMB5l5LHH8ykqL0fY+e3O7Aa+OFltRDj7Rq/sSuQ yrR2PLpK8iy8x5hyF2UMEYwwTs4IRpbfRlhuROzhUr4aqHg4vDkQ79Y8swFDFLevTf1n A90/24v9WHpKlWmh95js4NhWiVChi5vOHvy19qmSdMn0s21o/MC3mEvsVGF2U9nf6oM2 9kbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529195; x=1714133995; 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=1At+IHOlH7GduliDiXdU7UYfbzA9H/Y8A26LgnLCoUE=; b=BX7Ms0K1D0REg8DjgK9BoBs+pV4qWPWFs037lQmfqjNpCqf41Hi4l+BeaI0bW5sfe1 iKJ9yB9ASIpjI88z4QDqlhMMFkOF0USEx5BqLMY6CxVGE6fZ0L+unZ4RHD46NjE91GEY A4RffwvJPAbnfR9COB/UO4fKR+fVrU09x3bzEEyFtBTz2ZsYj2fSFuHkp57jSK9vMnRd S2afWs3kqQcOX/cdyI7RVir5OytHZGbGHoz6+o9z8Ro60mbgdb9K635jT7x0rtwXvd/X 4N4RacQVyx6K8DMPawowE54/nHlMeW9P+qOs9at/qv2KRx0ev6PRS6LrX7CA9ebSvKk+ 14uw== X-Gm-Message-State: AOJu0YxQ7cey1Dgt3wRDAJhZRZxsS9F434WlIEs5ViRkdo6h/mpdBZpX KweK5+RnR+1J6Sk6J8dL7RDKGwXL3tb2ZpcrwnEhG6Wl9Egb09leJtjHJQ== X-Google-Smtp-Source: AGHT+IHW4hjR/sFYiAQqw/q9kQsfGr2ubHHzPqnq4rM/OMpehZ+XiFpeUmYdLVIr5Pi62TYIBhxAJA== X-Received: by 2002:a2e:9059:0:b0:2d7:17e0:ff56 with SMTP id n25-20020a2e9059000000b002d717e0ff56mr1584026ljg.18.1713529195331; Fri, 19 Apr 2024 05:19:55 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:55 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/19] busybox: remove busybox-udhcpc-no_deconfig.patch Date: Fri, 19 Apr 2024 14:19:36 +0200 Message-Id: <20240419121945.1920944-10-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198538 The option was introduced in: https://git.yoctoproject.org/poky/commit/?h=master&id=427472e980cd6254a5e4ef37209b327e15af259b for the purpose of a standalone udhcpc service. 18 months later the service was removed as it was clashing with the broader networking service, and the option isn't used anywhere else: https://git.yoctoproject.org/poky/commit/?h=master&id=a4b1e348484b74d055b8906413892789d3452f4a There's a slight chance the option still survives somewhere private, and is important in that context, but I'd rather drop the patch so it can be maintained where it's useful, and maybe even proposed upstream. Signed-off-by: Alexander Kanavin --- .../busybox/busybox-udhcpc-no_deconfig.patch | 87 ------------------- meta/recipes-core/busybox/busybox_1.36.1.bb | 1 - 2 files changed, 88 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch deleted file mode 100644 index 948932a3e89..00000000000 --- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001 -From: Anders Darander -Date: Thu, 3 Nov 2011 08:51:31 +0100 -Subject: [PATCH] busybox-udhcpc-no_deconfig.patch - -Upstream-Status: Pending - -Add a new option -D to the udhcpc client that allows for -dhcp renewal to occur without having to down the interface -in the process. - -Signed-off-by: Greg Moffatt - -Updated to latest Busybox 1.17.3 - -Signed-off-by: Mark Hatle - -Updated to Busybox 1.18.4 -option spec is changed - -Signed-off-by: Qing He - -Updated to Busybox 1.19.3 - -Signed-off-by: Anders Darander - -Fixed options -b, -a and -P. - -Signed-off-by: Andreas Oberritter ---- - networking/udhcp/dhcpc.c | 29 ++++++++++++++++------ - 1 file changed, 21 insertions(+), 8 deletions(-) - -Index: busybox-1.34.0/networking/udhcp/dhcpc.c -=================================================================== ---- busybox-1.34.0.orig/networking/udhcp/dhcpc.c -+++ busybox-1.34.0/networking/udhcp/dhcpc.c -@@ -48,6 +48,8 @@ - }; - #endif - -+/* option whether to down the interface when reconfiguring */ -+static int allow_deconfig = 1; - - /* "struct client_data_t client_data" is in bb_common_bufsiz1 */ - -@@ -100,8 +102,10 @@ - OPT_x = 1 << 16, - OPT_f = 1 << 17, - OPT_B = 1 << 18, -+ OPT_D = 1 << 19, - /* The rest has variable bit positions, need to be clever */ - OPTBIT_B = 18, -+ OPTBIT_D = 19, - USE_FOR_MMU( OPTBIT_b,) - IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) - IF_FEATURE_UDHCP_PORT( OPTBIT_P,) -@@ -587,7 +591,8 @@ - - static void d4_run_script_deconfig(void) - { -- d4_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ d4_run_script(NULL, "deconfig"); - } - - /*** Sending/receiving packets ***/ -@@ -1244,7 +1249,7 @@ - /* Parse command line */ - opt = getopt32long(argv, "^" - /* O,x: list; -T,-t,-A take numeric param */ -- "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB" -+ "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD" - USE_FOR_MMU("b") - IF_FEATURE_UDHCPC_ARPING("a::") - IF_FEATURE_UDHCP_PORT("P:") -@@ -1361,6 +1366,10 @@ - logmode |= LOGMODE_SYSLOG; - } - -+ if (opt & OPT_D) { -+ allow_deconfig = 0; -+ } -+ - /* Create pidfile */ - write_pidfile(client_data.pidfile); - /* Goes to stdout (unless NOMMU) and possibly syslog */ diff --git a/meta/recipes-core/busybox/busybox_1.36.1.bb b/meta/recipes-core/busybox/busybox_1.36.1.bb index 06eb9eb9996..373a6b7781b 100644 --- a/meta/recipes-core/busybox/busybox_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox_1.36.1.bb @@ -2,7 +2,6 @@ require busybox.inc SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-depmod-Ignore-.debug-directories.patch \ - file://busybox-udhcpc-no_deconfig.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ From patchwork Fri Apr 19 12:19:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42676 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 B712EC071FD for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mx.groups.io with SMTP id smtpd.web10.19247.1713529198203137340 for ; Fri, 19 Apr 2024 05:19:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=StxPXvgq; spf=pass (domain: gmail.com, ip: 209.85.208.175, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2d717603aa5so24004511fa.0 for ; Fri, 19 Apr 2024 05:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529196; x=1714133996; 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=KWLQtJPk9SIrfIhVoGYy2yf28noZsdWps1iyfgyGjtA=; b=StxPXvgqiGih/5OFVUZixZsjWBu6YdPldOujsL0up6QgZCrvd3xspmPM1UolxQ7PIp usvZLFSxFMhEOWWvP6dnB5oca7r4giRugJKRly1/pxaTLsiqODcKJPztcBVfEUaG3mSQ s3nBmDAWeY8a+crnR1xfitHy4ho2fNCfnW31I3p2VN1mfA9+Vs+cEUOU8ZsrYzMhn/UK T2d/uirfJ3p1+0Ir+DdXUJKEEuF6y4vxm3TNRnaQugVDeuXdnUaRlbx3P4+mWuAcrQ+J hYUcWtBhRi8GIJI6MpcY/HtOplYbTU/zU1dPV1peyoA/yoqnEhr4oFoZ18xcR9i9OxWO sAgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529196; x=1714133996; 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=KWLQtJPk9SIrfIhVoGYy2yf28noZsdWps1iyfgyGjtA=; b=fCG3Q3Ld0wvM64SsPzABoeYIfaUqMS53wF5jvC1ohEde1dO/q0pS3oXNd3vrKHfQn3 MDbTPAi9tfFJCaMB/olYaTOzTHAKbjZeL0pD0MRyr+oizoBtDZj2XFCjV8880pRz6eT0 XphNoiGynpPwL2zkf/GlZQJpJ9aUbC6cwMUbrILSPVo5GHtq4uglmnzwRNRhxIFex92N 2tPffSbXPevCftKAqSMiw2/pf9hCdkOAN1N7V+8Fqkcu9FuhxCyYjQtmmMW+l8hKVC70 ysWQ3g8p+KG8igNCKMfIwPuX2q61WLC8PuGTc4DZNFxoaRU8srGNZxGuUi534miTN6Sv T2xA== X-Gm-Message-State: AOJu0YxZrNk5cPlbPnL3jiIxaAn6iDvifRxgm9GEekJCs0f0ngjwbgzi TJflvkXwzNfxjAVBwAv+Y3i0xdaYmF2n3DI1LSLhfk+uRJ9jSVUq88YXlQ== X-Google-Smtp-Source: AGHT+IHLagcdTwMOW0S2iAxqTzLq4ebJFuBnKQR23lqd7S8dDtWd/1YKY0sB5tacR+mawfpQxL23YQ== X-Received: by 2002:a05:6512:128b:b0:519:569b:361b with SMTP id u11-20020a056512128b00b00519569b361bmr1934065lfs.63.1713529196072; Fri, 19 Apr 2024 05:19:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:55 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/19] icu: add upstream submission links for fix-install-manx.patch Date: Fri, 19 Apr 2024 14:19:37 +0200 Message-Id: <20240419121945.1920944-11-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198539 Signed-off-by: Alexander Kanavin --- meta/recipes-support/icu/icu/fix-install-manx.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 7526bde3702..16cabc82643 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch @@ -11,7 +11,9 @@ and one process tries to chown a file that the other process has just deleted. Also install-manx should be a phony target, and for clarity use $^ instead of $? in the install command. -Upstream-Status: Pending +Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 + +Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] Signed-off-by: Ross Burton --- Makefile.in | 8 ++++---- From patchwork Fri Apr 19 12:19:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42679 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 C53A9C07C79 for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by mx.groups.io with SMTP id smtpd.web11.19155.1713529198807846321 for ; Fri, 19 Apr 2024 05:19:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iLPKayBN; spf=pass (domain: gmail.com, ip: 209.85.208.53, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-571cca01d8aso829650a12.2 for ; Fri, 19 Apr 2024 05:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529197; x=1714133997; 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=BmYhTSTI9bhG8y88B/S6AJg22yYObuPQnLxEy2xFTsc=; b=iLPKayBNgjPcQ5L4d23WnW42EgMpUMERf6Ahay4D0jxTW1O9dgNR8VRSFAUVLjKEac h/R8l8iyLoUAjVDQi0o1EDgOfXZccDA3OjQoMvZtSPjTw+wUgLWbSkYUp++TFlDNpHA7 Mxhd+URjwnbGSaHdPNlD/k38ZoHPY5ea3FHdeuCmFTPY6fNCblBfTpyobEqhIEyiT5uU sXA+gjJPPEfkf35CaO4vk/eslKNE+Q9iN3SzMSDyppN0q5Ancz0+JC1Fs3Ll89bnz4Nf kZeVW6gt9+e5JUDqvcuUXfUhpmsoE4r5DSp3vyZF1CIgKPsoHaJI5BrZa77O/1VjpDMw LQYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529197; x=1714133997; 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=BmYhTSTI9bhG8y88B/S6AJg22yYObuPQnLxEy2xFTsc=; b=PEfalmnsRvLGPnTM4AeWAEpO3BW3CWK2T4ttIU+786I36iyp8+AC3ghi1zzfYoCj39 lYBmcZZilpssf3Zl6XwC/hYXEugHZTdx32HUlvIxuMw/Enn82wE6V+FJNUmZLbHdbzje XHdrOPBP3WMb/+DsudDCWcTGZ/CAcklYipgxalpHthNUcboHuCenxVSSZFSX4Usz/qYX AJM6x2xxBojpy59N9V8XpRfy1HHtOBzcIncvviVuoTLVjAgUauOvk1DhkLh+73DyLalg w/Fi2ned8nH12suLfC28EdaOw8mSQQb0PZ+fwutR1/VjLqwfuyyeI4Pt1RvMF7mjGJuU GOaA== X-Gm-Message-State: AOJu0YzpL6AfJFpKE+jqIGdnn32gN2oOJlN/ZmV5SfrabdZr/n6Qq3Oo 92mccJy6y3V6urUHwEjUz2/Ylzep6eW6dKKfWSQJ/0mf/CgsJICxQoCxaA== X-Google-Smtp-Source: AGHT+IHzX6QYOsINw86cjltH2A9ArOKmZBkw7feY6eK5rSEx6XYBMegtQQbZsO6pHbYJP8NxuaKAxw== X-Received: by 2002:a50:871e:0:b0:56e:3774:749b with SMTP id i30-20020a50871e000000b0056e3774749bmr1197459edb.42.1713529196874; Fri, 19 Apr 2024 05:19:56 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:56 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/19] mpeg2dec: remove the recipe Date: Fri, 19 Apr 2024 14:19:38 +0200 Message-Id: <20240419121945.1920944-12-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198540 This is as well inactive for over 10 years, and has been superseded by ffmpeg long time ago. Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 1 - .../gstreamer1.0-plugins-ugly_1.22.11.bb | 1 - ...-1206-from-upstream-to-fix-PIE-build.patch | 156 ------------------ ...heck-for-available-arm-optimizations.patch | 55 ------ ...f-global-symbols-used-in-ARM-specifi.patch | 63 ------- .../files/61_global-symbol-test.patch | 70 -------- .../mpeg2dec/files/altivec_h_needed.patch | 43 ----- .../mpeg2dec/mpeg2dec_0.5.1.bb | 51 ------ 8 files changed, 440 deletions(-) delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch delete mode 100644 meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch delete mode 100644 meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 52bb542483d..a11859890e5 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -523,7 +523,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned " RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal " RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin " RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao " -RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin " RECIPE_MAINTAINER:pn-mpfr = "Khem Raj " RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin " RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu " diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb index d89442d7893..99f41d4f3dc 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb @@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - mpeg2dec \ " PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch deleted file mode 100644 index b2544cb44d8..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001 -From: Jan Schmidt -Date: Sun, 10 Nov 2013 00:49:52 +1100 -Subject: [PATCH] Import revision 1206 from upstream to fix PIE build. - -Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm -in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad -for shared libraries. Some environments demand that .text actually be -read-only all the time, yet MC_put_o_16_arm etc require that the addresses -be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.) -Even in those environments which permit the dynamic linker to modify the -.text segment, the runtime cost of doing the relocation can be noticeable. - -This commit rewrites the linkage, discarding the tables of addresses -in favor of tables of offsets. All transfers are local within each individual -function, so there can be no interference by processing that occurs -after assembly, such as link-time re-ordering (even of individual functions.) - -Patch by John Reiser -Signed-off-by: Khem Raj -Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499] ---- - libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++------------------- - 1 file changed, 33 insertions(+), 37 deletions(-) - -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S -index c921f7c..82143f8 100644 ---- a/libmpeg2/motion_comp_arm_s.S -+++ b/libmpeg2/motion_comp_arm_s.S -@@ -30,9 +30,13 @@ MC_put_o_16_arm: - pld [r1] - stmfd sp!, {r4-r11, lr} @ R14 is also called LR - and r4, r1, #3 -- adr r5, MC_put_o_16_arm_align_jt -- add r5, r5, r4, lsl #2 -- ldr pc, [r5] -+ ldrb r4, [pc, r4] -+ add pc, pc, r4, lsl #2 -+ .byte (MC_put_o_16_arm_align0 - 0f)>>2 -+ .byte (MC_put_o_16_arm_align1 - 0f)>>2 -+ .byte (MC_put_o_16_arm_align2 - 0f)>>2 -+ .byte (MC_put_o_16_arm_align3 - 0f)>>2 -+0: - - MC_put_o_16_arm_align0: - ldmia r1, {r4-r7} -@@ -76,11 +80,6 @@ MC_put_o_16_arm_align3: - 1: PROC(24) - bne 1b - ldmfd sp!, {r4-r11, pc} @@ update PC with LR content. --MC_put_o_16_arm_align_jt: -- .word MC_put_o_16_arm_align0 -- .word MC_put_o_16_arm_align1 -- .word MC_put_o_16_arm_align2 -- .word MC_put_o_16_arm_align3 - - @ ---------------------------------------------------------------- - .align -@@ -91,9 +90,14 @@ MC_put_o_8_arm: - pld [r1] - stmfd sp!, {r4-r10, lr} @ R14 is also called LR - and r4, r1, #3 -- adr r5, MC_put_o_8_arm_align_jt -- add r5, r5, r4, lsl #2 -- ldr pc, [r5] -+ ldrb r4, [pc, r4] -+ add pc, pc, r4, lsl #2 -+ .byte (MC_put_o_8_arm_align0 - 0f)>>2 -+ .byte (MC_put_o_8_arm_align1 - 0f)>>2 -+ .byte (MC_put_o_8_arm_align2 - 0f)>>2 -+ .byte (MC_put_o_8_arm_align3 - 0f)>>2 -+0: -+ - MC_put_o_8_arm_align0: - ldmia r1, {r4-r5} - add r1, r1, r2 -@@ -135,12 +139,6 @@ MC_put_o_8_arm_align3: - bne 1b - ldmfd sp!, {r4-r10, pc} @@ update PC with LR content. - --MC_put_o_8_arm_align_jt: -- .word MC_put_o_8_arm_align0 -- .word MC_put_o_8_arm_align1 -- .word MC_put_o_8_arm_align2 -- .word MC_put_o_8_arm_align3 -- - @ ---------------------------------------------------------------- - .macro AVG_PW rW1, rW2 - mov \rW2, \rW2, lsl #24 -@@ -160,12 +158,17 @@ MC_put_x_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR -+ ldr r11, 0f - and r4, r1, #3 -- adr r5, MC_put_x_16_arm_align_jt -- ldr r11, [r5] - mvn r12, r11 -- add r5, r5, r4, lsl #2 -- ldr pc, [r5, #4] -+ ldrb r4, [pc, r4] -+ add pc, pc, r4, lsl #2 -+ .byte (MC_put_x_16_arm_align0 - 0f)>>2 -+ .byte (MC_put_x_16_arm_align1 - 0f)>>2 -+ .byte (MC_put_x_16_arm_align2 - 0f)>>2 -+ .byte (MC_put_x_16_arm_align3 - 0f)>>2 -+0: -+ .word 0x01010101 - - .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4 - mov \R0, \R0, lsr #(\shift) -@@ -238,12 +241,6 @@ MC_put_x_16_arm_align3: - add r0, r0, r2 - bne 1b - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. --MC_put_x_16_arm_align_jt: -- .word 0x01010101 -- .word MC_put_x_16_arm_align0 -- .word MC_put_x_16_arm_align1 -- .word MC_put_x_16_arm_align2 -- .word MC_put_x_16_arm_align3 - - @ ---------------------------------------------------------------- - .align -@@ -253,12 +250,17 @@ MC_put_x_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] - stmfd sp!, {r4-r11,lr} @ R14 is also called LR -+ ldr r11, 0f - and r4, r1, #3 -- adr r5, MC_put_x_8_arm_align_jt -- ldr r11, [r5] - mvn r12, r11 -- add r5, r5, r4, lsl #2 -- ldr pc, [r5, #4] -+ ldrb r4, [pc, r4] -+ add pc, pc, r4, lsl #2 -+ .byte (MC_put_x_8_arm_align0 - 0f)>>2 -+ .byte (MC_put_x_8_arm_align1 - 0f)>>2 -+ .byte (MC_put_x_8_arm_align2 - 0f)>>2 -+ .byte (MC_put_x_8_arm_align3 - 0f)>>2 -+0: -+ .word 0x01010101 - - .macro ADJ_ALIGN_DW shift, R0, R1, R2 - mov \R0, \R0, lsr #(\shift) -@@ -319,9 +321,3 @@ MC_put_x_8_arm_align3: - add r0, r0, r2 - bne 1b - ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. --MC_put_x_8_arm_align_jt: -- .word 0x01010101 -- .word MC_put_x_8_arm_align0 -- .word MC_put_x_8_arm_align1 -- .word MC_put_x_8_arm_align2 -- .word MC_put_x_8_arm_align3 diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch deleted file mode 100644 index 5bf68b39ee6..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch +++ /dev/null @@ -1,55 +0,0 @@ -From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Jul 2017 18:49:21 -0700 -Subject: [PATCH 1/2] check for available arm optimizations - -Taken From -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - configure.ac | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index acdcb1e..2c0a721 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then - AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]) - - dnl arch-specific flags -- arm_conditional=false -+ build_arm_opt=false - case "$host" in - i?86-* | k?-* | x86_64-* | amd64-*) - AC_DEFINE([ARCH_X86],,[x86 architecture]) -@@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then - alpha*) - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; - arm*) -- arm_conditional=: -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);; -+ AC_LANG(C) -+ AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[ -+ void foo(void) { __asm__ volatile("pld [r1]"); }]])], -+ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]), -+ build_arm_opt=false);; - esac - elif test x"$CC" = x"tendracc"; then - dnl TenDRA portability checking compiler -@@ -123,7 +127,7 @@ else - esac - fi - --AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) -+AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue) - - dnl Checks for libtool - this must be done after we set cflags - AC_LIBTOOL_WIN32_DLL --- -2.13.2 - diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch deleted file mode 100644 index 83016923685..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch +++ /dev/null @@ -1,63 +0,0 @@ -From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 5 Jul 2017 19:03:36 -0700 -Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific - assembly file to internal - -Taken from -http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - libmpeg2/motion_comp_arm_s.S | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S -index f6c3d7d..c921f7c 100644 ---- a/libmpeg2/motion_comp_arm_s.S -+++ b/libmpeg2/motion_comp_arm_s.S -@@ -23,7 +23,8 @@ - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_16_arm -+ .global MC_put_o_16_arm -+ .internal MC_put_o_16_arm - MC_put_o_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] -@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt: - - @ ---------------------------------------------------------------- - .align -- .global MC_put_o_8_arm -+ .global MC_put_o_8_arm -+ .internal MC_put_o_8_arm - MC_put_o_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] -@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt: - .endm - - .align -- .global MC_put_x_16_arm -+ .global MC_put_x_16_arm -+ .internal MC_put_x_16_arm - MC_put_x_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] -@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt: - - @ ---------------------------------------------------------------- - .align -- .global MC_put_x_8_arm -+ .global MC_put_x_8_arm -+ .internal MC_put_x_8_arm - MC_put_x_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) - pld [r1] --- -2.13.2 - diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch deleted file mode 100644 index 00b667d3365..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch +++ /dev/null @@ -1,70 +0,0 @@ -Rewrite the public symbol check to verify the shared libraries, to check for -more things, and to avoid duplication; fixes make check on ARM - -Taken From -https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - test/globals | 42 +++++++++++++++++++++++++++--------------- - 1 file changed, 27 insertions(+), 15 deletions(-) - ---- mpeg2dec.orig/test/globals -+++ mpeg2dec/test/globals -@@ -1,4 +1,8 @@ - #!/bin/sh -+# TODO -+# - fix checking of .a libs; problem is that "nm -g --defined-only" lists -+# internal symbols; this can be solved by using objdump, but it's probably -+# good enough to just run the tests on the shared lib - - if test x"$srcdir" != x""; then - builddir="." # running from make check, but it does not define that -@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd` - - error=0 - --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\ -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'` -- --if test x"$bad_globals" != x""; then -- echo BAD GLOBAL SYMBOLS: -- for s in $bad_globals; do echo $s; done -+# check_bad_public_symbols [...] -+# -+# checks public symbols in shared libs: -+# - allow prefix_anything -+# - reject _prefixanything -+# - allow _anything -+# - reject anything else -+# -+# NB: skips missing files -+check_bad_public_symbols() { -+ symbols_prefix="$1" -+ shift -+ lib_files=`ls "$@" 2>/dev/null` -+ [ -z "$lib_files" ] && return -+ bad_globals=`nm -g --defined-only $lib_files | -+ awk '{if ($3) print $3}' | -+ sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"` -+ [ -z "$bad_globals" ] && return - error=1 --fi -- --bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\ -- awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'` -+ echo BAD GLOBAL SYMBOLS in $lib_files: -+ echo "$bad_globals" -+} - --if test x"$bad_globals" != x""; then -- echo BAD GLOBAL SYMBOLS: -- for s in $bad_globals; do echo $s; done -- error=1 --fi -+check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so -+check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so - - exit $error diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch deleted file mode 100644 index 5113ad44fe4..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add new method to judge whether is needed - -The original logic will use "typedef vector int t;" to judge -whether is needed. altivec.h contains the following -statement: - - #if !defined(__APPLE_ALTIVEC__) - #define vector __vector - #define pixel __pixel - #define bool - #endif - -In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither -as vector, pixel, and bool. In order to make "typedef vector int t;" -pass the compilation, we need to include altivec.h. - -However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler, -so as vector, pixel, and bool. We could not judge whether -altivec.h is needed by "typedef vector int t;". -Here we include another statement "int tmp = __CR6_EQ;", in -which __CR6_EQ is defined in altivec.h. - -Upstream-Status: Pending - -Signed-off-by: Dongxiao Xu - -diff -ruN a/configure.in b/configure.in ---- a/configure.ac 2010-09-14 20:55:42.399687663 +0800 -+++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800 -@@ -79,11 +79,11 @@ - CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS" - AC_MSG_CHECKING([if is needed]) - AC_TRY_COMPILE([], -- [typedef vector int t; -+ [typedef vector int t; int tmp = __CR6_EQ; - vec_ld(0, (unsigned char *)0);], - [have_altivec=yes; AC_MSG_RESULT(no)], - [AC_TRY_COMPILE([#include ], -- [typedef vector int t; vec_ld(0, (unsigned char *)0);], -+ [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);], - [AC_DEFINE([HAVE_ALTIVEC_H],, - [Define to 1 if you have the header.]) - have_altivec=yes; AC_MSG_RESULT(yes)], diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb deleted file mode 100644 index fd8b561657d..00000000000 --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams" -DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \ -mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \ -for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \ -is to have a simple test bed for libmpeg2." -HOMEPAGE = "https://libmpeg2.sourceforge.io/" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b" - -SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \ - file://altivec_h_needed.patch \ - file://0001-check-for-available-arm-optimizations.patch \ - file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \ - file://61_global-symbol-test.patch \ - file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \ - " - -S = "${WORKDIR}/libmpeg2-${PV}" - -SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef" -SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" - -UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared --disable-sdl" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" - -PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" - -FILES:${PN} = "${bindir}/*" -FILES:libmpeg2 = "${libdir}/libmpeg2.so.*" -FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*" -FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \ - ${libdir}/libmpeg2.la \ - ${libdir}/libmpeg2arch.la \ - ${libdir}/pkgconfig/libmpeg2.pc \ - ${includedir}/mpeg2dec/mpeg2.h" -FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a" -FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \ - ${libdir}/libmpeg2convert.la \ - ${libdir}/libmpeg2convertarch.la \ - ${libdir}/pkgconfig/libmpeg2convert.pc \ - ${includedir}/mpeg2dec/mpeg2convert.h" -FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a" From patchwork Fri Apr 19 12:19:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42677 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 A72DCC04FFE for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web11.19157.1713529199435302516 for ; Fri, 19 Apr 2024 05:19:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jraHOna8; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-56e69a51a33so2037270a12.1 for ; Fri, 19 Apr 2024 05:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529198; x=1714133998; 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=0b3fbFePIJY1s7CI624by7LvxR6hifo294sZXiEmCHo=; b=jraHOna8qBcAl8X8sMMHoI33LiKq1xdtRLUsd2CwrqT1+7TApkCjSwKIjVeQ+IVUvi bphd2WapSy20QXQOIMOt6lHZjL+wH+MToidKfmqkTHmvSHPH+QRt8DR5vcp7/8GHs1Gc G76TaFyk8HBVQn1nDC5FVg/arENBmCOizE/Fclc+IURjAa0xnKCewUgBdYWmVyoUp9bS KFdFu7haQHh546hIJI5m1V5wnBtSNgUJPWmwUdN+bgf8swZp1SWjrp0O0obTzTviVT0W /XlZggqniAiWkWUkBKqTa3IVHDlL4LRf+1Nv13qsT3d19GgSkgreOw+QWl0p+BaT/SVx QMew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529198; x=1714133998; 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=0b3fbFePIJY1s7CI624by7LvxR6hifo294sZXiEmCHo=; b=Jj5XTZ7gieBEwS3M7T9SOKiawqqtywLnZi7TNKAMuLRO1EGrjm7Ay1C8FAtCN1As0F zW0DRapE8ZQ8HU5qmgHzTn3gPFml3LdktPmWkHHigD7u7QROKofFOxkrPyShUNW+SGky I8dmgO0UGyeDsYflzsazvvV0KgRrwQ61sKhtl7RDA5cQ6l1Z5J989zXoXqLSx/SQAPVO 0r/cxwV2PfkAJQGGxHSB1usyujxdks7kSrMcsBq4Dpc7ui84Rx/HZ+NJEYrEWa8PQRNY 1FVUlvU6bD5U9zOw0VihPdHOMqMIQYry8JP7YYcDc5m4jMEFnCBHmov6InsjCtR/+Kgq z4pg== X-Gm-Message-State: AOJu0YwCIq27HESYytEB8ReSv71p84W9YeE7ZWrtnjAFEsHNZQmEIEMb fbruH0h3ThnFVEF5EgOvwBPaHmJi2HDlVwOslZtYH6Xzi8vnvf2a1sU0Sg== X-Google-Smtp-Source: AGHT+IEbpjUUeocRboTGx5gml907rB+SYuZv3XRDXeCkBuXu8qLDWY6iIWDmOOFAyVVBF/FqL1+tCQ== X-Received: by 2002:a50:f609:0:b0:56e:24a5:587a with SMTP id c9-20020a50f609000000b0056e24a5587amr1512134edn.11.1713529197800; Fri, 19 Apr 2024 05:19:57 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:57 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/19] apr: drop 0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch Date: Fri, 19 Apr 2024 14:19:39 +0200 Message-Id: <20240419121945.1920944-13-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198541 At some point this became unnecessary, as tested by building apr with DISTRO_FEATURES:append = " ld-is-gold" The logs do confirm that (previously) problematic binary links without errors. Signed-off-by: Alexander Kanavin --- ...libapr-against-phtread-to-make-gold-.patch | 50 ------------------- meta/recipes-support/apr/apr_1.7.4.bb | 1 - 2 files changed, 51 deletions(-) delete mode 100644 meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140ca..00000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 3 Mar 2017 22:24:17 +0100 -Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy - on test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' -| ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' -| collect2: error: ld returned 1 exit status -| Makefile:114: recipe for target 'globalmutexchild' failed -| make[1]: *** [globalmutexchild] Error 1 -| make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.in b/configure.in -index a227e72..cbc0f90 100644 ---- a/configure.in -+++ b/configure.in -@@ -784,6 +784,7 @@ else - APR_PTHREADS_CHECK_RESTORE ] ) - fi - if test "$pthreadh" = "1"; then -+ APR_ADDTO(LIBS,[-lpthread]) - APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - APR_CHECK_PTHREAD_RECURSIVE_MUTEX --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb index d322629b66f..4df741c7668 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.4.bb @@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ file://0004-Fix-packet-discards-HTTP-redirect.patch \ file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ - file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ From patchwork Fri Apr 19 12:19:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42675 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 95AB7C071DB for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mx.groups.io with SMTP id smtpd.web10.19250.1713529200464260977 for ; Fri, 19 Apr 2024 05:20:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=AQJvGDln; spf=pass (domain: gmail.com, ip: 209.85.208.176, mailfrom: alex.kanavin@gmail.com) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2d895138ce6so28917171fa.0 for ; Fri, 19 Apr 2024 05:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529198; x=1714133998; 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=Gq6qJCK2mhE7an0gjexyU2knH/FO+n623HJuQqvSFGE=; b=AQJvGDlnEPJnZrlmulHp5RUQ2NXtbHFnpi4po9mnBWMuQnPPkJ8Q/cWLxt7SkIK8uY TsxIJ/dSbohGEI/Y9qmEhwM3omSK31mHUFxHg+gjNjLlMGWbG728bsWDWV65DGT800g0 11hPO+tAwKslDDhilvdqyw3U9KyRhEm2GKXUuF3va5PShtonjocbrP7czXL93LFifaB0 yQ3ShS6vILsRIw11iC7rJDXASBKKketiA2S1bPbKBOdNDlyon+nkPO/QzZa9k3nJfaGH a5SIfsU9O5uJy2kklqz6usEm3PC/BhiNHL7L9cPJpqNWKCjJMfJfQMTI/OLKC+hIoOXf k3zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529198; x=1714133998; 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=Gq6qJCK2mhE7an0gjexyU2knH/FO+n623HJuQqvSFGE=; b=fTv6z39X/HuY6NOpaSDxnDStLBzxiIgsgjmNCRL3OxqaN3J6smJcWhGp0aaJr8l+rq ViHwvNA04dpRxs8j4H8SWLvpVI4QB3o0yNVPorBUXfqW0kRaP+6IgH8CmBb/FXovziNa 0sNzxcZbhiwSDpXt7qi3j1gn/VQWRgYqoMMifEU9HeD9+Qn3Ccxsvv2oTzyfyv0g8v5/ PuIR7PozHVlkg9VknNafV67ucVf1Azf3BEzB5Q5mNz2oJWqCa9fOux/z/Hvp3YI0aM8F RS5GaYp4Znh5p7bQsykfkEcuBN5cNsYWuEA3I0P8nD4RwU8hvb7d7jiRmqRzvalwOrEl b2kg== X-Gm-Message-State: AOJu0YzL4C1RyzIv3adVcAl2CLuJ9U0R3j9ttYFlDnwED0SwykpZMGVu McvF/FIwn1/ruUykYNi1jm99+BtOyGEeo3dTgXz8gKXmVrF87yR4RUXKCw== X-Google-Smtp-Source: AGHT+IGIoHIDToQmPuvN+4DK/HGS+Yug6bJ0GYTvfPV+h+lNMZNZEttwgfW+JxfHpjXtZjjls5jMeQ== X-Received: by 2002:a2e:8206:0:b0:2da:c3a:2546 with SMTP id w6-20020a2e8206000000b002da0c3a2546mr1134596ljg.21.1713529198459; Fri, 19 Apr 2024 05:19:58 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:58 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/19] libtraceevent: submit meson.patch upstream Date: Fri, 19 Apr 2024 14:19:40 +0200 Message-Id: <20240419121945.1920944-14-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198542 Signed-off-by: Alexander Kanavin --- meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch index 0c21b2347a1..fb831719cb6 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fixes for the Meson build of libtraceevent: - Make the plugin directory the same as the Makefiles - Install the plugins as modules not static and versioned shared libraries -Upstream-Status: Pending +Upstream-Status: Submitted [via email to linux-trace-devel@vger.kernel.org,rostedt@goodmis.org] Signed-off-by: Ross Burton --- meson.build | 2 +- From patchwork Fri Apr 19 12:19:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42678 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 8992DC41513 for ; Fri, 19 Apr 2024 12:20:01 +0000 (UTC) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by mx.groups.io with SMTP id smtpd.web11.19159.1713529200933514078 for ; Fri, 19 Apr 2024 05:20:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TjjMKmXb; spf=pass (domain: gmail.com, ip: 209.85.208.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-56e4a148aeeso892202a12.2 for ; Fri, 19 Apr 2024 05:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529199; x=1714133999; 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=SQnbGbpMoJt+W5/+ezwIlZ/HCcY54RueZSbiFiGg35o=; b=TjjMKmXb44XKSs2Qx11QH3vPby24bUWCY7KOoqc5uo+iyVwSXqjbfseGf18zivrz1F NsZ9q/xZsIXG2JznXIbM/68vTIfPkPK7ELm4Qk2wi7HJFc30foNECu0rnoaWK+GMYXks vZ1hX8kAtxRLVBmxss4R++t67AmXIFWQpvmRDtQmGALtXpqY3vqOeDDncPPdweg8i5gX TqICNr33Qk7qFSQ5QVOukBhKDj3Ud5hFwgqJZ90vBCrAqfGOe40ALpv88B8wFdT4773u O0mFvd5huLoTr3K+qEYMJC7XcAj9SxSS1houHEmFd6GPSg/B3XSo4FIhpDHUrXVsw0IC YUug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529199; x=1714133999; 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=SQnbGbpMoJt+W5/+ezwIlZ/HCcY54RueZSbiFiGg35o=; b=dEqRWNNm7GNmYf8fu2MQWqe3CcsQQQf3MjJEh87G6mNZpN7nkugu5Bwf3BOhgxW71F 8Mu1Yjf4YvEoJ4ia1mBBfFwbQqzeEUW2nD9GEqz52Se4j8S/vuRWaFDIsADgW9UIeg3/ m3Wg/qK1giIBdcFhmeiYLzLWOXSsjPU/mZPg9mdUrsp3Nn9qyqb65hfxhGP2jXIESyWc 7xw2sopWoQIKQsE0aZfsScIvbnPO0VpugvVRgvtjy9IpZkc0Nb4IoIKYU+a7TJ2tuA0W 1RBor7TKD80uzzPwh8yRtRcEgTLUY6mC5trRyXFERHWQh0v/5h2qJMMTfnRz1u67PqP4 KzvA== X-Gm-Message-State: AOJu0YxvtdlbvWV3jxLAvgpQrInavUryL8imgLTTm0EBiYB7q8HyGa/1 Phv8DcWnyPUpSFDR07AJjO1sVhtuMNo3ukTK2MeyvjeubAbxHxyiQWXEVA== X-Google-Smtp-Source: AGHT+IFCe2tcsP/ECCJDWLojNmTDoIr587Yqoc/BhEwysWCINepC/AHx7Oz0jFfUGLKaZWDHBRL6aw== X-Received: by 2002:a05:6402:26d0:b0:56e:2a05:a0e3 with SMTP id x16-20020a05640226d000b0056e2a05a0e3mr2249009edd.21.1713529199071; Fri, 19 Apr 2024 05:19:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:58 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/19] gstreamer1.0-plugins-good: remove 0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch Date: Fri, 19 Apr 2024 14:19:41 +0200 Message-Id: <20240419121945.1920944-15-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198543 At some point this patch became unnecessary as the respective qt5 plugin is building without issues without it (checked on qemuarm/qemuarm64). Signed-off-by: Alexander Kanavin --- ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 54 ------------------- .../gstreamer1.0-plugins-good_1.22.11.bb | 1 - 2 files changed, 55 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch deleted file mode 100644 index 9703a3a8894..00000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 31 Mar 2020 21:23:28 -0700 -Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h - -gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to -prefer qt headers definitions for GLsync - -This helps in fixing build errors like below - -/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync' - 24 | typedef struct __GLsync *GLsync; - | ^~~~~~ -In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84, - from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: -/mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync -' - 40 | typedef gpointer GLsync; - | ^~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - ext/qt/gstqsgtexture.cc | 2 +- - ext/qt/qtwindow.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc -index 663696b..36b17d4 100644 ---- a/ext/qt/gstqsgtexture.cc -+++ b/ext/qt/gstqsgtexture.cc -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - #include "gstqsgtexture.h" - - #define GST_CAT_DEFAULT gst_qsg_texture_debug -diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc -index 2872cb5..5a36be9 100644 ---- a/ext/qt/qtwindow.cc -+++ b/ext/qt/qtwindow.cc -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - #include "qtwindow.h" - #include "gstqsgtexture.h" - #include "gstqtglutility.h" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb index edd8609b7cd..57924d5c9fc 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb @@ -5,7 +5,6 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" From patchwork Fri Apr 19 12:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42688 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 37F35C4345F for ; Fri, 19 Apr 2024 12:20:12 +0000 (UTC) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mx.groups.io with SMTP id smtpd.web11.19160.1713529201900213286 for ; Fri, 19 Apr 2024 05:20:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eD8MfCKu; spf=pass (domain: gmail.com, ip: 209.85.167.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51ac9c6599bso535833e87.1 for ; Fri, 19 Apr 2024 05:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529200; x=1714134000; 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=blQ1KYyAnUkMDlDQ71LRYCeYeH9Jqj+vomuxTKAyw/o=; b=eD8MfCKuq/6SbRDe530g50w+m9yS1xwjhdYys3UmYJ4JMBUXNqRU8XOFn4b3DXpoAK O1Ce1OLYC1iHAnX4Y9IOZITc/+JCvdeff8FVIV3ABq+VpcycGTu+3zNtOA1wIqPETUQ3 JTuxFVLsiTnjKJAPhl8GFC5ro51NZtvyggl6lsFqZ8jTK4UXGmochTd21Q9QV+q8gM6R 7Bh0ZM7RXqQTMMaHffaNzm9z18iGQQzcaLgeXZPSDRmVvrcly8gGUzSXrUFhKNI4W0gV +GQ8hzfgUWdtWy2D1/WRRMcPQZnueV2AYOzq8fW4iSURPYWgyqY0EmqfWRKXMDAQ0+42 CllQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529200; x=1714134000; 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=blQ1KYyAnUkMDlDQ71LRYCeYeH9Jqj+vomuxTKAyw/o=; b=XzsZnpSuYe5n5kSzQ9F/jqDC56Fb1pau0bPXSlhKBt6+4aUGS6dn+36iCc/+Lyt1qn A/8nBN0vT9RZDRaEZwVWxS41JnLu/2+PTKcodGqU0M28E9wm+vQ8vNfp4yaSviLTuG3v fCAzdLDrCvAvVIWnSrHDWXFVuEI1V86AfGa+5YzKfBi//Xr7hLjcm6nFzuVDzWEn2Rfe w2dFw/eUwYIlV/YfK/ddNjzRS4yT8ktMZnxzmILWyjW1yg4KU07/ZLxGPp2Yiav2UI9H tqFdqs8/WjkJ2a/WJDWa64ECPZCWxUtjlSHSt9R/zCf5e2najmWwq5oSWxd7uRLBe3dp cr8g== X-Gm-Message-State: AOJu0YxZPF1VEwc7eGwczNf+Rk69qXdPDkuUjRR5r1MpSG/pMY/ZfxaA V0KaNX9OeQyLPGbiicQQKdWLPJIbwFXNoEN23CzXzqNAuekyENebA8Aqdw== X-Google-Smtp-Source: AGHT+IHFuJEr0viSen6c1n8Vdv4PUf7fzk7j5zSZhGV87sNrf4eg/QO6mB3wMfOuc4cuBLhsnH3f/w== X-Received: by 2002:a05:6512:e83:b0:519:b4f:51d7 with SMTP id bi3-20020a0565120e8300b005190b4f51d7mr1848841lfb.68.1713529199886; Fri, 19 Apr 2024 05:19:59 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:19:59 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/19] xinput-calibrator: mark upstream as inactive in a patch Date: Fri, 19 Apr 2024 14:19:42 +0200 Message-Id: <20240419121945.1920944-16-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198544 Signed-off-by: Alexander Kanavin --- .../Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch index 86982924a81..de0862599d7 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch @@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last commits over a decade ago] From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu From patchwork Fri Apr 19 12:19:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42690 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 52A96C04FFE for ; Fri, 19 Apr 2024 12:20:12 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.19252.1713529202310882995 for ; Fri, 19 Apr 2024 05:20:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XzkxwUTM; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-56e1baf0380so2537478a12.3 for ; Fri, 19 Apr 2024 05:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529201; x=1714134001; 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=ptjZui/QugPi/nHaaw/AKY/5aFSFar1t0hRmL7dvSgs=; b=XzkxwUTMXQLJBtUvt3zF/FV22s/uShPlyfdtu6TO5/DegAMncvgzTtYIa1bJynvJHN gUqqiZl1scF5SMkkZ8gIYTGsTVqAG+NtJiWG2w6aUH1nl2cA0Iq+JI33R5tDnxEMiNy6 rrGFjiJNhj/ua3DOOr0Vrl6+vKCNAyMSg6Zeos0mRAOZ2RCaDtJ9yYfDFjaxkX5w4qhw n2nMyv+yhL4UWYfubh/qXL8DRdXNuE3oMUrSmWULvIPj7NK0fcfGqtivGWZOJQ1RrohB x2tLDPDgfpg1rckymZxcu4lIx6c9gVSgu1fu7d8sNFSLv0zJxvK7yJneosoLCWzmob/k roAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529201; x=1714134001; 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=ptjZui/QugPi/nHaaw/AKY/5aFSFar1t0hRmL7dvSgs=; b=H6Mpe+X+oKqU44T54sHm4mJ3F1Gawtpg1JD6zGIXp2tsZTDnVfLyvjHYOtNvXQPrTE t2Q3SJVrAqjP6eMhOcGasvXT8xKVz90LcURkSN5DulK0C6rd4OCcv8ydi33lTbcleeKi Zg1kN3Wtu/hTcx6yY6wtaxsXNINgzcGfFPGk9yX74wlxCu+KOAjvY9euk2RmGUrhEv2w X+fOZzp2zZCUBipElw1j46oehEHIX5x2XpNjtM9FZvBYrCagOgpezr700vmBvXsCbRvl XhLGXx+JeDjEzHpKbdAAoIkSEtRc5TaKflm4QspnYbyEvMcbBUgVVESeLkjTmlKh+Jxv mCzg== X-Gm-Message-State: AOJu0YzOf7yJbib1GM+yF78ZbsbA5yv8VoZnuNMbrnrAVEL5I3p9BhZ5 +QJXeqnwYBdoaZtCBQBuexKB0XpHRP+nGceev0hWI5YbGlWAcHMbuGwd/w== X-Google-Smtp-Source: AGHT+IF0c5lS7tgWhFjJMKOYhCJuBpQrezXmFvKrgc4hhZBQVIuHL2CnRGEZX7aKpf31kmUg/fQ/6A== X-Received: by 2002:a50:9f6c:0:b0:570:374:d6ab with SMTP id b99-20020a509f6c000000b005700374d6abmr1555117edf.3.1713529200533; Fri, 19 Apr 2024 05:20:00 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:20:00 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/19] bash: mark build-tests.patch as Inappropriate Date: Fri, 19 Apr 2024 14:19:43 +0200 Message-Id: <20240419121945.1920944-17-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198545 Signed-off-by: Alexander Kanavin --- meta/recipes-extended/bash/bash/build-tests.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index ea38bace9b7..c1b9b8261f0 100644 --- a/meta/recipes-extended/bash/bash/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch @@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100 Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking dependencies. -Upstream-Status: Pending +Upstream-Status: Inappropriate [ptest specific] Signed-off-by: Anders Roxell Rebase to 5.0 From patchwork Fri Apr 19 12:19:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42689 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 37F70C04FF6 for ; Fri, 19 Apr 2024 12:20:12 +0000 (UTC) Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by mx.groups.io with SMTP id smtpd.web10.19253.1713529202927446501 for ; Fri, 19 Apr 2024 05:20:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jFKUQd3P; spf=pass (domain: gmail.com, ip: 209.85.208.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-571c25a329eso2177137a12.0 for ; Fri, 19 Apr 2024 05:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529201; x=1714134001; 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=KDuEM/nlqDeSFirabfuKLNP3x1dUFnw+YuqHBQydRoY=; b=jFKUQd3P7ZOfoRFR/NCNR4R75HHsDoa7b2I5p6MyyvVHJ+XpT197Qn/aS9Dfy3pfBv 8ALUHLMJcKbTxico5k16sHxXfFaEwbVkBG7U26uteDwOqyhh4fxhAgaTzJZz7IHg5aKa 6ag1awdOnKBKn1SSqAJQrzTLHa6p3LMP9Dmb7AkU+MHN5vv3duM+tJ6vq2UlAPc6O3KV WL6yBlKkTWEmCcn8EJjPTqnotyD6kAwVkikrO3GUlD99xHnsku5jbfi9GMCFlsRygd/l p3Uj5c0+32vI6JPRKgU0Qfxg3CR4ZFkUwog18CqpvdujZ5NK7430Oi7cmCe4QLrGSb/U Du1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529201; x=1714134001; 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=KDuEM/nlqDeSFirabfuKLNP3x1dUFnw+YuqHBQydRoY=; b=s/eGJAsaZYzaiaRZGt2oGCb3g5axKZvjSpj1RPgZtAdoyRieRzjEOEGVv+Fzwyff8o pQDuspK0bd5HI848hTQ4tlFIz4x1vXbpIA6SmxXBuBcEfZPRKnQv+5vTtMUf63epr2Nb RKhbjTlnR19CaEdy9lKixyFVOLzoo8Df/ZuoYCALux/NTYe+75Bn48Z2gXkxHxnDuL4/ cE0vFl6W9WqPqJol51Fm5IBKvt64YvBmTUjMCfNxlnrx6yuHIGg9at7EtveLW5cF8QJL hXmQatS3LsBt8LVmOTlxpMcatx+MyiMY5snBRQYQ3hQFiq0Wt3MZ8LrfMxHZ+F+KwiYS CMwQ== X-Gm-Message-State: AOJu0Yw8J/0WjWt2gFpIm/9Er4dwNM5aQLouR1A0mLdULkumu7G2cwhs aS4SfzEZbESa00Wgz2SFJr44OzU4vT8XXKxd8c17Qasi54/YcTQ0s2w1nQ== X-Google-Smtp-Source: AGHT+IFs8YFPB5MimkgQsp8WxbyzEyWt2LV4J7Pe/V0YoXfsUGTr3g7u87ilde/A0SKDob4wRX6moQ== X-Received: by 2002:a50:d6d8:0:b0:56d:eb1e:17be with SMTP id l24-20020a50d6d8000000b0056deb1e17bemr2009825edj.1.1713529201183; Fri, 19 Apr 2024 05:20:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:20:00 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/19] connman: make 0002-resolve-musl-does-not-implement-res_ninit.patch libc-agnostic Date: Fri, 19 Apr 2024 14:19:44 +0200 Message-Id: <20240419121945.1920944-18-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198546 The patch is reworked to take musl-specific path only if the functions are undefined by libc (which can be checked via __RES, as explained in https://www.openwall.com/lists/musl/2020/10/23/16 ). This should make it more suitable for upstream submission. Signed-off-by: Alexander Kanavin --- ...ve-musl-does-not-implement-res_ninit.patch | 105 ++++++++++-------- .../connman/connman_1.42.bb | 2 +- 2 files changed, 60 insertions(+), 47 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch index aefdd3aa065..71efd9035e9 100644 --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch @@ -1,75 +1,88 @@ -From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001 +From 60783f0d885c9a0db8b6f1d528786321e53f1512 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Apr 2015 23:02:21 -0700 -Subject: [PATCH] resolve: musl does not implement res_ninit +Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to + __RES -ported from +Not all libc implementation have those functions, and the way to determine +if they do is to check __RES which is explained in resolv.h thusly: + +/* + * Revision information. This is the release date in YYYYMMDD format. + * It can change every day so the right thing to do with it is use it + * in preprocessor commands such as "#if (__RES > 19931104)". Do not + * compare for equality; rather, use it to determine whether your resolver + * is new enough to contain a certain feature. + */ + +Indeed, it needs to be at least 19991006. + +The portion of the patch that implements a fallback is ported from +Alpine Linux: http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch Upstream-Status: Pending Signed-off-by: Khem Raj - --- - gweb/gresolv.c | 34 +++++++++++++--------------------- - 1 file changed, 13 insertions(+), 21 deletions(-) + gweb/gresolv.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) diff --git a/gweb/gresolv.c b/gweb/gresolv.c -index 954e7cf..2a9bc51 100644 +index 8101d71..9f1477c 100644 --- a/gweb/gresolv.c +++ b/gweb/gresolv.c -@@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index) +@@ -879,7 +879,9 @@ GResolv *g_resolv_new(int index) resolv->index = index; resolv->nameserver_list = NULL; -- res_ninit(&resolv->res); -- ++#if (__RES >= 19991006) + res_ninit(&resolv->res); ++#endif + return resolv; } - -@@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv) +@@ -920,7 +922,9 @@ void g_resolv_unref(GResolv *resolv) flush_nameservers(resolv); -- res_nclose(&resolv->res); -- ++#if (__RES >= 19991006) + res_nclose(&resolv->res); ++#endif + g_free(resolv); } - -@@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, +@@ -1024,6 +1028,7 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, debug(resolv, "hostname %s", hostname); if (!resolv->nameserver_list) { -- int i; -- -- for (i = 0; i < resolv->res.nscount; i++) { -- char buf[100]; -- int family = resolv->res.nsaddr_list[i].sin_family; -- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; -- -- if (family != AF_INET && -- resolv->res._u._ext.nsaddrs[i]) { -- family = AF_INET6; -- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; -+ FILE *f = fopen("/etc/resolv.conf", "r"); -+ if (f) { -+ char line[256], *s; -+ int i; -+ while (fgets(line, sizeof(line), f)) { -+ if (strncmp(line, "nameserver", 10) || !isspace(line[10])) -+ continue; -+ for (s = &line[11]; isspace(s[0]); s++); -+ for (i = 0; s[i] && !isspace(s[i]); i++); -+ s[i] = 0; -+ g_resolv_add_nameserver(resolv, s, 53, 0); - } -- -- if (family != AF_INET && family != AF_INET6) -- continue; -- -- if (inet_ntop(family, sa_addr, buf, sizeof(buf))) -- g_resolv_add_nameserver(resolv, buf, 53, 0); -+ fclose(f); ++#if (__RES >= 19991006) + int i; + + for (i = 0; i < resolv->res.nscount; i++) { +@@ -1043,6 +1048,22 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, + if (inet_ntop(family, sa_addr, buf, sizeof(buf))) + g_resolv_add_nameserver(resolv, buf, 53, 0); } ++#else ++ FILE *f = fopen("/etc/resolv.conf", "r"); ++ if (f) { ++ char line[256], *s; ++ int i; ++ while (fgets(line, sizeof(line), f)) { ++ if (strncmp(line, "nameserver", 10) || !isspace(line[10])) ++ continue; ++ for (s = &line[11]; isspace(s[0]); s++); ++ for (i = 0; s[i] && !isspace(s[i]); i++); ++ s[i] = 0; ++ g_resolv_add_nameserver(resolv, s, 53, 0); ++ } ++ fclose(f); ++ } ++#endif if (!resolv->nameserver_list) + g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0); +-- +2.39.2 + diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb index 91ab9895ac8..5c60b9cb83a 100644 --- a/meta/recipes-connectivity/connman/connman_1.42.bb +++ b/meta/recipes-connectivity/connman/connman_1.42.bb @@ -7,9 +7,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://no-version-scripts.patch \ file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \ file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \ + file://0002-resolve-musl-does-not-implement-res_ninit.patch \ " -SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa" From patchwork Fri Apr 19 12:19:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 42691 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 447F3C071DB for ; Fri, 19 Apr 2024 12:20:12 +0000 (UTC) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web11.19163.1713529203831584816 for ; Fri, 19 Apr 2024 05:20:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jxKgKTJU; spf=pass (domain: gmail.com, ip: 209.85.167.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-518931f8d23so2004572e87.3 for ; Fri, 19 Apr 2024 05:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713529202; x=1714134002; 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=Tf0ZWKlgOwdCJYNaTKVeT7MYvr614uKzAT/bIcOq3XA=; b=jxKgKTJUrrpkM+v41Dbw0f3VaMa5AL8taVu6aBk9xU51rIj6nn+Xxa2RPDs6u64+hF pYhGrLAY8rQEcTsIavvmgGZqNMGQdVT9Q1PrrzitmtRRBvm/MJnHtxYcSn12tRl+I6eO mD6RXCr7S26ANLaltm8PGPnZ8C/dyi0hyassm+/mwZLUb62/vBF73jy7M+tyBFYvVDP7 IAoO5czEo0J6Fs0kRiXlYg5KJLIax1U0nSOqLn3qJ3I36wmiA8rX7bax+GuesydUg3A8 rvO8GwT1UaUMi63NaKI31zvYt+oE19voxkXSeBurhNkbZqwy5SSHrlmnWvgSROVTtCLA u2og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713529202; x=1714134002; 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=Tf0ZWKlgOwdCJYNaTKVeT7MYvr614uKzAT/bIcOq3XA=; b=AdGVGZsM1RTFbNS1Nt27c45+A006FQidBxKqX8+JERRElQiNbRXw0UoB9Qys0Po+gO cFJFZ3VbNJbAfYhRrxeRfHPj+/8btxzdV5mN1OoEaMYkOh3C7YKDZ4oT3JZspP38qUnH 94BOK4QFAZwEBzeptqbyMdcTGz3SoaCA5Vvq+yNIk7Um/2RyU/z4VWKSC1JtdnM949Eq 313XreHH78VJ6dcjGwUr09YkjzpvqYlg8rHlkkQLYWzwChdl3P8jbN6LvQXL3jJ+KfO1 v3niwYkp+mYPZ209VAC33oIehDCdhzNN1QGIF9hliIvk8IaqmjPtSHe/LieE7V7HrlW4 QWyw== X-Gm-Message-State: AOJu0YzLg+1vlK3isdsDvp0/9I1hSvpqQ+XozHfjwihsborzex8LecsD hYy8IoaSu9JaN+qg4w5iZR6EjIUQYvoSp7B3/vFFgGaCHAsSwvhCfInsqw== X-Google-Smtp-Source: AGHT+IGRU0yha3xWAqz305aX/wafBrjvjPmUggXLgn0EjDgVsfD2Y1MWU/XgboLS57cC3LfmElz1vQ== X-Received: by 2002:ac2:5b89:0:b0:518:17ad:a6da with SMTP id o9-20020ac25b89000000b0051817ada6damr1252937lfn.44.1713529201892; Fri, 19 Apr 2024 05:20:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id w22-20020aa7cb56000000b00571c1070edfsm1608415edt.17.2024.04.19.05.20.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 05:20:01 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/19] connman: submit 0002-resolve-musl-does-not-implement-res_ninit.patch upstream Date: Fri, 19 Apr 2024 14:19:45 +0200 Message-Id: <20240419121945.1920944-19-alex@linutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419121945.1920944-1-alex@linutronix.de> References: <20240419121945.1920944-1-alex@linutronix.de> 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 ; Fri, 19 Apr 2024 12:20:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198547 Signed-off-by: Alexander Kanavin --- .../0002-resolve-musl-does-not-implement-res_ninit.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch index 71efd9035e9..9e2cc34995a 100644 --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch @@ -21,7 +21,7 @@ The portion of the patch that implements a fallback is ported from Alpine Linux: http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch -Upstream-Status: Pending +Upstream-Status: Submitted [to connman@lists.linux.dev,marcel@holtmann.org] Signed-off-by: Khem Raj ---