[PATCH 1/9] lzo: Add further info to a patch

[PATCH 1/9] lzo: Add further info to a patch

[Ross Burton]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Add some further info to the patch based on upsream changes. Given the last release
in 2017 and glaring issues on at least armv5, it does raise the question on whether
we should drop this. There are probably better compression tools now.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../lzo/0001-Use-memcpy-instead-of-reinventing-it.patch    | 7 +++++++
 1 file changed, 7 insertions(+)

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
index db3a70e8031..4e6ca4132b5 100644
--- 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
@@ -10,6 +10,13 @@ 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>
 ---
-- 
2.25.1

[PATCH 2/9] btrfs-tools: add a PACKAGECONFIG for lzo

[Ross Burton]

LZO is a fairly obsolete compression format these days, so add an option
to enable/disable LZO to btrfs-progs and disable it by default.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../btrfs-tools/btrfs-tools/lzo-option.patch  | 126 ++++++++++++++++++
 .../btrfs-tools/btrfs-tools_5.16.2.bb         |   4 +-
 2 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch
new file mode 100644
index 00000000000..e6e85562d7c
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/lzo-option.patch
@@ -0,0 +1,126 @@
+Upstream-Status: Submitted [https://github.com/kdave/btrfs-progs/pull/474]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From 4f4eafe8ebcc86f84f6c85a5c5814c430d8f190c Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Tue, 24 May 2022 13:44:29 +0100
+Subject: [PATCH] btrfs-progs: add option to disable LZO support
+
+LZO as a compression format is pretty archaic these days, there are
+better algorithsm in all metrics for compression and decompression, and
+lzo hasn't had a new release since 2017.
+
+Add an option to disable LZO (defaulting to enabled), and respect it in
+cmds/restore.c.
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ Makefile        |  2 +-
+ Makefile.inc.in |  1 +
+ cmds/restore.c  |  7 +++++++
+ configure.ac    | 30 ++++++++++++++++++++----------
+ 4 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index af4908f9..0e8e05f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -335,7 +335,7 @@ endif
+ btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2)
+ btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS)
+ btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype
+-cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
++cmds_restore_cflags = -DBTRFSRESTORE_LZO=$(BTRFSRESTORE_LZO) -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
+ 
+ ifeq ($(CRYPTOPROVIDER_BUILTIN),1)
+ CRYPTO_OBJECTS = crypto/sha224-256.o crypto/blake2b-ref.o
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index c995aef9..385b7ae1 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -16,6 +16,7 @@ BUILD_PROGRAMS = @BUILD_PROGRAMS@
+ BUILD_SHARED_LIBRARIES = @BUILD_SHARED_LIBRARIES@
+ BUILD_STATIC_LIBRARIES = @BUILD_STATIC_LIBRARIES@
+ BTRFSCONVERT_EXT2 = @BTRFSCONVERT_EXT2@
++BTRFSRESTORE_LZO = @BTRFSRESTORE_LZO@
+ BTRFSCONVERT_REISERFS = @BTRFSCONVERT_REISERFS@
+ BTRFSRESTORE_ZSTD = @BTRFSRESTORE_ZSTD@
+ PYTHON_BINDINGS = @PYTHON_BINDINGS@
+diff --git a/cmds/restore.c b/cmds/restore.c
+index 5923d571..4dd79fce 100644
+--- a/cmds/restore.c
++++ b/cmds/restore.c
+@@ -25,8 +25,10 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#if BTRFSRESTORE_LZO
+ #include <lzo/lzoconf.h>
+ #include <lzo/lzo1x.h>
++#endif
+ #include <zlib.h>
+ #if BTRFSRESTORE_ZSTD
+ #include <zstd.h>
+@@ -98,6 +100,10 @@ static inline size_t read_compress_length(unsigned char *buf)
+ static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf,
+ 			char *outbuf, u64 compress_len, u64 *decompress_len)
+ {
++#if !BTRFSRESTORE_LZO
++	error("btrfs not compiled with lzo support");
++	return -1;
++#else
+ 	size_t new_len;
+ 	size_t in_len;
+ 	size_t out_len = 0;
+@@ -156,6 +162,7 @@ static int decompress_lzo(struct btrfs_root *root, unsigned char *inbuf,
+ 	*decompress_len = out_len;
+ 
+ 	return 0;
++#endif
+ }
+ 
+ static int decompress_zstd(const char *inbuf, char *outbuf, u64 compress_len,
+diff --git a/configure.ac b/configure.ac
+index d907636b..c1ad2c22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -372,16 +372,26 @@ if ${PKG_CONFIG} udev --atleast-version 190; then
+ fi
+ AC_SUBST(UDEVDIR)
+ 
+-dnl lzo library does not provide pkg-config, let use classic way
+-AC_CHECK_LIB([lzo2], [lzo_version], [
+-	LZO2_LIBS="-llzo2"
+-	LZO2_CFLAGS=""
+-	LZO2_LIBS_STATIC="-llzo2"],[
+-	AC_MSG_ERROR([cannot find lzo2 library])
+-])
+-AC_SUBST([LZO2_LIBS])
+-AC_SUBST([LZO2_LIBS_STATIC])
+-AC_SUBST([LZO2_CFLAGS])
++AC_ARG_ENABLE([lzo],
++	AS_HELP_STRING([--disable-lzo], [build without lzo support]),
++	[], [enable_lzo=yes]
++)
++
++if test "x$enable_lzo" = xyes; then
++	dnl lzo library does not provide pkg-config, let use classic way
++	AC_CHECK_LIB([lzo2], [lzo_version], [
++		LZO2_LIBS="-llzo2"
++		LZO2_CFLAGS=""
++		LZO2_LIBS_STATIC="-llzo2"],[
++		AC_MSG_ERROR([cannot find lzo2 library])
++	])
++	AC_SUBST([LZO2_LIBS])
++	AC_SUBST([LZO2_LIBS_STATIC])
++	AC_SUBST([LZO2_CFLAGS])
++fi
++
++AS_IF([test "x$enable_lzo" = xyes], [BTRFSRESTORE_LZO=1], [BTRFSRESTORE_LZO=0])
++AC_SUBST(BTRFSRESTORE_LZO)
+ 
+ dnl call PKG_INSTALLDIR from pkg.m4 to set pkgconfigdir
+ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_MSG_ERROR([please install pkgconf])])
+-- 
+2.25.1
+
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
index 4ab486c465c..88b5c6259cf 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.2.bb
@@ -13,10 +13,11 @@ LIC_FILES_CHKSUM = " \
     file://libbtrfsutil/COPYING;md5=4fbd65380cdd255951079008b364516c \
 "
 SECTION = "base"
