| Message ID | 20220524152401.1663317-9-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] lzo: Add further info to a patch | expand |
Hi Ross, Bruce, Il giorno Tue, 24 May 2022 16:24:01 +0100 "Ross Burton" <ross.burton@arm.com> ha scritto: > LZO is a fairly archaic compression format that hasn't been updated > since 2017. It's now unused by anything else in oe-core, so remove > the recipes. > > Signed-off-by: Ross Burton <ross.burton@arm.com> I love removals of archaic features... ...and how they make things explode :-) stdio: ERROR: Nothing PROVIDES 'lzo' (but /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen_4.16.bb, /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen-tools_4.16.bb DEPENDS on or otherwise requires it) https://autobuilder.yoctoproject.org/typhoon/#/builders/128/builds/124/steps/13/logs/errors https://autobuilder.yoctoproject.org/typhoon/#/builders/128/builds/124/steps/13/logs/stdio
On 25 May 2022, at 09:03, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > Hi Ross, Bruce, > > Il giorno Tue, 24 May 2022 16:24:01 +0100 > "Ross Burton" <ross.burton@arm.com> ha scritto: > >> LZO is a fairly archaic compression format that hasn't been updated >> since 2017. It's now unused by anything else in oe-core, so remove >> the recipes. >> >> Signed-off-by: Ross Burton <ross.burton@arm.com> > > I love removals of archaic features... > > ...and how they make things explode :-) > > stdio: ERROR: Nothing PROVIDES 'lzo' (but > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen_4.16.bb, > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen-tools_4.16.bb > DEPENDS on or otherwise requires it) I’ve also just sent a RFC patch for xen to disable LZO entirely, but I’ll leave that up to Bruce to decide. If lzo is removed from core it will be added to meta-oe, so xen will continue to build either way. Ross
On Wed, May 25, 2022 at 7:26 AM Ross Burton <Ross.Burton@arm.com> wrote: > On 25 May 2022, at 09:03, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > > > Hi Ross, Bruce, > > > > Il giorno Tue, 24 May 2022 16:24:01 +0100 > > "Ross Burton" <ross.burton@arm.com> ha scritto: > > > >> LZO is a fairly archaic compression format that hasn't been updated > >> since 2017. It's now unused by anything else in oe-core, so remove > >> the recipes. > >> > >> Signed-off-by: Ross Burton <ross.burton@arm.com> > > > > I love removals of archaic features... > > > > ...and how they make things explode :-) > > > > stdio: ERROR: Nothing PROVIDES 'lzo' (but > > > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/ > xen_4.16.bb, > > > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/ > xen-tools_4.16.bb > > DEPENDS on or otherwise requires it) > > I’ve also just sent a RFC patch for xen to disable LZO entirely, but I’ll > leave that up to Bruce to decide. If lzo is removed from core it will be > added to meta-oe, so xen will continue to build either way. > > right. We'll keep it as optional. But isn't this just a timing issue for the failure ? Or are we missing a dependency in meta-virt on where this landed in meta-oe ? We definitely have meta-oe dependencies in meta-virt, so the AB should already have those in place .. so this must have only blown up because it hasn't landed in meta-oe yet (nor should it probably have, as this is a test of the removal in OEcore) . Either way, I'll merge the meta-virt, make-it-optional patch shortly and this should be good to go. Bruce > Ross
Yes, it mainly blew up because the tested oe-core branch had the removal of lzo but meta-oe didn’t have the addition. Would you like a resend of the xen patch to add an option, but leave it as enabled? Or will you merge this patch which disables lzo? Ross From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Wednesday, 25 May 2022 at 13:59 To: Ross Burton <Ross.Burton@arm.com> Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>, openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>, nd <nd@arm.com> Subject: Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core On Wed, May 25, 2022 at 7:26 AM Ross Burton <Ross.Burton@arm.com<mailto:Ross.Burton@arm.com>> wrote: On 25 May 2022, at 09:03, Luca Ceresoli <luca.ceresoli@bootlin.com<mailto:luca.ceresoli@bootlin.com>> wrote: > > Hi Ross, Bruce, > > Il giorno Tue, 24 May 2022 16:24:01 +0100 > "Ross Burton" <ross.burton@arm.com<mailto:ross.burton@arm.com>> ha scritto: > >> LZO is a fairly archaic compression format that hasn't been updated >> since 2017. It's now unused by anything else in oe-core, so remove >> the recipes. >> >> Signed-off-by: Ross Burton <ross.burton@arm.com<mailto:ross.burton@arm.com>> > > I love removals of archaic features... > > ...and how they make things explode :-) > > stdio: ERROR: Nothing PROVIDES 'lzo' (but > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen_4.16.bb<http://xen_4.16.bb>, > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen-tools_4.16.bb<http://xen-tools_4.16.bb> > DEPENDS on or otherwise requires it) I’ve also just sent a RFC patch for xen to disable LZO entirely, but I’ll leave that up to Bruce to decide. If lzo is removed from core it will be added to meta-oe, so xen will continue to build either way. right. We'll keep it as optional. But isn't this just a timing issue for the failure ? Or are we missing a dependency in meta-virt on where this landed in meta-oe ? We definitely have meta-oe dependencies in meta-virt, so the AB should already have those in place .. so this must have only blown up because it hasn't landed in meta-oe yet (nor should it probably have, as this is a test of the removal in OEcore) . Either way, I'll merge the meta-virt, make-it-optional patch shortly and this should be good to go. Bruce Ross -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
On Wed, May 25, 2022 at 9:46 AM Ross Burton <Ross.Burton@arm.com> wrote: > > Yes, it mainly blew up because the tested oe-core branch had the removal of lzo but meta-oe didn’t have the addition. > > > > Would you like a resend of the xen patch to add an option, but leave it as enabled? Or will you merge this patch which disables lzo? > > The patch is fine as-is. If someone needs it on by default, they can scream and send a patch to change that status :) It will still be available, so they can easily carry bbappend with a packageconfig. Bruce > > Ross > > > > From: Bruce Ashfield <bruce.ashfield@gmail.com> > Date: Wednesday, 25 May 2022 at 13:59 > To: Ross Burton <Ross.Burton@arm.com> > Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>, openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>, nd <nd@arm.com> > Subject: Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core > > > > > > On Wed, May 25, 2022 at 7:26 AM Ross Burton <Ross.Burton@arm.com> wrote: > > On 25 May 2022, at 09:03, Luca Ceresoli <luca.ceresoli@bootlin.com> wrote: > > > > Hi Ross, Bruce, > > > > Il giorno Tue, 24 May 2022 16:24:01 +0100 > > "Ross Burton" <ross.burton@arm.com> ha scritto: > > > >> LZO is a fairly archaic compression format that hasn't been updated > >> since 2017. It's now unused by anything else in oe-core, so remove > >> the recipes. > >> > >> Signed-off-by: Ross Burton <ross.burton@arm.com> > > > > I love removals of archaic features... > > > > ...and how they make things explode :-) > > > > stdio: ERROR: Nothing PROVIDES 'lzo' (but > > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen_4.16.bb, > > /home/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/xen/xen-tools_4.16.bb > > DEPENDS on or otherwise requires it) > > I’ve also just sent a RFC patch for xen to disable LZO entirely, but I’ll leave that up to Bruce to decide. If lzo is removed from core it will be added to meta-oe, so xen will continue to build either way. > > > > right. > > > > We'll keep it as optional. > > > > But isn't this just a timing issue for the failure ? Or are we missing a dependency in meta-virt on where this landed in meta-oe ? We definitely have meta-oe dependencies in meta-virt, so the AB should already have those in place .. so this must have only blown up because it hasn't landed in meta-oe yet (nor should it probably have, as this is a test of the removal in OEcore) . > > > > Either way, I'll merge the meta-virt, make-it-optional patch shortly and this should be good to go. > > > > Bruce > > > > > > Ross > > > > > -- > > - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end > - "Use the force Harry" - Gandalf, Star Trek II
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e43c0acd80c..d5f91265d9b 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -186,7 +186,6 @@ DISTRO_PN_ALIAS:pn-lttng-modules = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS:pn-lttng-tools = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS:pn-lttng-ust = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS:pn-lz4 = "Debian=lz4 Fedora=lz4" -DISTRO_PN_ALIAS:pn-lzo = "Debian=liblzo Ubuntu=liblzo Fedora=lzp" DISTRO_PN_ALIAS:pn-mailx = "Debian=bsd-mailx Ubuntu=bsd-mailx" DISTRO_PN_ALIAS:pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev" DISTRO_PN_ALIAS:pn-makedevs = "OE-Core" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index de3fb7474cb..02e8982de52 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -470,7 +470,6 @@ RECIPE_MAINTAINER:pn-lttng-tools = "Richard Purdie <richard.purdie@linuxfoundati RECIPE_MAINTAINER:pn-lttng-ust = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER:pn-lua = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-lz4 = "Denys Dmytriyenko <denis@denix.org>" -RECIPE_MAINTAINER:pn-lzo = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER:pn-lzip = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER:pn-m4 = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER:pn-m4-native = "Robert Yang <liezhi.yang@windriver.com>" diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index a1ead906493..d97bb80d4d2 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -42,7 +42,6 @@ PTESTS_FAST = "\ libxml-simple-perl-ptest \ libxml2-ptest \ lua-ptest \ - lzo-ptest \ m4-ptest \ nettle-ptest \ openssl-ptest \ diff --git a/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch b/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch deleted file mode 100644 index 5235a15dc9c..00000000000 --- a/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e730bfd7c2d3a4b5f3605878599cb9b20d31b1fd Mon Sep 17 00:00:00 2001 -From: Fan Xin <fan.xin@jp.fujitsu.com> -Date: Fri, 2 Jun 2017 11:52:25 +0900 -Subject: [PATCH] Add pkgconfigdir to solve the undefine error. - -Upstream-Status: Pending - -Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index e4d383b..c75023d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -14,6 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) - LDADD = src/liblzo2.la - lib_LTLIBRARIES = - noinst_PROGRAMS = -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = lzo2.pc - - --- -1.9.1 - diff --git a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch deleted file mode 100644 index 4e6ca4132b5..00000000000 --- a/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Sun, 23 Nov 2014 22:50:33 +0000 -Subject: Use memcpy() instead of reinventing it - -gcc inlines memcpy() with results as fast as handwritten code (at -least in my brief testing with lzop), and knows the alignment -constraints for our architectures. - -Change suggested by Julian Taylor. - -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757037 - -RP: Patch is still in debian as of 20220524 in a revised form: -https://sources.debian.org/patches/lzo2/2.10-2/ -https://sources.debian.org/patches/lzo2/2.10-2/0001-Conditionally-replace-reinvention-of-memcpy-with-cal.patch/ - -We likely need this in OE to prevent against unaligned accesses -on systems such as armv5. - -Upstream-Status: Pending -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - minilzo/minilzo.c | 14 ++++++++++++++ - src/lzo_func.h | 14 ++++++++++++++ - 2 files changed, 28 insertions(+) - - -diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c -index ab2be5f..6913c2f 100644 ---- a/minilzo/minilzo.c -+++ b/minilzo/minilzo.c -@@ -3523,6 +3523,20 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) - if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ - LZO_BLOCK_END - -+/* Debian-specific change: we know that our compiler inlines memcpy() with -+ * constant n to be as fast as handwritten code, and knows which architectures -+ * need things correctly aligned. */ -+#undef LZO_MEMOPS_COPY1 -+#undef LZO_MEMOPS_COPY2 -+#undef LZO_MEMOPS_COPY4 -+#undef LZO_MEMOPS_COPY8 -+#undef LZO_MEMOPS_COPYN -+#define LZO_MEMOPS_COPY1(dd,ss) memcpy(dd, ss, 1) -+#define LZO_MEMOPS_COPY2(dd,ss) memcpy(dd, ss, 2) -+#define LZO_MEMOPS_COPY4(dd,ss) memcpy(dd, ss, 4) -+#define LZO_MEMOPS_COPY8(dd,ss) memcpy(dd, ss, 8) -+#define LZO_MEMOPS_COPYN(dd,ss,nn) memcpy(dd, ss, nn) -+ - __lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss) - { - lzo_uint16_t v; -diff --git a/src/lzo_func.h b/src/lzo_func.h -index dfaa676..1cc1b53 100644 ---- a/src/lzo_func.h -+++ b/src/lzo_func.h -@@ -333,6 +333,20 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) - if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \ - LZO_BLOCK_END - -+/* Debian-specific change: we know that our compiler inlines memcpy() with -+ * constant n to be as fast as handwritten code, and knows which architectures -+ * need things correctly aligned. */ -+#undef LZO_MEMOPS_COPY1 -+#undef LZO_MEMOPS_COPY2 -+#undef LZO_MEMOPS_COPY4 -+#undef LZO_MEMOPS_COPY8 -+#undef LZO_MEMOPS_COPYN -+#define LZO_MEMOPS_COPY1(dd,ss) memcpy(dd, ss, 1) -+#define LZO_MEMOPS_COPY2(dd,ss) memcpy(dd, ss, 2) -+#define LZO_MEMOPS_COPY4(dd,ss) memcpy(dd, ss, 4) -+#define LZO_MEMOPS_COPY8(dd,ss) memcpy(dd, ss, 8) -+#define LZO_MEMOPS_COPYN(dd,ss,nn) memcpy(dd, ss, nn) -+ - __lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss) - { - lzo_uint16_t v; diff --git a/meta/recipes-support/lzo/lzo/run-ptest b/meta/recipes-support/lzo/lzo/run-ptest deleted file mode 100644 index 6acb89fc1fe..00000000000 --- a/meta/recipes-support/lzo/lzo/run-ptest +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -./lzotest -mavail -n10 -q /etc/services -if [ $? -eq 0 ]; then - echo 'PASS: lzotest' -else - echo 'FAIL: lzotest' -fi -LZOTEST=./lzotest /bin/sh -e "./check.sh" "/etc" -./align -if [ $? -eq 0 ]; then - echo 'PASS: align' -else - echo 'FAIL: align' -fi -./chksum -if [ $? -eq 0 ]; then - echo 'PASS: chksum' -else - echo 'FAIL: chksum' -fi -./simple -if [ $? -eq 0 ]; then - echo 'PASS: simple' -else - echo 'FAIL: simple' -fi -./testmini -if [ $? -eq 0 ]; then - echo 'PASS: testmini' -else - echo 'FAIL: testmini' -fi diff --git a/meta/recipes-support/lzo/lzo_2.10.bb b/meta/recipes-support/lzo/lzo_2.10.bb deleted file mode 100644 index 195c2f29393..00000000000 --- a/meta/recipes-support/lzo/lzo_2.10.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Lossless data compression library" -DESCRIPTION = "A portable lossless data compression library written in \ -ANSI C that offers pretty fast compression and *extremely* fast decompression. " -HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" -SECTION = "libs" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/lzo_init.c;beginline=5;endline=25;md5=9ae697ca01829b0a383c5d2d163e0108" - -SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ - file://0001-Use-memcpy-instead-of-reinventing-it.patch \ - file://0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "39d3f3f9c55c87b1e5d6888e1420f4b5" -SRC_URI[sha256sum] = "c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072" - -inherit autotools ptest - -CVE_PRODUCT = "lzo oberhumer:lzo2" - -EXTRA_OECONF = "--enable-shared" - -do_install_ptest() { - t=${D}${PTEST_PATH} - cp ${S}/util/check.sh $t - cp ${B}/minilzo/testmini $t - for i in tests/align tests/chksum lzotest/lzotest examples/simple - do cp ${B}/`dirname $i`/.libs/`basename $i` $t; \ - done -} - - -BBCLASSEXTEND = "native nativesdk"
LZO is a fairly archaic compression format that hasn't been updated since 2017. It's now unused by anything else in oe-core, so remove the recipes. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/conf/distro/include/distro_alias.inc | 1 - meta/conf/distro/include/maintainers.inc | 1 - .../distro/include/ptest-packagelists.inc | 1 - ...onfigdir-to-solve-the-undefine-error.patch | 27 ------- ...Use-memcpy-instead-of-reinventing-it.patch | 77 ------------------- meta/recipes-support/lzo/lzo/run-ptest | 33 -------- meta/recipes-support/lzo/lzo_2.10.bb | 35 --------- 7 files changed, 175 deletions(-) delete mode 100644 meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch delete mode 100644 meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch delete mode 100644 meta/recipes-support/lzo/lzo/run-ptest delete mode 100644 meta/recipes-support/lzo/lzo_2.10.bb