Skip to contentSkip to conversation

zip: Always enable LARGE_FILE_SUPPORT

PATCH New Khem Raj 1 participant 5 messages Aug 13, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/5 zip: Always enable LARGE_FILE_SUPPORT

largefile distro feature is deprecated

---
 meta/recipes-extended/zip/zip_3.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/zip/zip_3.0.bb +2 -1
index 65d9b0995bf..1930a40140b 100644
@@ -31,7 +31,8 @@ CVE_CHECK_IGNORE += "CVE-2018-13410"
 # Not for zip but for smart contract implementation for it
 CVE_CHECK_IGNORE += "CVE-2018-13684"
 
-CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DLARGE_FILE_SUPPORT', '', d)}"
+# Enable largefile support
+CFLAGS += "-DLARGE_FILE_SUPPORT"
 
 # zip.inc sets CFLAGS, but what Makefile actually uses is
 # CFLAGS_NOOPT.  It will also force -O3 optimization, overriding
Signature · 1 line
2.37.1
author
#1 lore raw

PATCH 2/5 libmicrohttpd: Enable largefile support unconditionally

the distro feature knob is deprecated

---
 meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.75.bb +2 -5
index 9c99af7c912..043fed367c6 100644
@@ -13,13 +13,10 @@ inherit autotools lib_package pkgconfig gettext
 
 CFLAGS += "-pthread -D_REENTRANT"
 
-EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../"
+EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../ --enable-largefile"
 
 PACKAGECONFIG ?= "curl https"
-PACKAGECONFIG:append:class-target = "\
-        ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \
-"
-PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
+
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,"
 PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls,"
 
Signature · 1 line
2.37.1
author
#2 lore raw

PATCH 3/5 unzip: Always enable largefile support

In reply to Khem Raj
---
 meta/recipes-extended/unzip/unzip_6.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/unzip/unzip_6.0.bb +2 -1
index 96068eefdd2..a4d10c30aa2 100644
@@ -46,7 +46,8 @@ UPSTREAM_CHECK_REGEX = "unzip(?P<pver>(?!552).+)\.tgz"
 
 S = "${WORKDIR}/unzip60"
 
-CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DLARGE_FILE_SUPPORT', '', d)}"
+# Enable largefile support
+CFLAGS += "-DLARGE_FILE_SUPPORT"
 
 # Makefile uses CF_NOOPT instead of CFLAGS.  We lifted the values from
 # Makefile and add CFLAGS.  Optimization will be overriden by unzip
Signature · 1 line
2.37.1
author
#3 lore raw

PATCH 4/5 local.conf.sample.extended: Remove largefile from DISTRO_FEATURES

In reply to Khem Raj

This feature is removed therefore lets remove it from samples and templates

---
 meta/conf/local.conf.sample.extended | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/local.conf.sample.extended +1 -1
index d24616c764b..a898b18d59f 100644
@@ -35,7 +35,7 @@
 #DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi nfs zeroconf pci"
 
 # If you want to get an image based on directfb without x11, Please copy this variable to build/conf/local.conf
-#DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb"
+#DISTRO_FEATURES = "alsa bluetooth ext2 irda ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb"
 
 # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
 # packages at build time using qemu-native. Disabling it (by setting it to 0)
Signature · 1 line
2.37.1
author
#4 lore raw

PATCH 5/5 default-distrovars: Remove largefile from defualt DISTRO_FEATURES

In reply to Khem Raj
---
 meta/conf/distro/include/default-distrovars.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
index 230bab84dd4..abf48f79f08 100644
@@ -19,7 +19,7 @@ DISTRO_FEATURES_DEFAULT:remove:arc = "seccomp"
 # seccomp is not yet ported to microblaze
 DISTRO_FEATURES_DEFAULT:remove:microblaze = "seccomp"
 
-DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp"
+DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
 IMAGE_FEATURES ?= ""
 
Signature · 1 line
2.37.1