-DEPENDS = "lzo util-linux zlib"
+DEPENDS = "util-linux zlib"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
+           file://lzo-option.patch \
            "
 SRCREV = "31458c9c81935abbed010221261897273a98d2c1"
 S = "${WORKDIR}/git"
@@ -32,6 +33,7 @@ PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
 PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs"
 PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned"
 PACKAGECONFIG[python] = "--enable-python,--disable-python,python3-setuptools-native"
+PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
 PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd"
 PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev"
 
-- 
2.25.1

[PATCH 3/9] mtd-utils: disable LZO by default

[Ross Burton]

LZO is a fairly obsolete compression format these days, so disable it by
default.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 3318277477f..8931e870324 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
 # regardless whether acl is enabled or disabled in the distro should be okay.
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo jffs ubifs"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} jffs ubifs"
 PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo"
 PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl"
 PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,openssl"
-- 
2.25.1

[PATCH 4/9] squashfs-tools: disable LZO by default

[Ross Burton]

LZO is a fairly obsolete compression format these days, so disable it by
default.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 4e009d26255..0a7e0f2a523 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
 
-PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd reproducible"
+PACKAGECONFIG ??= "gzip xz lz4 lzma xattr zstd reproducible"
 PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib"
 PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz"
 PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo"
-- 
2.25.1

[PATCH 5/9] libarchive: disable LZO by default

[Ross Burton]

