diff options
Diffstat (limited to 'meta/recipes-devtools/file')
-rw-r--r-- | meta/recipes-devtools/file/file_5.38.bb | 49 | ||||
-rw-r--r-- | meta/recipes-devtools/file/file_5.45.bb | 61 | ||||
-rw-r--r-- | meta/recipes-devtools/file/files/print_c.patch | 27 |
3 files changed, 88 insertions, 49 deletions
diff --git a/meta/recipes-devtools/file/file_5.38.bb b/meta/recipes-devtools/file/file_5.38.bb deleted file mode 100644 index b8f09107e8..0000000000 --- a/meta/recipes-devtools/file/file_5.38.bb +++ /dev/null @@ -1,49 +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 = "zlib file-replacement-native" -DEPENDS_class-native = "zlib-native" - -SRC_URI = "git://github.com/file/file.git" - -SRCREV = "ec41083645689a787cdd00cb3b5bf578aa79e46c" -S = "${WORKDIR}/git" - -inherit autotools update-alternatives - -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.45.bb b/meta/recipes-devtools/file/file_5.45.bb new file mode 100644 index 0000000000..fa8dc576dc --- /dev/null +++ b/meta/recipes-devtools/file/file_5.45.bb @@ -0,0 +1,61 @@ +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;branch=master;protocol=https \ + file://print_c.patch \ + " + +SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be" +S = "${WORKDIR}/git" + +inherit autotools update-alternatives + +PACKAGECONFIG ??= "bz2 lzma zlib zstdlib lzlib" +PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2" +PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz" +PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib" +PACKAGECONFIG[zstdlib] = "--enable-zstdlib, --disable-zstdlib, zstd" +PACKAGECONFIG[lzlib] = "--enable-lzlib, --disable-lzlib, lzlib" +PACKAGECONFIG[seccomp] = "--enable-libseccomp, --disable-libseccomp, 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" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/file.sh" + +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_wrapper ${D}/${bindir}/file MAGIC=${datadir}/misc/magic.mgc + mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d + cat <<- EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/file.sh + export MAGIC="${datadir}/misc/magic.mgc" + EOF +} + +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/print_c.patch b/meta/recipes-devtools/file/files/print_c.patch new file mode 100644 index 0000000000..760813f9c2 --- /dev/null +++ b/meta/recipes-devtools/file/files/print_c.patch @@ -0,0 +1,27 @@ +From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Mon, 7 Aug 2023 22:37:19 +0000 +Subject: [PATCH] print.c: initialize timezone data for localtime_r() + +The man page for localtime() points out that while it acts +like tzset() has been called, localtime_r() might not. We +have a local version of localtime_r() that avoids this, but +we do not compile it. + +Upstream-Status: Submitted [file@astron.com] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + src/print.c | 1 + + 1 file changed, 1 insertion(+) + +--- git.orig/src/print.c ++++ git/src/print.c +@@ -289,6 +289,7 @@ file_fmtdatetime(char *buf, size_t bsize + goto out; + + if (flags & FILE_T_LOCAL) { ++ tzset(); + tm = localtime_r(&t, &tmz); + } else { + tm = gmtime_r(&t, &tmz); |