From 3db91ef623024f0f03af362e2677baab5c4cbc4e Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 8 Apr 2021 13:40:50 +0800 Subject: file: upgrade 5.39 -> 5.40 0001-src-compress.c-correct-header-define-for-xz-lzma.patch removed since it is included in 5.40 (From OE-Core rev: ae73c5fa666c0e0a7d1d7a04acd6246542b744aa) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file_5.39.bb | 55 ---------------------- meta/recipes-devtools/file/file_5.40.bb | 54 +++++++++++++++++++++ ...press.c-correct-header-define-for-xz-lzma.patch | 27 ----------- 3 files changed, 54 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-devtools/file/file_5.39.bb create mode 100644 meta/recipes-devtools/file/file_5.40.bb delete mode 100644 meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.39.bb deleted file mode 100644 index abaa8149a3..0000000000 --- a/meta/recipes-devtools/file/file_5.39.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "File classification tool" -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -HOMEPAGE = "http://www.darwinsys.com/file/" -SECTION = "console/utils" - -# two clause BSD -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b" - -DEPENDS = "file-replacement-native" -DEPENDS_class-native = "bzip2-replacement-native" - -SRC_URI = "git://github.com/file/file.git \ - file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch" - -SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" -S = "${WORKDIR}/git" - -inherit autotools update-alternatives - -PACKAGECONFIG ??= "bz2 lzma zlib" -PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2" -PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz" -PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib" - -EXTRA_OECONF += "--disable-libseccomp" - -ALTERNATIVE_${PN} = "file" -ALTERNATIVE_LINK_NAME[file] = "${bindir}/file" - -EXTRA_OEMAKE_append_class-target = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" -EXTRA_OEMAKE_append_class-nativesdk = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" - -FILES_${PN} += "${datadir}/misc/*.mgc" - -do_compile_append_class-native() { - oe_runmake check -} - -do_install_append_class-native() { - create_cmdline_wrapper ${D}/${bindir}/file \ - --magic-file ${datadir}/misc/magic.mgc -} - -do_install_append_class-nativesdk() { - create_cmdline_wrapper ${D}/${bindir}/file \ - --magic-file ${datadir}/misc/magic.mgc -} - -BBCLASSEXTEND = "native nativesdk" -PROVIDES_append_class-native = " file-replacement-native" -# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who -# depends on file-replacement-native. -bindir_append_class-native = "/file-native" diff --git a/meta/recipes-devtools/file/file_5.40.bb b/meta/recipes-devtools/file/file_5.40.bb new file mode 100644 index 0000000000..ec79839bd2 --- /dev/null +++ b/meta/recipes-devtools/file/file_5.40.bb @@ -0,0 +1,54 @@ +SUMMARY = "File classification tool" +DESCRIPTION = "File attempts to classify files depending \ +on their contents and prints a description if a match is found." +HOMEPAGE = "http://www.darwinsys.com/file/" +SECTION = "console/utils" + +# two clause BSD +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b" + +DEPENDS = "file-replacement-native" +DEPENDS_class-native = "bzip2-replacement-native" + +SRC_URI = "git://github.com/file/file.git" + +SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8" +S = "${WORKDIR}/git" + +inherit autotools update-alternatives + +PACKAGECONFIG ??= "bz2 lzma zlib" +PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2" +PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz" +PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib" + +EXTRA_OECONF += "--disable-libseccomp" + +ALTERNATIVE_${PN} = "file" +ALTERNATIVE_LINK_NAME[file] = "${bindir}/file" + +EXTRA_OEMAKE_append_class-target = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" +EXTRA_OEMAKE_append_class-nativesdk = " -e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" + +FILES_${PN} += "${datadir}/misc/*.mgc" + +do_compile_append_class-native() { + oe_runmake check +} + +do_install_append_class-native() { + create_cmdline_wrapper ${D}/${bindir}/file \ + --magic-file ${datadir}/misc/magic.mgc +} + +do_install_append_class-nativesdk() { + create_cmdline_wrapper ${D}/${bindir}/file \ + --magic-file ${datadir}/misc/magic.mgc +} + +BBCLASSEXTEND = "native nativesdk" +PROVIDES_append_class-native = " file-replacement-native" +# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who +# depends on file-replacement-native. +bindir_append_class-native = "/file-native" diff --git a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch b/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch deleted file mode 100644 index f8ba2f6153..0000000000 --- a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 18 Oct 2020 23:40:42 +0200 -Subject: [PATCH] src/compress.c: correct header define for xz/lzma - -Upstream-Status: Submitted [https://github.com/file/file/pull/98] -Signed-off-by: Alexander Kanavin ---- - src/compress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compress.c b/src/compress.c -index 67f21583..9670b72c 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -71,7 +71,7 @@ typedef void (*sig_t)(int); - #include - #endif - --#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT) -+#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT) - #define BUILTIN_XZLIB - #include - #endif --- -2.28.0 - -- cgit v1.2.3-54-g00ecf