LZO is a fairly obsolete compression format these days, so disable it by
default.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-extended/libarchive/libarchive_3.6.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
index c795b416289..761cfca6473 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d499814247adaee08d88080841cb5665"
 
 DEPENDS = "e2fsprogs-native"
 
-PACKAGECONFIG ?= "zlib bz2 xz lzo zstd"
+PACKAGECONFIG ?= "zlib bz2 xz zstd"
 
 PACKAGECONFIG:append:class-target = "\
 	${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \
-- 
2.25.1

[PATCH 6/9] lzop: remove recipe from oe-core

[Ross Burton]

There are no users of lzop in oe-core, and there hasn't been a release of
lzop since 2017.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/conf/distro/include/maintainers.inc    |   1 -
 meta/recipes-support/lzop/lzop/acinclude.m4 | 390 --------------------
 meta/recipes-support/lzop/lzop_1.04.bb      |  27 --
 3 files changed, 418 deletions(-)
 delete mode 100644 meta/recipes-support/lzop/lzop/acinclude.m4
 delete mode 100644 meta/recipes-support/lzop/lzop_1.04.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 3990d1d507f..de3fb7474cb 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -472,7 +472,6 @@ 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-lzop = "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>"
 RECIPE_MAINTAINER:pn-make = "Robert Yang <liezhi.yang@windriver.com>"
diff --git a/meta/recipes-support/lzop/lzop/acinclude.m4 b/meta/recipes-support/lzop/lzop/acinclude.m4
deleted file mode 100644
index 0029c19c7d9..00000000000
--- a/meta/recipes-support/lzop/lzop/acinclude.m4
+++ /dev/null
@@ -1,390 +0,0 @@
-
-AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
-AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-])#
-
-AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
-AC_HEADER_TIME
-AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h])
-])#
-
-AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
-AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
-])#
-
-
-AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(__int16)
-AC_CHECK_SIZEOF(__int32)
-AC_CHECK_SIZEOF(__int64)
-
-AC_CHECK_SIZEOF(void *)
-AC_CHECK_SIZEOF(size_t)
-AC_CHECK_SIZEOF(ptrdiff_t)
-])#
-
-
-# /***********************************************************************
-# // Check for ACC_conformance
-# ************************************************************************/
-
-AC_DEFUN([mfx_ACC_ACCCHK], [
-mfx_tmp=$1
-mfx_save_CPPFLAGS=$CPPFLAGS
-dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-
-AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-
-AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-[[#define ACC_CONFIG_NO_HEADER 1
-#include "acc/acc.h"
-#include "acc/acc_incd.h"
-#undef ACCCHK_ASSERT
-#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-#include "acc/acc_chk.ch"
-#undef ACCCHK_ASSERT
-static void test_acc_compile_time_assert(void) {
-#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
-#include "acc/acc_chk.ch"
-#undef ACCCHK_ASSERT
-}
-#undef NDEBUG
-#include <assert.h>
-static int test_acc_run_time_assert(int r) {
-#define ACCCHK_ASSERT(expr)     assert(expr);
-#include "acc/acc_chk.ch"
-#undef ACCCHK_ASSERT
-return r;
-}
-]], [[
-test_acc_compile_time_assert();
-if (test_acc_run_time_assert(1) != 1) return 1;
-]]
-)])
-
-mfx_tmp=FAILED
-_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-rm -f conftest.$ac_ext conftest.$ac_objext
-
-CPPFLAGS=$mfx_save_CPPFLAGS
-
-AC_MSG_RESULT([$mfx_tmp])
-case x$mfx_tmp in
-  xpassed | xyes) ;;
-  *)
-    AC_MSG_NOTICE([])
-    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-    AC_MSG_NOTICE([Thanks for your support.])
-    AC_MSG_NOTICE([])
-    AC_MSG_ERROR([ACC conformance test failed. Stop.])
-dnl    AS_EXIT
-    ;;
-esac
-])# mfx_ACC_ACCCHK
-
-
-# /***********************************************************************
-# // Check for ACC_conformance
-# ************************************************************************/
-
-AC_DEFUN([mfx_MINIACC_ACCCHK], [
-mfx_tmp=$1
-mfx_save_CPPFLAGS=$CPPFLAGS
-dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
-test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
-
-AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
-
-AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-[[#define ACC_CONFIG_NO_HEADER 1
-#define ACC_WANT_ACC_INCD_H 1
-#include $2
-
-#define ACC_WANT_ACC_CHK_CH 1
-#undef ACCCHK_ASSERT
-#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
-#include $2
-
-#define ACC_WANT_ACC_CHK_CH 1
-#undef ACCCHK_ASSERT
-#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
-static void test_acc_compile_time_assert(void) {
-#include $2
-}
-
-#undef NDEBUG
-#include <assert.h>
-#define ACC_WANT_ACC_CHK_CH 1
-#undef ACCCHK_ASSERT
-#define ACCCHK_ASSERT(expr)  assert(expr);
-static int test_acc_run_time_assert(int r) {
-#include $2
-return r;
-}
-]], [[
-test_acc_compile_time_assert();
-if (test_acc_run_time_assert(1) != 1) return 1;
-]]
-)])
-
-mfx_tmp=FAILED
-_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
-rm -f conftest.$ac_ext conftest.$ac_objext
-
-CPPFLAGS=$mfx_save_CPPFLAGS
-
-AC_MSG_RESULT([$mfx_tmp])
-case x$mfx_tmp in
-  xpassed | xyes) ;;
-  *)
-    AC_MSG_NOTICE([])
-    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
-    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
-    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
-    AC_MSG_NOTICE([Thanks for your support.])
-    AC_MSG_NOTICE([])
-    AC_MSG_ERROR([ACC conformance test failed. Stop.])
-dnl    AS_EXIT
-    ;;
-esac
-])# mfx_MINIACC_ACCCHK
-
-
-
-# serial 1
-
-AC_DEFUN([mfx_PROG_CPPFLAGS], [
-AC_MSG_CHECKING([whether the C preprocessor needs special flags])
-
-AC_LANG_CONFTEST([AC_LANG_PROGRAM(
-[[#include <limits.h>
-#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-#  include "your C preprocessor is broken 1"
-#elif (0xffffu == 0xfffffffful)
-#  include "your C preprocessor is broken 2"
-#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
-#  include "your C preprocessor is broken 3"
-#endif
-]], [[ ]]
-)])
-
-mfx_save_CPPFLAGS=$CPPFLAGS
-mfx_tmp=ERROR
-for mfx_arg in "" -no-cpp-precomp
-do
-  CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
-  _AC_COMPILE_IFELSE([],
-[mfx_tmp=$mfx_arg
-break])
-done
-CPPFLAGS=$mfx_save_CPPFLAGS
-rm -f conftest.$ac_ext conftest.$ac_objext
-case x$mfx_tmp in
-  x)
-    AC_MSG_RESULT([none needed]) ;;
-  xERROR)
-    AC_MSG_RESULT([ERROR])
-    AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
-    ;;
-  *)
-    AC_MSG_RESULT([$mfx_tmp])
-    CPPFLAGS="$mfx_tmp $CPPFLAGS"
-    ;;
-esac
-])# mfx_PROG_CPPFLAGS
-
-
-
-# serial 3
-
-AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
-AC_CACHE_CHECK([whether limits.h is sane],
-mfx_cv_header_sane_limits_h,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h>
-#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
-#  if defined(__APPLE__) && defined(__GNUC__)
-#    error "your preprocessor is broken - use compiler option -no-cpp-precomp"
-#  else
-#    include "your preprocessor is broken"
-#  endif
-#endif
-#define MFX_0xffff          0xffff
-#define MFX_0xffffffffL     4294967295ul
-#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-#  include "error CHAR_BIT"
-#endif
-#if !defined(UCHAR_MAX)
-#  include "error UCHAR_MAX 1"
-#endif
-#if !defined(USHRT_MAX)
-#  include "error USHRT_MAX 1"
-#endif
-#if !defined(UINT_MAX)
-#  include "error UINT_MAX 1"
-#endif
-#if !defined(ULONG_MAX)
-#  include "error ULONG_MAX 1"
-#endif
-#if !defined(SHRT_MAX)
-#  include "error SHRT_MAX 1"
-#endif
-#if !defined(INT_MAX)
-#  include "error INT_MAX 1"
-#endif
-#if !defined(LONG_MAX)
-#  include "error LONG_MAX 1"
-#endif
-#if (UCHAR_MAX < 1)
-#  include "error UCHAR_MAX 2"
-#endif
-#if (USHRT_MAX < 1)
-#  include "error USHRT_MAX 2"
-#endif
-#if (UINT_MAX < 1)
-#  include "error UINT_MAX 2"
-#endif
-#if (ULONG_MAX < 1)
-#  include "error ULONG_MAX 2"
-#endif
-#if (UCHAR_MAX < 0xff)
-#  include "error UCHAR_MAX 3"
-#endif
-#if (USHRT_MAX < MFX_0xffff)
-#  include "error USHRT_MAX 3"
-#endif
-#if (UINT_MAX < MFX_0xffff)
-#  include "error UINT_MAX 3"
-#endif
-#if (ULONG_MAX < MFX_0xffffffffL)
-#  include "error ULONG_MAX 3"
-#endif
-#if (USHRT_MAX > UINT_MAX)
-#  include "error USHRT_MAX vs UINT_MAX"
-#endif
-#if (UINT_MAX > ULONG_MAX)
-#  include "error UINT_MAX vs ULONG_MAX"
-#endif
-]], [[
-#if (USHRT_MAX == MFX_0xffff)
-{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
-#elif (USHRT_MAX >= MFX_0xffff)
-{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
-#endif
-#if (UINT_MAX == MFX_0xffff)
-{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
-#elif (UINT_MAX >= MFX_0xffff)
-{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
-#endif
-#if (ULONG_MAX == MFX_0xffff)
-{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
-#elif (ULONG_MAX >= MFX_0xffff)
-{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
-#endif
-#if (USHRT_MAX == MFX_0xffffffffL)
-{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
-#elif (USHRT_MAX >= MFX_0xffffffffL)
-{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
-#endif
-#if (UINT_MAX == MFX_0xffffffffL)
-{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
-#elif (UINT_MAX >= MFX_0xffffffffL)
-{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
-#endif
-#if (ULONG_MAX == MFX_0xffffffffL)
-{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
-#elif (ULONG_MAX >= MFX_0xffffffffL)
-{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
-#endif
-]])],
-[mfx_cv_header_sane_limits_h=yes],
-[mfx_cv_header_sane_limits_h=no])])
-])
-
-# /***********************************************************************
-# // standard
-# ************************************************************************/
-
-AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [
-AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
-])#
-
-
-# /***********************************************************************
-# //
-# ************************************************************************/
-
-dnl more types which are not yet covered by ACC
-
-AC_DEFUN([mfx_CHECK_SIZEOF], [
-AC_CHECK_SIZEOF(__int32)
-AC_CHECK_SIZEOF(intmax_t)
-AC_CHECK_SIZEOF(uintmax_t)
-AC_CHECK_SIZEOF(intptr_t)
-AC_CHECK_SIZEOF(uintptr_t)
-
-AC_CHECK_SIZEOF(float)
-AC_CHECK_SIZEOF(double)
-AC_CHECK_SIZEOF(long double)
-
-AC_CHECK_SIZEOF(dev_t)
-AC_CHECK_SIZEOF(fpos_t)
-AC_CHECK_SIZEOF(mode_t)
-AC_CHECK_SIZEOF(off_t)
-AC_CHECK_SIZEOF(ssize_t)
-AC_CHECK_SIZEOF(time_t)
-])#
-
-
-
-AC_DEFUN([mfx_CHECK_LIB_WINMM], [
-if test "X$GCC" = Xyes; then
-case $host_os in
-cygwin* | mingw* | pw32*)
-     test "X$LIBS" != "X" && LIBS="$LIBS "
-     LIBS="${LIBS}-lwinmm" ;;
-*)
-     ;;
-esac
-fi
-])#
-
-#serial 6
-
-dnl From Paul Eggert.
-
-# Define ST_MTIM_NSEC to be the nanoseconds member of struct stat's st_mtim,
-# if it exists.
-
-AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC],
- [AC_CACHE_CHECK([for nanoseconds member of struct stat.st_mtim],
-   ac_cv_struct_st_mtim_nsec,
-   [ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_cv_struct_st_mtim_nsec=no
-    # tv_nsec -- the usual case
-    # _tv_nsec -- Solaris 2.6, if
-    #	(defined _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED == 1
-    #	 && !defined __EXTENSIONS__)
-    # st__tim.tv_nsec -- UnixWare 2.1.2
-    for ac_val in tv_nsec _tv_nsec st__tim.tv_nsec; do
-      CPPFLAGS="$ac_save_CPPFLAGS -DST_MTIM_NSEC=$ac_val"
-      AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>], [struct stat s; s.st_mtim.ST_MTIM_NSEC;],
-        [ac_cv_struct_st_mtim_nsec=$ac_val; break])
-    done
-    CPPFLAGS="$ac_save_CPPFLAGS"])
-
-  if test $ac_cv_struct_st_mtim_nsec != no; then
-    AC_DEFINE_UNQUOTED(ST_MTIM_NSEC, $ac_cv_struct_st_mtim_nsec,
-      [Define to be the nanoseconds member of struct stat's st_mtim,
-       if it exists.])
-  fi
- ]
-)
diff --git a/meta/recipes-support/lzop/lzop_1.04.bb b/meta/recipes-support/lzop/lzop_1.04.bb
deleted file mode 100644
index d9b3524b678..00000000000
--- a/meta/recipes-support/lzop/lzop_1.04.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Real-time file compressor"
-DESCRIPTION = "lzop is a compression utility which is designed to be a companion to gzip. \n\
-It is based on the LZO data compression library and its main advantages over \n\
-gzip are much higher compression and decompression speed at the cost of some \n\
-compression ratio. The lzop compression utility was designed with the goals \n\
-of reliability, speed, portability and with reasonable drop-in compatibility \n\
-to gzip."
-HOMEPAGE = "http://www.lzop.org/"
-DEPENDS += "lzo"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8"
-
-SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
-           file://acinclude.m4 \
-          "
-SRC_URI[md5sum] = "271eb10fde77a0a96b9cbf745e719ddf"
-SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"
-
-inherit autotools
-
-do_configure:prepend () {
-    install -Dm 0644 ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
-}
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.25.1

[PATCH 7/9] oeqa/selftest/imagefeatures: don't exercise lzo compression

[Ross Burton]

We're removing lzo from oe-core, so don't exercise lzo compressed images
in oe-selftest.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 6d010b3e3a7..c1abb0d8282 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -171,7 +171,7 @@ class ImageFeatures(OESelftestTestCase):
         Author:      Tom Rini <trini@konsulko.com>
         """
 
-        conv = "ext4.bmap.gz.bz2.lzo.xz.u-boot"
+        conv = "ext4.bmap.gz.bz2.xz.u-boot"
         features = 'IMAGE_FSTYPES += "%s %s.sha256sum"' % (conv, conv)
         self.write_config(features)
 
-- 
2.25.1

[PATCH 8/9] packagegroup-self-hosted: remove lzo

[Ross Burton]

lzo isn't needed to build, so it doesn't need to be in the self-hosted
packagegroup.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 9523aadd153..772b86b39a3 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -129,7 +129,6 @@ RDEPENDS:packagegroup-self-hosted-extended = "\
     libusb1 \
     libxml2 \
     lsof \
-    lzo \
     man \
     man-pages \
     mdadm \
-- 
2.25.1

[PATCH 9/9] lzo: remove recipe from oe-core

[Ross Burton]

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

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"
-- 
2.25.1

Re: [OE-core] [PATCH 1/9] lzo: Add further info to a patch

[Luca Ceresoli]

Hi Richard,

Il giorno Tue, 24 May 2022 16:23:53 +0100
"Ross Burton" <ross.burton@arm.com> ha scritto:

> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> Add some further info to the patch based on upsream changes. Given

s/upsream/upstream/

Fixing it in my master-next branch.


-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core

[Luca Ceresoli]

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

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 3/9] mtd-utils: disable LZO by default

[richard.purdie]

On Tue, 2022-05-24 at 16:23 +0100, Ross Burton wrote:
> LZO is a fairly obsolete compression format these days, so disable it by
> default.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
> index 3318277477f..8931e870324 100644
> --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
> +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
> @@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
>  # xattr support creates an additional compile-time dependency on acl because
>  # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
>  # regardless whether acl is enabled or disabled in the distro should be okay.
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} lzo jffs ubifs"
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)} jffs ubifs"
>  PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo"
>  PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr,acl"
>  PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,openssl"

This and kernel compression are the two pieces that worry me a little.
LZO is still probably one of the best speed/size compromises and was
the reason it was added to jffs2. I'm not sure there are many devices
that still use flash directly via jffs2 but this probably still does
have a use there. Obviously it would still be in meta-oe but I'm
worried the "off by default" will catch out a few old BSPs and be a
pain to enable. At lot of this history was paged out in long term
storage!

Cheers,

Richard

Re: [OE-core] [PATCH 3/9] mtd-utils: disable LZO by default

[Ross Burton]

> This and kernel compression are the two pieces that worry me a little.
> LZO is still probably one of the best speed/size compromises and was
> the reason it was added to jffs2. I'm not sure there are many devices
> that still use flash directly via jffs2 but this probably still does
> have a use there. Obviously it would still be in meta-oe but I'm
> worried the "off by default" will catch out a few old BSPs and be a
> pain to enable. At lot of this history was paged out in long term
> storage!

Enabling should just be a matter of pulling in meta-oe and flipping the packageconfigs, so I don’t see this as a huge problem.

Looking in the time machine that is meta-handheld, I see the zaurus machines turn on LZO in the JFFS2 kernel module, but they also build UBIFS images which explicitly use zlib instead of lzo.  UBIFS also support Zstd now, so that’s probably a better option all around: it compresses almost as well as zlib but almost as fast as lzo[1].

Ross

[1] from btrfs benchmarks at https://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git/commit/?h=next&id=5c1aab1dd5445ed8bdcdbb575abc1b0d7ee5b2e7

Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core

[Ross Burton]

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

Re: [OE-core] [PATCH 3/9] mtd-utils: disable LZO by default

[richard.purdie]

On Wed, 2022-05-25 at 10:34 +0000, Ross Burton wrote:
> > This and kernel compression are the two pieces that worry me a
> > little.
> > LZO is still probably one of the best speed/size compromises and
> > was
> > the reason it was added to jffs2. I'm not sure there are many
> > devices
> > that still use flash directly via jffs2 but this probably still
> > does
> > have a use there. Obviously it would still be in meta-oe but I'm
> > worried the "off by default" will catch out a few old BSPs and be a
> > pain to enable. At lot of this history was paged out in long term
> > storage!
> 
> Enabling should just be a matter of pulling in meta-oe and flipping
> the packageconfigs, so I don’t see this as a huge problem.

My worry is that it changes the task checksums for the native tools and
means the BSP can never be YP Compat.

> Looking in the time machine that is meta-handheld, I see the zaurus
> machines turn on LZO in the JFFS2 kernel module, but they also build
> UBIFS images which explicitly use zlib instead of lzo.  UBIFS also
> support Zstd now, so that’s probably a better option all around: it
> compresses almost as well as zlib but almost as fast as lzo[1].

If the zaurus moved to ubifs, there is probably less of an issue and
just the kernel boot time remains but I'd hope zstd is being used there
too now (or will be).

Cheers,

Richard

Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core

[Bruce Ashfield]

[-- Attachment #1: Type: text/plain, Size: 1870 bytes --]

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

[-- Attachment #2: Type: text/html, Size: 3470 bytes --]

Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core

[Ross Burton]

[-- Attachment #1: Type: text/plain, Size: 2559 bytes --]

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

[-- Attachment #2: Type: text/html, Size: 7426 bytes --]

Re: [OE-core] [PATCH 9/9] lzo: remove recipe from oe-core

[Bruce Ashfield]

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



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II